diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-17 01:31:55 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-17 01:31:55 -0700 |
| commit | 7c9eab4730efac736064ec35a312d3a7936674d2 (patch) | |
| tree | af4cad2d4d8c3e065ff390d1b9874c8038a623a4 /docs/conf.py | |
| parent | 51cc630b6868a148aa153b751410ea9eb5ecc9d9 (diff) | |
| download | pyramid-7c9eab4730efac736064ec35a312d3a7936674d2.tar.gz pyramid-7c9eab4730efac736064ec35a312d3a7936674d2.tar.bz2 pyramid-7c9eab4730efac736064ec35a312d3a7936674d2.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/conf.py')
| -rw-r--r-- | docs/conf.py | 6 |
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', ) |