Commit 1453cd8f authored by Tom Lane's avatar Tom Lane

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.
parent 853c1750
...@@ -3869,11 +3869,11 @@ FROM pg_stat_activity; ...@@ -3869,11 +3869,11 @@ FROM pg_stat_activity;
</indexterm> </indexterm>
<listitem> <listitem>
<para> <para>
Sets the time zone used for timestamps written in the log. Sets the time zone used for timestamps written in the server log.
Unlike <xref linkend="guc-timezone">, this value is cluster-wide, Unlike <xref linkend="guc-timezone">, this value is cluster-wide,
so that all sessions will report timestamps consistently. so that all sessions will report timestamps consistently.
The default is <literal>unknown</>, which means use whatever If not explicitly set, the server initializes this variable to the
the system environment specifies as the time zone. See <xref time zone specified by its system environment. See <xref
linkend="datatype-timezones"> for more information. linkend="datatype-timezones"> for more information.
This parameter can only be set in the <filename>postgresql.conf</> This parameter can only be set in the <filename>postgresql.conf</>
file or on the server command line. file or on the server command line.
...@@ -4918,10 +4918,9 @@ SET XML OPTION { DOCUMENT | CONTENT }; ...@@ -4918,10 +4918,9 @@ SET XML OPTION { DOCUMENT | CONTENT };
<listitem> <listitem>
<para> <para>
Sets the time zone for displaying and interpreting time stamps. Sets the time zone for displaying and interpreting time stamps.
The default is <literal>unknown</>, which means to use whatever If not explicitly set, the server initializes this variable to the
the system environment specifies as the time zone. See <xref time zone specified by its system environment. See <xref
linkend="datatype-timezones"> for more linkend="datatype-timezones"> for more information.
information.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
...@@ -390,8 +390,7 @@ ...@@ -390,8 +390,7 @@
#log_temp_files = -1 # log temporary files equal or larger #log_temp_files = -1 # log temporary files equal or larger
# than the specified size in kilobytes; # than the specified size in kilobytes;
# -1 disables, 0 logs all temp files # -1 disables, 0 logs all temp files
#log_timezone = unknown # actually, defaults to TZ environment #log_timezone = '(defaults to server environment setting)'
# setting
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
...@@ -471,8 +470,7 @@ ...@@ -471,8 +470,7 @@
#datestyle = 'iso, mdy' #datestyle = 'iso, mdy'
#intervalstyle = 'postgres' #intervalstyle = 'postgres'
#timezone = unknown # actually, defaults to TZ environment #timezone = '(defaults to server environment setting)'
# setting
#timezone_abbreviations = 'Default' # Select the set of available time zone #timezone_abbreviations = 'Default' # Select the set of available time zone
# abbreviations. Currently, there are # abbreviations. Currently, there are
# Default # Default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment