summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-01 21:21:45 -0500
committerChris McDonough <chrism@plope.com>2013-01-01 21:21:45 -0500
commitecece60de4f8c21b0f0d4f7db45ea05e905ca1e3 (patch)
tree26b81ce1a2872d1f62cd11460cf196f04ba366a9 /docs
parent341fc7e53578152fd97dfbbfc6007ab5d0723fda (diff)
parent78bba61a7a53949529c1b7444fd6611e116b725d (diff)
downloadpyramid-ecece60de4f8c21b0f0d4f7db45ea05e905ca1e3.tar.gz
pyramid-ecece60de4f8c21b0f0d4f7db45ea05e905ca1e3.tar.bz2
pyramid-ecece60de4f8c21b0f0d4f7db45ea05e905ca1e3.zip
Merge branch 'pyvenv' of git://github.com/tshepang/pyramid into tshepang-pyvenv
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst17
1 files changed, 9 insertions, 8 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index a1c7b0d64..8947a891f 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -249,18 +249,19 @@ 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
+ 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