summaryrefslogtreecommitdiff
path: root/docs/designdefense.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-08 05:08:26 -0400
committerChris McDonough <chrism@plope.com>2011-09-08 05:08:26 -0400
commitd2d34713387498ef781b70b05196b2caae28eb50 (patch)
tree0840eb1b1513a84d9e1396f7fb36976b8623492a /docs/designdefense.rst
parente7085bb4fcbd1bec75dc13724b8e399879c69290 (diff)
parente74d305b8d7f68cfff0ef2927104c717e0fcb5de (diff)
downloadpyramid-d2d34713387498ef781b70b05196b2caae28eb50.tar.gz
pyramid-d2d34713387498ef781b70b05196b2caae28eb50.tar.bz2
pyramid-d2d34713387498ef781b70b05196b2caae28eb50.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/designdefense.rst')
-rw-r--r--docs/designdefense.rst2
1 files changed, 1 insertions, 1 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
+++++++++