summaryrefslogtreecommitdiff
path: root/docs/narr/introduction.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-12 01:19:38 -0500
committerChris McDonough <chrism@plope.com>2013-01-12 01:19:38 -0500
commit3ac960c7d1a77d89d84931c34dbed5ab57cdbe66 (patch)
tree59bb15ff08231e4986b9d0f66903a894d60f11b5 /docs/narr/introduction.rst
parent99ca9e74cc119328987fc1cd0c377b8380beccdf (diff)
parent464ddc91ea47e3d6ba8fe30b8e9381cd395bb1d9 (diff)
downloadpyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.tar.gz
pyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.tar.bz2
pyramid-3ac960c7d1a77d89d84931c34dbed5ab57cdbe66.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/introduction.rst')
-rw-r--r--docs/narr/introduction.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst
index b35c61720..c4f2ea512 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
@@ -475,7 +475,7 @@ per route. For example, you can create a route with the pattern ``/items``
and when the route is matched, you can shuffle off the request to one view if
the request method is GET, another view if the request method is POST, etc.
A system known as "view predicates" allows for this. Request method matching
-is the very most basic thing you can do with a view predicate. You can also
+is the most basic thing you can do with a view predicate. You can also
associate views with other request parameters such as the elements in the
query string, the Accept header, whether the request is an XHR request or
not, and lots of other things. This feature allows you to keep your