summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:23:26 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:23:26 -0500
commit4546427bf1c6a2b42c55ce78c063043cc8d18d34 (patch)
tree2a52f1e4480fbe52295deee325c26ee16e0d4247 /docs
parent341fc7e53578152fd97dfbbfc6007ab5d0723fda (diff)
parent00d83a42a4499a1a94d9019b740cc477270960cf (diff)
downloadpyramid-4546427bf1c6a2b42c55ce78c063043cc8d18d34.tar.gz
pyramid-4546427bf1c6a2b42c55ce78c063043cc8d18d34.tar.bz2
pyramid-4546427bf1c6a2b42c55ce78c063043cc8d18d34.zip
Merge branch 'tshepang-pyvenv'
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst19
1 files changed, 9 insertions, 10 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index a1c7b0d64..6db0d88f5 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -249,18 +249,17 @@ your setuptools-enabled Python interpreter, use the ``easy_install`` command.
.. warning::
- Even though Python 3.3 and better comes with ``pyvenv`` out of the box,
- which is similar to ``virtualenv``, we suggest using ``virtualenv`` instead.
- ``virtualenv`` works on well Python 3.3. This isn't a recommendation made
- for technical reasons, it's one made because it's not feasible for the
- authors of this guide to explain setup using multiple virtual environment
- systems. We are aiming to not need to make the installation documentation
+ Python 3.3 includes ``pyvenv`` out of the box, which provides similar
+ functionality to ``virtualenv``. We however suggest using ``virtualenv``
+ instead, which works well with Python 3.3. This isn't a recommendation made
+ for technical reasons; it's made because it's not feasible for the authors
+ of this guide to explain setup using multiple virtual environment systems.
+ We are aiming to not need to make the installation documentation
Turing-complete.
- ``pyvenv`` will work fine. However, if you use ``pyvenv`` instead of
- ``virtualenv``, you'll need to understand how to install software such as
- ``distribute`` into the virtual environment manually, which this guide does
- not cover.
+ If you insist on using ``pyvenv``, you'll need to understand how to install
+ software such as ``distribute`` into the virtual environment manually,
+ which this guide does not cover.
.. code-block:: text