diff --git a/README.md b/README.md index cfeb2970..f0e2a755 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ create the following settings before pushing: heroku config:set DJANGO_SETTINGS_MODULE=babybuddy.settings.heroku heroku config:set SECRET_KEY= heroku config:set DISABLE_COLLECTSTATIC=1 - heroku config:set TIME_ZONE= + heroku config:set TIME_ZONE= See [Configuration](#configuration) for other settings that can be controlled by `heroku config:set`. @@ -365,8 +365,9 @@ See also [Django's documentation on the SECRET_KEY setting](https://docs.djangop *Default: Etc/UTC* -The time zone to use for the instance. See [List of tz database time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) -for all possible values. +The default time zone to use for the instance. See [List of tz database time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) +for all possible values. This value can be overridden per use from the user +settings form. ## Languages diff --git a/app.json b/app.json index fab49bc3..685991aa 100644 --- a/app.json +++ b/app.json @@ -32,7 +32,7 @@ "value": "1" }, "TIME_ZONE": { - "description": "Sets the instance time zone.", + "description": "Sets the instance default time zone.", "value": "Etc/UTC" } },