diff options
| author | Chris McDonough <chrism@plope.com> | 2014-05-23 14:57:01 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2014-05-23 14:57:01 -0400 |
| commit | d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3 (patch) | |
| tree | 36784e20002ecc4cb6675901b3cc2bda36e54caa /docs/quick_tutorial/jinja2.rst | |
| parent | 0c5bb0aa329239df877ccb053280e398766eb434 (diff) | |
| parent | c740e8bd20c049cbab43ce0a1cd5a4533fe6b849 (diff) | |
| download | pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.gz pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.tar.bz2 pyramid-d76bdb514c92ee1fd9b1bd67387d15d34ea28bb3.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 | 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 |