Merge pull request #868 from tshepang/grammar

simplify sentence and fix its grammar

5 files changed, 8 insertions, 8 deletions

diff --git a/docs/narr/commandline.rst b/docs/narr/commandline.rst
index 0a5feafc4..48df6b9a8 100644
--- a/docs/narr/commandline.rst
+++ b/docs/narr/commandline.rst
@@ -276,10 +276,10 @@ exposed, and the request is configured to generate urls from the host
 IPython or bpython
 ~~~~~~~~~~~~~~~~~~
 
-If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ or 
-`bpython <http://bpython-interpreter.org/>`_ or both installed in
+If you have `IPython <http://en.wikipedia.org/wiki/IPython>`_ and/or
+`bpython <http://bpython-interpreter.org/>`_ in
 the interpreter you use to invoke the ``pshell`` command, ``pshell`` will 
-autodiscover them and use the first respectively found in this order :
+autodiscover and use the first one found, in this order:
 IPython, bpython, standard Python interpreter. However you could 
 specifically invoke one of your choice with the ``-p choice`` or 
 ``--python-shell choice`` option.
diff --git a/docs/narr/templates.rst b/docs/narr/templates.rst
index 6a1fbf916..89024a34e 100644
--- a/docs/narr/templates.rst
+++ b/docs/narr/templates.rst
@@ -621,7 +621,7 @@ Debugging Templates
 -------------------
 
 A :exc:`NameError` exception resulting from rendering a template with an
-undefined variable (e.g. ``${wrong}``) might will end like this:
+undefined variable (e.g. ``${wrong}``) might end up looking like this:
 
 .. code-block:: text
 
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst
index 20017064b..d5624469c 100644
--- a/docs/narr/testing.rst
+++ b/docs/narr/testing.rst
@@ -70,7 +70,7 @@ Test Set Up and Tear Down
 --------------------------
 
 :app:`Pyramid` uses a "global" (actually :term:`thread local`) data structure
-to hold on to two items: the current :term:`request` and the current
+to hold onto two items: the current :term:`request` and the current
 :term:`application registry`.  These data structures are available via the
 :func:`pyramid.threadlocal.get_current_request` and
 :func:`pyramid.threadlocal.get_current_registry` functions, respectively.
diff --git a/docs/narr/viewconfig.rst b/docs/narr/viewconfig.rst
index 7001cd980..e7c79b09b 100644
--- a/docs/narr/viewconfig.rst
+++ b/docs/narr/viewconfig.rst
@@ -293,7 +293,7 @@ configured view.
   This value can be any string or a sequence of strings.  A view declaration 
   with this argument ensures that the view will only be called when the 
   :term:`request` has a key in the ``request.params`` dictionary (an HTTP 
-  ``GET`` or ``POST`` variable) that has a name which matches the a 
+  ``GET`` or ``POST`` variable) that has a name which matches the
   supplied value.
 
   If any value supplied has a ``=`` sign in it,
@@ -475,7 +475,7 @@ Adding View Configuration Using the ``@view_config`` Decorator
 
 .. warning::
 
-   Using this feature tends to slows down application startup slightly, as
+   Using this feature tends to slow down application startup slightly, as
    more work is performed at application startup to scan for view
    configuration declarations.  For maximum startup performance, use the view
    configuration method described in
diff --git a/docs/narr/views.rst b/docs/narr/views.rst
index 860c380f3..b9330b881 100644
--- a/docs/narr/views.rst
+++ b/docs/narr/views.rst
@@ -176,7 +176,7 @@ exception` objects.
 HTTP Exceptions
 ~~~~~~~~~~~~~~~
 
-All classes documented in the :mod:`pyramid.httpexceptions` module documented
+All :mod:`pyramid.httpexceptions` classes which are documented
 as inheriting from the :class:`pyramid.httpexceptions.HTTPException` are
 :term:`http exception` objects.  Instances of an HTTP exception object may
 either be *returned* or *raised* from within view code.  In either case