diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-17 01:23:41 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-17 01:23:41 -0700 |
| commit | d073d31dfb1bc7484039d23667a7a90895935027 (patch) | |
| tree | a7fa8e197724b3adca6b4a27f5fd4990ec45a11d /docs | |
| parent | 9b0ac053084b0811111fdc33b969598e1b78f2e6 (diff) | |
| parent | 9a7510433b13a91e15e262ab30ea3704e6ff7f49 (diff) | |
| download | pyramid-d073d31dfb1bc7484039d23667a7a90895935027.tar.gz pyramid-d073d31dfb1bc7484039d23667a7a90895935027.tar.bz2 pyramid-d073d31dfb1bc7484039d23667a7a90895935027.zip | |
Merge pull request #2510 from stevepiercy/1.7-branch
update RELEASING.txt with version terms, extra step
Diffstat (limited to 'docs')
| -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', ) |