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

Commit 6aa0fdc

Browse files
committed
Use on/off consistently for GUC variables in postgresql.conf and the
documentation, to match SHOW.
1 parent 74b49a8 commit 6aa0fdc

File tree

2 files changed

+76
-75
lines changed

2 files changed

+76
-75
lines changed

doc/src/sgml/runtime.sgml

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.333 2005/07/01 13:29:23 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.334 2005/07/02 18:29:03 momjian Exp $
33
-->
44

55
<chapter Id="runtime">
@@ -2461,7 +2461,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
24612461
rather than append to, any existing log file of the same name.
24622462
However, truncation will occur only when a new file is being opened
24632463
due to time-based rotation, not during server startup or size-based
2464-
rotation. When false, pre-existing files will be appended to in
2464+
rotation. When off, pre-existing files will be appended to in
24652465
all cases. For example, using this option in combination with
24662466
a <varname>log_filename</varname> like <literal>postgresql-%H.log</literal>
24672467
would result in generating twenty-four hourly log files and then
@@ -2474,14 +2474,14 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
24742474
<literal>server_log.Mon</literal>, <literal>server_log.Tue</literal>,
24752475
etc, and automatically overwrite last week's log with this week's log,
24762476
set <varname>log_filename</varname> to <literal>server_log.%a</literal>,
2477-
<varname>log_truncate_on_rotation</varname> to <literal>true</literal>, and
2477+
<varname>log_truncate_on_rotation</varname> to <literal>on</literal>, and
24782478
<varname>log_rotation_age</varname> to <literal>1440</literal>.
24792479
</para>
24802480
<para>
24812481
Example: To keep 24 hours of logs, one log file per hour, but
24822482
also rotate sooner if the log file size exceeds 1GB, set
24832483
<varname>log_filename</varname> to <literal>server_log.%H%M</literal>,
2484-
<varname>log_truncate_on_rotation</varname> to <literal>true</literal>,
2484+
<varname>log_truncate_on_rotation</varname> to <literal>on</literal>,
24852485
<varname>log_rotation_age</varname> to <literal>60</literal>, and
24862486
<varname>log_rotation_size</varname> to <literal>1000000</literal>.
24872487
Including <literal>%M</> in <varname>log_filename</varname> allows
@@ -3258,7 +3258,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
32583258
</indexterm>
32593259
<listitem>
32603260
<para>
3261-
This parameter is normally true. When set to false, it disables
3261+
This parameter is normally on. When set to off, it disables
32623262
validation of the function body string during <xref
32633263
linkend="sql-createfunction"
32643264
endterm="sql-createfunction-title">. Disabling validation is
@@ -3307,7 +3307,7 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
33073307
<para>
33083308
A read-only SQL transaction cannot alter non-temporary tables.
33093309
This parameter controls the default read-only status of each new
3310-
transaction. The default is false (read/write).
3310+
transaction. The default is off (read/write).
33113311
</para>
33123312

33133313
<para>
@@ -3385,11 +3385,11 @@ archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
33853385
<indexterm><primary>time zone</><secondary>Australian</></>
33863386
<listitem>
33873387
<para>
3388-
If set to true, <literal>ACST</literal>,
3388+
If set to on, <literal>ACST</literal>,
33893389
<literal>CST</literal>, <literal>EST</literal>, and
33903390
<literal>SAT</literal> are interpreted as Australian time
33913391
zones rather than as North/South American time zones and
3392-
Saturday. The default is false.
3392+
Saturday. The default is off.
33933393
</para>
33943394
</listitem>
33953395
</varlistentry>
@@ -3670,12 +3670,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
36703670
</indexterm>
36713671
<listitem>
36723672
<para>
3673-
When <literal>true</>, tables that are referenced by a query
3673+
When <literal>on</>, tables that are referenced by a query
36743674
will be automatically added to the <literal>FROM</> clause if
36753675
not already present. This behavior does not comply with the
36763676
SQL standard and many people dislike it because it can mask
36773677
mistakes (such as referencing a table where you should have
3678-
referenced its alias). The default is <literal>false</>. This
3678+
referenced its alias). The default is <literal>off</>. This
36793679
variable can be enabled for compatibility with releases of
36803680
<productname>PostgreSQL</> prior to 8.1, where this behavior
36813681
was allowed by default.
@@ -3744,7 +3744,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
37443744
determines whether OIDs will be included in tables created by
37453745
<command>SELECT INTO</command>. In <productname>PostgreSQL</>
37463746
8.1 <varname>default_with_oids</> is disabled by default; in
3747-
prior versions of PostgreSQL, it was true by default.
3747+
prior versions of PostgreSQL, it was on by default.
37483748
</para>
37493749

