Used a parsed-literal to pin the version number on easy_install.

2 files changed, 19 insertions, 19 deletions

diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 1ac5181f3..98584e608 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -22,21 +22,21 @@ and `setuptools <https://pypi.python.org/pypi/setuptools/>`_.
 
 As an example, for Python 3.3+ on Linux:
 
-.. code-block:: bash
+.. parsed-literal::
 
   $ pyvenv env33
   $ wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | env33/bin/python
-  $ env33/bin/easy_install pyramid
+  $ env33/bin/easy_install "pyramid==\ |release|\ "
 
 For Windows:
 
-.. code-block:: posh
+.. parsed-literal::
 
     # Use your browser to download:
     #   https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
-    c:\> c:\Python33\python -m venv env33
-    c:\> env33\Scripts\python ez_setup.py
-    c:\> env33\Scripts\easy_install pyramid
+    c:\\> c:\\Python33\\python -m venv env33
+    c:\\> env33\\Scripts\\python ez_setup.py
+    c:\\> env33\\Scripts\\easy_install "pyramid==\ |release|\ "
 
 Of course Pyramid runs fine on Python 2.6+, as do the examples in this
 *Quick Tour*. We're just showing Python 3 a little love (Pyramid had
@@ -297,7 +297,7 @@ The only change in our view...point the renderer at the ``.jinja2`` file:
 Our Jinja2 template is very similar to our previous template:
 
 .. literalinclude:: quick_tour/jinja2/hello_world.jinja2
-    :language: jinja
+    :language: html
 
 Pyramid's templating add-ons register a new kind of renderer into your
 application. The renderer registration maps to different kinds of
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.