Merge branch 'master' of github.com:Pylons/pyramid

1 files changed, 23 insertions, 6 deletions

diff --git a/docs/conf.py b/docs/conf.py
index ff5f325d8..4c6ed76ad 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,6 +19,8 @@ import warnings
 
 warnings.simplefilter('ignore', DeprecationWarning)
 
+import pkg_resources
+
 # skip raw nodes
 from sphinx.writers.text import TextTranslator
 from sphinx.writers.latex import LaTeXTranslator
@@ -55,10 +57,25 @@ extensions = [
 
 # Looks for objects in external projects
 intersphinx_mapping = {
+    'tutorials': ('http://docs.pylonsproject.org/projects/pyramid_tutorials/en/latest/', None),
+    'jinja2': ('http://docs.pylonsproject.org/projects/pyramid_jinja2/en/latest/', None),
+    'tm': (
+        'http://docs.pylonsproject.org/projects/pyramid_tm/en/latest/',
+        None,
+    ),
     'zcomponent': ('http://docs.zope.org/zope.component', None),
     'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
     'webob': ('http://docs.webob.org/en/latest', None),
+    'colander': (
+        'http://docs.pylonsproject.org/projects/colander/en/latest',
+    None),
+    'deform': (
+        'http://docs.pylonsproject.org/projects/deform/en/latest',
+    None),
     'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
+    'beaker': (
+        'http://docs.pylonsproject.org/projects/pyramid_beaker/en/latest',
+        None),
     'who': ('http://docs.repoze.org/who/latest', None),
     'python': ('http://docs.python.org', None),
     'python3': ('http://docs.python.org/3', None),
@@ -85,7 +102,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General substitutions.
-project = 'The Pyramid Web Application Development Framework'
+project = 'The Pyramid Web Framework'
 thisyear = datetime.datetime.now().year
 copyright = '2008-%s, Agendaless Consulting' % thisyear
 
@@ -93,7 +110,7 @@ copyright = '2008-%s, Agendaless Consulting' % thisyear
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.5dev'
+version = pkg_resources.get_distribution('pyramid').version
 
 # The full version, including alpha/beta/rc tags.
 release = version
@@ -179,7 +196,7 @@ html_theme_options = dict(
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-html_title = 'The Pyramid Web Application Development Framework v%s' % release
+html_title = 'The Pyramid Web Framework v%s' % release
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = 'Home'
@@ -251,7 +268,7 @@ latex_additional_files = ['_static/latex-note.png', '_static/latex-warning.png']
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
   ('latexindex', 'pyramid.tex',
-   'The Pyramid Web Application Development Framework',
+   'The Pyramid Web Framework',
    'Chris McDonough', 'manual'),
     ]
 
@@ -491,7 +508,7 @@ def resig(app, what, name, obj, options, signature, return_annotation):
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = 'The Pyramid Web Application Development Framework, Version %s' \
+epub_title = 'The Pyramid Web Framework, Version %s' \
              % release
 epub_author = 'Chris McDonough'
 epub_publisher = 'Agendaless Consulting'
@@ -509,7 +526,7 @@ epub_scheme = 'ISBN'
 epub_identifier = '0615445675'
 
 # A unique identification for the text.
-epub_uid = 'The Pyramid Web Application Development Framework, Version %s' \
+epub_uid = 'The Pyramid Web Framework, Version %s' \
            % release
 # HTML files that should be inserted before the pages created by sphinx.
 # The format is a list of tuples containing the path and title.