diff options
Diffstat (limited to 'src/backend')
41 files changed, 116 insertions, 116 deletions
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index ab2288a97f0..821cc221bbb 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.25 2007/01/05 22:19:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.26 2007/02/01 19:10:25 momjian Exp $ *------------------------------------------------------------------------- */ #include "postgres.h" @@ -687,7 +687,7 @@ gistContinueInsert(gistIncompleteInsert *insert) } if (ntodelete == 0) - elog(PANIC, "gistContinueInsert: can't find pointer to page(s)"); + elog(PANIC, "gistContinueInsert: cannot find pointer to page(s)"); /* * we check space with subtraction only first tuple to delete, diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index f7d0bb00043..3230c65008e 100644 --- a/src/backend/access/hash/hashscan.c +++ b/src/backend/access/hash/hashscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.41 2007/01/05 22:19:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.42 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,7 +99,7 @@ _hash_dropscan(IndexScanDesc scan) last = chk; if (chk == NULL) - elog(ERROR, "hash scan list trashed; can't find 0x%p", (void *) scan); + elog(ERROR, "hash scan list trashed; cannot find 0x%p", (void *) scan); if (last == NULL) HashScans = chk->hashsl_next; diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index b39f283acc8..5dce2083088 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.40 2007/01/05 22:19:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.41 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -142,7 +142,7 @@ _bt_restore_page(Page page, char *from, int len) itemsz = MAXALIGN(itemsz); if (PageAddItem(page, (Item) from, itemsz, FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) - elog(PANIC, "_bt_restore_page: can't add item to page"); + elog(PANIC, "_bt_restore_page: cannot add item to page"); from += itemsz; } } diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index e42d6a8ae6a..4ee1cc711cd 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.231 2007/01/05 22:19:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.232 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2582,7 +2582,7 @@ RequireTransactionChain(void *stmtNode, const char *stmtType) ereport(ERROR, (errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION), /* translator: %s represents an SQL statement name */ - errmsg("%s may only be used in transaction blocks", + errmsg("%s can only be used in transaction blocks", stmtType))); } diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 53a464694cf..62fbab8d950 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.260 2007/01/05 22:19:23 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.261 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -4670,8 +4670,8 @@ StartupXLOG(void) ereport(LOG, (errmsg("database system was interrupted while in recovery at log time %s", str_time(ControlFile->checkPointCopy.time)), - errhint("If this has occurred more than once some data may be corrupted" - " and you may need to choose an earlier recovery target."))); + errhint("If this has occurred more than once some data might be corrupted" + " and you might need to choose an earlier recovery target."))); else if (ControlFile->state == DB_IN_PRODUCTION) ereport(LOG, (errmsg("database system was interrupted; last known up at %s", diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 328f8ccfda7..b1210841fff 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.135 2007/01/23 05:07:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.136 2007/02/01 19:10:25 momjian Exp $ * * NOTES * See acl.h. @@ -998,7 +998,7 @@ ExecGrant_Language(InternalGrant *istmt) (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("language \"%s\" is not trusted", NameStr(pg_language_tuple->lanname)), - errhint("Only superusers may use untrusted languages."))); + errhint("Only superusers can use untrusted languages."))); /* * Get owner ID and working copy of existing ACL. If there's no ACL, diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 639bfc2169f..2041125d4d0 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.62 2007/01/05 22:19:24 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.63 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -607,7 +607,7 @@ recursiveDeletion(const ObjectAddress *object, (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST), errmsg("cannot drop %s because %s requires it", objDescription, otherObjDesc), - errhint("You may drop %s instead.", + errhint("You can drop %s instead.", otherObjDesc))); } diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 2cfd828bd52..52554c3b21d 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.277 2007/01/25 02:17:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.278 2007/02/01 19:10:25 momjian Exp $ * * * INTERFACE ROUTINES @@ -667,7 +667,7 @@ index_create(Oid heapRelationId, /* Shouldn't have any expressions */ if (indexInfo->ii_Expressions) - elog(ERROR, "constraints can't have index expressions"); + elog(ERROR, "constraints cannot have index expressions"); conOid = CreateConstraintEntry(indexRelationName, namespaceId, diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index e66a6e88837..7c2cd4b8a49 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.90 2007/01/05 22:19:24 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.91 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -236,7 +236,7 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation) if (newRelation->schemaname) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), - errmsg("temporary tables may not specify a schema name"))); + errmsg("temporary tables cannot specify a schema name"))); /* Initialize temp namespace if first time through */ if (!OidIsValid(myTempNamespace)) InitTempTableNamespace(); diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 78ceef357fe..2a16b12be1d 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.155 2007/01/05 22:19:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.156 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -376,9 +376,9 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck) errmsg("cannot cluster on index \"%s\" because access method does not handle null values", RelationGetRelationName(OldIndex)), recheck - ? errhint("You may be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.", + ? errhint("You might be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.", NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)) - : errhint("You may be able to work around this by marking column \"%s\" NOT NULL.", + : errhint("You might be able to work around this by marking column \"%s\" NOT NULL.", NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)))); } else if (colno < 0) diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index 2f6a38d42d2..344099ebdf6 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -7,7 +7,7 @@ * Copyright (c) 1996-2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.95 2007/01/23 05:07:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.96 2007/02/01 19:10:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -584,7 +584,7 @@ CommentDatabase(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("database name may not be qualified"))); + errmsg("database name cannot be qualified"))); database = strVal(linitial(qualname)); /* @@ -632,7 +632,7 @@ CommentTablespace(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("tablespace name may not be qualified"))); + errmsg("tablespace name cannot be qualified"))); tablespace = strVal(linitial(qualname)); oid = get_tablespace_oid(tablespace); @@ -669,7 +669,7 @@ CommentRole(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("role name may not be qualified"))); + errmsg("role name cannot be qualified"))); role = strVal(linitial(qualname)); oid = get_roleid_checked(role); @@ -702,7 +702,7 @@ CommentNamespace(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("schema name may not be qualified"))); + errmsg("schema name cannot be qualified"))); namespace = strVal(linitial(qualname)); oid = GetSysCacheOid(NAMESPACENAME, @@ -1161,7 +1161,7 @@ CommentLanguage(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("language name may not be qualified"))); + errmsg("language name cannot be qualified"))); language = strVal(linitial(qualname)); oid = GetSysCacheOid(LANGNAME, diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 38db4ae3b92..be16791342e 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.190 2007/01/17 16:25:01 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.191 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -707,7 +707,7 @@ RenameDatabase(const char *oldname, const char *newname) if (db_id == MyDatabaseId) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("current database may not be renamed"))); + errmsg("current database cannot be renamed"))); /* * Make sure the database does not have active sessions. This is the same diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index a7183127110..b01093106c0 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.154 2007/01/25 04:35:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.155 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -315,7 +315,7 @@ DefineIndex(RangeVar *heapRelation, if (list_length(rangetable) != 1 || getrelid(1, rangetable) != relationId) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("index expressions and predicates may refer only to the table being indexed"))); + errmsg("index expressions and predicates can refer only to the table being indexed"))); } /* diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 802b6909525..12bca5119fe 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.53 2007/01/23 05:07:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.54 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -508,7 +508,7 @@ DefineOpClass(CreateOpClassStmt *stmt) else if (!amstorage) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("storage type may not be different from data type for access method \"%s\"", + errmsg("storage type cannot be different from data type for access method \"%s\"", stmt->amname))); } @@ -932,7 +932,7 @@ AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid, case OPCLASS_ITEM_STORAGETYPE: ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("STORAGE may not be specified in ALTER OPERATOR FAMILY"))); + errmsg("STORAGE cannot be specified in ALTER OPERATOR FAMILY"))); break; default: elog(ERROR, "unrecognized item type: %d", item->itemtype); diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index 998a2729a84..7bb7f4a33ee 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.58 2007/01/05 22:19:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.59 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -88,7 +88,7 @@ PerformCursorOpen(DeclareCursorStmt *stmt, ParamListInfo params) if (query->into) ereport(ERROR, (errcode(ERRCODE_INVALID_CURSOR_DEFINITION), - errmsg("DECLARE CURSOR may not specify INTO"))); + errmsg("DECLARE CURSOR cannot specify INTO"))); if (query->rowMarks != NIL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index 7b65dbcfe36..09c2ca9f633 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.42 2007/01/05 22:19:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.43 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -159,7 +159,7 @@ RemoveSchema(List *names, DropBehavior behavior, bool missing_ok) if (list_length(names) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("schema name may not be qualified"))); + errmsg("schema name cannot be qualified"))); namespaceName = strVal(linitial(names)); namespaceId = GetSysCacheOid(NAMESPACENAME, diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 73ef84d5ffd..bd06bfb5da3 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.142 2007/01/05 22:19:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.143 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1121,7 +1121,7 @@ init_params(List *options, bool isInit, snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value); ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("START value (%s) can't be less than MINVALUE (%s)", + errmsg("START value (%s) cannot be less than MINVALUE (%s)", bufs, bufm))); } if (new->last_value > new->max_value) @@ -1133,7 +1133,7 @@ init_params(List *options, bool isInit, snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value); ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("START value (%s) can't be greater than MAXVALUE (%s)", + errmsg("START value (%s) cannot be greater than MAXVALUE (%s)", bufs, bufm))); } diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index d2cb245f150..80c5a927a30 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.41 2007/01/25 04:35:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.42 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -228,7 +228,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt) if (strchr(location, '\'')) ereport(ERROR, (errcode(ERRCODE_INVALID_NAME), - errmsg("tablespace location may not contain single quotes"))); + errmsg("tablespace location cannot contain single quotes"))); /* * Allowing relative paths seems risky diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 923505901f3..cbbc31ca6f0 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.175 2007/01/05 22:19:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.176 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1007,11 +1007,11 @@ RenameRole(const char *oldname, const char *newname) if (roleid == GetSessionUserId()) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("session user may not be renamed"))); + errmsg("session user cannot be renamed"))); if (roleid == GetOuterUserId()) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("current user may not be renamed"))); + errmsg("current user cannot be renamed"))); /* make sure the new name doesn't exist */ if (SearchSysCacheExists(AUTHNAME, diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index e3c21f9e642..43647d7989f 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.343 2007/01/05 22:19:26 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.344 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -905,7 +905,7 @@ vac_truncate_clog(TransactionId frozenXID) { ereport(WARNING, (errmsg("some databases have not been vacuumed in over 2 billion transactions"), - errdetail("You may have already suffered transaction-wraparound data loss."))); + errdetail("You might have already suffered transaction-wraparound data loss."))); return; } @@ -1407,7 +1407,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, * release write lock before commit there.) */ ereport(NOTICE, - (errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink relation", + (errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation", relname, blkno, offnum, HeapTupleHeaderGetXmin(tuple.t_data)))); do_shrinking = false; break; @@ -1420,7 +1420,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, * release write lock before commit there.) */ ereport(NOTICE, - (errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink relation", + (errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation", relname, blkno, offnum, HeapTupleHeaderGetXmax(tuple.t_data)))); do_shrinking = false; break; @@ -1900,7 +1900,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, /* Quick exit if we have no vtlinks to search in */ if (vacrelstats->vtlinks == NULL) { - elog(DEBUG2, "parent item in update-chain not found --- can't continue repair_frag"); + elog(DEBUG2, "parent item in update-chain not found --- cannot continue repair_frag"); break; /* out of walk-along-page loop */ } @@ -2040,7 +2040,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, if (vtlp == NULL) { /* see discussion above */ - elog(DEBUG2, "parent item in update-chain not found --- can't continue repair_frag"); + elog(DEBUG2, "parent item in update-chain not found --- cannot continue repair_frag"); chain_move_failed = true; break; /* out of check-all-items loop */ } @@ -2075,7 +2075,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, HeapTupleHeaderGetXmin(tp.t_data)))) { ReleaseBuffer(Pbuf); - elog(DEBUG2, "too old parent tuple found --- can't continue repair_frag"); + elog(DEBUG2, "too old parent tuple found --- cannot continue repair_frag"); chain_move_failed = true; break; /* out of check-all-items loop */ } diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 75a9e42a24d..732c1ab849f 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.209 2007/01/25 11:53:50 petere Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.210 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -3465,7 +3465,7 @@ ExecInitExpr(Expr *node, PlanState *parent) if (naggs != aggstate->numaggs) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), - errmsg("aggregate function calls may not be nested"))); + errmsg("aggregate function calls cannot be nested"))); } else { diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index b49df212709..63b03bd28a5 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.128 2007/01/20 20:45:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.129 2007/02/01 19:10:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -636,9 +636,9 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, * Otherwise the parser messed up. */ if (!bms_is_subset(relids, qualscope)) - elog(ERROR, "JOIN qualification may not refer to other relations"); + elog(ERROR, "JOIN qualification cannot refer to other relations"); if (ojscope && !bms_is_subset(relids, ojscope)) - elog(ERROR, "JOIN qualification may not refer to other relations"); + elog(ERROR, "JOIN qualification cannot refer to other relations"); /* * If the clause is variable-free, our normal heuristic for pushing it diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index bfeb3375701..aac66abfba5 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.231 2007/01/22 01:35:20 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.232 2007/02/01 19:10:26 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -482,7 +482,7 @@ count_agg_clauses_walker(Node *node, AggClauseCounts *counts) if (contain_agg_clause((Node *) aggref->args)) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), - errmsg("aggregate function calls may not be nested"))); + errmsg("aggregate function calls cannot be nested"))); /* * Having checked that, we need not recurse into the argument. diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 4117fbb6da5..0eb81d6d898 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.359 2007/01/12 19:34:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.360 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -646,7 +646,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt, if (selectQuery->into) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("INSERT ... SELECT may not specify INTO"))); + errmsg("INSERT ... SELECT cannot specify INTO"))); /* * Make the source be a subquery in the INSERT's rangetable, and add @@ -1803,7 +1803,7 @@ transformIndexStmt(ParseState *pstate, IndexStmt *stmt) if (expression_returns_set(ielem->expr)) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("index expression may not return a set"))); + errmsg("index expression cannot return a set"))); } } @@ -1892,7 +1892,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, if (list_length(pstate->p_rtable) != 2) /* naughty, naughty... */ ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("rule WHERE condition may not contain references to other relations"))); + errmsg("rule WHERE condition cannot contain references to other relations"))); /* aggregates not allowed (but subselects are okay) */ if (pstate->p_hasAggs) @@ -1967,7 +1967,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, stmt->whereClause != NULL) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions"))); + errmsg("rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"))); /* * If the action is INSERT...SELECT, OLD/NEW have been pushed down @@ -2003,11 +2003,11 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, if (has_old) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON SELECT rule may not use OLD"))); + errmsg("ON SELECT rule cannot use OLD"))); if (has_new) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON SELECT rule may not use NEW"))); + errmsg("ON SELECT rule cannot use NEW"))); break; case CMD_UPDATE: /* both are OK */ @@ -2016,13 +2016,13 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, if (has_old) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON INSERT rule may not use OLD"))); + errmsg("ON INSERT rule cannot use OLD"))); break; case CMD_DELETE: if (has_new) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON DELETE rule may not use NEW"))); + errmsg("ON DELETE rule cannot use NEW"))); break; default: elog(ERROR, "unrecognized event type: %d", @@ -2663,7 +2663,7 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt) if (contain_vars_of_level((Node *) selectQuery, 1)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level"))); + errmsg("UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"))); } /* @@ -2987,7 +2987,7 @@ transformReturningList(ParseState *pstate, List *returningList) if (list_length(pstate->p_rtable) != length_rtable) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("RETURNING may not contain references to other relations"))); + errmsg("RETURNING cannot contain references to other relations"))); /* mark column origins */ markTargetListOrigins(pstate, rlist); @@ -3206,7 +3206,7 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt) if (((Query *) stmt->query)->into) ereport(ERROR, (errcode(ERRCODE_INVALID_CURSOR_DEFINITION), - errmsg("DECLARE CURSOR may not specify INTO"))); + errmsg("DECLARE CURSOR cannot specify INTO"))); return result; } diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index c256d73eadb..1f1dfdb761d 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.577 2007/01/25 11:53:51 petere Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.578 2007/02/01 19:10:27 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -2266,7 +2266,7 @@ CreateAsStmt: if (n->into != NULL) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("CREATE TABLE AS may not specify INTO"))); + errmsg("CREATE TABLE AS cannot specify INTO"))); $4->istemp = $2; n->into = $4; n->intoColNames = $5; diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 961b78aa209..1409285cda4 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.76 2007/01/20 20:45:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.77 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,7 +70,7 @@ transformAggregateCall(ParseState *pstate, Aggref *agg) if (checkExprHasAggs((Node *) agg->args)) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), - errmsg("aggregate function calls may not be nested"))); + errmsg("aggregate function calls cannot be nested"))); } if (min_varlevel < 0) diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 9792671fec6..0c718adc32a 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.163 2007/01/10 18:06:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.164 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -452,7 +452,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r) if (query->into != NULL) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("subquery in FROM may not have SELECT INTO"))); + errmsg("subquery in FROM cannot have SELECT INTO"))); /* * The subquery cannot make use of any variables from FROM items created @@ -472,7 +472,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r) if (contain_vars_of_level((Node *) query, 1)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("subquery in FROM may not refer to other relations of same query level"))); + errmsg("subquery in FROM cannot refer to other relations of same query level"))); } /* @@ -521,7 +521,7 @@ transformRangeFunction(ParseState *pstate, RangeFunction *r) if (contain_vars_of_level(funcexpr, 0)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("function expression in FROM may not refer to other relations of same query level"))); + errmsg("function expression in FROM cannot refer to other relations of same query level"))); } /* diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index bbe2bc85705..888dc200d1f 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.193 2007/01/31 21:03:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.194 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -213,7 +213,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, func_signature_string(funcname, nargs, actual_arg_types)), errhint("Could not choose a best candidate function. " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); else ereport(ERROR, @@ -222,7 +222,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, func_signature_string(funcname, nargs, actual_arg_types)), errhint("No function matches the given name and argument types. " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); } @@ -282,7 +282,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, if (retset) ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), - errmsg("aggregates may not return sets"), + errmsg("aggregates cannot return sets"), parser_errposition(pstate, location))); } diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 55c40367218..c8d295047b3 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.93 2007/01/31 21:03:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.94 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -771,7 +771,7 @@ op_error(ParseState *pstate, List *op, char oprkind, errmsg("operator is not unique: %s", op_signature_string(op, oprkind, arg1, arg2)), errhint("Could not choose a best candidate operator. " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); else ereport(ERROR, @@ -779,7 +779,7 @@ op_error(ParseState *pstate, List *op, char oprkind, errmsg("operator does not exist: %s", op_signature_string(op, oprkind, arg1, arg2)), errhint("No operator matches the given name and argument type(s). " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); } diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index 64aca56ee28..31bf9cbbf0d 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -235,11 +235,11 @@ caterr(char *s) strcat(errbuf, "to many errors"); break; case L_ERROR_NOLIB: - strcat(errbuf, "can't load library"); + strcat(errbuf, "cannot load library"); strcat(errbuf, p); break; case L_ERROR_UNDEF: - strcat(errbuf, "can't find symbol"); + strcat(errbuf, "cannot find symbol"); strcat(errbuf, p); break; case L_ERROR_RLDBAD: diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c index c769994d12b..8248db6984d 100644 --- a/src/backend/regex/rege_dfa.c +++ b/src/backend/regex/rege_dfa.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.6 2005/10/15 02:49:24 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.7 2007/02/01 19:10:27 momjian Exp $ * */ @@ -691,7 +691,7 @@ pickss(struct vars * v, /* used only for debug flags */ } /* nobody's old enough?!? -- something's really wrong */ - FDEBUG(("can't find victim to replace!\n")); + FDEBUG(("cannot find victim to replace!\n")); assert(NOTREACHED); ERR(REG_ASSERT); return d->ssets; diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index abafba2f54d..d4212a44089 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.116 2007/01/05 22:19:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.117 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -349,7 +349,7 @@ DefineQueryRewrite(RuleStmt *stmt) (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("could not convert table \"%s\" to a view because it has triggers", event_obj->relname), - errhint("In particular, the table may not be involved in any foreign key relationships."))); + errhint("In particular, the table cannot be involved in any foreign key relationships."))); if (event_relation->rd_rel->relhasindex) ereport(ERROR, diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 4e0baf9c2d3..8c0e6530dfe 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.169 2007/01/05 22:19:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.170 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -790,7 +790,7 @@ process_matched_tle(TargetEntry *src_tle, } else { - elog(ERROR, "can't happen"); + elog(ERROR, "cannot happen"); newexpr = NULL; } diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 7b4576fadbe..867699b045a 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.214 2007/01/05 22:19:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.215 2007/02/01 19:10:27 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -2126,7 +2126,7 @@ AbortBufferIO(void) buf->tag.rnode.spcNode, buf->tag.rnode.dbNode, buf->tag.rnode.relNode), - errdetail("Multiple failures --- write error may be permanent."))); + errdetail("Multiple failures --- write error might be permanent."))); } } TerminateBufferIO(buf, false, BM_IO_ERROR); diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 3117f901578..fa062a1f7b7 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.175 2007/01/05 22:19:38 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.176 2007/02/01 19:10:28 momjian Exp $ * * NOTES * A lock table is a shared memory hash table. When @@ -581,7 +581,7 @@ LockAcquire(const LOCKTAG *locktag, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } locallock->lock = lock; @@ -647,7 +647,7 @@ LockAcquire(const LOCKTAG *locktag, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } locallock->proclock = proclock; @@ -2272,7 +2272,7 @@ lock_twophase_recover(TransactionId xid, uint16 info, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } /* @@ -2337,7 +2337,7 @@ lock_twophase_recover(TransactionId xid, uint16 info, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } /* diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 035f5bf0467..af277875c56 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -9,7 +9,7 @@ * Author: Andreas Pflug <pgadmin@pse-consulting.de> * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.14 2007/01/05 22:19:40 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.15 2007/02/01 19:10:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -118,7 +118,7 @@ pg_read_file(PG_FUNCTION_ARGS) if (bytes_to_read < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("requested length may not be negative"))); + errmsg("requested length cannot be negative"))); /* not sure why anyone thought that int64 length was a good idea */ if (bytes_to_read > (MaxAllocSize - VARHDRSZ)) diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 6e35e9ad9d1..fce3bb89fba 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.77 2007/01/05 22:19:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.78 2007/02/01 19:10:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1397,7 +1397,7 @@ generate_series_step_int4(PG_FUNCTION_ARGS) if (step == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("step size may not equal zero"))); + errmsg("step size cannot equal zero"))); /* create a function context for cross-call persistence */ funcctx = SRF_FIRSTCALL_INIT(); diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 7d0fbf9ed1e..7f0d1df93cc 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.63 2007/01/05 22:19:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.64 2007/02/01 19:10:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1209,7 +1209,7 @@ generate_series_step_int8(PG_FUNCTION_ARGS) if (step == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("step size may not equal zero"))); + errmsg("step size cannot equal zero"))); /* create a function context for cross-call persistence */ funcctx = SRF_FIRSTCALL_INIT(); diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index b49bae2b437..218b7646b75 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -7,7 +7,7 @@ * Copyright (c) 2002-2007, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.32 2007/01/05 22:19:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.33 2007/02/01 19:10:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -99,7 +99,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS) else { /* second and subsequent calls */ - elog(ERROR, "init_MultiFuncCall may not be called more than once"); + elog(ERROR, "init_MultiFuncCall cannot be called more than once"); /* never reached, but keep compiler happy */ retval = NULL; diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 4fad4a5cab3..a5967454afd 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.160 2007/01/05 22:19:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.161 2007/02/01 19:10:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1079,7 +1079,7 @@ ValidatePgVersion(const char *path) path), errdetail("File \"%s\" does not contain valid data.", full_path), - errhint("You may need to initdb."))); + errhint("You might need to initdb."))); FreeFile(file); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index dad28983336..1c8a4893d95 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.371 2007/01/25 11:53:51 petere Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.372 2007/02/01 19:10:28 momjian Exp $ * *-------------------------------------------------------------------- */ @@ -1196,7 +1196,7 @@ static struct config_int ConfigureNamesInt[] = { {"work_mem", PGC_USERSET, RESOURCES_MEM, gettext_noop("Sets the maximum memory to be used for query workspaces."), - gettext_noop("This much memory may be used by each internal " + gettext_noop("This much memory can be used by each internal " "sort operation and hash table before switching to " "temporary disk files."), GUC_UNIT_KB @@ -2120,7 +2120,7 @@ static struct config_string ConfigureNamesString[] = { {"log_directory", PGC_SIGHUP, LOGGING_WHERE, gettext_noop("Sets the destination directory for log files."), - gettext_noop("May be specified as relative to the data directory " + gettext_noop("Can be specified as relative to the data directory " "or as absolute path."), GUC_SUPERUSER_ONLY }, |