From 44ab6cd8bbd913d01c8c0c6e33507f606422cdfe Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 7 Apr 2009 23:27:34 +0000
Subject: [PATCH] Revert addition of units to GUC descriptions; doesn't affect
postgresql.conf.
---
src/backend/utils/misc/guc.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index a9e78f733a4..7313dc0e585 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.501 2009/04/07 22:22:19 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.502 2009/04/07 23:27:34 momjian Exp $
*
*--------------------------------------------------------------------
*/
@@ -1316,7 +1316,7 @@ static struct config_int ConfigureNamesInt[] =
{
/* This is PGC_SIGHUP so all backends have the same value. */
{"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT,
- gettext_noop("Sets the time to wait on a lock before checking for deadlock, in milliseconds."),
+ gettext_noop("Sets the time to wait on a lock before checking for deadlock."),
NULL,
GUC_UNIT_MS
},
@@ -1406,7 +1406,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"maintenance_work_mem", PGC_USERSET, RESOURCES_MEM,
- gettext_noop("Sets the maximum memory to be used for maintenance operations, in kilobytes."),
+ gettext_noop("Sets the maximum memory to be used for maintenance operations."),
gettext_noop("This includes operations such as VACUUM and CREATE INDEX."),
GUC_UNIT_KB
},
@@ -1530,7 +1530,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"statement_timeout", PGC_USERSET, CLIENT_CONN_STATEMENT,
- gettext_noop("Sets the maximum duration of any statement, in milliseconds."),
+ gettext_noop("Sets the maximum allowed duration of any statement."),
gettext_noop("A value of 0 turns off the timeout."),
GUC_UNIT_MS
},
@@ -1569,7 +1569,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"authentication_timeout", PGC_SIGHUP, CONN_AUTH_SECURITY,
- gettext_noop("Sets the maximum allowed time to complete client authentication, in seconds."),
+ gettext_noop("Sets the maximum allowed time to complete client authentication."),
NULL,
GUC_UNIT_S
},
@@ -1599,7 +1599,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"checkpoint_timeout", PGC_SIGHUP, WAL_CHECKPOINTS,
- gettext_noop("Sets the maximum time between automatic WAL checkpoints, in seconds."),
+ gettext_noop("Sets the maximum time between automatic WAL checkpoints."),
NULL,
GUC_UNIT_S
},
@@ -1632,7 +1632,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"wal_writer_delay", PGC_SIGHUP, WAL_SETTINGS,
- gettext_noop("WAL writer sleep time between WAL flushes, in milliseconds."),
+ gettext_noop("WAL writer sleep time between WAL flushes."),
NULL,
GUC_UNIT_MS
},
@@ -1673,8 +1673,8 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_min_duration_statement", PGC_SUSET, LOGGING_WHEN,
- gettext_noop("Sets the minimum execution time (in milliseconds) above "
- "which statements will be logged."),
+ gettext_noop("Sets the minimum execution time above which "
+ "statements will be logged."),
gettext_noop("Zero prints all queries. -1 turns this feature off."),
GUC_UNIT_MS
},
@@ -1684,7 +1684,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"log_autovacuum_min_duration", PGC_SIGHUP, LOGGING_WHAT,
- gettext_noop("Sets the minimum execution in milliseconds above which "
+ gettext_noop("Sets the minimum execution time above which "
"autovacuum actions will be logged."),
gettext_noop("Zero prints all actions. -1 turns autovacuum logging off."),
GUC_UNIT_MS
@@ -1695,7 +1695,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"bgwriter_delay", PGC_SIGHUP, RESOURCES,
- gettext_noop("Background writer sleep time between rounds, in milliseconds."),
+ gettext_noop("Background writer sleep time between rounds."),
NULL,
GUC_UNIT_MS
},
@@ -1827,7 +1827,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"autovacuum_naptime", PGC_SIGHUP, AUTOVACUUM,
- gettext_noop("Time to sleep between autovacuum runs, in seconds."),
+ gettext_noop("Time to sleep between autovacuum runs."),
NULL,
GUC_UNIT_S
},
@@ -1871,7 +1871,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"tcp_keepalives_idle", PGC_USERSET, CLIENT_CONN_OTHER,
- gettext_noop("Seconds between issuing TCP keepalives."),
+ gettext_noop("Time between issuing TCP keepalives."),
gettext_noop("A value of 0 uses the system default."),
GUC_UNIT_S
},
@@ -1881,7 +1881,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"tcp_keepalives_interval", PGC_USERSET, CLIENT_CONN_OTHER,
- gettext_noop("Seconds between TCP keepalive retransmits."),
+ gettext_noop("Time between TCP keepalive retransmits."),
gettext_noop("A value of 0 uses the system default."),
GUC_UNIT_S
},
--
GitLab