Merge branch '1.6-release'

doc/_templates/indexsidebar.html

@@ -3,7 +3,7 @@
   {%trans%}project{%endtrans%}</p>
 
 <h3>Download</h3>
-{% if version.endswith('a0') %}
+{% if version.endswith('+') %}
 <p>{%trans%}This documentation is for version <b><a href="changes.html">{{ version }}</a></b>, which is
   not released yet.{%endtrans%}</p>
 <p>{%trans%}You can use it from the

doc/conf.py

@@ -16,7 +16,7 @@ exclude_patterns = ['_build']
 
 project = 'Sphinx'
 copyright = '2007-2017, Georg Brandl and the Sphinx team'
-version = sphinx.__released__
+version = sphinx.__display_version__
 release = version
 show_authors = True
 

doc/config.rst

@@ -771,6 +771,12 @@ that use Sphinx's HTMLWriter class.
    will be used to convert quotes and dashes to typographically correct
    entities.  Default: ``True``.
 
+   .. deprecated:: 1.6
+      Use the `smart_quotes option`_ in the Docutils configuration file
+      (``docutils.conf``) instead.
+
+      .. _`smart_quotes option`: http://docutils.sourceforge.net/docs/user/config.html#smart-quotes
+
 .. confval:: html_add_permalinks
 
    Sphinx will add "permalinks" for each heading and description environment as

doc/theming.rst

@@ -47,7 +47,9 @@ file :file:`blue.zip`, you can put it right in the directory containing
     html_theme_path = ["."]
 
 The third form is a python package.  If a theme you want to use is distributed
-as a python package, you can use it after installing::
+as a python package, you can use it after installing
+
+.. code-block:: bash
 
     # installing theme package
     $ pip install sphinxjp.themes.dotted