summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2022-12-30 11:18:04 -0600
committerGitHub <noreply@github.com>2022-12-30 11:18:04 -0600
commitd3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1 (patch)
tree60774a19ad044f32cf6c9416c807b3d423376847 /docs/conf.py
parent240f34a18cde2473922bcc139ee92ee8b6978ce2 (diff)
parent068555acbd102694bd83c2fe11b5b125ca8649f8 (diff)
downloadpyramid-d3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1.tar.gz
pyramid-d3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1.tar.bz2
pyramid-d3fc4f97e8d5b8553c2a40da535a4b82d41d8ea1.zip
Merge pull request #3713 from jvanasco/main
rename "master" to "main"
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index df117b1e3..1d2daa7de 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -86,7 +86,7 @@ templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'
-# The master toctree document.
+# The main toctree document.
master_doc = 'index'
# General substitutions.
@@ -150,7 +150,7 @@ html_theme = 'pyramid'
html_theme_path = pylons_sphinx_themes.get_html_themes_path()
html_theme_options = dict(
github_url='https://github.com/Pylons/pyramid',
- # On master branch and new branch still in
+ # On main branch and new branch still in
# pre-release status: true; else: false.
in_progress='true',
# On branches previous to "latest": true; else: false.