diff options
| author | Chris McDonough <chrism@plope.com> | 2015-06-05 14:06:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-06-05 14:06:02 -0400 |
| commit | f3c67a4217504bc7f2862ec1616342240738efae (patch) | |
| tree | 9e7452b3ffdc8d4f30739cfc9d898169d6719206 /docs/quick_tutorial/jinja2.rst | |
| parent | 7b4ed3088af03de473ad164c314062c283afce39 (diff) | |
| parent | c1dbb5092d486df5d7fbad8e52cd1dbcc2c834d9 (diff) | |
| download | pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.gz pyramid-f3c67a4217504bc7f2862ec1616342240738efae.tar.bz2 pyramid-f3c67a4217504bc7f2862ec1616342240738efae.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 | 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. |