summaryrefslogtreecommitdiff
path: root/docs/narr/vhosting.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-12-05 12:36:37 -0500
committerChris McDonough <chrism@plope.com>2013-12-05 12:36:37 -0500
commitb13969deeb80dd9aa5130d16ea712b323ac3bafe (patch)
treeb4f446fb193f9e8401e9425ca39b90feea8eea65 /docs/narr/vhosting.rst
parent4065081434a455a61377c770705375e085be8f16 (diff)
parent3a950cb42ee450a02d567b25bcb2847f586eabfa (diff)
downloadpyramid-b13969deeb80dd9aa5130d16ea712b323ac3bafe.tar.gz
pyramid-b13969deeb80dd9aa5130d16ea712b323ac3bafe.tar.bz2
pyramid-b13969deeb80dd9aa5130d16ea712b323ac3bafe.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/vhosting.rst')
-rw-r--r--docs/narr/vhosting.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/vhosting.rst b/docs/narr/vhosting.rst
index d37518052..53f6888b3 100644
--- a/docs/narr/vhosting.rst
+++ b/docs/narr/vhosting.rst
@@ -109,7 +109,7 @@ An example of an Apache ``mod_proxy`` configuration that will host the
is below:
.. code-block:: apache
- :linenos:
+ :linenos:
NameVirtualHost *:80
@@ -130,7 +130,7 @@ For a :app:`Pyramid` application running under :term:`mod_wsgi`,
the same can be achieved using ``SetEnv``:
.. code-block:: apache
- :linenos:
+ :linenos:
<Location />
SetEnv HTTP_X_VHM_ROOT /cms