summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/jinja2.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-10-21 00:34:10 -0500
committerMichael Merickel <michael@merickel.org>2015-10-21 00:34:10 -0500
commit504027873ab0e1b15601e2d1900ef8a4469f6a43 (patch)
tree06e6cbf634a894dbce232c9dbb06324637a95a86 /docs/quick_tutorial/jinja2.rst
parentbf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff)
parente1ec631ab2d470b1550640d21c28ddd1387f4045 (diff)
downloadpyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.tar.gz
pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.tar.bz2
pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.zip
Merge pull request #2020 from bertjwregeer/feature/configurable-view-deriver
Configurable View Deriver moving forward...
Diffstat (limited to 'docs/quick_tutorial/jinja2.rst')
-rw-r--r--docs/quick_tutorial/jinja2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/quick_tutorial/jinja2.rst b/docs/quick_tutorial/jinja2.rst
index 613542349..2121803f9 100644
--- a/docs/quick_tutorial/jinja2.rst
+++ b/docs/quick_tutorial/jinja2.rst
@@ -6,7 +6,7 @@
We just said Pyramid doesn't prefer one templating language over
another. Time to prove it. Jinja2 is a popular templating system,
-used in Flask and modelled after Django's templates. Let's add
+used in Flask and modeled after Django's templates. Let's add
``pyramid_jinja2``, a Pyramid :term:`add-on` which enables Jinja2 as a
:term:`renderer` in our Pyramid applications.