diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index 70dd02e878..36cd5f687e 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -2,7 +2,7 @@
 
 {% block sidebartitle %}
     {%- if logo and theme_logo_only %}
-        <a href="{{ pathto(master_doc) }}">
+        <a href="{{ pathto(root_doc) }}">
             <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" alt="{{ _('Logo') }}"/>
         </a>
     {%- endif %}
diff --git a/docs/conf.py b/docs/conf.py
index 3614a9bbec..2d94b263c0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -44,8 +44,8 @@ templates_path = ["_templates"]
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
 
-# The master toctree document.
-master_doc = "index"
+# The root toctree document.
+root_doc = "index"
 
 # General information about the project.
 project = "Zulip"
@@ -234,7 +234,7 @@ latex_elements: Dict[str, str] = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, "zulip-contributor-docs.tex", "Zulip Documentation", "The Zulip Team", "manual"),
+    (root_doc, "zulip-contributor-docs.tex", "Zulip Documentation", "The Zulip Team", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -263,7 +263,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, "zulip-contributor-docs", "Zulip Documentation", [author], 1),
+    (root_doc, "zulip-contributor-docs", "Zulip Documentation", [author], 1),
 ]
 
 # If true, show URL addresses after external links.
@@ -277,7 +277,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     (
-        master_doc,
+        root_doc,
         "zulip-contributor-docs",
         "Zulip Documentation",
         author,