37503750
<para>
@@ -3997,9 +3997,9 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
39973997
<para>
39983998
Reports whether ordinary string literals
39993999
(<literal>'...'</>) treat backslashes literally, as specified in
4000-
the SQL standard. The value is currently always <literal>false</>,
4000+
the SQL standard. The value is currently always <literal>off</>,
40014001
indicating that backslashes are treated as escapes. It is planned
4002-
that this will change to <literal>true</> in a future
4002+
that this will change to <literal>on</> in a future
40034003
<productname>PostgreSQL</productname> release when string literal
40044004
syntax changes to meet the standard. Applications may check this
40054005
parameter to determine how string literals will be processed.
@@ -4164,7 +4164,7 @@ plruby.bar = true # generates error, unknown class name
41644164
</indexterm>
41654165
<listitem>
41664166
<para>
4167-
If true, emit WAL-related debugging output. This option is
4167+
If on, emit WAL-related debugging output. This option is
41684168
only available if the <symbol>WAL_DEBUG</symbol> macro was
41694169
defined when <productname>PostgreSQL</productname> was
41704170
compiled.
@@ -4181,14 +4181,14 @@ plruby.bar = true # generates error, unknown class name
41814181
<para>
41824182
Detection of a damaged page header normally causes
41834183
<productname>PostgreSQL</> to report an error, aborting the current
4184-
command. Setting <varname>zero_damaged_pages</> to true causes
4184+
command. Setting <varname>zero_damaged_pages</> to on causes
41854185
the system to instead report a warning, zero out the damaged page,
41864186
and continue processing. This behavior <emphasis>will destroy data</>,
41874187
namely all the rows on the damaged page. But it allows you to get
41884188
past the error and retrieve rows from any undamaged pages that may
41894189
be present in the table. So it is useful for recovering data if
41904190
corruption has occurred due to hardware or software error. You should
4191-
generally not set this true until you have given up hope of recovering
4191+
generally not set this on until you have given up hope of recovering
41924192
data from the damaged page(s) of a table. The
41934193
default setting is off, and it can only be changed by a superuser.
41944194
</para>

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

+60-59
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
# - Security & Authentication -
6363

6464
#authentication_timeout = 60 # 1-600, in seconds
65-
#ssl = false
66-
#password_encryption = true
67-
#db_user_namespace = false
65+
#ssl = off
66+
#password_encryption = on
67+
#db_user_namespace = off
6868
# Kerberos
6969
#krb_server_keyfile = ''
70-
#krb_caseins_users = false
70+
#krb_caseins_users = off
7171
#krb_srvname = 'postgres'
7272

7373

@@ -117,7 +117,7 @@
117117

118118
# - Settings -
119119

120-
#fsync = true # turns forced synchronization on or off
120+
#fsync = on # turns forced synchronization on or off
121121
#wal_sync_method = fsync # the default varies across platforms:
122122
# fsync, fdatasync, fsync_writethrough,
123123
# open_sync, open_datasync
@@ -142,15 +142,15 @@
142142

143143
# - Planner Method Configuration -
144144

145-
#enable_bitmapscan = true
146-
#enable_hashagg = true
147-
#enable_hashjoin = true
148-
#enable_indexscan = true
149-
#enable_mergejoin = true
150-
#enable_nestloop = true
151-
#enable_seqscan = true
152-
#enable_sort = true
153-
#enable_tidscan = true
145+
#enable_bitmapscan = on
146+
#enable_hashagg = on
147+
#enable_hashjoin = on
148+
#enable_indexscan = on
149+
#enable_mergejoin = on
150+
#enable_nestloop = on
151+
#enable_seqscan = on
152+
#enable_sort = on
153+
#enable_tidscan = on
154154

155155
# - Planner Cost Constants -
156156

@@ -162,7 +162,7 @@
162162

163163
# - Genetic Query Optimizer -
164164

165-
#geqo = true
165+
#geqo = on
166166
#geqo_threshold = 12
167167
#geqo_effort = 5 # range 1-10
168168
#geqo_pool_size = 0 # selects default based on effort
@@ -186,24 +186,25 @@
186186
# syslog and eventlog, depending on
187187
# platform.
188188

