summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 13:58:56 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 13:58:56 -0400
commita66e00e9bd51fdffd85fef14e83f12502f2d864e (patch)
tree43eb06f24df2818e2db5a947e9866c8076257e91 /docs/narr/introduction.rst
parentbf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 (diff)
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
downloadpyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.gz
pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.bz2
pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.zip
Merge remote-tracking branch 'origin/master' into docs.gettingstarted
Conflicts: docs/index.rst docs/latexindex.rst setup.py
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index 48164d323..032f4be6b 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -217,6 +217,8 @@ that the Pyramid core doesn't. Add-on packages already exist which let you
easily send email, let you use the Jinja2 templating system, let you use
XML-RPC or JSON-RPC, let you integrate with jQuery Mobile, etc.
+Examples: http://docs.pylonsproject.org/en/latest/docs/pyramid.html#pyramid-add-on-documentation
+
Class-based and function-based views
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -857,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