Merge upstream master

1 files changed, 30 insertions, 6 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 8a9bac6ed..518f7e784 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,21 +53,24 @@ extensions = [
     'sphinx.ext.doctest',
     'repoze.sphinx.autointerface',
     'sphinx.ext.viewcode',
-    'sphinx.ext.intersphinx'
+    'sphinx.ext.intersphinx',
+    'sphinxcontrib.programoutput',
+    # enable pylons_sphinx_latesturl when this branch is no longer "latest"
+    # 'pylons_sphinx_latesturl',
     ]
 
 # Looks for objects in external projects
 intersphinx_mapping = {
-    'colander': (        'http://docs.pylonsproject.org/projects/colander/en/latest', None),
+    'colander': ('http://docs.pylonsproject.org/projects/colander/en/latest', None),
     'cookbook': ('http://docs.pylonsproject.org/projects/pyramid-cookbook/en/latest/', None),
     'deform': ('http://docs.pylonsproject.org/projects/deform/en/latest', None),
     'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
     'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
-    'python': ('http://docs.python.org', None),
-    'python3': ('http://docs.python.org/3', None),
+    'python': ('https://docs.python.org/3', None),
+    'pytest': ('http://pytest.org/latest/', None),
     'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
-    'tm': ('http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/',         None),
-    'toolbar':         ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),
+    'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
+    'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),
     'tstring': ('http://docs.pylonsproject.org/projects/translationstring/en/latest', None),
     'tutorials': ('http://docs.pylonsproject.org/projects/pyramid-tutorials/en/latest/', None),
     'venusian': ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
@@ -123,12 +126,33 @@ if book:
 
 # Options for HTML output
 # -----------------------
+# enable pylons_sphinx_latesturl when this branch is no longer "latest"
+# pylons_sphinx_latesturl_base = (
+#     'http://docs.pylonsproject.org/projects/pyramid/en/latest/')
+# pylons_sphinx_latesturl_pagename_overrides = {
+#     # map old pagename -> new pagename
+#     'whatsnew-1.0': 'index',
+#     'whatsnew-1.1': 'index',
+#     'whatsnew-1.2': 'index',
+#     'whatsnew-1.3': 'index',
+#     'whatsnew-1.4': 'index',
+#     'whatsnew-1.5': 'index',
+#     'whatsnew-1.6': 'index',
+#     'whatsnew-1.7': 'index',
+#     'tutorials/gae/index': 'index',
+#     'api/chameleon_text': 'api',
+#     'api/chameleon_zpt': 'api',
+# }
 
 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
+    # pre-release status: true; else: false.
     in_progress='true',
+    # On branches previous to "latest": true; else: false.
+    outdated='false',
     )
 
 # The name for this set of Sphinx documents.  If None, it defaults to