diff options
| author | Tim Graham <timograham@gmail.com> | 2016-05-08 18:07:43 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-05-08 18:09:10 -0400 |
| commit | 145572adb386dc05bc1302bee4432648b13e7e66 (patch) | |
| tree | c16ab4d1b735d95ab51a845202330f268e7158f8 /docs/ref/settings.txt | |
| parent | 86b346435a6735484c23fc9c798cf5243cbf8124 (diff) | |
[1.9.x] Fixed #26483 -- Updated docs.python.org links to use Intersphinx.
Backport of f5ff5010cd74500785a707ac70b51d292403cddc from master
Diffstat (limited to 'docs/ref/settings.txt')
| -rw-r--r-- | docs/ref/settings.txt | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 6044c4f7cf..a139f21eba 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -954,16 +954,15 @@ Default:: A list of formats that will be accepted when inputting data on a date field. Formats will be tried in order, using the first valid one. Note that these -format strings use Python's datetime_ module syntax, not the format strings -from the ``date`` Django template tag. +format strings use Python's :ref:`datetime module syntax +<strftime-strptime-behavior>`, not the format strings from the :tfilter:`date` +template filter. When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher precedence and will be applied instead. See also :setting:`DATETIME_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`. -.. _datetime: https://docs.python.org/library/datetime.html#strftime-strptime-behavior - .. setting:: DATETIME_FORMAT ``DATETIME_FORMAT`` @@ -1002,16 +1001,15 @@ Default:: A list of formats that will be accepted when inputting data on a datetime field. Formats will be tried in order, using the first valid one. Note that -these format strings use Python's datetime_ module syntax, not the format -strings from the ``date`` Django template tag. +these format strings use Python's :ref:`datetime module syntax +<strftime-strptime-behavior>`, not the format strings from the :tfilter:`date` +template filter. When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher precedence and will be applied instead. See also :setting:`DATE_INPUT_FORMATS` and :setting:`TIME_INPUT_FORMATS`. -.. _datetime: https://docs.python.org/library/datetime.html#strftime-strptime-behavior - .. setting:: DEBUG ``DEBUG`` @@ -1765,14 +1763,12 @@ __ https://github.com/django/django/blob/master/django/utils/log.py Default: ``'logging.config.dictConfig'`` A path to a callable that will be used to configure logging in the -Django project. Points at a instance of Python's `dictConfig`_ -configuration method by default. +Django project. Points at a instance of Python's :ref:`dictConfig +<logging-config-dictschema>` configuration method by default. If you set :setting:`LOGGING_CONFIG` to ``None``, the logging configuration process will be skipped. -.. _dictConfig: https://docs.python.org/library/logging.config.html#configuration-dictionary-schema - .. setting:: MANAGERS ``MANAGERS`` @@ -2528,16 +2524,15 @@ Default:: A list of formats that will be accepted when inputting data on a time field. Formats will be tried in order, using the first valid one. Note that these -format strings use Python's datetime_ module syntax, not the format strings -from the ``date`` Django template tag. +format strings use Python's :ref:`datetime module syntax +<strftime-strptime-behavior>`, not the format strings from the :tfilter:`date` +template filter. When :setting:`USE_L10N` is ``True``, the locale-dictated format has higher precedence and will be applied instead. See also :setting:`DATE_INPUT_FORMATS` and :setting:`DATETIME_INPUT_FORMATS`. -.. _datetime: https://docs.python.org/library/datetime.html#strftime-strptime-behavior - .. setting:: TIME_ZONE ``TIME_ZONE`` |