aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-05-10 13:48:40 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-05-10 13:48:40 -0400
commit1453cd8f82139a3e751c617dc6635f7b1c7abe14 (patch)
tree9d1ee8d7e60f38ad31e2bfbeb3184e870853cf7c /src
parent853c1750f91feaa6a72b29ae683c955ab6f4df70 (diff)
downloadpostgresql-1453cd8f82139a3e751c617dc6635f7b1c7abe14.tar.gz
postgresql-1453cd8f82139a3e751c617dc6635f7b1c7abe14.zip
Adjust documentation with respect to "unknown" timezone setting.
The recent cleanup of GUC assign hooks got rid of the kludge of using "unknown" as a magic value for timezone and log_timezone. But I forgot to update the documentation to match, as noted by Martin Pitt.
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index b8a1582eaa9..655dad42c71 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -390,8 +390,7 @@
#log_temp_files = -1 # log temporary files equal or larger
# than the specified size in kilobytes;
# -1 disables, 0 logs all temp files
-#log_timezone = unknown # actually, defaults to TZ environment
- # setting
+#log_timezone = '(defaults to server environment setting)'
#------------------------------------------------------------------------------
@@ -471,8 +470,7 @@
#datestyle = 'iso, mdy'
#intervalstyle = 'postgres'
-#timezone = unknown # actually, defaults to TZ environment
- # setting
+#timezone = '(defaults to server environment setting)'
#timezone_abbreviations = 'Default' # Select the set of available time zone
# abbreviations. Currently, there are
# Default