Merge pull request #1887 from stevepiercy/master

- add pylonswebframework to intersphinx config, sort entries so they …

2 files changed, 17 insertions, 31 deletions

diff --git a/docs/conf.py b/docs/conf.py
index 11e42c5f3..8a9bac6ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -58,37 +58,24 @@ extensions = [
 
 # Looks for objects in external projects
 intersphinx_mapping = {
-    'tutorials': ('http://docs.pylonsproject.org/projects/pyramid-tutorials/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),
-    '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),
-    'who': ('http://repozewho.readthedocs.org/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),
-    'tstring':
-        ('http://docs.pylonsproject.org/projects/translationstring/en/latest',
-          None),
-    'venusian':
-        ('http://docs.pylonsproject.org/projects/venusian/en/latest', None),
-    'toolbar':
-        ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest',
-         None),
-    'zcml':
-        ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/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),
+    '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),
+    'webob': ('http://docs.webob.org/en/latest', None),
+    'webtest': ('http://webtest.pythonpaste.org/en/latest', None),
+    'who': ('http://repozewho.readthedocs.org/en/latest', None),
+    'zcml': ('http://docs.pylonsproject.org/projects/pyramid-zcml/en/latest', None),
+    'zcomponent': ('http://docs.zope.org/zope.component', None),
 }
 
 
diff --git a/docs/narr/i18n.rst b/docs/narr/i18n.rst
index 3c804a158..8d81418d9 100644
--- a/docs/narr/i18n.rst
+++ b/docs/narr/i18n.rst
@@ -219,10 +219,9 @@ by creating various kinds of gettext files.
    The steps a developer must take to work with :term:`gettext`
    :term:`message catalog` files within a :app:`Pyramid`
    application are very similar to the steps a :term:`Pylons`
-   developer must take to do the same.  See the `Pylons
-   internationalization documentation
-   <http://wiki.pylonshq.com/display/pylonsdocs/Internationalization+and+Localization>`_
-   for more information.
+   developer must take to do the same.  See the :ref:`Pylons
+   Internationalization and Localization documentation
+   <pylonswebframework:i18n>` for more information.
 
 GNU gettext uses three types of files in the translation framework,
 ``.pot`` files, ``.po`` files and ``.mo`` files.