summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-10 02:32:28 -0400
committerChris McDonough <chrism@plope.com>2013-08-10 02:32:28 -0400
commitdff772959de5604c44a445bee30b9bdf9741f56b (patch)
tree53c2a6a57e7d205e78aab7054684d312de6b4fb7 /docs/narr/introduction.rst
parent3f503d0a30b487b590fc3e12834ce12d8ed0a25c (diff)
parent3c173be3c43aba74554265cbfe3a11f4de9ca537 (diff)
downloadpyramid-dff772959de5604c44a445bee30b9bdf9741f56b.tar.gz
pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.tar.bz2
pyramid-dff772959de5604c44a445bee30b9bdf9741f56b.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