diff options
| author | Tim Graham <timograham@gmail.com> | 2018-01-11 06:48:29 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-01-11 06:53:20 -0500 |
| commit | bb39e4b57e036765ea86ebb36913a54ec78b2b04 (patch) | |
| tree | 1366b26719edb9468cab790e376c7c6e4a3fecdf /docs | |
| parent | 967d824288ddd0b9bc5e713ae8f7ba052ac88967 (diff) | |
[1.11.x] Fixed #29002 -- Corrected cached template loader docs about when it's automatically enabled.
Thanks oTree-org for the suggestion.
Backport of 7c00f9fb1cc47e1c993f7728e2b592a1be29dd40 from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/templates/api.txt | 6 | ||||
| -rw-r--r-- | docs/releases/1.11.txt | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index df3123cf16..7513b11930 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -932,8 +932,10 @@ loaders that come with Django: ``Template`` in memory. The cached ``Template`` instance is returned for subsequent requests to load the same template. - This loader is automatically enabled if :setting:`DEBUG` is ``False`` and - :setting:`OPTIONS['loaders'] <TEMPLATES-OPTIONS>` isn't specified. + This loader is automatically enabled if :setting:`OPTIONS['loaders'] + <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 using settings like this:: diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index 5b6b17a012..86a0fa53b5 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -695,8 +695,9 @@ Miscellaneous 1.0) is removed. * The :class:`cached template loader <django.template.loaders.cached.Loader>` - is now enabled if :setting:`DEBUG` is ``False`` and - :setting:`OPTIONS['loaders'] <TEMPLATES-OPTIONS>` isn't specified. This could + is now enabled if :setting:`OPTIONS['loaders'] <TEMPLATES-OPTIONS>` isn't + 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 thread safe <template_tag_thread_safety>`. |