From 2b50258d4f7771b4a52a0170733186b3fc4e9b7b Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 8 May 2016 12:27:24 -0700
Subject: pylons != pyramid

---
 docs/designdefense.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs')

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.
 
-- 
cgit v1.2.3


From a1aa71ac60fbaac4fc0fbc3d4846fb9f33d2ad07 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 8 May 2016 12:35:16 -0700
Subject: - use cleaner URL for IRC

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

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
-- 
cgit v1.2.3


From c6729daea00b438bcf01c15c0e98f4a8024bf3c7 Mon Sep 17 00:00:00 2001
From: Steve Piercy <web@stevepiercy.com>
Date: Sun, 8 May 2016 12:41:08 -0700
Subject: use new trypyramid.com page. whee!

---
 docs/narr/introduction.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- 
cgit v1.2.3