quick_tutorial cleanup

- replace nose with pytest
- cleanup jinja2.rst
- add pyramid_jinja2 to requirements.rst

2 files changed, 32 insertions, 29 deletions

diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
index 6b9d5feba..2fc68827b 100644
--- a/docs/quick_tutorial/jinja2.rst
+++ b/docs/quick_tutorial/jinja2.rst
@@ -4,24 +4,26 @@
 12: Templating With ``jinja2``
 ==============================
 
-We just said Pyramid doesn't prefer one templating language over
-another. Time to prove it. Jinja2 is a popular templating system,
-used in Flask and modeled after Django's templates. Let's add
-``pyramid_jinja2``, a Pyramid :term:`add-on` which enables Jinja2 as a
-:term:`renderer` in our Pyramid applications.
+We just said Pyramid doesn't prefer one templating language over another. Time
+to prove it. Jinja2 is a popular templating system, used in Flask and modeled
+after Django's templates. Let's add ``pyramid_jinja2``, a Pyramid
+:term:`add-on` which enables Jinja2 as a :term:`renderer` in our Pyramid
+applications.
+
 
 Objectives
 ==========
 
-- Show Pyramid's support for different templating systems
+- Show Pyramid's support for different templating systems.
+
+- Learn about installing Pyramid add-ons.
 
-- Learn about installing Pyramid add-ons
 
 Steps
 =====
 
-#. In this step let's start by copying the ``view_class`` step's 
-   directory, and then installing the ``pyramid_jinja2`` add-on. 
+#. In this step let's start by copying the ``view_class`` step's  directory,
+   and then installing the ``pyramid_jinja2`` add-on.
 
    .. code-block:: bash
 
@@ -29,8 +31,7 @@ Steps
     $ $VENV/bin/pip install -e .
     $ $VENV/bin/pip install pyramid_jinja2
 
-#. We need to include ``pyramid_jinja2`` in
-   ``jinja2/tutorial/__init__.py``:
+#. We need to include ``pyramid_jinja2`` in ``jinja2/tutorial/__init__.py``:
 
    .. literalinclude:: jinja2/tutorial/__init__.py
     :linenos:
@@ -49,7 +50,9 @@ Steps
 
    .. code-block:: bash
 
-    $ $VENV/bin/nosetests tutorial
+    $ $VENV/bin/py.test tutorial/tests.py -q
+    ....
+    4 passed in 0.40 seconds
 
 #. Run your Pyramid application with:
 
@@ -59,30 +62,30 @@ Steps
 
 #. Open http://localhost:6543/ in your browser.
 
+
 Analysis
 ========
 
-Getting a Pyramid add-on into Pyramid is simple. First you use normal
-Python package installation tools to install the add-on package into
-your Python. You then tell Pyramid's configurator to run the setup code
+Getting a Pyramid add-on into Pyramid is simple. First you use normal Python
+package installation tools to install the add-on package into your Python
+virtual environment. You then tell Pyramid's configurator to run the setup code
 in the add-on. In this case the setup code told Pyramid to make a new
 "renderer" available that looked for ``.jinja2`` file extensions.
 
-Our view code stayed largely the same. We simply changed the file
-extension on the renderer. For the template, the syntax for Chameleon
-and Jinja2's basic variable insertion is very similar.
+Our view code stayed largely the same. We simply changed the file extension on
+the renderer. For the template, the syntax for Chameleon and Jinja2's basic
+variable insertion is very similar.
+
 
-Extra Credit
+Extra credit
 ============
 
-#. Our project now depends on ``pyramid_jinja2``. We installed that
-   dependency manually. What is another way we could have made the
-   association?
+#. Our project now depends on ``pyramid_jinja2``. We installed that dependency
+   manually. What is another way we could have made the association?
 
 #. We used ``config.include`` which is an imperative configuration to get the
-   :term:`Configurator` to load ``pyramid_jinja2``'s configuration. 
-   What is another way could include it into the config?
+   :term:`Configurator` to load ``pyramid_jinja2``'s configuration. What is
+   another way could include it into the config?
 
-.. seealso:: `Jinja2 homepage <http://jinja.pocoo.org/>`_,
-   and
+.. seealso:: `Jinja2 homepage <http://jinja.pocoo.org/>`_, and
    :ref:`pyramid_jinja2 Overview <jinja2:overview>`
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index f4c1e70ac..1f2b4da97 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -205,10 +205,10 @@ tutorial.
 
     # Mac and Linux
     $ $VENV/bin/pip install webtest pytest pytest-cov deform sqlalchemy \
-      pyramid_chameleon pyramid_debugtoolbar waitress pyramid_tm \
-      zope.sqlalchemy
+      pyramid_chameleon pyramid_debugtoolbar pyramid_jinja2 waitress \
+      pyramid_tm zope.sqlalchemy
 
 .. code-block:: doscon
 
     # Windows
-    c:\> %VENV%\Scripts\pip install webtest deform sqlalchemy pyramid_chameleon pyramid_debugtoolbar waitress pyramid_tm zope.sqlalchemy
+    c:\> %VENV%\Scripts\pip install webtest deform sqlalchemy pyramid_chameleon pyramid_debugtoolbar pyramid_jinja2 waitress pyramid_tm zope.sqlalchemy