Merge pull request #2017 from stevepiercy/master

minor grammar, rewrap 79 columns

1 files changed, 55 insertions, 62 deletions

diff --git a/docs/narr/vhosting.rst b/docs/narr/vhosting.rst
index 53f6888b3..0edf03353 100644
--- a/docs/narr/vhosting.rst
+++ b/docs/narr/vhosting.rst
@@ -6,13 +6,13 @@
 Virtual Hosting
 ===============
 
-"Virtual hosting" is, loosely, the act of serving a :app:`Pyramid`
-application or a portion of a :app:`Pyramid` application under a
-URL space that it does not "naturally" inhabit.
+"Virtual hosting" is, loosely, the act of serving a :app:`Pyramid` application
+or a portion of a :app:`Pyramid` application under a URL space that it does not
+"naturally" inhabit.
 
-:app:`Pyramid` provides facilities for serving an application under
-a URL "prefix", as well as serving a *portion* of a :term:`traversal`
-based application under a root URL.
+:app:`Pyramid` provides facilities for serving an application under a URL
+"prefix", as well as serving a *portion* of a :term:`traversal` based
+application under a root URL.
 
 .. index::
    single: hosting an app under a prefix
@@ -20,27 +20,26 @@ based application under a root URL.
 Hosting an Application Under a URL Prefix
 -----------------------------------------
 
