summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-27 21:40:59 -0500
committerChris McDonough <chrism@plope.com>2010-11-27 21:40:59 -0500
commit43eb02a0ad067ffe32bf69a351ca0dce3f5a216c (patch)
tree67c136c2136ad6d016bc35d6b9a5de410d1e8740 /docs/narr/introduction.rst
parent87f4a7cb32c9e89c914925f5cf4262834a1dd6d6 (diff)
parentaa3306e314fc951b9ed9b007f2e9e9aff7ad05ea (diff)
downloadpyramid-43eb02a0ad067ffe32bf69a351ca0dce3f5a216c.tar.gz
pyramid-43eb02a0ad067ffe32bf69a351ca0dce3f5a216c.tar.bz2
pyramid-43eb02a0ad067ffe32bf69a351ca0dce3f5a216c.zip
Merge branch 'master' into twophase
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 725d32725..7c725690d 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -103,7 +103,7 @@ What Is The Pylons Project?
---------------------------
:app:`Pyramid` is a member of the collection of software published under the
-Pylons Project. :Pylons software is written by a loose-knit community of
+Pylons Project. Pylons software is written by a loose-knit community of
contributors. The `Pylons Project website <http://docs.pylonshq.com>`_
includes details about how :app:`Pyramid` relates to the Pylons Project.