summaryrefslogtreecommitdiff
path: root/docs/narr/install.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-04 14:52:18 -0400
committerChris McDonough <chrism@plope.com>2011-09-04 14:52:18 -0400
commitd0ec94cfd0a87e5c5c705b33267039eec6f0794f (patch)
tree0aa58163418e16f27e5831d0fc5f8444c78f89b5 /docs/narr/install.rst
parent3171fbe0e2c9e99cdadcc0a1fd4d583ddc7a7fca (diff)
downloadpyramid-d0ec94cfd0a87e5c5c705b33267039eec6f0794f.tar.gz
pyramid-d0ec94cfd0a87e5c5c705b33267039eec6f0794f.tar.bz2
pyramid-d0ec94cfd0a87e5c5c705b33267039eec6f0794f.zip
Add Windows analogues to all command lines. Closes #144
Diffstat (limited to 'docs/narr/install.rst')
-rw-r--r--docs/narr/install.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index f543753ce..a1e7ce382 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -18,10 +18,10 @@ run :app:`Pyramid`.
Python 2.6.6, and Python 2.7.2. :app:`Pyramid` does not run under any
version of Python before 2.5, and does not yet run under Python 3.X.
-:app:`Pyramid` is known to run on all popular Unix-like systems such as
+:app:`Pyramid` is known to run on all popular UNIX-like systems such as
Linux, MacOS X, and FreeBSD as well as on Windows platforms. It is also
-known to run on Google's App Engine, :term:`PyPy` (1.5), and :term:`Jython`
-(2.5.2).
+known to run on Google's App Engine, :term:`PyPy` (1.5 and 1.6), and
+:term:`Jython` (2.5.2).
:app:`Pyramid` installation does not require the compilation of any
C code, so you need only a Python interpreter that meets the
@@ -204,9 +204,9 @@ into your setuptools-enabled Python interpreter, use the
$ easy_install virtualenv
-This command should succeed, and tell you that the virtualenv package
-is now installed. If it fails due to permission errors, you may need
-to install it as your system's administrative user. For example:
+This command should succeed, and tell you that the virtualenv package is now
+installed. If it fails due to permission errors, you may need to install it
+as your system's administrative user. For example:
.. code-block:: text
@@ -238,7 +238,7 @@ following:
depending on the packages you've already got installed into your
Python's "main" site-packages dir.
-.. warning:: If you're on UNIX, *do not* use ``sudo`` to run the
+.. warning:: *do not* use ``sudo`` to run the
``virtualenv`` script. It's perfectly acceptable (and desirable)
to create a virtualenv as a normal user.
@@ -250,7 +250,7 @@ Installing :app:`Pyramid` Into the Virtual Python Environment
After you've got your ``env`` virtualenv installed, you may install
:app:`Pyramid` itself using the following commands from within the
-virtualenv (``env``) directory you created in the last step:
+virtualenv (``env``) directory you created in the last step.
.. code-block:: text