mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[2.0.x] Fixed #29002 -- Corrected cached template loader docs about when it's automatically enabled.

Browse Source 
Thanks oTree-org for the suggestion.

Backport of 7c00f9fb1c from master
This commit is contained in:
Tim Graham
2018-01-11 06:48:29 -05:00
parent 26a20e4fba
commit 3d144787c9
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/ref/templates/api.txt
View File

@@ -918,8 +918,10 @@ loaders that come with Django:
``Template`` in memory. The cached ``Template`` instance is returned for ``Template`` in memory. The cached ``Template`` instance is returned for
subsequent requests to load the same template. subsequent requests to load the same template.
This loader is automatically enabled if :setting:`DEBUG` is ``False`` and This loader is automatically enabled if :setting:`OPTIONS['loaders']
:setting:`OPTIONS['loaders'] <TEMPLATES-OPTIONS>` isn't specified. <TEMPLATES-OPTIONS>` isn't specified and :setting:`OPTIONS['debug']
<TEMPLATES-OPTIONS>` is ``False`` (the latter option defaults to the value
of :setting:`DEBUG`).
You can also enable template caching with some custom template loaders You can also enable template caching with some custom template loaders
using settings like this:: using settings like this::

5
docs/releases/1.11.txt
View File

@@ -698,8 +698,9 @@ Miscellaneous
1.0) is removed. 1.0) is removed.
* The :class:`cached template loader <django.template.loaders.cached.Loader>` * The :class:`cached template loader <django.template.loaders.cached.Loader>`
is now enabled if :setting:`DEBUG` is ``False`` and is now enabled if :setting:`OPTIONS['loaders'] <TEMPLATES-OPTIONS>` isn't
:setting:`OPTIONS['loaders'] <TEMPLATES-OPTIONS>` isn't specified. This could specified and :setting:`OPTIONS['debug'] <TEMPLATES-OPTIONS>` is ``False``
(the latter option defaults to the value of :setting:`DEBUG`). This could
be backwards-incompatible if you have some :ref:`template tags that aren't be backwards-incompatible if you have some :ref:`template tags that aren't
thread safe <template_tag_thread_safety>`. thread safe <template_tag_thread_safety>`.