summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Ribbens <jribbens@gmail.com>2017-09-22 18:13:34 +0100
committerTim Graham <timograham@gmail.com>2017-09-28 10:17:46 -0400
commitaff2df2427232807a88c2f408e7dc62b88f51cd0 (patch)
tree052687fa369954f3311a037372ec6e79c86d0477
parent7c6590af5f199c9ede970758877b5c1eb7e9b3a6 (diff)
[2.0.x] Fixed #28625 -- Distinguished DATABASES['TIME_ZONE'] from settings.TIME_ZONE.
Backport of 44f08422c872e32854216b2b30aab119ec3bb5d8 from master
-rw-r--r--docs/ref/settings.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 358de5eca0..90e6d1fe7c 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -625,8 +625,9 @@ default port. Not used with SQLite.
Default: ``None``
A string representing the time zone for datetimes stored in this database
-(assuming that it doesn't support time zones) or ``None``. The same values are
-accepted as in the general :setting:`TIME_ZONE` setting.
+(assuming that it doesn't support time zones) or ``None``. This inner option of
+the :setting:`DATABASES` setting accepts the same values as the general
+:setting:`TIME_ZONE` setting.
This allows interacting with third-party databases that store datetimes in
local time rather than UTC. To avoid issues around DST changes, you shouldn't