-:app:`Pyramid` supports a common form of virtual hosting whereby you
-can host a :app:`Pyramid` application as a "subset" of some other site
-(e.g. under ``http://example.com/mypyramidapplication/`` as opposed to
-under ``http://example.com/``).
+:app:`Pyramid` supports a common form of virtual hosting whereby you can host a
+:app:`Pyramid` application as a "subset" of some other site (e.g., under
+``http://example.com/mypyramidapplication/`` as opposed to under
+``http://example.com/``).
 
 If you use a "pure Python" environment, this functionality can be provided by
-Paste's `urlmap <http://pythonpaste.org/modules/urlmap.html>`_ "composite"
-WSGI application.  Alternately, you can use :term:`mod_wsgi` to serve your
-application, which handles this virtual hosting translation for you "under
-the hood".
-
-If you use the ``urlmap`` composite application "in front" of a
-:app:`Pyramid` application or if you use :term:`mod_wsgi` to serve
-up a :app:`Pyramid` application, nothing special needs to be done
-within the application for URLs to be generated that contain a
-prefix. :mod:`paste.urlmap` and :term:`mod_wsgi` manipulate the
-:term:`WSGI` environment in such a way that the ``PATH_INFO`` and
-``SCRIPT_NAME`` variables are correct for some given prefix.
-
-Here's an example of a PasteDeploy configuration snippet that includes
-a ``urlmap`` composite.
+Paste's `urlmap <http://pythonpaste.org/modules/urlmap.html>`_ "composite" WSGI
+application.  Alternatively, you can use :term:`mod_wsgi` to serve your
+application, which handles this virtual hosting translation for you "under the
+hood".
+
+If you use the ``urlmap`` composite application "in front" of a :app:`Pyramid`
+application or if you use :term:`mod_wsgi` to serve up a :app:`Pyramid`
+application, nothing special needs to be done within the application for URLs
+to be generated that contain a prefix. :mod:`paste.urlmap` and :term:`mod_wsgi`
+manipulate the :term:`WSGI` environment in such a way that the ``PATH_INFO``
+and ``SCRIPT_NAME`` variables are correct for some given prefix.
+
+Here's an example of a PasteDeploy configuration snippet that includes a
+``urlmap`` composite.
 
 .. code-block:: ini
   :linenos:
@@ -52,23 +51,21 @@ a ``urlmap`` composite.
   use = egg:Paste#urlmap
   /pyramidapp = mypyramidapp
 
-This "roots" the :app:`Pyramid` application at the prefix
-``/pyramidapp`` and serves up the composite as the "main" application
-in the file.
+This "roots" the :app:`Pyramid` application at the prefix ``/pyramidapp`` and
+serves up the composite as the "main" application in the file.
 
-.. note:: If you're using an Apache server to proxy to a Paste
-   ``urlmap`` composite, you may have to use the `ProxyPreserveHost
+.. note:: If you're using an Apache server to proxy to a Paste ``urlmap``
+   composite, you may have to use the `ProxyPreserveHost
    <http://httpd.apache.org/docs/2.2/mod/mod_proxy.html#proxypreservehost>`_
    directive to pass the original ``HTTP_HOST`` header along to the
-   application, so URLs get generated properly.  As of this writing
-   the ``urlmap`` composite does not seem to respect the
-   ``HTTP_X_FORWARDED_HOST`` parameter, which will contain the
-   original host header even if ``HTTP_HOST`` is incorrect.
+   application, so URLs get generated properly.  As of this writing the
+   ``urlmap`` composite does not seem to respect the ``HTTP_X_FORWARDED_HOST``
+   parameter, which will contain the original host header even if ``HTTP_HOST``
+   is incorrect.
 
-If you use :term:`mod_wsgi`, you do not need to use a ``composite``
-application in your ``.ini`` file.  The ``WSGIScriptAlias``
-configuration setting in a :term:`mod_wsgi` configuration does the
-work for you:
+If you use :term:`mod_wsgi`, you do not need to use a ``composite`` application
+in your ``.ini`` file.  The ``WSGIScriptAlias`` configuration setting in a
+:term:`mod_wsgi` configuration does the work for you:
 
 .. code-block:: apache
    :linenos:
@@ -87,8 +84,7 @@ Virtual Root Support
 --------------------
 
 :app:`Pyramid` also supports "virtual roots", which can be used in
-:term:`traversal` -based (but not :term:`URL dispatch` -based)
-applications.
+:term:`traversal`-based (but not :term:`URL dispatch`-based) applications.
 
 Virtual root support is useful when you'd like to host some resource in a
 :app:`Pyramid` resource tree as an application under a URL pathname that does
@@ -98,15 +94,14 @@ object at the traversal path ``/cms`` as an application reachable via
 
 To specify a virtual root, cause an environment variable to be inserted into
 the WSGI environ named ``HTTP_X_VHM_ROOT`` with a value that is the absolute
-pathname to the resource object in the resource tree that should behave as
-the "root" resource.  As a result, the traversal machinery will respect this
-value during traversal (prepending it to the PATH_INFO before traversal
-starts), and the :meth:`pyramid.request.Request.resource_url` API will
-generate the "correct" virtually-rooted URLs.
+pathname to the resource object in the resource tree that should behave as the
+"root" resource.  As a result, the traversal machinery will respect this value
+during traversal (prepending it to the PATH_INFO before traversal starts), and
+the :meth:`pyramid.request.Request.resource_url` API will generate the
+"correct" virtually-rooted URLs.
 
-An example of an Apache ``mod_proxy`` configuration that will host the
-``/cms`` subobject as ``http://www.example.com/`` using this facility
-is below:
+An example of an Apache ``mod_proxy`` configuration that will host the ``/cms``
+subobject as ``http://www.example.com/`` using this facility is below:
 
 .. code-block:: apache
     :linenos:
@@ -121,13 +116,12 @@ is below:
       RequestHeader add X-Vhm-Root /cms
     </VirtualHost>
 
-.. note:: Use of the ``RequestHeader`` directive requires that the
-   Apache `mod_headers
-   <http://httpd.apache.org/docs/2.2/mod/mod_headers.html>`_ module be
-   available in the Apache environment you're using.
+.. note:: Use of the ``RequestHeader`` directive requires that the Apache
+   `mod_headers <http://httpd.apache.org/docs/2.2/mod/mod_headers.html>`_
+   module be available in the Apache environment you're using.
 
-For a :app:`Pyramid` application running under :term:`mod_wsgi`,
-the same can be achieved using ``SetEnv``:
+For a :app:`Pyramid` application running under :term:`mod_wsgi`, the same can
+be achieved using ``SetEnv``:
 
 .. code-block:: apache
     :linenos:
@@ -136,17 +130,16 @@ the same can be achieved using ``SetEnv``:
       SetEnv HTTP_X_VHM_ROOT /cms
     </Location>
 
-Setting a virtual root has no effect when using an application based
-on :term:`URL dispatch`.
+Setting a virtual root has no effect when using an application based on
+:term:`URL dispatch`.
 
 Further Documentation and Examples
 ----------------------------------
 
 The API documentation in :ref:`traversal_module` documents a
-:func:`pyramid.traversal.virtual_root` API.  When called, it
-returns the virtual root object (or the physical root object if no
-virtual root has been specified).
-
-:ref:`modwsgi_tutorial` has detailed information about using
-:term:`mod_wsgi` to serve :app:`Pyramid` applications.
+:func:`pyramid.traversal.virtual_root` API.  When called, it returns the
+virtual root object (or the physical root object if no virtual root has been
+specified).
 
+:ref:`modwsgi_tutorial` has detailed information about using :term:`mod_wsgi`
+to serve :app:`Pyramid` applications.