diff options
| author | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:51 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-11-18 07:03:51 -0500 |
| commit | c503891d43251e7bf6111c6c1f521b43c55d917b (patch) | |
| tree | 3028630a1d1e331718e16be26a54d69c56d76b9d /docs/narr/vhosting.rst | |
| parent | 345694c8eb6dff9ef7375374c5032e53b764c1de (diff) | |
| parent | fb15c26a2960d5f7bf598c147f1dd6ad6a062952 (diff) | |
| download | pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.gz pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.bz2 pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.zip | |
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/narr/vhosting.rst')
| -rw-r--r-- | docs/narr/vhosting.rst | 4 |
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 |