diff options
| author | Michael Merickel <michael@merickel.org> | 2014-11-10 00:57:29 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-11-10 00:57:29 -0600 |
| commit | d1d3edbbafd5ed0160e70f960025a12fa0783b5b (patch) | |
| tree | d4bbc47ee9c469d3a89cf84f9df27b0edffe0f29 /docs/quick_tutorial/jinja2.rst | |
| parent | fe83c6bfdab16818cb434d95a09bd6510b43aa24 (diff) | |
| parent | 7dd39020afbd50f6b27e03bb81ace700ae280bef (diff) | |
| download | pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.gz pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.tar.bz2 pyramid-d1d3edbbafd5ed0160e70f960025a12fa0783b5b.zip | |
Merge branch 'master' into feature.security-docs-enhancements
Diffstat (limited to 'docs/quick_tutorial/jinja2.rst')
| -rw-r--r-- | docs/quick_tutorial/jinja2.rst | 7 |
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 ============ |