summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RELEASING.txt6
-rw-r--r--docs/conf.py3
2 files changed, 8 insertions, 1 deletions
diff --git a/RELEASING.txt b/RELEASING.txt
index 61420ce8b..bc8f2c721 100644
--- a/RELEASING.txt
+++ b/RELEASING.txt
@@ -28,12 +28,16 @@ Releasing Pyramid
include a link under "Bug Fix Releases" to the minor feature
changes in CHANGES.txt .
-- update README.rst to use correct versions of badges and URLs according to
+- Update README.rst to use correct versions of badges and URLs according to
each branch and context, i.e., RTD "latest" == GitHub/Travis "1.x-branch".
- Update whatsnew-X.X.rst in docs to point at change log entries for individual
releases if applicable.
+- For major version releases, in docs/conf.py, update values under
+ html_theme_options for in_progress and outdated across master, releasing
+ branch, and previously released branch.
+
- Change setup.py version to the new version number.
- Change CHANGES.txt heading to reflect the new version number.
diff --git a/docs/conf.py b/docs/conf.py
index 073811eca..4cac1e913 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -129,7 +129,10 @@ 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 true, else false
in_progress='true',
+ # on previous branches/major releases true, else false
+ outdated='false',
)
# The name for this set of Sphinx documents. If None, it defaults to