Merge branch 'master' into change_master_doc_to_index

doc/usage/builders/index.rst

@@ -165,16 +165,17 @@ The builder's "name" must be given to the **-b** command-line option of
    * ``texlive-fonts-recommended``
    * ``texlive-latex-extra``
    * ``latexmk`` (for ``make latexpdf`` on GNU/Linux and MacOS X)
-   * ``latex-xcolor`` (old Ubuntu)
    * ``texlive-luatex``, ``texlive-xetex`` (see :confval:`latex_engine`)
 
-   The testing of Sphinx LaTeX is done on Ubuntu trusty with the above
-   mentioned packages, which are from a TeXLive 2013 snapshot dated
-   February 2014.
+   The testing of Sphinx LaTeX is done on Ubuntu xenial with the above mentioned
+   packages, which are from a TeXLive 2015 snapshot dated March 2016.
 
    .. versionchanged:: 1.6
       Formerly, testing had been done on Ubuntu precise (TeXLive 2009).
 
+   .. versionchanged:: 2.0
+      Formerly, testing had been done on Ubuntu trusty (TeXLive 2013).
+
    .. note::
 
       Since 1.6, ``make latexpdf`` uses ``latexmk`` (not on Windows).  This
@@ -215,7 +216,7 @@ Note that a direct PDF builder is being provided by `rinohtype`_. The builder's
 name is ``rinoh``. Refer to the `rinohtype manual`_ for details.
 
 .. _rinohtype: https://github.com/brechtm/rinohtype
-.. _rinohtype manual: http://www.mos6581.org/rinohtype/quickstart.html#sphinx-builder
+.. _rinohtype manual: https://www.mos6581.org/rinohtype/quickstart.html#sphinx-builder
 
 .. module:: sphinx.builders.text
 .. class:: TextBuilder

doc/usage/configuration.rst

@@ -1248,7 +1248,7 @@ that use Sphinx's HTMLWriter class.
 
       :'sphinx.search.ja.DefaultSplitter':
          TinySegmenter algorithm. This is default splitter.
-      :'sphinx.search.ja.MeCabSplitter':
+      :'sphinx.search.ja.MecabSplitter':
          MeCab binding. To use this splitter, 'mecab' python binding or dynamic
          link library ('libmecab.so' for linux, 'libmecab.dll' for windows) is
          required.
@@ -1350,6 +1350,19 @@ Options for HTML help output
 
    Output file base name for HTML help builder.  Default is ``'pydoc'``.
 
+.. confval:: htmlhelp_file_suffix
+
+   This is the file name suffix for generated HTML help files.  The
+   default is ``".html"``.
+
+   .. versionadded:: 2.0
+
+.. confval:: htmlhelp_link_suffix
+
+   Suffix for generated links to HTML files.  The default is ``".html"``.
+
+   .. versionadded:: 2.0
+
 
 .. _applehelp-options:
 

doc/usage/extensions/autosummary.rst

@@ -208,6 +208,8 @@ The following variables available in the templates:
    List containing names of all inherited members of class.  Only available for
    classes.
 
+   .. versionadded:: 1.8.0
+
 .. data:: functions
 
    List containing names of "public" functions in the module.  Here, "public"

doc/usage/extensions/example_google.py

@@ -178,7 +178,7 @@ class ExampleError(Exception):
         self.code = code
 
 
-class ExampleClass(object):
+class ExampleClass:
     """The summary line for a class docstring should fit on one line.
 
     If the class has public attributes, they may be documented here

doc/usage/extensions/example_numpy.py

@@ -223,7 +223,7 @@ class ExampleError(Exception):
         self.code = code
 
 
-class ExampleClass(object):
+class ExampleClass:
     """The summary line for a class docstring should fit on one line.
 
     If the class has public attributes, they may be documented here

doc/usage/extensions/inheritance.rst

@@ -54,7 +54,7 @@ It adds this directive:
            E   D   F
         """
 
-        class A(object):
+        class A:
             pass
 
         class B(A):

doc/usage/extensions/math.rst

@@ -183,7 +183,7 @@ Sphinx.
 
    The default is empty (not configured).
 
-.. _Using in-line configuration options: http://docs.mathjax.org/en/latest/configuration.html#using-in-line-configuration-options
+.. _Using in-line configuration options: https://docs.mathjax.org/en/latest/configuration.html#using-in-line-configuration-options
 
 :mod:`sphinx.ext.jsmath` -- Render math via JavaScript
 ------------------------------------------------------

doc/usage/extensions/napoleon.rst

@@ -409,10 +409,10 @@ sure that "sphinx.ext.napoleon" is enabled in `conf.py`::
 
        .. attribute:: attr1
 
-          *int*
-
           Description of `attr1`
 
+          :type: int
+
 .. confval:: napoleon_use_param
 
    True to use a ``:param:`` role for each function parameter. False to

doc/usage/installation.rst

@@ -12,10 +12,9 @@ Installing Sphinx
 Overview
 --------
 
-Sphinx is written in `Python`__ and supports both Python 2.7 and Python 3.3+.
-We recommend the latter.
+Sphinx is written in `Python`__ and supports Python 3.5+.
 
-__ http://docs.python-guide.org/en/latest/
+__ https://docs.python-guide.org/
 
 
 Linux
@@ -73,7 +72,7 @@ Homebrew
 
 For more information, refer to the `package overview`__.
 
-__ http://formulae.brew.sh/formula/sphinx-doc
+__ https://formulae.brew.sh/formula/sphinx-doc
 
 MacPorts
 ~~~~~~~~
@@ -121,9 +120,9 @@ Once Python is installed, you can install Sphinx using :command:`pip`.  Refer
 to the :ref:`pip installation instructions <install-pypi>` below for more
 information.
 
-__ http://docs.python-guide.org/en/latest/
-__ http://docs.python-guide.org/en/latest/starting/install3/win/
-__ http://docs.python-guide.org/en/latest/starting/install/win/
+__ https://docs.python-guide.org/
+__ https://docs.python-guide.org/starting/install3/win/
+__ https://docs.python-guide.org/starting/install/win/
 
 
 .. _install-pypi:

doc/usage/markdown.rst

@@ -15,7 +15,7 @@ parsing the `CommonMark`__ Markdown flavor.
 __ https://daringfireball.net/projects/markdown/
 __ https://recommonmark.readthedocs.io/en/latest/index.html
 __ https://github.com/rtfd/CommonMark-py
-__ http://commonmark.org/
+__ https://commonmark.org/
 
 Configuration
 -------------