summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-08 02:07:52 -0700
committerChris McDonough <chrism@plope.com>2011-09-08 02:07:52 -0700
commite74d305b8d7f68cfff0ef2927104c717e0fcb5de (patch)
treef346cfe8a294ddd7d0a8f80b8582ea2eac731067 /docs
parentfdae55901a72a0894274847da8811779cdfdd1cd (diff)
parent7ced0a4d75954d9cc23bd47b70c70598beadf1b4 (diff)
downloadpyramid-e74d305b8d7f68cfff0ef2927104c717e0fcb5de.tar.gz
pyramid-e74d305b8d7f68cfff0ef2927104c717e0fcb5de.tar.bz2
pyramid-e74d305b8d7f68cfff0ef2927104c717e0fcb5de.zip
Merge pull request #265 from michr/master
mention #pyramid irc channel
Diffstat (limited to 'docs')
-rw-r--r--docs/designdefense.rst2
-rw-r--r--docs/index.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index 417181749..e147ef991 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -1755,7 +1755,7 @@ If you can understand this hello world program, you can use Pyramid:
Pyramid has ~ 650 pages of documentation (printed), covering topics from the
very basic to the most advanced. *Nothing* is left undocumented, quite
literally. It also has an *awesome*, very helpful community. Visit the
-#pyramid and/or #pylons IRC channels on freenode.net and see.
+#pyramid IRC channels on freenode.net and see.
Hate Zope
+++++++++
diff --git a/docs/index.rst b/docs/index.rst
index 579bea337..d7f2f4fb6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -206,8 +206,8 @@ To report bugs, use the `issue tracker
If you've got questions that aren't answered by this documentation,
contact the `Pylons-devel maillist
-<http://groups.google.com/group/pylons-devel>`_ or join the `#pylons
-IRC channel <irc://irc.freenode.net/#pylons>`_.
+<http://groups.google.com/group/pylons-devel>`_ or join the `#pyramid
+IRC channel <irc://irc.freenode.net/#pyramid>`_.
Browse and check out tagged and trunk versions of :app:`Pyramid` via
the `Pyramid GitHub repository <http://github.com/Pylons/pyramid/>`_.