diff options
| author | Jason Pellerin <jpellerin@gmail.com> | 2006-07-09 17:11:34 +0000 |
|---|---|---|
| committer | Jason Pellerin <jpellerin@gmail.com> | 2006-07-09 17:11:34 +0000 |
| commit | ef1a9eeb64b24a49769b107a9361643bd7e7a688 (patch) | |
| tree | 35e92a9d96da0e8141ef9bcc18a2b826ca66aae3 /docs/settings.txt | |
| parent | 60947322a582e4bc3f07622024ef7e2d470b0d68 (diff) | |
[multi-db] Merge trunk to [3302]
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
| -rw-r--r-- | docs/settings.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/settings.txt b/docs/settings.txt index 4f4fb70298..9e1c6b529b 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -729,6 +729,10 @@ TIME_ZONE Default: ``'America/Chicago'`` A string representing the time zone for this installation. `See available choices`_. +(Note that list of available choices lists more than one on the same line; +you'll want to use just one of the choices for a given time zone. For instance, +one line says ``'Europe/London GB GB-Eire'``, but you should use the first bit +of that -- ``'Europe/London'`` -- as your ``TIME_ZONE`` setting.) Note that this is the time zone to which Django will convert all dates/times -- not necessarily the timezone of the server. For example, one server may serve @@ -750,7 +754,7 @@ Default: ``True`` A boolean that specifies whether Django's internationalization system should be enabled. This provides an easy way to turn it off, for performance. If this is -set to ``False, Django will make some optimizations so as not to load the +set to ``False``, Django will make some optimizations so as not to load the internationalization machinery. YEAR_MONTH_FORMAT |