diff options
| author | goodwillcoding <goodwillcoding@webhippo.net> | 2014-04-20 10:05:52 -0700 |
|---|---|---|
| committer | goodwillcoding <goodwillcoding@webhippo.net> | 2014-04-20 10:05:52 -0700 |
| commit | 8c4f2514d73ec2887ea142081238878ee5a2429d (patch) | |
| tree | 0a0290ba087433ebdca6e0257036937e0ea5bafe /docs/quick_tutorial/jinja2.rst | |
| parent | 510715d0a541a2d7361d505e034f1a4ce6115492 (diff) | |
| parent | 872796d2c1743430ab04364d05657b46133fa230 (diff) | |
| download | pyramid-8c4f2514d73ec2887ea142081238878ee5a2429d.tar.gz pyramid-8c4f2514d73ec2887ea142081238878ee5a2429d.tar.bz2 pyramid-8c4f2514d73ec2887ea142081238878ee5a2429d.zip | |
Merge branch 'master' of github.com:Pylons/pyramid into scaffold_version
Diffstat (limited to 'docs/quick_tutorial/jinja2.rst')
| -rw-r--r-- | docs/quick_tutorial/jinja2.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst index 44d9f635b..2f1e295dd 100644 --- a/docs/quick_tutorial/jinja2.rst +++ b/docs/quick_tutorial/jinja2.rst @@ -88,9 +88,9 @@ Extra Credit dependency manually. What is another way we could have made the association? -#. We used ``development.ini`` to get the :term:`configurator` to - load ``pyramid_jinja2``'s configuration. What is another way could - include it into the config? +#. 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? .. seealso:: `Jinja2 homepage <http://jinja.pocoo.org/>`_, and |