diff options
| author | Paul McMillan <Paul@McMillan.ws> | 2010-06-09 21:20:49 +0000 |
|---|---|---|
| committer | Paul McMillan <Paul@McMillan.ws> | 2010-06-09 21:20:49 +0000 |
| commit | e3bad40d3e4873be5f9b7103b2140ebf81361c8a (patch) | |
| tree | e7fbac7c580781061f3fa6c06ac16f43ec292b72 /docs/ref | |
| parent | 8bdf160e05f666c0f1c9106719bad46b407f9992 (diff) | |
Merged trunk changes r13316:13342 into test-refactor SOC branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 958ac888e9..53fbfb2ffe 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -441,7 +441,7 @@ to be displayed. See also ``DATETIME_INPUT_FORMATS`` and ``TIME_INPUT_FORMATS``. -.. _datetime: http://docs.python.org/library/datetime.html#strftime-behavior +.. _datetime: http://docs.python.org/library/datetime.html#strftime-strptime-behavior .. setting:: DATETIME_FORMAT @@ -481,7 +481,7 @@ to be displayed. See also ``DATE_INPUT_FORMATS`` and ``TIME_INPUT_FORMATS``. -.. _datetime: http://docs.python.org/library/datetime.html#strftime-behavior +.. _datetime: http://docs.python.org/library/datetime.html#strftime-strptime-behavior .. setting:: DEBUG @@ -1532,7 +1532,7 @@ to be displayed. See also ``DATE_INPUT_FORMATS`` and ``DATETIME_INPUT_FORMATS``. -.. _datetime: http://docs.python.org/library/datetime.html#strftime-behavior +.. _datetime: http://docs.python.org/library/datetime.html#strftime-strptime-behavior .. setting:: TIME_ZONE |