The default setting for master_doc is changed to 'index'

25 files changed, 14 insertions, 17 deletions

diff --git a/tests/roots/test-autosummary/contents.rst b/tests/roots/test-autosummary/index.rst
index 5ddc4bd40..5ddc4bd40 100644
--- a/tests/roots/test-autosummary/contents.rst
+++ b/tests/roots/test-autosummary/index.rst
diff --git a/tests/roots/test-build-text/conf.py b/tests/roots/test-build-text/conf.py
index 23d0ae840..fd9eefbf6 100644
--- a/tests/roots/test-build-text/conf.py
+++ b/tests/roots/test-build-text/conf.py
@@ -1,3 +1,2 @@
-master_doc = 'contents'
 source_suffix = '.txt'
 exclude_patterns = ['_build']
diff --git a/tests/roots/test-build-text/contents.txt b/tests/roots/test-build-text/index.txt
index ca9f8dc6c..ca9f8dc6c 100644
--- a/tests/roots/test-build-text/contents.txt
+++ b/tests/roots/test-build-text/index.txt
diff --git a/tests/roots/test-circular/contents.rst b/tests/roots/test-circular/index.rst
index 294e674dd..294e674dd 100644
--- a/tests/roots/test-circular/contents.rst
+++ b/tests/roots/test-circular/index.rst
diff --git a/tests/roots/test-circular/sub.rst b/tests/roots/test-circular/sub.rst
index 070c39743..cebfd6587 100644
--- a/tests/roots/test-circular/sub.rst
+++ b/tests/roots/test-circular/sub.rst
@@ -1,3 +1,3 @@
 .. toctree::
 
-   contents
+   index
diff --git a/tests/roots/test-correct-year/contents.rst b/tests/roots/test-correct-year/index.rst
index 938dfd503..938dfd503 100644
--- a/tests/roots/test-correct-year/contents.rst
+++ b/tests/roots/test-correct-year/index.rst
diff --git a/tests/roots/test-directive-only/contents.rst b/tests/roots/test-directive-only/index.rst
index 80ec00313..80ec00313 100644
--- a/tests/roots/test-directive-only/contents.rst
+++ b/tests/roots/test-directive-only/index.rst
diff --git a/tests/roots/test-docutilsconf/contents.txt b/tests/roots/test-docutilsconf/index.txt
index b20204e61..b20204e61 100644
--- a/tests/roots/test-docutilsconf/contents.txt
+++ b/tests/roots/test-docutilsconf/index.txt
diff --git a/tests/roots/test-ext-autodoc/contents.rst b/tests/roots/test-ext-autodoc/index.rst
index ce4302204..ce4302204 100644
--- a/tests/roots/test-ext-autodoc/contents.rst
+++ b/tests/roots/test-ext-autodoc/index.rst
diff --git a/tests/roots/test-ext-autosummary/contents.rst b/tests/roots/test-ext-autosummary/index.rst
index fc84927bb..fc84927bb 100644
--- a/tests/roots/test-ext-autosummary/contents.rst
+++ b/tests/roots/test-ext-autosummary/index.rst
diff --git a/tests/roots/test-gettext-template/contents.rst b/tests/roots/test-gettext-template/index.rst
index e69de29bb..e69de29bb 100644
--- a/tests/roots/test-gettext-template/contents.rst
+++ b/tests/roots/test-gettext-template/index.rst
diff --git a/tests/roots/test-inheritance/contents.rst b/tests/roots/test-inheritance/index.rst
index db4fbacb8..db4fbacb8 100644
--- a/tests/roots/test-inheritance/contents.rst
+++ b/tests/roots/test-inheritance/index.rst
diff --git a/tests/roots/test-intl/_templates/index.html b/tests/roots/test-intl/_templates/contents.html
index d730545d1..d730545d1 100644
--- a/tests/roots/test-intl/_templates/index.html
+++ b/tests/roots/test-intl/_templates/contents.html
diff --git a/tests/roots/test-intl/conf.py b/tests/roots/test-intl/conf.py
index aafd9ba79..0306ff38e 100644
--- a/tests/roots/test-intl/conf.py
+++ b/tests/roots/test-intl/conf.py
@@ -4,7 +4,7 @@ project = 'Sphinx intl <Tests>'
 source_suffix = '.txt'
 keep_warnings = True
 templates_path = ['_templates']
