Merge branch 'master' into pdf_bookmarksdepth

4 files changed, 6 insertions, 6 deletions

diff --git a/sphinx/templates/htmlhelp/project.hhc b/sphinx/templates/htmlhelp/project.hhc
index c1096e711..705cfeba7 100644
--- a/sphinx/templates/htmlhelp/project.hhc
+++ b/sphinx/templates/htmlhelp/project.hhc
@@ -18,7 +18,7 @@
     </OBJECT>
     <UL>
       <LI>
-        {{ sitemap(short_title, master_doc)|indent(8) }}
+        {{ sitemap(short_title, root_doc)|indent(8) }}
       </LI>
       {%- for indexname, indexcls, content, collapse in domain_indices %}
       <LI>
diff --git a/sphinx/templates/htmlhelp/project.hhp b/sphinx/templates/htmlhelp/project.hhp
index b647b3713..17edc1f3d 100644
--- a/sphinx/templates/htmlhelp/project.hhp
+++ b/sphinx/templates/htmlhelp/project.hhp
@@ -4,7 +4,7 @@ Binary Index=No
 Compiled file={{ outname }}.chm
 Contents file={{ outname }}.hhc
 Default Window={{ outname }}
-Default topic={{ master_doc }}
+Default topic={{ root_doc }}
 Display compile progress=No
 Full text search stop list file={{ outname }}.stp
 Full-text search=Yes
@@ -13,7 +13,7 @@ Language={{ "%#x"|format(lcid) }}
 Title={{ title }}
 
 [WINDOWS]
-{{ outname }}="{{ title }}","{{ outname }}.hhc","{{ outname }}.hhk","{{ master_doc }}","{{ master_doc }}",,,,,0x63520,220,0x10384e,[0,0,1024,768],,,,,,,0
+{{ outname }}="{{ title }}","{{ outname }}.hhc","{{ outname }}.hhk","{{ root_doc }}","{{ root_doc }}",,,,,0x63520,220,0x10384e,[0,0,1024,768],,,,,,,0
 
 [FILES]
 {%- for filename in files %}
diff --git a/sphinx/templates/quickstart/conf.py_t b/sphinx/templates/quickstart/conf.py_t
index 8a20fc4c8..0c5285f9e 100644
--- a/sphinx/templates/quickstart/conf.py_t
+++ b/sphinx/templates/quickstart/conf.py_t
@@ -64,9 +64,9 @@ templates_path = ['{{ dot }}templates']
 source_suffix = {{ suffix | repr }}
 
 {% endif -%}
-{% if master != 'index' -%}
-# The master toctree document.
-master_doc = {{ master | repr }}
+{% if root_doc != 'index' -%}
+# The root document.
+root_doc = {{ root_doc | repr }}
 
 {% endif -%}
 {% if language -%}
diff --git a/sphinx/templates/quickstart/master_doc.rst_t b/sphinx/templates/quickstart/root_doc.rst_t
index 3aa98af08..3aa98af08 100644
--- a/sphinx/templates/quickstart/master_doc.rst_t
+++ b/sphinx/templates/quickstart/root_doc.rst_t