Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdd740e1

Browse files
author
Neil Conway
committed
Various improvements to the GUC description strings. Punctuate and
capitalize the strings like sentences. Remove unnecessarilyspecific descriptions of the units used by GUC variables, sincewe now allow any reasonable unit to be specified.
1 parenta39e395 commitdd740e1

File tree

1 file changed

+46
-46
lines changed
  • src/backend/utils/misc

1 file changed

+46
-46
lines changed

‎src/backend/utils/misc/guc.c‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.360 2006/11/29 14:50:07 petere Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.361 2006/12/06 17:35:49 neilc Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -587,7 +587,7 @@ static struct config_bool ConfigureNamesBool[] =
587587
{
588588
/* currently undocumented, so don't show in SHOW ALL */
589589
{"exit_on_error",PGC_USERSET,UNGROUPED,
590-
gettext_noop("no description available"),
590+
gettext_noop("No description available."),
591591
NULL,
592592
GUC_NO_SHOW_ALL |GUC_NOT_IN_SAMPLE
593593
},
@@ -669,7 +669,7 @@ static struct config_bool ConfigureNamesBool[] =
669669
#ifdefBTREE_BUILD_STATS
670670
{
671671
{"log_btree_build_stats",PGC_SUSET,DEVELOPER_OPTIONS,
672-
gettext_noop("no description available"),
672+
gettext_noop("No description available."),
673673
NULL,
674674
GUC_NOT_IN_SAMPLE
675675
},
@@ -761,7 +761,7 @@ static struct config_bool ConfigureNamesBool[] =
761761
#ifdefLOCK_DEBUG
762762
{
763763
{"trace_locks",PGC_SUSET,DEVELOPER_OPTIONS,
764-
gettext_noop("no description available"),
764+
gettext_noop("No description available."),
765765
NULL,
766766
GUC_NOT_IN_SAMPLE
767767
},
@@ -770,7 +770,7 @@ static struct config_bool ConfigureNamesBool[] =
770770
},
771771
{
772772
{"trace_userlocks",PGC_SUSET,DEVELOPER_OPTIONS,
773-
gettext_noop("no description available"),
773+
gettext_noop("No description available."),
774774
NULL,
775775
GUC_NOT_IN_SAMPLE
776776
},
@@ -779,7 +779,7 @@ static struct config_bool ConfigureNamesBool[] =
779779
},
780780
{
781781
{"trace_lwlocks",PGC_SUSET,DEVELOPER_OPTIONS,
782-
gettext_noop("no description available"),
782+
gettext_noop("No description available."),
783783
NULL,
784784
GUC_NOT_IN_SAMPLE
785785
},
@@ -788,7 +788,7 @@ static struct config_bool ConfigureNamesBool[] =
788788
},
789789
{
790790
{"debug_deadlocks",PGC_SUSET,DEVELOPER_OPTIONS,
791-
gettext_noop("no description available"),
791+
gettext_noop("No description available."),
792792
NULL,
793793
GUC_NOT_IN_SAMPLE
794794
},
@@ -982,7 +982,7 @@ static struct config_bool ConfigureNamesBool[] =
982982

983983
{
984984
{"standard_conforming_strings",PGC_USERSET,COMPAT_OPTIONS_PREVIOUS,
985-
gettext_noop("'...' strings treat backslashes literally."),
985+
gettext_noop("Causes'...' strings to treat backslashes literally."),
986986
NULL,
987987
GUC_REPORT
988988
},
@@ -1050,8 +1050,8 @@ static struct config_int ConfigureNamesInt[] =
10501050
},
10511051
{
10521052
{"from_collapse_limit",PGC_USERSET,QUERY_TUNING_OTHER,
1053-
gettext_noop("Sets the FROM-list size beyond which subqueriesare not"
1054-
"collapsed."),
1053+
gettext_noop("Sets the FROM-list size beyond which subqueries "
1054+
"are notcollapsed."),
10551055
gettext_noop("The planner will merge subqueries into upper "
10561056
"queries if the resulting FROM list would have no more than "
10571057
"this many items.")
@@ -1061,11 +1061,11 @@ static struct config_int ConfigureNamesInt[] =
10611061
},
10621062
{
10631063
{"join_collapse_limit",PGC_USERSET,QUERY_TUNING_OTHER,
1064-
gettext_noop("Sets the FROM-list size beyond which JOINconstructs are not"
1065-
"flattened."),
1064+
gettext_noop("Sets the FROM-list size beyond which JOIN "
1065+
"constructs are notflattened."),
10661066
gettext_noop("The planner will flatten explicit JOIN "
1067-
"constructs into lists of FROM items whenever a list of no more "
1068-
"than this many items would result.")
1067+
"constructs into lists of FROM items whenever a "
1068+
"list of no morethan this many items would result.")
10691069
},
10701070
&join_collapse_limit,
10711071
8,1,INT_MAX,NULL,NULL
@@ -1105,7 +1105,7 @@ static struct config_int ConfigureNamesInt[] =
11051105

11061106
{
11071107
{"deadlock_timeout",PGC_SIGHUP,LOCK_MANAGEMENT,
1108-
gettext_noop("Thetimein millisecondsto wait on lock before checking for deadlock."),
1108+
gettext_noop("Sets thetime to wait on a lock before checking for deadlock."),
11091109
NULL,
11101110
GUC_UNIT_MS
11111111
},
@@ -1322,7 +1322,7 @@ static struct config_int ConfigureNamesInt[] =
13221322

13231323
{
13241324
{"statement_timeout",PGC_USERSET,CLIENT_CONN_STATEMENT,
1325-
gettext_noop("Sets the maximum allowed duration(in milliseconds)of any statement."),
1325+
gettext_noop("Sets the maximum allowed duration of any statement."),
13261326
gettext_noop("A value of 0 turns off the timeout."),
13271327
GUC_UNIT_MS
13281328
},
@@ -1369,7 +1369,7 @@ static struct config_int ConfigureNamesInt[] =
13691369

13701370
{
13711371
{"authentication_timeout",PGC_SIGHUP,CONN_AUTH_SECURITY,
1372-
gettext_noop("Sets the maximumtime in seconds to complete client authentication."),
1372+
gettext_noop("Sets the maximumallowed time to complete client authentication."),
13731373
NULL,
13741374
GUC_UNIT_S
13751375
},
@@ -1380,8 +1380,8 @@ static struct config_int ConfigureNamesInt[] =
13801380
{
13811381
/* Not for general use */
13821382
{"pre_auth_delay",PGC_SIGHUP,DEVELOPER_OPTIONS,
1383-
gettext_noop("no description available"),
1384-
NULL,
1383+
gettext_noop("Waits N seconds on connection startup before authentication."),
1384+
gettext_noop("This allows attaching a debugger to the process."),
13851385
GUC_NOT_IN_SAMPLE |GUC_UNIT_S
13861386
},
13871387
&PreAuthDelay,
@@ -1399,7 +1399,7 @@ static struct config_int ConfigureNamesInt[] =
13991399

14001400
{
14011401
{"checkpoint_timeout",PGC_SIGHUP,WAL_CHECKPOINTS,
1402-
gettext_noop("Sets the maximum timein secondsbetween automatic WAL checkpoints."),
1402+
gettext_noop("Sets the maximum time between automatic WAL checkpoints."),
14031403
NULL,
14041404
GUC_UNIT_S
14051405
},
@@ -1409,8 +1409,8 @@ static struct config_int ConfigureNamesInt[] =
14091409

14101410
{
14111411
{"checkpoint_warning",PGC_SIGHUP,WAL_CHECKPOINTS,
1412-
gettext_noop("Logsiffilling ofcheckpoint segmentshappens more "
1413-
"frequently than this (in seconds)."),
1412+
gettext_noop("Enables warningsif checkpoint segmentsare filled more "
1413+
"frequently than this."),
14141414
gettext_noop("Write a message to the server log if checkpoints "
14151415
"caused by the filling of checkpoint segment files happens more "
14161416
"frequently than this number of seconds. Zero turns off the warning."),
@@ -1463,7 +1463,7 @@ static struct config_int ConfigureNamesInt[] =
14631463

14641464
{
14651465
{"log_min_duration_statement",PGC_SUSET,LOGGING_WHEN,
1466-
gettext_noop("Sets the minimum execution timein millisecondsabove which statements will "
1466+
gettext_noop("Sets the minimum execution time above which statements will "
14671467
"be logged."),
14681468
gettext_noop("Zero prints all queries. The default is -1 (turning this feature off)."),
14691469
GUC_UNIT_MS
@@ -1474,7 +1474,7 @@ static struct config_int ConfigureNamesInt[] =
14741474

14751475
{
14761476
{"bgwriter_delay",PGC_SIGHUP,RESOURCES,
1477-
gettext_noop("Background writer sleep time between rounds in milliseconds"),
1477+
gettext_noop("Background writer sleep time between rounds."),
14781478
NULL,
14791479
GUC_UNIT_MS
14801480
},
@@ -1484,7 +1484,7 @@ static struct config_int ConfigureNamesInt[] =
14841484

14851485
{
14861486
{"bgwriter_lru_maxpages",PGC_SIGHUP,RESOURCES,
1487-
gettext_noop("Background writer maximum number of LRU pages to flush per round"),
1487+
gettext_noop("Background writer maximum number of LRU pages to flush per round."),
14881488
NULL
14891489
},
14901490
&bgwriter_lru_maxpages,
@@ -1493,7 +1493,7 @@ static struct config_int ConfigureNamesInt[] =
14931493

14941494
{
14951495
{"bgwriter_all_maxpages",PGC_SIGHUP,RESOURCES,
1496-
gettext_noop("Background writer maximum number of all pages to flush per round"),
1496+
gettext_noop("Background writer maximum number of all pages to flush per round."),
14971497
NULL
14981498
},
14991499
&bgwriter_all_maxpages,
@@ -1502,7 +1502,7 @@ static struct config_int ConfigureNamesInt[] =
15021502

15031503
{
15041504
{"log_rotation_age",PGC_SIGHUP,LOGGING_WHERE,
1505-
gettext_noop("Automatic log file rotation will occur after N minutes"),
1505+
gettext_noop("Automatic log file rotation will occur after N minutes."),
15061506
NULL,
15071507
GUC_UNIT_MIN
15081508
},
@@ -1512,7 +1512,7 @@ static struct config_int ConfigureNamesInt[] =
15121512

15131513
{
15141514
{"log_rotation_size",PGC_SIGHUP,LOGGING_WHERE,
1515-
gettext_noop("Automatic log file rotation will occur after N kilobytes"),
1515+
gettext_noop("Automatic log file rotation will occur after N kilobytes."),
15161516
NULL,
15171517
GUC_UNIT_KB
15181518
},
@@ -1542,7 +1542,7 @@ static struct config_int ConfigureNamesInt[] =
15421542

15431543
{
15441544
{"max_identifier_length",PGC_INTERNAL,PRESET_OPTIONS,
1545-
gettext_noop("Shows the maximum identifier length"),
1545+
gettext_noop("Shows the maximum identifier length."),
15461546
NULL,
15471547
GUC_NOT_IN_SAMPLE |GUC_DISALLOW_IN_FILE
15481548
},
@@ -1552,7 +1552,7 @@ static struct config_int ConfigureNamesInt[] =
15521552

15531553
{
15541554
{"block_size",PGC_INTERNAL,PRESET_OPTIONS,
1555-
gettext_noop("Shows size of a disk block"),
1555+
gettext_noop("Showsthesize of a disk block."),
15561556
NULL,
15571557
GUC_NOT_IN_SAMPLE |GUC_DISALLOW_IN_FILE
15581558
},
@@ -1562,7 +1562,7 @@ static struct config_int ConfigureNamesInt[] =
15621562

15631563
{
15641564
{"autovacuum_naptime",PGC_SIGHUP,AUTOVACUUM,
1565-
gettext_noop("Time to sleep between autovacuum runs, in seconds."),
1565+
gettext_noop("Time to sleep between autovacuum runs."),
15661566
NULL,
15671567
GUC_UNIT_S
15681568
},
@@ -1597,7 +1597,7 @@ static struct config_int ConfigureNamesInt[] =
15971597

15981598
{
15991599
{"tcp_keepalives_idle",PGC_USERSET,CLIENT_CONN_OTHER,
1600-
gettext_noop("Seconds between issuing TCP keepalives."),
1600+
gettext_noop("Time between issuing TCP keepalives."),
16011601
gettext_noop("A value of 0 uses the system default."),
16021602
GUC_UNIT_S
16031603
},
@@ -1607,7 +1607,7 @@ static struct config_int ConfigureNamesInt[] =
16071607

16081608
{
16091609
{"tcp_keepalives_interval",PGC_USERSET,CLIENT_CONN_OTHER,
1610-
gettext_noop("Seconds between TCP keepalive retransmits."),
1610+
gettext_noop("Time between TCP keepalive retransmits."),
16111611
gettext_noop("A value of 0 uses the system default."),
16121612
GUC_UNIT_S
16131613
},
@@ -1638,7 +1638,7 @@ static struct config_int ConfigureNamesInt[] =
16381638

16391639
{
16401640
{"effective_cache_size",PGC_USERSET,QUERY_TUNING_COST,
1641-
gettext_noop("Sets the planner's assumption about size of the disk cache."),
1641+
gettext_noop("Sets the planner's assumption aboutthesize of the disk cache."),
16421642
gettext_noop("That is, the portion of the kernel's disk cache that "
16431643
"will be used for PostgreSQL data files. This is measured in disk "
16441644
"pages, which are normally 8 kB each."),
@@ -1726,7 +1726,7 @@ static struct config_real ConfigureNamesReal[] =
17261726

17271727
{
17281728
{"bgwriter_lru_percent",PGC_SIGHUP,RESOURCES,
1729-
gettext_noop("Background writer percentage of LRU buffers to flush per round"),
1729+
gettext_noop("Background writer percentage of LRU buffers to flush per round."),
17301730
NULL
17311731
},
17321732
&bgwriter_lru_percent,
@@ -1735,7 +1735,7 @@ static struct config_real ConfigureNamesReal[] =
17351735

17361736
{
17371737
{"bgwriter_all_percent",PGC_SIGHUP,RESOURCES,
1738-
gettext_noop("Background writer percentage of all buffers to flush per round"),
1738+
gettext_noop("Background writer percentage of all buffers to flush per round."),
17391739
NULL
17401740
},
17411741
&bgwriter_all_percent,
@@ -1780,8 +1780,8 @@ static struct config_string ConfigureNamesString[] =
17801780
{
17811781
{
17821782
{"archive_command",PGC_SIGHUP,WAL_SETTINGS,
1783-
gettext_noop("WAL archivingcommand."),
1784-
gettext_noop("The shell command that will be called to archive a WAL file.")
1783+
gettext_noop("Sets the shellcommand that will be called to archive a WAL file."),
1784+
NULL
17851785
},
17861786
&XLogArchiveCommand,
17871787
"",NULL,NULL
@@ -1858,8 +1858,8 @@ static struct config_string ConfigureNamesString[] =
18581858

18591859
{
18601860
{"log_line_prefix",PGC_SIGHUP,LOGGING_WHAT,
1861-
gettext_noop("Controls information prefixed to each log line"),
1862-
gettext_noop("if blank no prefix is used")
1861+
gettext_noop("Controls information prefixed to each log line."),
1862+
gettext_noop("If blank, no prefix is used.")
18631863
},
18641864
&Log_line_prefix,
18651865
"",NULL,NULL
@@ -2150,7 +2150,7 @@ static struct config_string ConfigureNamesString[] =
21502150
},
21512151
{
21522152
{"timezone_abbreviations",PGC_USERSET,CLIENT_CONN_LOCALE,
2153-
gettext_noop("Selects a file of time zone abbreviations"),
2153+
gettext_noop("Selects a file of time zone abbreviations."),
21542154
NULL,
21552155
},
21562156
&timezone_abbreviations_string,
@@ -2170,8 +2170,8 @@ static struct config_string ConfigureNamesString[] =
21702170
{
21712171
{"unix_socket_group",PGC_POSTMASTER,CONN_AUTH_SETTINGS,
21722172
gettext_noop("Sets the owning group of the Unix-domain socket."),
2173-
gettext_noop("(The owning user of the socket is always the user "
2174-
"that starts the server.)")
2173+
gettext_noop("The owning user of the socket is always the user "
2174+
"that starts the server.")
21752175
},
21762176
&Unix_socket_group,
21772177
"",NULL,NULL
@@ -2199,7 +2199,7 @@ static struct config_string ConfigureNamesString[] =
21992199

22002200
{
22012201
{"wal_sync_method",PGC_SIGHUP,WAL_SETTINGS,
2202-
gettext_noop("Selects the method used for forcing WAL updatesoutto disk."),
2202+
gettext_noop("Selects the method used for forcing WAL updates to disk."),
22032203
NULL
22042204
},
22052205
&XLOG_sync_method,
@@ -2238,7 +2238,7 @@ static struct config_string ConfigureNamesString[] =
22382238

22392239
{
22402240
{"hba_file",PGC_POSTMASTER,FILE_LOCATIONS,
2241-
gettext_noop("Sets the server's \"hba\" configuration file"),
2241+
gettext_noop("Sets the server's \"hba\" configuration file."),
22422242
NULL,
22432243
GUC_SUPERUSER_ONLY
22442244
},
@@ -2248,7 +2248,7 @@ static struct config_string ConfigureNamesString[] =
22482248

22492249
{
22502250
{"ident_file",PGC_POSTMASTER,FILE_LOCATIONS,
2251-
gettext_noop("Sets the server's \"ident\" configuration file"),
2251+
gettext_noop("Sets the server's \"ident\" configuration file."),
22522252
NULL,
22532253
GUC_SUPERUSER_ONLY
22542254
},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp