Merge pull request #2562 from stevepiercy/master

Fix a few links in docs

3 files changed, 4 insertions, 3 deletions

diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 51c3c5bd8..e759c0e2a 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -1432,7 +1432,8 @@ object which *is not logically global*:
         # this is executed if the request method was GET or the
         # credentials were invalid    
 
-The `Pylons 1.X <http://docs.pylonsproject.org/projects/pyramid/en/latest/>`_
+The `Pylons 1.X
+<http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/>`_
 web framework uses a similar strategy.  It calls these things "Stacked Object
 Proxies", so, for purposes of this discussion, I'll do so as well.
 
diff --git a/docs/index.rst b/docs/index.rst
index ad667684c..452666dc8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -80,7 +80,7 @@ If you've got questions that aren't answered by this documentation, contact the
 `Pylons-discuss maillist
 <https://groups.google.com/forum/#!forum/pylons-discuss>`_ or join the
 `#pyramid IRC channel
-<https://webchat.freenode.net?channels=%23pyramid&uio=d4>`_.
+<https://webchat.freenode.net/?channels=pyramid>`_.
 
 Browse and check out tagged and trunk versions of :app:`Pyramid` via the
 `Pyramid GitHub repository <https://github.com/Pylons/pyramid/>`_. To check out
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index d92916503..de6ac408b 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -221,7 +221,7 @@ send email, let you use the Jinja2 templating system, let you use XML-RPC or
 JSON-RPC, let you integrate with jQuery Mobile, etc.
 
 Examples:
-http://docs.pylonsproject.org/en/latest/docs/pyramid.html#pyramid-add-ons
+https://trypyramid.com/resources-extending-pyramid.html
 
 Class-based and function-based views
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~