summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2011-07-05 00:01:35 +0300
committerPeter Eisentraut <peter_e@gmx.net>2011-07-05 00:17:25 +0300
commit06f04b6dc41354d1eada7b68bab339c908fc97eb (patch)
tree9d7730ebcc5cd83599dc598863fcadb0292e6f81 /src/backend/utils
parent413ed2556f7ea21aa7c9d6fe28225455f0e5eac3 (diff)
Message style tweaks
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/varlena.c2
-rw-r--r--src/backend/utils/misc/guc.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 9acbc2d4e51..d1113ed5d30 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -3937,7 +3937,7 @@ text_format_string_conversion(StringInfo buf, char conversion,
else if (conversion == 'I')
ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
- errmsg("NULL cannot be escaped as an SQL identifier")));
+ errmsg("null values cannot be formatted as an SQL identifier")));
return;
}
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 1c6f1977483..5fe469262da 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -887,7 +887,7 @@ static struct config_bool ConfigureNamesBool[] =
},
{
{"restart_after_crash", PGC_SIGHUP, ERROR_HANDLING_OPTIONS,
- gettext_noop("Reinitialize after backend crash."),
+ gettext_noop("Reinitialize server after backend crash."),
NULL
},
&restart_after_crash,
@@ -1378,7 +1378,7 @@ static struct config_bool ConfigureNamesBool[] =
{
{"hot_standby_feedback", PGC_SIGHUP, WAL_STANDBY_SERVERS,
- gettext_noop("Allows feedback from a hot standby primary that will avoid query conflicts."),
+ gettext_noop("Allows feedback from a hot standby to the primary that will avoid query conflicts."),
NULL
},
&hot_standby_feedback,
@@ -1567,7 +1567,7 @@ static struct config_int ConfigureNamesInt[] =
{
{"wal_receiver_status_interval", PGC_SIGHUP, WAL_STANDBY_SERVERS,
- gettext_noop("Sets the maximum interval between WAL receiver status reports to the master."),
+ gettext_noop("Sets the maximum interval between WAL receiver status reports to the primary."),
NULL,
GUC_UNIT_S
},
@@ -2965,7 +2965,7 @@ static struct config_string ConfigureNamesString[] =
{
{"synchronous_standby_names", PGC_SIGHUP, WAL_REPLICATION,
- gettext_noop("List of potential standby names to synchronize with."),
+ gettext_noop("List of names of potential synchronous standbys."),
NULL,
GUC_LIST_INPUT
},