From 793ecf6db764cb79d17ef8615f58431c378b1219 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 30 Mar 2015 20:56:50 -0400 Subject: [PATCH] [1.8.x] Documented jinja2 install requirement. Backport of 56286542dbb7d1cca253b25de0eb3eb4392ff271 from master --- docs/releases/1.8.txt | 11 +++++------ 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 006d37a1afc..e56b78e76fc 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 ` and check -the :doc:`upgrade instructions ` 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 ` and check the +:doc:`upgrade instructions ` for details. Security enhancements ~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt index b60a7813e04..aab43f6c886 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 ` to ``'django.template.backends.jinja2.Jinja2'`` to configure a Jinja2_ engine.