summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-01-02 12:34:55 -0800
committerChris McDonough <chrism@plope.com>2013-01-02 12:34:55 -0800
commit510c741078825710db718065638bdd5bda6f2a9e (patch)
tree0159845ae50499f85759cb1137c38e2d6f75f0be /docs/tutorials/wiki2
parentc5d01d4667d678782898b7d6859d60c617e30a9e (diff)
parentfdc6975c2c1c2824dbbab543ddc62fc9e3d1655a (diff)
downloadpyramid-510c741078825710db718065638bdd5bda6f2a9e.tar.gz
pyramid-510c741078825710db718065638bdd5bda6f2a9e.tar.bz2
pyramid-510c741078825710db718065638bdd5bda6f2a9e.zip
Merge pull request #761 from tshepang/wiki
Reduce duplicated installation instructions from the tutorials
Diffstat (limited to 'docs/tutorials/wiki2')
-rw-r--r--docs/tutorials/wiki2/installation.rst35
1 files changed, 4 insertions, 31 deletions
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 05b6a2a42..572bffcab 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -2,30 +2,22 @@
Installation
============
-This tutorial assumes that Python and :term:`virtualenv` are already installed
-and working in your system. If you need help setting this up, you should
-refer to the chapters on :ref:`installing_chapter`.
-
Preparation
===========
-Please take the following steps to prepare for the tutorial. The
-steps are slightly different depending on whether you're using UNIX or
-Windows.
+Follow the steps in :ref:`installing_chapter`, but name the virtualenv
+directory ``pyramidtut``.
Preparation, UNIX
-----------------
#. Install SQLite3 and its development packages if you don't already
have them installed. Usually this is via your system's package
- manager. For example, on a Debian Linux system, do ``sudo apt-get
- install libsqlite3-dev``.
-
-#. Use your Python's virtualenv to make a workspace:
+ manager. On a Debian system, this would be:
.. code-block:: text
- $ path/to/my/Python-2.6/bin/virtualenv --no-site-packages pyramidtut
+ $ sudo apt-get install libsqlite3-dev
#. Switch to the ``pyramidtut`` directory:
@@ -33,35 +25,16 @@ Preparation, UNIX
$ cd pyramidtut
-#. Use ``easy_install`` to get :app:`Pyramid` and its direct
- dependencies installed:
-
- .. code-block:: text
-
- $ bin/easy_install pyramid
Preparation, Windows
--------------------
-#. Use your Python's virtualenv to make a workspace:
-
- .. code-block:: text
-
- c:\> c:\Python26\Scripts\virtualenv --no-site-packages pyramidtut
-
#. Switch to the ``pyramidtut`` directory:
.. code-block:: text
c:\> cd pyramidtut
-#. Use ``easy_install`` to get :app:`Pyramid` and its direct
- dependencies installed:
-
- .. code-block:: text
-
- c:\pyramidtut> Scripts\easy_install pyramid
-
.. _sql_making_a_project:
Making a Project