summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCarlos de la Guardia <cguardia@yahoo.com>2010-03-09 20:59:32 +0000
committerCarlos de la Guardia <cguardia@yahoo.com>2010-03-09 20:59:32 +0000
commitba26465bea1d6ef7f9411f8821a800932d9add7e (patch)
tree7476927fec31131d9adbb28b7315e44c1c0003bc /docs
parent997b68c2df3a9aaa6146fc5f97e9783a0ce11906 (diff)
downloadpyramid-ba26465bea1d6ef7f9411f8821a800932d9add7e.tar.gz
pyramid-ba26465bea1d6ef7f9411f8821a800932d9add7e.tar.bz2
pyramid-ba26465bea1d6ef7f9411f8821a800932d9add7e.zip
one extra word, one extra letter
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/urldispatch.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 557d71a41..06da16aa0 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -574,7 +574,7 @@ represent neither predicates nor view configuration information.
Route Matching
--------------
-The main purpose of route configuration is to match (nor not match)
+The main purpose of route configuration is to match (or not match)
the ``PATH_INFO`` present in the WSGI environment provided during a
request against a URL path pattern.
@@ -629,7 +629,7 @@ Routing Examples
----------------
Let's check out some examples of how route configuration statements
-might be commonly declared, and what will happen if a they are matched
+might be commonly declared, and what will happen if they are matched
by the information present in a request. The examples that follow
assume that :term:`ZCML` will be used to perform route configuration,
although you can use :term:`imperative configuration` equivalently if