p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[2.0.x] Fixed #28625 -- Distinguished DATABASES['TIME_ZONE'] from settings.TIME_ZONE. 

Backport of 44f08422c8 from master
This commit is contained in:
Jon Ribbens 2017-09-22 18:13:34 +01:00 committed by Tim Graham
parent 7c6590af5f
commit aff2df2427
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/ref/settings.txt
View File

@ -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