summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst23
-rw-r--r--docs/tutorials/wiki2/installation.rst3
2 files changed, 16 insertions, 10 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 09c37c7f2..ff89553ae 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -52,6 +52,10 @@ command:
$ sudo apt-get install python2.7-dev
+This command will install both the Python interpreter and its development
+header files. Note that the headers are required by some (optional) C
+extensions in software depended upon by Pyramid, not by Pyramid itself.
+
Once these steps are performed, the Python interpreter will usually be
invokable via ``python2.7`` from a shell prompt.
@@ -245,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
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 4ab02a13a..05b6a2a42 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -303,6 +303,9 @@ the following assumptions:
- you are willing to use :term:`url dispatch` to map URLs to code.
+- you want to use ``ZopeTransactionExtension`` and ``pyramid_tm`` to scope
+ sessions to requests
+
.. note::
:app:`Pyramid` supports any persistent storage mechanism (e.g. object