diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/middleware.txt | 2 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 10 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt index 27a2d9a95a..2afd79038f 100644 --- a/docs/ref/middleware.txt +++ b/docs/ref/middleware.txt @@ -122,7 +122,7 @@ Reverse proxy middleware .. class:: django.middleware.http.SetRemoteAddrFromForwardedFor -.. versionchanged: 1.1 +.. versionchanged:: 1.1 This middleware was removed in Django 1.1. See :ref:`the release notes <removed-setremoteaddrfromforwardedfor-middleware>` for details. diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index d403a83224..7fda207d5b 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -411,7 +411,7 @@ DATE_FORMAT Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``) The default formatting to use for displaying date fields in any part of the -system. Note that if setting:`USE_L10N` is set to ``True``, then the +system. Note that if setting:`USE_L10N` is set to ``True``, then the locale-dictated format has higher precedence and will be applied instead. See :ttag:`allowed date format strings <now>`. @@ -451,7 +451,7 @@ DATETIME_FORMAT Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``) The default formatting to use for displaying datetime fields in any part of the -system. Note that if setting:`USE_L10N` is set to ``True``, then the +system. Note that if setting:`USE_L10N` is set to ``True``, then the locale-dictated format has higher precedence and will be applied instead. See :ttag:`allowed date format strings <now>`. @@ -1353,7 +1353,7 @@ SHORT_DATE_FORMAT Default: ``m/d/Y`` (e.g. ``12/31/2003``) An available formatting that can be used for displaying date fields on -templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding +templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding locale-dictated format has higher precedence and will be applied. See :ttag:`allowed date format strings <now>`. @@ -1369,7 +1369,7 @@ SHORT_DATETIME_FORMAT Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``) An available formatting that can be used for displaying datetime fields on -templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding +templates. Note that if ``USE_L10N`` is set to ``True``, then the corresponding locale-dictated format has higher precedence and will be applied. See :ttag:`allowed date format strings <now>`. @@ -1509,7 +1509,7 @@ TIME_FORMAT Default: ``'P'`` (e.g. ``4 p.m.``) The default formatting to use for displaying time fields in any part of the -system. Note that if setting:`USE_L10N` is set to ``True``, then the +system. Note that if setting:`USE_L10N` is set to ``True``, then the locale-dictated format has higher precedence and will be applied instead. See :ttag:`allowed date format strings <now>`. diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 12e5d46b88..3e267531de 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -724,7 +724,7 @@ and :setting:`TEMPLATE_DEBUG`. All available settings are described in the Using an alternative template language ====================================== -.. versionadded 1.2 +.. versionadded:: 1.2 The Django ``Template`` and ``Loader`` classes implement a simple API for loading and rendering templates. By providing some simple wrapper classes that |