summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-03-25 02:02:04 -0700
committerChris McDonough <chrism@plope.com>2013-03-25 02:02:04 -0700
commit31c4e1d91973a18f36a3859d0b449aee36323728 (patch)
tree8277d6fc0f90dc078318a8d21f4385ec98a205f8 /docs
parent147903265781c96e295f44ce367729fabc950123 (diff)
parent70cc73739af9171f4c918253eb73994ec63677fe (diff)
downloadpyramid-31c4e1d91973a18f36a3859d0b449aee36323728.tar.gz
pyramid-31c4e1d91973a18f36a3859d0b449aee36323728.tar.bz2
pyramid-31c4e1d91973a18f36a3859d0b449aee36323728.zip
Merge pull request #941 from stevepiercy/master
place colon within strong style
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/install.rst2
-rw-r--r--docs/tutorials/wiki2/installation.rst60
2 files changed, 41 insertions, 21 deletions
diff --git a/docs/narr/install.rst b/docs/narr/install.rst
index 7f4742ee2..8fc63f3a4 100644
--- a/docs/narr/install.rst
+++ b/docs/narr/install.rst
@@ -341,7 +341,7 @@ for both versions are included below.
Windows Using Python 2
~~~~~~~~~~~~~~~~~~~~~~
-#. Install, or find the most recent `Python 2.7.x version
+#. Install the most recent `Python 2.7.x version
<http://www.python.org/download/>`_ for your system.
#. Install the `Python for Windows extensions
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 9590e4abe..17788cdde 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -20,7 +20,8 @@ Next let's create a `virtualenv` workspace for our project. We will
use the `VENV` environment variable instead of absolute path of the
virtual environment.
-**On UNIX:**
+On UNIX
+^^^^^^^
.. code-block:: text
@@ -29,7 +30,8 @@ virtual environment.
New python executable in /home/foo/env/bin/python
Installing setuptools.............done.
-**On Windows**:
+On Windows
+^^^^^^^^^^
Set the `VENV` environment variable.
@@ -55,13 +57,15 @@ Python 3.2:
Install Pyramid Into the Virtual Python Environment
---------------------------------------------------
-**On UNIX:**
+On UNIX
+^^^^^^^
.. code-block:: text
$ $VENV/bin/easy_install pyramid
-**On Windows**:
+On Windows
+^^^^^^^^^^
.. code-block:: text
@@ -88,13 +92,15 @@ Change Directory to Your Virtual Python Environment
Change directory to the ``pyramidtut`` directory.
-**On UNIX**:
+On UNIX
+^^^^^^^
.. code-block:: text
$ cd pyramidtut
-**On Windows**:
+On Windows
+^^^^^^^^^^
.. code-block:: text
@@ -123,13 +129,15 @@ required files. For example, `pcreate` creates the
The below instructions assume your current working directory is the
"virtualenv" named "pyramidtut".
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ $VENV/bin/pcreate -s alchemy tutorial
-**On Windows**:
+On Windows
+----------
.. code-block:: text
@@ -152,14 +160,16 @@ the project as a development egg in your workspace using the
directory you created in :ref:`sql_making_a_project`, and run the
``setup.py develop`` command using the virtualenv Python interpreter.
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ cd tutorial
$ $VENV/bin/python setup.py develop
-**On Windows**:
+On Windows
+----------
.. code-block:: text
@@ -180,13 +190,15 @@ Running the Tests
After you've installed the project in development mode, you may run
the tests for the project.
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ $VENV/bin/python setup.py test -q
-**On Windows**:
+On Windows
+----------
.. code-block:: text
@@ -212,13 +224,15 @@ tests.
To get this functionality working, we'll need to install the ``nose`` and
``coverage`` packages into our ``virtualenv``:
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ $VENV/bin/easy_install nose coverage
-**On Windows**:
+On Windows
+----------
.. code-block:: text
@@ -227,13 +241,15 @@ To get this functionality working, we'll need to install the ``nose`` and
Once ``nose`` and ``coverage`` are installed, we can actually run the
coverage tests.
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ $VENV/bin/nosetests --cover-package=tutorial --cover-erase --with-coverage
-**On Windows**:
+On Windows
+----------
.. code-block:: text
@@ -271,13 +287,15 @@ script` to initialize our database.
Type the following command, make sure you are still in the ``tutorial``
directory (the directory with a ``development.ini`` in it):
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ $VENV/bin/initialize_tutorial_db development.ini
-**On Windows**:
+On Windows
+----------
.. code-block:: text
@@ -319,13 +337,15 @@ Starting the Application
Start the application.
-**On UNIX**:
+On UNIX
+-------
.. code-block:: text
$ $VENV/bin/pserve development.ini --reload
-**On Windows**:
+On Windows
+----------
.. code-block:: text