summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-03-30 20:56:50 -0400
committerTim Graham <timograham@gmail.com>2015-03-30 20:56:50 -0400
commit56286542dbb7d1cca253b25de0eb3eb4392ff271 (patch)
tree34ffb6ee92a34922c333cbc66358b4df384ce1de
parent29b4a3f513f412fb4a987b777b61b596c09d217e (diff)
Documented jinja2 install requirement.
-rw-r--r--docs/releases/1.8.txt11
-rw-r--r--docs/topics/templates.txt6
2 files changed, 11 insertions, 6 deletions
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index e44181acc3..8b79b7147a 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 036c006035..9f0048bc1f 100644
--- a/docs/topics/templates.txt
+++ b/docs/topics/templates.txt
@@ -384,6 +384,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.