From 1c9bdc5ba0f6317ed64bc120c3ebeeb5f089df62 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Tue, 19 Mar 2013 22:55:40 +0200 Subject: some improvements/fixes to a paragraph --- docs/tutorials/wiki2/installation.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/tutorials/wiki2') diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index 64e069e6f..253296b95 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/docs/tutorials/wiki2/installation.rst @@ -66,11 +66,11 @@ On Windows: startup problems, try putting both the virtualenv and the project into directories that do not contain spaces in their paths. -Pcreate is a script that comes with Pyramid that helps by creating and organizing files -needed as part of a Pyramid project. By passing in `alchemy` was are asking the script to -create the files needed to use SQLAlchemy. By passing in our app name `tutorial` it goes through and +`pcreate` is a script that comes with Pyramid that helps by creating and organizing files +needed as part of a Pyramid project. By passing in `alchemy`, we are asking the script to +create the files needed to use SQLAlchemy. By passing in our app name `tutorial`, the script places that application name in all the different files required. For example, the ``initialize_tutorial_db`` -that is in the ``pyramidtut/bin`` directory that we use later in this tutorial was created by `pcreate` +that is in the ``pyramidtut/bin`` directory was created by `pcreate`. -- cgit v1.2.3 From 07c189da9a9fa4a1a4231dbfff34ed77d09f73d1 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 19 Mar 2013 23:10:56 -0700 Subject: Fix whitespace in CHANGES.txt to permit build. Add "Before You Begin" section. --- docs/tutorials/wiki2/installation.rst | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'docs/tutorials/wiki2') diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst index 253296b95..8c4149bfc 100644 --- a/docs/tutorials/wiki2/installation.rst +++ b/docs/tutorials/wiki2/installation.rst @@ -2,13 +2,23 @@ Installation ============ -Preparation -=========== +Before You Begin +================ + +Installation Requirements +------------------------- Follow the steps in :ref:`installing_chapter`, but name the virtualenv -directory ``pyramidtut``. +directory ``pyramidtut``. Following these steps will ensure you have met the +following requirements: -Preparation, UNIX +* Python interpreter is installed on your operating system +* :term:`setuptools` or :term:`distribute` is installed +* :term:`virtualenv` is installed +* a virtual Python environment named ``pyramidtut`` has been created +* Pyramid is installed + +UNIX Requirements ----------------- #. Install SQLite3 and its development packages if you don't already @@ -25,8 +35,7 @@ Preparation, UNIX $ cd pyramidtut - -Preparation, Windows +Windows Requirements -------------------- #. Switch to the ``pyramidtut`` directory: -- cgit v1.2.3