summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-10-08 12:01:41 -0400
committerChris McDonough <chrism@plope.com>2014-10-08 12:01:41 -0400
commit39c64b7369ac4563a373e050d30d86872d0150cf (patch)
treefeca96997439461bee0892b8cdf0844b329e3c9d /docs/quick_tutorial
parent03b469479c6a70d89cf18b2fdc91c223c9f6197a (diff)
parent9095de6ac110a7d31ea76a5dbb5b65408897c75e (diff)
downloadpyramid-39c64b7369ac4563a373e050d30d86872d0150cf.tar.gz
pyramid-39c64b7369ac4563a373e050d30d86872d0150cf.tar.bz2
pyramid-39c64b7369ac4563a373e050d30d86872d0150cf.zip
Merge pull request #1425 from deisner/master
Minor edits to Templating With jinja2
Diffstat (limited to 'docs/quick_tutorial')
-rw-r--r--docs/quick_tutorial/jinja2.rst7
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
index ad6da7a9e..613542349 100644
--- a/docs/quick_tutorial/jinja2.rst
+++ b/docs/quick_tutorial/jinja2.rst
@@ -20,8 +20,8 @@ Objectives
Steps
=====
-#. In this step let's start by installing the ``pyramid_jinja2``
- add-on, the copying the ``view_class`` step's directory:
+#. 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
@@ -72,9 +72,6 @@ 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 functional tests don't have ``development.ini`` so they needed the
-``pyramid.includes`` to be setup in the test setup.
-
Extra Credit
============