From aff2df2427232807a88c2f408e7dc62b88f51cd0 Mon Sep 17 00:00:00 2001 From: Jon Ribbens Date: Fri, 22 Sep 2017 18:13:34 +0100 Subject: [PATCH] [2.0.x] Fixed #28625 -- Distinguished DATABASES['TIME_ZONE'] from settings.TIME_ZONE. Backport of 44f08422c872e32854216b2b30aab119ec3bb5d8 from master --- docs/ref/settings.txt | 5 +++-- 1 file 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