summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2011-07-16 14:05:44 -0500
committerMichael Merickel <michael@merickel.org>2011-07-16 18:29:13 -0500
commit42eaadb95ae2bfabc364ffbfa2769ad131d943be (patch)
treecb4b6318f8dfb495f639f734a83518f8a9056845
parentd50edc5807539da66e266a7ed7810f770cee969a (diff)
downloadpyramid-42eaadb95ae2bfabc364ffbfa2769ad131d943be.tar.gz
pyramid-42eaadb95ae2bfabc364ffbfa2769ad131d943be.tar.bz2
pyramid-42eaadb95ae2bfabc364ffbfa2769ad131d943be.zip
garden
-rw-r--r--docs/narr/commandline.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index bc210904f..9adb04d4b 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -294,7 +294,7 @@ Writing a Script
All web applications are, at their hearts, systems which accept a request and
return a response. When a request is accepted by a :app:`Pyramid`
application, the system receives state from the request which is later relied
-on your application code. For example, one :term:`view callable` may assume
+on by your application code. For example, one :term:`view callable` may assume
it's working against a request that has a ``request.matchdict`` of a
particular composition, while another assumes a different composition of the
matchdict.
@@ -410,7 +410,7 @@ object present in the info dictionary returned by
:func:`pyramid.paster.bootstrap` will be a :app:`Pyramid` :term:`router`
instead.
-By default, Pyramid will general a request object in the ``info`` dictionary
+By default, Pyramid will generate a request object in the ``info`` dictionary
anchored at the root path (``/``). You can alternately supply your own
:class:`pyramid.request.Request` instance to the
:func:`pyramid.paster.bootstrap` function, to set up request parameters