189-
# This is relevant when logging to stderr:
190-
#redirect_stderr = false # Enable capturing of stderr into log files.
191-
# These are only relevant if redirect_stderr is true:
192-
#log_directory = 'pg_log' # Directory where log files are written.
193-
# May be specified absolute or relative to PGDATA
189+
# This is used when logging to stderr:
190+
#redirect_stderr = off # Enable capturing of stderr into log files.
191+
192+
# These are only used if redirect_stderr is on:
193+
#log_directory = 'pg_log' # Directory where log files are written.
194+
# Can be absolute or relative to PGDATA
194195
#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # Log file name pattern.
195-
# May include strftime() escapes
196-
#log_truncate_on_rotation = false # If true, any existing log file of the
197-
# same name as the new log file will be truncated
198-
# rather than appended to. But such truncation
199-
# only occurs on time-driven rotation,
200-
# not on restarts or size-driven rotation.
201-
# Default is false, meaning append to existing
202-
# files in all cases.
203-
#log_rotation_age = 1440 # Automatic rotation of logfiles will happen after
204-
# so many minutes. 0 to disable.
205-
#log_rotation_size = 10240 # Automatic rotation of logfiles will happen after
206-
# so many kilobytes of log output. 0 to disable.
196+
# Can include strftime() escapes
197+
#log_truncate_on_rotation = off # If on, any existing log file of the same
198+
# name as the new log file will be truncated
199+
# rather than appended to. But such truncation
200+
# only occurs on time-driven rotation,
201+
# not on restarts or size-driven rotation.
202+
# Default is off, meaning append to existing
203+
# files in all cases.
204+
#log_rotation_age = 1440 # Automatic rotation of logfiles will happen after
205+
# so many minutes. 0 to disable.
206+
#log_rotation_size = 10240 # Automatic rotation of logfiles will happen after
207+
# so many kilobytes of log output. 0 to disable.
207208

208209
# These are relevant when logging to syslog:
209210
#syslog_facility = 'LOCAL0'
@@ -230,17 +231,17 @@
230231
#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements
231232
# and their durations, in milliseconds.
232233

233-
#silent_mode = false # DO NOT USE without syslog or redirect_stderr
234+
#silent_mode = off # DO NOT USE without syslog or redirect_stderr
234235

235236
# - What to Log -
236237

237-
#debug_print_parse = false
238-
#debug_print_rewritten = false
239-
#debug_print_plan = false
240-
#debug_pretty_print = false
241-
#log_connections = false
242-
#log_disconnections = false
243-
#log_duration = false
238+
#debug_print_parse = off
239+
#debug_print_rewritten = off
240+
#debug_print_plan = off
241+
#debug_pretty_print = off
242+
#log_connections = off
243+
#log_disconnections = off
244+
#log_duration = off
244245
#log_line_prefix = '' # %u = user name
245246
# %d = database name
246247
# %r = remote host and port
@@ -257,7 +258,7 @@
257258
# %% = '%'
258259
# e.g. '<%u%%%d> '
259260
#log_statement = 'none' # none, mod, ddl, all
260-
#log_hostname = false
261+
#log_hostname = off
261262

262263

263264
#---------------------------------------------------------------------------
@@ -266,18 +267,18 @@
266267

267268
# - Statistics Monitoring -
268269

269-
#log_parser_stats = false
270-
#log_planner_stats = false
271-
#log_executor_stats = false
272-
#log_statement_stats = false
270+
#log_parser_stats = off
271+
#log_planner_stats = off
272+
#log_executor_stats = off
273+
#log_statement_stats = off
273274

274275
# - Query/Index Statistics Collector -
275276

276-
#stats_start_collector = true
277-
#stats_command_string = false
278-
#stats_block_level = false
279-
#stats_row_level = false
280-
#stats_reset_on_server_start = true
277+
#stats_start_collector = on
278+
#stats_command_string = off
279+
#stats_block_level = off
280+
#stats_row_level = off
281+
#stats_reset_on_server_start = on
281282

282283

283284
#---------------------------------------------------------------------------
@@ -288,16 +289,16 @@
288289

289290
#search_path = '$user,public' # schema names
290291
#default_tablespace = '' # a tablespace name, or '' for default
291-
#check_function_bodies = true
292+
#check_function_bodies = on
292293
#default_transaction_isolation = 'read committed'
293-
#default_transaction_read_only = false
294+
#default_transaction_read_only = off
294295
#statement_timeout = 0 # 0 is disabled, in milliseconds
295296

296297
# - Locale and Formatting -
297298

298299
#datestyle = 'iso, mdy'
299300
#timezone = unknown # actually, defaults to TZ environment setting
300-
#australian_timezones = false
301+
#australian_timezones = off
301302
#extra_float_digits = 0 # min -15, max 2
302303
#client_encoding = sql_ascii # actually, defaults to database encoding
303304

@@ -309,7 +310,7 @@
309310

310311
# - Other Defaults -
311312

312-
#explain_pretty_print = true
313+
#explain_pretty_print = on
313314
#dynamic_library_path = '$libdir'
314315

315316

@@ -327,12 +328,12 @@
327328

328329
# - Previous Postgres Versions -
329330

330-
#add_missing_from = false
331+
#add_missing_from = off
331332
#regex_flavor = advanced # advanced, extended, or basic
332-
#sql_inheritance = true
333-
#default_with_oids = false
334-
#escape_string_warning = false
333+
#sql_inheritance = on
334+
#default_with_oids = off
335+
#escape_string_warning = off
335336

336337
# - Other Platforms & Clients -
337338

338-
#transform_null_equals = false
339+
#transform_null_equals = off

0 commit comments

Comments
 (0)