Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1453cd8

Browse files
committed
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.
1 parent 853c175 commit 1453cd8

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

doc/src/sgml/config.sgml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3869,11 +3869,11 @@ FROM pg_stat_activity;
38693869
</indexterm>
38703870
<listitem>
38713871
<para>
3872-
Sets the time zone used for timestamps written in the log.
3872+
Sets the time zone used for timestamps written in the server log.
38733873
Unlike <xref linkend="guc-timezone">, this value is cluster-wide,
38743874
so that all sessions will report timestamps consistently.
3875-
The default is <literal>unknown</>, which means use whatever
3876-
the system environment specifies as the time zone. See <xref
3875+
If not explicitly set, the server initializes this variable to the
3876+
time zone specified by its system environment. See <xref
38773877
linkend="datatype-timezones"> for more information.
38783878
This parameter can only be set in the <filename>postgresql.conf</>
38793879
file or on the server command line.
@@ -4918,10 +4918,9 @@ SET XML OPTION { DOCUMENT | CONTENT };
49184918
<listitem>
49194919
<para>
49204920
Sets the time zone for displaying and interpreting time stamps.
4921-
The default is <literal>unknown</>, which means to use whatever
4922-
the system environment specifies as the time zone. See <xref
4923-
linkend="datatype-timezones"> for more
4924-
information.
4921+
If not explicitly set, the server initializes this variable to the
4922+
time zone specified by its system environment. See <xref
4923+
linkend="datatype-timezones"> for more information.
49254924
</para>
49264925
</listitem>
49274926
</varlistentry>

src/backend/utils/misc/postgresql.conf.sample

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,7 @@
390390
#log_temp_files = -1 # log temporary files equal or larger
391391
# than the specified size in kilobytes;
392392
# -1 disables, 0 logs all temp files
393-
#log_timezone = unknown # actually, defaults to TZ environment
394-
# setting
393+
#log_timezone = '(defaults to server environment setting)'
395394

396395

397396
#------------------------------------------------------------------------------
@@ -471,8 +470,7 @@
471470

472471
#datestyle = 'iso, mdy'
473472
#intervalstyle = 'postgres'
474-
#timezone = unknown # actually, defaults to TZ environment
475-
# setting
473+
#timezone = '(defaults to server environment setting)'
476474
#timezone_abbreviations = 'Default' # Select the set of available time zone
477475
# abbreviations. Currently, there are
478476
# Default

0 commit comments

Comments
 (0)