From a8cb0406c3096486dd66204aa144cb117dab0890 Mon Sep 17 00:00:00 2001
From: Marius Gedminas <marius@gedmin.as>
Date: Sat, 28 Sep 2013 09:59:09 +0300
Subject: OCD: add back missing )

---
 docs/quick_tour.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/quick_tour.rst')

diff --git a/docs/quick_tour.rst b/docs/quick_tour.rst
index 434dbdad5..1ac5181f3 100644
--- a/docs/quick_tour.rst
+++ b/docs/quick_tour.rst
@@ -17,7 +17,7 @@ Pyramid is a breeze. Unfortunately "standard" is not so simple in Python.
 For this Quick Tour, it means:
 `Python <http://www.python.org/download/releases/>`_, a
 `virtual environment <http://docs.python.org/dev/library/venv.html>`_
-(or `virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_,
+(or `virtualenv for Python 2.7 <https://pypi.python.org/pypi/virtualenv>`_),
 and `setuptools <https://pypi.python.org/pypi/setuptools/>`_.
 
 As an example, for Python 3.3+ on Linux:
-- 
cgit v1.2.3


From ebca905c2a2e1e796f3840baaf154a6d9d695cc4 Mon Sep 17 00:00:00 2001
From: Paul Everitt <paul@agendaless.com>
Date: Sat, 28 Sep 2013 12:14:13 -0400
Subject: Used a parsed-literal to pin the version number on easy_install.

---
 docs/quick_tour.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'docs/quick_tour.rst')

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
-- 
cgit v1.2.3