diff options
| author | Chris McDonough <chrism@plope.com> | 2015-04-02 13:57:30 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-04-02 13:57:30 -0400 |
| commit | 45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f (patch) | |
| tree | 9efe59281dbc0b20b9a94b69ee0a18bcb124aa93 /docs/quick_tutorial/jinja2.rst | |
| parent | b6498fce8c1418f3c7b33d31aa9c151a86bc4166 (diff) | |
| parent | 575ff8050b0cbdbf424947361f419b803568e122 (diff) | |
| download | pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.tar.gz pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.tar.bz2 pyramid-45ddb5a5b744aebeac6004e9dba1c03d5bc8c50f.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/quick_tutorial/jinja2.rst')
| -rw-r--r-- | docs/quick_tutorial/jinja2.rst | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst index 2f1e295dd..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 @@ -45,12 +45,6 @@ Steps .. literalinclude:: jinja2/tutorial/home.jinja2 :language: html -#. Get the ``pyramid.includes`` into the functional test setup in - ``jinja2/tutorial/tests.py``: - - .. literalinclude:: jinja2/tutorial/tests.py - :linenos: - #. Now run the tests: .. code-block:: bash @@ -78,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 ============ |