summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/jinja2.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
committerMichael Merickel <michael@merickel.org>2014-11-17 02:27:03 -0600
commit5d0b1beaf3b09045fd3dd71244938ee6e391ebf3 (patch)
tree2fd3a374d4c937184497e5589bcf93391833949a /docs/quick_tutorial/jinja2.rst
parent650d3d5fa383d89a3b28029162d6ef4d58be3da1 (diff)
parentc0f1fc8d31df45371d5ae6689d3e0a39c058c3ac (diff)
downloadpyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.gz
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.tar.bz2
pyramid-5d0b1beaf3b09045fd3dd71244938ee6e391ebf3.zip
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to 'docs/quick_tutorial/jinja2.rst')
-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
============