diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/acl.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/misc/tzparser.c | 4 |
7 files changed, 18 insertions, 18 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 509c6dea92a..9a475ed706b 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.135 2006/09/05 21:08:36 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.136 2006/10/06 17:13:59 petere Exp $ * *------------------------------------------------------------------------- */ @@ -371,7 +371,7 @@ check_acl(const Acl *acl) if (ARR_ELEMTYPE(acl) != ACLITEMOID) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("ACL array contains wrong datatype"))); + errmsg("ACL array contains wrong data type"))); if (ARR_NDIM(acl) != 1) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), @@ -379,7 +379,7 @@ check_acl(const Acl *acl) if (ARR_HASNULL(acl)) ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), - errmsg("ACL arrays must not contain nulls"))); + errmsg("ACL arrays must not contain null values"))); } /* diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index a29d31bd6eb..b510d42bb90 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.133 2006/10/04 00:29:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.134 2006/10/06 17:13:59 petere Exp $ * *------------------------------------------------------------------------- */ @@ -1984,7 +1984,7 @@ array_set(ArrayType *array, if (isNull) ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), - errmsg("cannot assign NULL to an element of a fixed-length array"))); + errmsg("cannot assign null value to an element of a fixed-length array"))); newarray = (ArrayType *) palloc(arraytyplen); memcpy(newarray, array, arraytyplen); @@ -2944,7 +2944,7 @@ deconstruct_array(ArrayType *array, else ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), - errmsg("NULL array element not allowed in this context"))); + errmsg("null array element not allowed in this context"))); } else { diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index c3710c62115..ceefe444978 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.91 2006/10/04 00:30:01 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.92 2006/10/06 17:13:59 petere Exp $ * *------------------------------------------------------------------------- */ @@ -285,7 +285,7 @@ internal_load_library(const char *libname) ereport(ERROR, (errmsg("incompatible library \"%s\": missing magic block", libname), - errhint("Extension libraries are now required to use the PG_MODULE_MAGIC macro."))); + errhint("Extension libraries are required to use the PG_MODULE_MAGIC macro."))); } /* diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c index 668758e746d..8851f58c42e 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.22 2006/10/04 00:30:02 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.23 2006/10/06 17:13:59 petere Exp $ * *------------------------------------------------------------------------- */ @@ -134,7 +134,7 @@ iso8859_to_utf8(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), - errmsg("unexpected encoding id %d for ISO-8859 charsets", encoding))); + errmsg("unexpected encoding ID %d for ISO 8859 character sets", encoding))); PG_RETURN_VOID(); } diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c index 559367701b0..df027b99d7b 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.6 2006/10/04 00:30:03 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.7 2006/10/06 17:14:00 petere Exp $ * *------------------------------------------------------------------------- */ @@ -124,7 +124,7 @@ win_to_utf8(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), - errmsg("unexpected encoding id %d for WIN charsets", encoding))); + errmsg("unexpected encoding ID %d for WIN character sets", encoding))); PG_RETURN_VOID(); } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 74092a8f785..96244ec91f8 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.354 2006/10/04 00:30:03 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.355 2006/10/06 17:14:00 petere Exp $ * *-------------------------------------------------------------------- */ @@ -894,7 +894,7 @@ static struct config_bool ConfigureNamesBool[] = {"array_nulls", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS, gettext_noop("Enable input of NULL elements in arrays."), gettext_noop("When turned on, unquoted NULL in an array input " - "value means a NULL value; " + "value means a null value; " "otherwise it is taken literally.") }, &Array_nulls, @@ -1611,7 +1611,7 @@ static struct config_int ConfigureNamesInt[] = { {"gin_fuzzy_search_limit", PGC_USERSET, UNGROUPED, - gettext_noop("Sets the maximum allowed result for exact search by gin."), + gettext_noop("Sets the maximum allowed result for exact search by GIN."), NULL, 0 }, @@ -2133,7 +2133,7 @@ static struct config_string ConfigureNamesString[] = }, { {"timezone_abbreviations", PGC_USERSET, CLIENT_CONN_LOCALE, - gettext_noop("Selects a file of timezone abbreviations"), + gettext_noop("Selects a file of time zone abbreviations"), NULL, }, &timezone_abbreviations_string, diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c index 1eff2e401b6..663c68f3adf 100644 --- a/src/backend/utils/misc/tzparser.c +++ b/src/backend/utils/misc/tzparser.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/tzparser.c,v 1.2 2006/10/04 00:30:04 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/tzparser.c,v 1.3 2006/10/06 17:14:00 petere Exp $ * *------------------------------------------------------------------------- */ @@ -233,7 +233,7 @@ addToArray(tzEntry **base, int *arraysize, int n, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("time zone abbreviation \"%s\" is multiply defined", entry->abbrev), - errdetail("Time zone file \"%s\", line %d conflicts with file \"%s\", line %d.", + errdetail("Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d.", midptr->filename, midptr->lineno, entry->filename, entry->lineno))); return -1; |