summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2011-01-25 15:42:24 +0000
committerRamiro Morales <cramm0@gmail.com>2011-01-25 15:42:24 +0000
commitf81d4ba5b3deceeacbe51923f379acb7d033665f (patch)
treecf3c4942cd81549fcd9112c3c07f87db7469430d /docs/ref/settings.txt
parent5d2ea792ecc271f08201e59268a26ff163f91634 (diff)
Fixed #14038 -- Added information to release notes and version changed|added markers to documentation additions for the new template loeaders API introduced in version 1.2. Thanks 3point2 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 87a71fe6ed..5140d3519d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1743,6 +1743,12 @@ used instead of a string. The first item in the tuple should be the ``Loader``'s
module, subsequent items are passed to the ``Loader`` during initialization. See
:doc:`/ref/templates/api`.
+.. versionchanged:: 1.2
+ The class-based API for template loaders was introduced in Django 1.2
+ although the ``TEMPLATE_LOADERS`` setting will accept strings that specify
+ function-based loaders until compatibility with them is completely removed in
+ Django 1.4.
+
.. setting:: TEMPLATE_STRING_IF_INVALID
TEMPLATE_STRING_IF_INVALID