diff options
| author | Tim Graham <timograham@gmail.com> | 2015-03-30 20:56:50 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-31 07:45:02 -0400 |
| commit | 793ecf6db764cb79d17ef8615f58431c378b1219 (patch) | |
| tree | 9cccad49b7920ca0c75fd01d4eb5f5bdb1774c58 /docs | |
| parent | 121c5f7d5b85dca61c63306fe87b34412b9faba6 (diff) | |
[1.8.x] Documented jinja2 install requirement.
Backport of 56286542dbb7d1cca253b25de0eb3eb4392ff271 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.8.txt | 11 | ||||
| -rw-r--r-- | docs/topics/templates.txt | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index 006d37a1af..e56b78e76f 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -49,12 +49,11 @@ Multiple template engines ~~~~~~~~~~~~~~~~~~~~~~~~~ Django 1.8 defines a stable API for integrating template backends. It includes -built-in support for the Django template language and for Jinja2_. It supports -rendering templates with multiple engines within the same project. Learn more -about the new features in the :doc:`topic guide </topics/templates>` and check -the :doc:`upgrade instructions </ref/templates/upgrading>` for details. - -.. _Jinja2: http://jinja.pocoo.org/ +built-in support for the Django template language and for +:class:`~django.template.backends.jinja2.Jinja2`. It supports rendering +templates with multiple engines within the same project. Learn more about the +new features in the :doc:`topic guide </topics/templates>` and check the +:doc:`upgrade instructions </ref/templates/upgrading>` for details. Security enhancements ~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt index b60a7813e0..aab43f6c88 100644 --- a/docs/topics/templates.txt +++ b/docs/topics/templates.txt @@ -392,6 +392,12 @@ applications. This generic name was kept for backwards-compatibility. .. class:: Jinja2 +Requires Jinja2_ to be installed: + +.. code-block:: console + + $ pip install Jinja2 + Set :setting:`BACKEND <TEMPLATES-BACKEND>` to ``'django.template.backends.jinja2.Jinja2'`` to configure a Jinja2_ engine. |