diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:19:18 -0600 |
| commit | 18e54fe9619fd8b2aa6006126fc1c2840e32f2c1 (patch) | |
| tree | ea26bbfd681ae5d821f2cde9ac5cbe2e80f5c714 /docs/quick_tutorial/jinja2.rst | |
| parent | bf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff) | |
| parent | d4221720b8409eafb65b301562be327af0196c7e (diff) | |
| download | pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.gz pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.tar.bz2 pyramid-18e54fe9619fd8b2aa6006126fc1c2840e32f2c1.zip | |
Merge branch 'master' of github.com:Pylons/pyramid into feature/configurable-view-deriver
Diffstat (limited to 'docs/quick_tutorial/jinja2.rst')
| -rw-r--r-- | docs/quick_tutorial/jinja2.rst | 2 |
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. |