summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-15 18:40:27 +0200
committerChris McDonough <chrism@plope.com>2013-08-15 18:40:27 +0200
commit5aab1e9c2aebbbb0e955a34067db9a196d430a0c (patch)
tree727028ad4eeb596c291d0f96fbc9bb520ec971fd /docs/narr/introduction.rst
parentb210ce350a3856166376f63a32725cc1516ba294 (diff)
parent7319ab677216063581e47a231fd70b8b55a19466 (diff)
downloadpyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.gz
pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.tar.bz2
pyramid-5aab1e9c2aebbbb0e955a34067db9a196d430a0c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index fa2646134..032f4be6b 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -859,7 +859,7 @@ It's our goal that no Pyramid question go unanswered. Whether you ask a
question on IRC, on the Pylons-discuss maillist, or on StackOverflow, you're
likely to get a reasonably prompt response. We don't tolerate "support
trolls" or other people who seem to get their rocks off by berating fellow
-users in our various offical support channels. We try to keep it well-lit
+users in our various official support channels. We try to keep it well-lit
and new-user-friendly.
Example: Visit irc\://freenode.net#pyramid (the ``#pyramid`` channel on