summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial
diff options
context:
space:
mode:
authorKarl O. Pinc <kop@meme.com>2013-10-02 15:07:20 -0500
committerKarl O. Pinc <kop@meme.com>2013-10-02 15:07:20 -0500
commit1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b (patch)
treed02e465bf1402b571071a1f29a1a5b39aa6ebad8 /docs/quick_tutorial
parent68d16988404aec339fde1df7822c783d3ea23af6 (diff)
parent678f49d2e08b128785e32ed6fc9e12df4713ad7c (diff)
downloadpyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.tar.gz
pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.tar.bz2
pyramid-1a2b37baf2c37e060cbbc6fd37812dd5c8078b5b.zip
Merge remote-tracking branch 'upstream/master' into doc_render
Doing something to make the pull request have the right stuff.
Diffstat (limited to 'docs/quick_tutorial')
-rw-r--r--docs/quick_tutorial/requirements.rst24
1 files changed, 12 insertions, 12 deletions
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index df63ff912..40e818807 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -94,23 +94,23 @@ and where our virtual environment will reside:
Final directory structure.
-The commands to do so are as follows:
+For Linux, the commands to do so are as follows:
.. code-block:: bash
# Mac and Linux
$ cd ~
- $ mkdir projects
- $ cd projects
- $ mkdir quick_tutorial
- $ cd quick_tutorial
+ $ mkdir -p projects/quick_tutorial
+ $ cd projects/quick_tutorial
+
+For Windows:
+
+.. code-block:: posh
# Windows
c:\> cd \
- c:\> mkdir projects
- c:\> cd projects
- c:\> mkdir quick_tutorial
- c:\> cd quick_tutorial
+ c:\> mkdir projects\quick_tutorial
+ c:\> cd projects\quick_tutorial
In the above figure, your user home directory is represented by ``~``. In
your home directory, all of your projects are in the ``projects`` directory.
@@ -208,13 +208,13 @@ Install Pyramid
We have our Python standard prerequisites out of the way. The Pyramid
part is pretty easy:
-.. code-block:: bash
+.. parsed-literal::
# Mac and Linux
- $ $VENV/bin/easy_install pyramid
+ $ $VENV/bin/easy_install "pyramid==\ |release|\ "
# Windows
- c:\> %VENV%\Scripts\easy_install pyramid
+ c:\\> %VENV%\\Scripts\\easy_install "pyramid==\ |release|\ "
Our Python virtual environment now has the Pyramid software available.