-html_additional_pages = {'index': 'index.html'}
+html_additional_pages = {'contents': 'contents.html'}
 release = version = '2013.120'
 gettext_additional_targets = ['index']
 exclude_patterns = ['_build']
diff --git a/tests/roots/test-intl/contents.po b/tests/roots/test-intl/index.po
index 76ef049f0..76ef049f0 100644
--- a/tests/roots/test-intl/contents.po
+++ b/tests/roots/test-intl/index.po
diff --git a/tests/roots/test-intl/contents.txt b/tests/roots/test-intl/index.txt
index b818e99c7..cd63b5ec3 100644
--- a/tests/roots/test-intl/contents.txt
+++ b/tests/roots/test-intl/index.txt
@@ -10,7 +10,7 @@ CONTENTS
    :numbered:
    :caption: Table of Contents
 
-   subdir/contents
+   subdir/index
    bom
    warnings
    footnote
diff --git a/tests/roots/test-intl/role_xref.po b/tests/roots/test-intl/role_xref.po
index 5b6d114c0..81ee22c6e 100644
--- a/tests/roots/test-intl/role_xref.po
+++ b/tests/roots/test-intl/role_xref.po
@@ -19,8 +19,8 @@ msgstr ""
 msgid "i18n role xref"
 msgstr "I18N ROCK'N ROLE XREF"
 
-msgid "link to :term:`Some term`, :ref:`i18n-role-xref`, :doc:`contents`."
-msgstr "LINK TO :ref:`i18n-role-xref`, :doc:`contents`, :term:`SOME NEW TERM`."
+msgid "link to :term:`Some term`, :ref:`i18n-role-xref`, :doc:`index`."
+msgstr "LINK TO :ref:`i18n-role-xref`, :doc:`index`, :term:`SOME NEW TERM`."
 
 msgid "same type links"
 msgstr "SAME TYPE LINKS"
@@ -31,8 +31,8 @@ msgstr "LINK TO :term:`SOME OTHER NEW TERM` AND :term:`SOME NEW TERM`."
 msgid "link to :ref:`i18n-role-xref` and :ref:`same-type-links`."
 msgstr "LINK TO :ref:`same-type-links` AND :ref:`i18n-role-xref`."
 
-msgid "link to :doc:`contents` and :doc:`glossary_terms`."
-msgstr "LINK TO :doc:`glossary_terms` AND :doc:`contents`."
+msgid "link to :doc:`index` and :doc:`glossary_terms`."
+msgstr "LINK TO :doc:`glossary_terms` AND :doc:`index`."
 
 msgid "link to :option:`-m` and :option:`--module`."
 msgstr "LINK TO :option:`--module` AND :option:`-m`."
diff --git a/tests/roots/test-intl/role_xref.txt b/tests/roots/test-intl/role_xref.txt
index b3d42d127..875af4667 100644
--- a/tests/roots/test-intl/role_xref.txt
+++ b/tests/roots/test-intl/role_xref.txt
@@ -5,7 +5,7 @@
 i18n role xref
 ==============
 
-link to :term:`Some term`, :ref:`i18n-role-xref`, :doc:`contents`.
+link to :term:`Some term`, :ref:`i18n-role-xref`, :doc:`index`.
 
 .. _same-type-links:
 
@@ -16,7 +16,7 @@ link to :term:`Some term` and :term:`Some other term`.
 
 link to :ref:`i18n-role-xref` and :ref:`same-type-links`.
 
