diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-08 05:08:26 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-08 05:08:26 -0400 |
| commit | d2d34713387498ef781b70b05196b2caae28eb50 (patch) | |
| tree | 0840eb1b1513a84d9e1396f7fb36976b8623492a | |
| parent | e7085bb4fcbd1bec75dc13724b8e399879c69290 (diff) | |
| parent | e74d305b8d7f68cfff0ef2927104c717e0fcb5de (diff) | |
| download | pyramid-d2d34713387498ef781b70b05196b2caae28eb50.tar.gz pyramid-d2d34713387498ef781b70b05196b2caae28eb50.tar.bz2 pyramid-d2d34713387498ef781b70b05196b2caae28eb50.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/designdefense.rst | 2 | ||||
| -rw-r--r-- | docs/index.rst | 4 |
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/>`_. |