Merge branch 'stevepiercy-master'

4 files changed, 17 insertions, 18 deletions

diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 15e9e8699..fb67b899b 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -256,7 +256,7 @@ you can then create a virtual environment.  To do so, invoke the following:
 .. code-block:: text
 
    $ export VENV=~/env
-   $ virtualenv --no-site-packages $VENV
+   $ virtualenv $VENV
    New python executable in /home/foo/env/bin/python
    Installing setuptools.............done.
 
@@ -267,17 +267,16 @@ it's an absolute path.
 
 .. warning::
 
-   Using ``--no-site-packages`` when generating your virtualenv is *very
-   important*. This flag provides the necessary isolation for running the set
-   of packages required by :app:`Pyramid`.  If you do not specify
-   ``--no-site-packages``, it's possible that :app:`Pyramid` will not install
-   properly into the virtualenv, or, even if it does, may not run properly,
-   depending on the packages you've already got installed into your Python's
-   "main" site-packages dir.
+   Avoid using the ``--system-site-packages`` option when creating the
+   virtualenv unless you know what you are doing. For versions of virtualenv
+   prior to 1.7, make sure to use the ``--no-site-packages`` option, because
+   this option was formerly not the default and may produce undesirable
+   results.
 
-.. warning:: *do not* use ``sudo`` to run the
-   ``virtualenv`` script.  It's perfectly acceptable (and desirable) to create
-   a virtualenv as a normal user.
+.. warning::
+
+    *do not* use ``sudo`` to run the ``virtualenv`` script.  It's perfectly
+    acceptable (and desirable) to create a virtualenv as a normal user.
 
 
 Installing :app:`Pyramid` Into the Virtual Python Environment
@@ -343,9 +342,9 @@ You can use Pyramid on Windows under Python 2 or 3.
       c:\> set VENV=c:\env
       # modify the command according to the python version, e.g.:
       # for Python 2.7:
-      c:\> c:\Python27\Scripts\virtualenv --no-site-packages %VENV%
+      c:\> c:\Python27\Scripts\virtualenv %VENV%
       # for Python 3.3:
-      c:\> c:\Python33\Scripts\virtualenv --no-site-packages %VENV%
+      c:\> c:\Python33\Scripts\virtualenv %VENV%
 
    You can either follow the use of the environment variable, ``%VENV%``, or
    replace it with the root directory of the :term:`virtualenv`. In that case,
diff --git a/docs/tutorials/bfg/index.rst b/docs/tutorials/bfg/index.rst
index a50637279..1abb26466 100644
--- a/docs/tutorials/bfg/index.rst
+++ b/docs/tutorials/bfg/index.rst
@@ -60,7 +60,7 @@ Here's how to convert a :mod:`repoze.bfg` application to a
    .. code-block:: bash
 
       $ cd ~
-      $ virtualenv --no-site-packages pyramidenv
+      $ virtualenv pyramidenv
       $ cd pyramidenv
       $ $VENV/bin/easy_install pyramid
 
diff --git a/docs/tutorials/modwsgi/index.rst b/docs/tutorials/modwsgi/index.rst
index e0021f8db..ddd968927 100644
--- a/docs/tutorials/modwsgi/index.rst
+++ b/docs/tutorials/modwsgi/index.rst
@@ -46,7 +46,7 @@ specific path information for commands and files.
        $ cd ~
        $ mkdir modwsgi
        $ cd modwsgi
-       $ /usr/local/bin/virtualenv --no-site-packages env
+       $ /usr/local/bin/virtualenv env
 
 #.  Install :app:`Pyramid` into the newly created virtualenv:
 
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 17788cdde..e21bf7108 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -26,7 +26,7 @@ On UNIX
 .. code-block:: text
 
    $ export VENV=~/pyramidtut
-   $ virtualenv --no-site-packages $VENV
+   $ virtualenv $VENV
    New python executable in /home/foo/env/bin/python
    Installing setuptools.............done.
 
@@ -46,13 +46,13 @@ Python 2.7:
 
 .. code-block:: text
 
-   c:\> c:\Python27\Scripts\virtualenv --no-site-packages %VENV%
+   c:\> c:\Python27\Scripts\virtualenv %VENV%
 
 Python 3.2:
 
 .. code-block:: text
 
-   c:\> c:\Python32\Scripts\virtualenv --no-site-packages %VENV%
+   c:\> c:\Python32\Scripts\virtualenv %VENV%
 
 Install Pyramid Into the Virtual Python Environment
 ---------------------------------------------------