summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-11 21:59:01 -0800
committerChris McDonough <chrism@plope.com>2013-01-11 21:59:01 -0800
commit102a2413a73e715cadc86ad3e9f22565cb6d24d8 (patch)
tree242d494bd7b1cae1b2b372e6146201f4a4b3f083 /docs/narr
parent99ca9e74cc119328987fc1cd0c377b8380beccdf (diff)
parentb98e70e340f84652b44c888472724a23bae5f007 (diff)
downloadpyramid-102a2413a73e715cadc86ad3e9f22565cb6d24d8.tar.gz
pyramid-102a2413a73e715cadc86ad3e9f22565cb6d24d8.tar.bz2
pyramid-102a2413a73e715cadc86ad3e9f22565cb6d24d8.zip
Merge pull request #764 from tshepang/typos
typos
Diffstat (limited to 'docs/narr')
-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 b35c61720..956d7a177 100644
--- a/docs/narr/introduction.rst
+++ b/docs/narr/introduction.rst
@@ -101,7 +101,7 @@ frameworks for small and large applications is just false; a well-designed
framework should be able to be good at both. Pyramid strives to be that kind
of framework.
-To this end, Pyramid provides a set of features, that, combined, are unique
+To this end, Pyramid provides a set of features that, combined, are unique
amongst Python web frameworks. Lots of other frameworks contain some
combination of these features; Pyramid of course actually stole many of them
from those other frameworks. But Pyramid is the only one that has all of