summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2014-04-20 06:50:44 -0700
committerSteve Piercy <web@stevepiercy.com>2014-04-20 07:32:38 -0700
commit872796d2c1743430ab04364d05657b46133fa230 (patch)
treee2b1f8c9e4492955aac6fddb7669e555c446e932 /docs
parentef7a4e90de2f78a57e4a3326072f8b40b449182c (diff)
downloadpyramid-872796d2c1743430ab04364d05657b46133fa230.tar.gz
pyramid-872796d2c1743430ab04364d05657b46133fa230.tar.bz2
pyramid-872796d2c1743430ab04364d05657b46133fa230.zip
Merge pull request #1309 from omidraha/patch-1
Correct question to adapt to the the text.
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tutorial/jinja2.rst6
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