-link to :doc:`contents` and :doc:`glossary_terms`.
+link to :doc:`index` and :doc:`glossary_terms`.
 
 link to :option:`-m` and :option:`--module`.
 
diff --git a/tests/roots/test-intl/subdir/contents.txt b/tests/roots/test-intl/subdir/index.txt
index 7578ce387..7578ce387 100644
--- a/tests/roots/test-intl/subdir/contents.txt
+++ b/tests/roots/test-intl/subdir/index.txt
diff --git a/tests/roots/test-numbered-circular/contents.rst b/tests/roots/test-numbered-circular/index.rst
index c3129cd48..c3129cd48 100644
--- a/tests/roots/test-numbered-circular/contents.rst
+++ b/tests/roots/test-numbered-circular/index.rst
diff --git a/tests/roots/test-numbered-circular/sub.rst b/tests/roots/test-numbered-circular/sub.rst
index 070c39743..cebfd6587 100644
--- a/tests/roots/test-numbered-circular/sub.rst
+++ b/tests/roots/test-numbered-circular/sub.rst
@@ -1,3 +1,3 @@
 .. toctree::
 
-   contents
+   index
diff --git a/tests/roots/test-root/conf.py b/tests/roots/test-root/conf.py
index d5029a776..42b8295a2 100644
--- a/tests/roots/test-root/conf.py
+++ b/tests/roots/test-root/conf.py
@@ -18,7 +18,6 @@ jsmath_path = 'dummy.js'
 
 templates_path = ['_templates']
 
-master_doc = 'contents'
 source_suffix = ['.txt', '.add', '.foo']
 
 project = 'Sphinx <Tests>'
@@ -37,8 +36,7 @@ rst_epilog = '.. |subst| replace:: global substitution'
 
 html_sidebars = {'**': ['localtoc.html', 'relations.html', 'sourcelink.html',
                         'customsb.html', 'searchbox.html'],
-                 'contents': ['contentssb.html', 'localtoc.html',
-                              'globaltoc.html']}
+                 'index': ['contentssb.html', 'localtoc.html', 'globaltoc.html']}
 html_style = 'default.css'
 html_last_updated_fmt = '%b %d, %Y'
 html_context = {'hckey': 'hcval', 'hckey_co': 'wrong_hcval_co'}
@@ -49,19 +47,19 @@ applehelp_bundle_id = 'org.sphinx-doc.Sphinx.help'
 applehelp_disable_external_tools = True
 
 latex_documents = [
-    ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation',
+    ('index', 'SphinxTests.tex', 'Sphinx Tests Documentation',
      'Georg Brandl \\and someone else', 'manual'),
 ]
 
 latex_additional_files = ['svgimg.svg']
 
 texinfo_documents = [
-    ('contents', 'SphinxTests', 'Sphinx Tests',
+    ('index', 'SphinxTests', 'Sphinx Tests',
      'Georg Brandl \\and someone else', 'Sphinx Testing', 'Miscellaneous'),
 ]
 
 man_pages = [
-    ('contents', 'SphinxTests', 'Sphinx Tests Documentation',
+    ('index', 'SphinxTests', 'Sphinx Tests Documentation',
      'Georg Brandl and someone else', 1),
 ]
 
diff --git a/tests/roots/test-root/contents.txt b/tests/roots/test-root/index.txt
index d5ff24115..d5ff24115 100644
--- a/tests/roots/test-root/contents.txt
+++ b/tests/roots/test-root/index.txt
diff --git a/tests/roots/test-setup/doc/contents.txt b/tests/roots/test-setup/doc/index.txt
index 56960f53e..56960f53e 100644
--- a/tests/roots/test-setup/doc/contents.txt
+++ b/tests/roots/test-setup/doc/index.txt
diff --git a/tests/roots/test-templating/contents.txt b/tests/roots/test-templating/index.txt
index 04a40e21c..04a40e21c 100644
--- a/tests/roots/test-templating/contents.txt
+++ b/tests/roots/test-templating/index.txt