diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-01-25 15:44:41 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-01-25 15:44:41 +0000 |
| commit | 7d0d10ce204118f32ef50d778fa975fb18314ece (patch) | |
| tree | 6c14d35c828f7120d20a7f6c3e707e9e77ebdf57 /docs/ref | |
| parent | c09249731b0e66bfee72e978e0274d698bfad091 (diff) | |
[1.2.X] 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.
Backport of [15309] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 6 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 9 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 7cf131e323..33011c08e9 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1504,6 +1504,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 diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 1b08542a90..b91b1e4414 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -613,8 +613,13 @@ sources. Some of these other loaders are disabled by default, but you can activate them by editing your :setting:`TEMPLATE_LOADERS` setting. :setting:`TEMPLATE_LOADERS` -should be a tuple of strings, where each string represents a template loader. -Here are the template loaders that come with Django: +should be a tuple of strings, where each string represents a template loader +class. Here are the template loaders that come with Django: + +.. versionchanged:: 1.2 + Template loaders were based on callables (usually functions) before Django + 1.2, starting with the 1.2 release there is a new class-based API, all the + loaders described below implement this new API. ``django.template.loaders.filesystem.Loader`` Loads templates from the filesystem, according to :setting:`TEMPLATE_DIRS`. |