summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-04-16 22:16:22 -0700
committerSteve Piercy <web@stevepiercy.com>2016-04-16 22:16:22 -0700
commit9a7510433b13a91e15e262ab30ea3704e6ff7f49 (patch)
treea7fa8e197724b3adca6b4a27f5fd4990ec45a11d /docs
parent86e79cf1db4c789d4fcb1cf75a42189ef3fd21ec (diff)
downloadpyramid-9a7510433b13a91e15e262ab30ea3704e6ff7f49.tar.gz
pyramid-9a7510433b13a91e15e262ab30ea3704e6ff7f49.tar.bz2
pyramid-9a7510433b13a91e15e262ab30ea3704e6ff7f49.zip
update RELEASING.txt with version terms, extra step
update conf.py with clearer comments and prep for rolldown for 1.6
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index c40f1c875..786ff3abf 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -137,6 +137,7 @@ if book:
# 'whatsnew-1.3': 'index',
# 'whatsnew-1.4': 'index',
# 'whatsnew-1.5': 'index',
+# 'whatsnew-1.6': 'index',
# 'tutorials/gae/index': 'index',
# 'api/chameleon_text': 'api',
# 'api/chameleon_zpt': 'api',
@@ -146,9 +147,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
+ # On master branch and new branch still in
+ # pre-release status: true; else: false.
in_progress='true',
- # on previous branches/major releases true, else false
+ # On branches previous to "latest": true; else: false.
outdated='false',
)