Wording cleanup for error messages. Also change can't -> cannot.

Standard English uses "may", "can", and "might" in different ways: may - permission, "You may borrow my rake." can - ability, "I can lift that log." might - possibility, "It might rain today." Unfortunately, in conversational English, their use is often mixed, as in, "You may use this variable to do X", when in fact, "can" is a better choice. Similarly, "It may crash" is better stated, "It might crash".
author: Bruce Momjian <bruce@momjian.us> 2007-02-01 19:10:30 +0000
committer: Bruce Momjian <bruce@momjian.us> 2007-02-01 19:10:30 +0000
commit: 8b4ff8b6a14096a28910fbff3d485f30dcb9a637 (patch)
tree: c250f17f4a8e3bfee442970a0666431ed8310650 /src
parent: baaec74c5a953032049015883802660edd821cac (diff)
download: postgresql-8b4ff8b6a14096a28910fbff3d485f30dcb9a637.tar.gz
postgresql-8b4ff8b6a14096a28910fbff3d485f30dcb9a637.zip
71 files changed, 192 insertions, 192 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
 		},
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index d374c9c14ae..ea7b949aa00 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.130 2007/01/31 18:52:49 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.131 2007/02/01 19:10:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -876,7 +876,7 @@ check_encodings_match(int pg_enc, const char *ctype)
 			_("%s: warning: encoding mismatch\n"), progname);
 	fprintf(stderr,
 	  _("The encoding you selected (%s) and the encoding that the selected\n"
-		"locale uses (%s) are not known to match.  This may lead to\n"
+		"locale uses (%s) are not known to match.  This might lead to\n"
 	"misbehavior in various character string processing functions.  To fix\n"
 		"this situation, rerun %s and either do not specify an encoding\n"
 		"explicitly, or choose a matching combination.\n"),
@@ -1052,7 +1052,7 @@ check_input(char *path)
 		else
 			fprintf(stderr,
 					_("%s: could not access file \"%s\": %s\n"
-					  "This may mean you have a corrupted installation or identified\n"
+					  "This might mean you have a corrupted installation or identified\n"
 					  "the wrong directory with the invocation option -L.\n"),
 					progname, path, strerror(errno));
 		exit(1);
@@ -2580,7 +2580,7 @@ main(int argc, char *argv[])
 
 	if (pwprompt && pwfilename)
 	{
-		fprintf(stderr, _("%s: password prompt and password file may not be specified together\n"), progname);
+		fprintf(stderr, _("%s: password prompt and password file cannot be specified together\n"), progname);
 		exit(1);
 	}
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 6806d3f8c67..5e430047c35 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.76 2007/01/05 22:19:48 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.77 2007/02/01 19:10:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -522,7 +522,7 @@ do_start(void)
 	{
 		old_pid = get_pgpid();
 		if (old_pid != 0)
-			write_stderr(_("%s: another server may be running; "
+			write_stderr(_("%s: another server might be running; "
 						   "trying to start server anyway\n"),
 						 progname);
 	}
@@ -1443,7 +1443,7 @@ do_help(void)
 	printf(_("  -c, --core-files       not applicable on this platform\n"));
 #endif
 	printf(_("\nOptions for stop or restart:\n"));
-	printf(_("  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"));
+	printf(_("  -m SHUTDOWN-MODE   can be \"smart\", \"fast\", or \"immediate\"\n"));
 
 	printf(_("\nShutdown modes are:\n"));
 	printf(_("  smart       quit after all clients have disconnected\n"));
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index cd84c608827..c64d68e3802 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.140 2007/01/25 03:30:43 momjian Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.141 2007/02/01 19:10:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2701,7 +2701,7 @@ ReadHead(ArchiveHandle *AH)
 						 (unsigned long) AH->intSize);
 
 		if (AH->intSize > sizeof(int))
-			write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations may fail\n");
+			write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations might fail\n");
 
 		if (AH->version >= K_VERS_1_7)
 			AH->offSize = (*AH->ReadBytePtr) (AH);
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index f5bf5761a23..9705baced7c 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.55 2007/01/05 22:19:48 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.56 2007/02/01 19:10:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -341,7 +341,7 @@ main(int argc, char *argv[])
 	if (ControlFile.state != DB_SHUTDOWNED && !force)
 	{
 		printf(_("The database server was not shut down cleanly.\n"
-				 "Resetting the transaction log may cause data to be lost.\n"
+				 "Resetting the transaction log might cause data to be lost.\n"
 				 "If you want to proceed anyway, use -f to force reset.\n"));
 		exit(1);
 	}
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 6ea1e88ecb6..f8b9744273e 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.139 2007/01/05 22:19:49 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.140 2007/02/01 19:10:29 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -755,7 +755,7 @@ checkWin32Codepage(void)
 	if (wincp != concp)
 	{
 		printf(_("Warning: Console code page (%u) differs from Windows code page (%u)\n"
-				 "         8-bit characters may not work correctly. See psql reference\n"
+				 "         8-bit characters might not work correctly. See psql reference\n"
 			   "         page \"Notes for Windows users\" for details.\n\n"),
 			   concp, wincp);
 	}
diff --git a/src/include/regex/regerrs.h b/src/include/regex/regerrs.h
index 77baf97f4bb..74bf86958fc 100644
--- a/src/include/regex/regerrs.h
+++ b/src/include/regex/regerrs.h
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/src/include/regex/regerrs.h,v 1.3 2003/11/29 22:41:10 pgsql Exp $
+ * $PostgreSQL: pgsql/src/include/regex/regerrs.h,v 1.4 2007/02/01 19:10:29 momjian Exp $
  */
 
 {
@@ -59,7 +59,7 @@
 },
 
 {
-	REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug"
+	REG_ASSERT, "REG_ASSERT", "\"cannot happen\" -- you found a bug"
 },
 
 {
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index c8b2327289b..5352f7f86cd 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.96 2007/01/12 10:00:13 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.97 2007/02/01 19:10:29 momjian Exp $ */
 
 /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
 /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@@ -39,7 +39,7 @@ help(const char *progname)
 	printf("  -c             automatically generate C code from embedded SQL code;\n"
 		   "                 currently this works for EXEC SQL TYPE\n");
 	printf("  -C MODE        set compatibility mode;\n"
-	  "                 MODE may be one of \"INFORMIX\", \"INFORMIX_SE\"\n");
+	  "                 MODE can be one of \"INFORMIX\", \"INFORMIX_SE\"\n");
 #ifdef YYDEBUG
 	printf("  -d             generate parser debug output\n");
 #endif
@@ -49,7 +49,7 @@ help(const char *progname)
 	printf("  -I DIRECTORY   search DIRECTORY for include files\n");
 	printf("  -o OUTFILE     write result to OUTFILE\n");
 	printf("  -r OPTION      specify runtime behaviour;\n"
-		   "                 OPTION may only be \"no_indicator\"\n");
+		   "                 OPTION can only be \"no_indicator\"\n");
 	printf("  -t             turn on autocommit of transactions\n");
 	printf("  --help         show this help, then exit\n");
 	printf("  --regression   run in regression testing mode\n");
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index a70b3ed7763..ccc021daff2 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.339 2006/10/23 08:00:48 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.340 2007/02/01 19:10:29 momjian Exp $ */
 
 /* Copyright comment */
 %{
@@ -1673,7 +1673,7 @@ CreateAsStmt:  CREATE OptTemp TABLE qualified_name OptCreateAs OptWith OnCommitO
 		SelectStmt
 		{
 			if (FoundInto == 1)
-				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE / AS SELECT may not specify INTO");
+				mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE / AS SELECT cannot specify INTO");
 
 			$$ = cat_str(10, make_str("create"), $2, make_str("table"), $4, $5, $6, $7, $8, make_str("as"), $11);
 		}
diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c
index 0ce8a252366..6d147712070 100644
--- a/src/interfaces/libpq/win32.c
+++ b/src/interfaces/libpq/win32.c
@@ -110,7 +110,7 @@ static struct WSErrorEntry
 		WSAEADDRINUSE, "Address already in use"
 	},
 	{
-		WSAEADDRNOTAVAIL, "Can't assign requested address"
+		WSAEADDRNOTAVAIL, "Cannot assign requested address"
 	},
 	{
 		WSAENETDOWN, "Network is down"
@@ -137,10 +137,10 @@ static struct WSErrorEntry
 		WSAENOTCONN, "Socket is not connected"
 	},
 	{
-		WSAESHUTDOWN, "Can't send after socket shutdown"
+		WSAESHUTDOWN, "Cannot send after socket shutdown"
 	},
 	{
-		WSAETOOMANYREFS, "Too many references, can't splice"
+		WSAETOOMANYREFS, "Too many references, cannot splice"
 	},
 	{
 		WSAETIMEDOUT, "Connection timed out"
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index c7b09de35f4..0cf8c57a137 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plperl.c - perl as a procedural language for PostgreSQL
  *
- *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.125 2007/01/27 16:46:21 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.126 2007/02/01 19:10:29 momjian Exp $
  *
  **********************************************************************/
 
@@ -350,7 +350,7 @@ check_interp(bool trusted)
 	else
 	{
 		elog(ERROR, 
-			 "can not allocate second Perl interpreter on this platform");
+			 "cannot allocate second Perl interpreter on this platform");
 
 	}
 	
@@ -1538,7 +1538,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
 					free(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("trigger functions may only be called "
+							 errmsg("trigger functions can only be called "
 									"as triggers")));
 				}
 				else
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
index 6ab8d4e98eb..0e6e017a828 100644
--- a/src/pl/plpgsql/src/gram.y
+++ b/src/pl/plpgsql/src/gram.y
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.96 2007/01/05 22:20:01 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.97 2007/02/01 19:10:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -478,7 +478,7 @@ decl_aliasitem	: T_WORD
 
 						plpgsql_convert_ident(yytext, &name, 1);
 						if (name[0] != '$')
-							yyerror("only positional parameters may be aliased");
+							yyerror("only positional parameters can be aliased");
 
 						plpgsql_ns_setlocal(false);
 						nsi = plpgsql_ns_lookup(name, NULL);
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index f9eb233e8c4..3ca2ca28b3f 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.110 2007/01/30 22:05:12 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.111 2007/02/01 19:10:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -521,7 +521,7 @@ do_compile(FunctionCallInfo fcinfo,
 				else if (rettypeid == TRIGGEROID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("trigger functions may only be called as triggers")));
+							 errmsg("trigger functions can only be called as triggers")));
 				else
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 689a232b0e7..cd0f701581e 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.93 2007/01/28 19:36:46 adunstan Exp $
+ *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.94 2007/02/01 19:10:30 momjian Exp $
  *
  *********************************************************************
  */
@@ -811,7 +811,7 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc)
 				if (proc->setof == NULL)
 					ereport(ERROR,
 							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("returned object can not be iterated"),
+							 errmsg("returned object cannot be iterated"),
 					errdetail("SETOF must be returned as iterable object")));
 			}
 
@@ -1191,7 +1191,7 @@ PLy_procedure_create(FunctionCallInfo fcinfo, Oid tgreloid,
 				if (procStruct->prorettype == TRIGGEROID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("trigger functions may only be called as triggers")));
+							 errmsg("trigger functions can only be called as triggers")));
 				else
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1731,7 +1731,7 @@ PLyMapping_ToTuple(PLyTypeInfo * info, PyObject * mapping)
 
 				so = PyObject_Str(value);
 				if (so == NULL)
-					PLy_elog(ERROR, "can't convert mapping type");
+					PLy_elog(ERROR, "cannot convert mapping type");
 				valuestr = PyString_AsString(so);
 
 				values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc
@@ -1820,7 +1820,7 @@ PLySequence_ToTuple(PLyTypeInfo * info, PyObject * sequence)
 
 				so = PyObject_Str(value);
 				if (so == NULL)
-					PLy_elog(ERROR, "can't convert sequence type");
+					PLy_elog(ERROR, "cannot convert sequence type");
 				valuestr = PyString_AsString(so);
 				values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc
 											  ,valuestr
@@ -1891,7 +1891,7 @@ PLyObject_ToTuple(PLyTypeInfo * info, PyObject * object)
 
 				so = PyObject_Str(value);
 				if (so == NULL)
-					PLy_elog(ERROR, "can't convert object type");
+					PLy_elog(ERROR, "cannot convert object type");
 				valuestr = PyString_AsString(so);
 				values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc
 											  ,valuestr
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index c6efa75331f..7611fa7cc76 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -2,7 +2,7 @@
  * pltcl.c		- PostgreSQL support for Tcl as
  *				  procedural language (PL)
  *
- *	  $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.108 2006/10/04 00:30:14 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.109 2007/02/01 19:10:30 momjian Exp $
  *
  **********************************************************************/
 
@@ -1061,7 +1061,7 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
 					free(prodesc);
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("trigger functions may only be called as triggers")));
+							 errmsg("trigger functions can only be called as triggers")));
 				}
 				else
 				{
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 9f1eb55a233..d65908ec0e6 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.28 2007/01/05 22:20:03 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.29 2007/02/01 19:10:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@ importFile(PGconn *conn, char *filename)
 	fd = open(filename, O_RDONLY, 0666);
 	if (fd < 0)
 	{							/* error */
-		fprintf(stderr, "can't open unix file\"%s\"\n", filename);
+		fprintf(stderr, "cannot open unix file\"%s\"\n", filename);
 	}
 
 	/*
@@ -54,7 +54,7 @@ importFile(PGconn *conn, char *filename)
 	 */
 	lobjId = lo_creat(conn, INV_READ | INV_WRITE);
 	if (lobjId == 0)
-		fprintf(stderr, "can't create large object");
+		fprintf(stderr, "cannot create large object");
 
 	lobj_fd = lo_open(conn, lobjId, INV_WRITE);
 
@@ -84,7 +84,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
 
 	lobj_fd = lo_open(conn, lobjId, INV_READ);
 	if (lobj_fd < 0)
-		fprintf(stderr, "can't open large object %u", lobjId);
+		fprintf(stderr, "cannot open large object %u", lobjId);
 
 	lo_lseek(conn, lobj_fd, start, SEEK_SET);
 	buf = malloc(len + 1);
@@ -115,7 +115,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
 
 	lobj_fd = lo_open(conn, lobjId, INV_WRITE);
 	if (lobj_fd < 0)
-		fprintf(stderr, "can't open large object %u", lobjId);
+		fprintf(stderr, "cannot open large object %u", lobjId);
 
 	lo_lseek(conn, lobj_fd, start, SEEK_SET);
 	buf = malloc(len + 1);
@@ -160,7 +160,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
 	 */
 	lobj_fd = lo_open(conn, lobjId, INV_READ);
 	if (lobj_fd < 0)
-		fprintf(stderr, "can't open large object %u", lobjId);
+		fprintf(stderr, "cannot open large object %u", lobjId);
 
 	/*
 	 * open the file to be written to
@@ -168,7 +168,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
 	fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
 	if (fd < 0)
 	{							/* error */
-		fprintf(stderr, "can't open unix file\"%s\"",
+		fprintf(stderr, "cannot open unix file\"%s\"",
 				filename);
 	}
 
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 8776cb90737..a1a61f710cf 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1315,7 +1315,7 @@ alter table anothertab alter column atcol1 drop default;
 alter table anothertab alter column atcol1 type boolean
         using case when atcol1 % 2 = 0 then true else false end; -- fails
 ERROR:  operator does not exist: boolean <= integer
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 alter table anothertab drop constraint anothertab_chk;
 alter table anothertab alter column atcol1 type boolean
         using case when atcol1 % 2 = 0 then true else false end;
diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out
index 79eed2b7a6e..0ef4bffe0b5 100644
--- a/src/test/regress/expected/create_view.out
+++ b/src/test/regress/expected/create_view.out
@@ -78,11 +78,11 @@ CREATE VIEW temp_view_test.v2 AS SELECT * FROM base_table;
 -- should fail
 CREATE VIEW temp_view_test.v3_temp AS SELECT * FROM temp_table;
 NOTICE:  view "v3_temp" will be a temporary view
-ERROR:  temporary tables may not specify a schema name
+ERROR:  temporary tables cannot specify a schema name
 -- should fail
 CREATE SCHEMA test_schema
     CREATE TEMP VIEW testview AS SELECT 1;
-ERROR:  temporary tables may not specify a schema name
+ERROR:  temporary tables cannot specify a schema name
 -- joins: if any of the join relations are temporary, the view
 -- should also be temporary
 -- should be non-temp
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index f307788cf14..e90952cc2f4 100644
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
 ERROR:  operator does not exist: lseg # point
 LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
                                            ^
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 -- closest point
 SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
    FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index f8cc66492ce..fb4f33ed6b1 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -306,7 +306,7 @@ SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time
 ERROR:  operator does not exist: date - time with time zone
 LINE 1: SELECT date '1991-02-03' - time with time zone '04:05:06 UTC...
                                  ^
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
 --
 -- timestamp, interval arithmetic
 --
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 5404969c608..bcb2ea54aed 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -235,7 +235,7 @@ REVOKE ALL PRIVILEGES ON LANGUAGE sql FROM PUBLIC;
 GRANT USAGE ON LANGUAGE sql TO regressuser1; -- ok
 GRANT USAGE ON LANGUAGE c TO PUBLIC; -- fail
 ERROR:  language "c" is not trusted
-HINT:  Only superusers may use untrusted languages.
+HINT:  Only superusers can use untrusted languages.
 SET SESSION AUTHORIZATION regressuser1;
 GRANT USAGE ON LANGUAGE sql TO regressuser2; -- fail
 WARNING:  no privileges were granted for "sql"
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 000d4e36c52..8abc323a70e 100644
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -19,7 +19,7 @@ INSERT INTO foo2 VALUES(1, 111);
 CREATE FUNCTION foot(int) returns setof foo2 as 'SELECT * FROM foo2 WHERE fooid = $1;' LANGUAGE SQL;
 -- supposed to fail with ERROR
 select * from foo2, foot(foo2.fooid) z where foo2.f2 = z.f2;
-ERROR:  function expression in FROM may not refer to other relations of same query level
+ERROR:  function expression in FROM cannot refer to other relations of same query level
 -- function in subselect
 select * from foo2 where f2 in (select f2 from foot(foo2.fooid) z where z.fooid = foo2.fooid) ORDER BY 1,2;
  fooid | f2  
diff --git a/src/test/regress/expected/time.out b/src/test/regress/expected/time.out
index dce09d0790a..6e21828cf7c 100644
--- a/src/test/regress/expected/time.out
+++ b/src/test/regress/expected/time.out
@@ -83,4 +83,4 @@ SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
 ERROR:  operator is not unique: time without time zone + time without time zone
 LINE 1: SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
                   ^
-HINT:  Could not choose a best candidate operator. You may need to add explicit type casts.
+HINT:  Could not choose a best candidate operator. You might need to add explicit type casts.
diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
index 5fdda250cc2..44e8b25b301 100644
--- a/src/test/regress/expected/timetz.out
+++ b/src/test/regress/expected/timetz.out
@@ -90,4 +90,4 @@ SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TIMETZ_TBL;
 ERROR:  operator does not exist: time with time zone + time with time zone
 LINE 1: SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TI...
                   ^
-HINT:  No operator matches the given name and argument type(s). You may need to add explicit type casts.
+HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out
index 8d3be84d63d..c8fe0522bfe 100644
--- a/src/test/regress/expected/transactions.out
+++ b/src/test/regress/expected/transactions.out
@@ -285,11 +285,11 @@ SELECT a FROM savepoints WHERE a BETWEEN 18 AND 22;
 DROP TABLE savepoints;
 -- only in a transaction block:
 SAVEPOINT one;
-ERROR:  SAVEPOINT may only be used in transaction blocks
+ERROR:  SAVEPOINT can only be used in transaction blocks
 ROLLBACK TO SAVEPOINT one;
-ERROR:  ROLLBACK TO SAVEPOINT may only be used in transaction blocks
+ERROR:  ROLLBACK TO SAVEPOINT can only be used in transaction blocks
 RELEASE SAVEPOINT one;
-ERROR:  RELEASE SAVEPOINT may only be used in transaction blocks
+ERROR:  RELEASE SAVEPOINT can only be used in transaction blocks
 -- Only "rollback to" allowed in aborted state
 BEGIN;
   SAVEPOINT one;
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 1af4d9e2890..a7990a5e189 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -241,7 +241,7 @@ select set_ttdummy(1);
 
 -- we want to correct some "date"
 update tttest set price_on = -1 where price_id = 1;
-ERROR:  ttdummy (tttest): you can't change price_on and/or price_off columns (use set_ttdummy)
+ERROR:  ttdummy (tttest): you cannot change price_on and/or price_off columns (use set_ttdummy)
 -- but this doesn't work
 -- try in this way
 select set_ttdummy(0);
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3da5ccf7d71..b06dd1bf2ca 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.27 2007/01/19 21:21:13 alvherre Exp $
+ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.28 2007/02/01 19:10:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -630,7 +630,7 @@ initialize_environment(void)
 	unsetenv("LC_ALL");
 	unsetenv("LANG");
 	unsetenv("LANGUAGE");
-	/* On Windows the default locale may not be English, so force it */
+	/* On Windows the default locale cannot be English, so force it */
 #if defined(WIN32) || defined(__CYGWIN__)
 	putenv("LANG=en");
 #endif
@@ -1486,7 +1486,7 @@ help(void)
 	printf(_("  --multibyte=ENCODING      use ENCODING as the multibyte encoding\n"));
 	printf(_("  --outputdir=DIR           place output files in DIR (default \".\")\n"));
 	printf(_("  --schedule=FILE           use test ordering schedule from FILE\n"));
-	printf(_("                            (may be used multiple times to concatenate)\n"));
+	printf(_("                            (can be used multiple times to concatenate)\n"));
 	printf(_("  --srcdir=DIR              absolute path to source directory (for VPATH builds)\n"));
 	printf(_("  --temp-install=DIR        create a temporary installation in DIR\n"));
 	printf(_("  --no-locale               use C locale\n"));
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index e8ff412af3c..551b157a169 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.68 2006/07/13 16:49:20 momjian Exp $
+ * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.69 2007/02/01 19:10:30 momjian Exp $
  */
 
 #include "postgres.h"
@@ -483,11 +483,11 @@ ttdummy(PG_FUNCTION_ARGS)
 	if (!CALLED_AS_TRIGGER(fcinfo))
 		elog(ERROR, "ttdummy: not fired by trigger manager");
 	if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-		elog(ERROR, "ttdummy: can't process STATEMENT events");
+		elog(ERROR, "ttdummy: cannot process STATEMENT events");
 	if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
 		elog(ERROR, "ttdummy: must be fired before event");
 	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-		elog(ERROR, "ttdummy: can't process INSERT event");
+		elog(ERROR, "ttdummy: cannot process INSERT event");
 	if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
 		newtuple = trigdata->tg_newtuple;
 
@@ -541,7 +541,7 @@ ttdummy(PG_FUNCTION_ARGS)
 			elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]);
 
 		if (oldon != newon || oldoff != newoff)
-			elog(ERROR, "ttdummy (%s): you can't change %s and/or %s columns (use set_ttdummy)",
+			elog(ERROR, "ttdummy (%s): you cannot change %s and/or %s columns (use set_ttdummy)",
 				 relname, args[0], args[1]);
 
 		if (newoff != TTDUMMY_INFINITY)
diff --git a/src/test/thread/thread_test.c b/src/test/thread/thread_test.c
index 88d5dcf244d..9e6f5183b91 100644
--- a/src/test/thread/thread_test.c
+++ b/src/test/thread/thread_test.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/test/thread/thread_test.c,v 1.3 2007/01/05 22:20:04 momjian Exp $
+ *	$PostgreSQL: pgsql/src/test/thread/thread_test.c,v 1.4 2007/02/01 19:10:30 momjian Exp $
  *
  *	This program tests to see if your standard libc functions use
  *	pthread_setspecific()/pthread_getspecific() to be thread-safe.
@@ -187,7 +187,7 @@ main(int argc, char *argv[])
 #if !defined(HAVE_GETADDRINFO) && !defined(HAVE_GETHOSTBYNAME_R)
 	if (gethostname(myhostname, MAXHOSTNAMELEN) != 0)
 	{
-		fprintf(stderr, "Can not get local hostname **\nexiting\n");
+		fprintf(stderr, "Cannot get local hostname **\nexiting\n");
 		exit(1);
 	}
 #endif
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index af5fc36f152..08237965e4f 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -3,7 +3,7 @@
  * 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/zic.c,v 1.20 2007/01/26 17:45:42 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/zic.c,v 1.21 2007/02/01 19:10:30 momjian Exp $
  */
 
 #include "postgres.h"
@@ -645,7 +645,7 @@ dolink(const char *fromfile, const char *tofile)
 			const char *e = strerror(errno);
 
 			(void) fprintf(stderr,
-						   _("%s: Can't link from %s to %s: %s\n"),
+						   _("%s: Cannot link from %s to %s: %s\n"),
 						   progname, fromname, toname, e);
 			(void) exit(EXIT_FAILURE);
 		}
@@ -831,7 +831,7 @@ infile(const char *name)
 	{
 		const char *e = strerror(errno);
 
-		(void) fprintf(stderr, _("%s: Can't open %s: %s\n"),
+		(void) fprintf(stderr, _("%s: Cannot open %s: %s\n"),
 					   progname, name, e);
 		(void) exit(EXIT_FAILURE);
 	}
@@ -1566,7 +1566,7 @@ writezone(const char *name)
 	{
 		const char *e = strerror(errno);
 
-		(void) fprintf(stderr, _("%s: Can't remove %s: %s\n"),
+		(void) fprintf(stderr, _("%s: Cannot remove %s: %s\n"),
 					   progname, fullname, e);
 		(void) exit(EXIT_FAILURE);
 	}
@@ -1578,7 +1578,7 @@ writezone(const char *name)
 		{
 			const char *e = strerror(errno);
 
-			(void) fprintf(stderr, _("%s: Can't create %s: %s\n"),
+			(void) fprintf(stderr, _("%s: Cannot create %s: %s\n"),
 						   progname, fullname, e);
 			(void) exit(EXIT_FAILURE);
 		}
@@ -1863,7 +1863,7 @@ outzone(const struct zone * zpfirst, int zonecount)
 				(void) strcpy(startbuf, zp->z_format);
 			eat(zp->z_filename, zp->z_linenum);
 			if (*startbuf == '\0')
-				error(_("can't determine time zone abbreviation to use just after until time"));
+				error(_("cannot determine time zone abbreviation to use just after until time"));
 			else
 				addtt(starttime,
 					  addtype(startoff, startbuf,
@@ -2342,7 +2342,7 @@ mkdirs(char *argname)
 				if (errno != EEXIST || !itsdir(name))
 				{
 					(void) fprintf(stderr,
-								   _("%s: Can't create directory %s: %s\n"),
+								   _("%s: Cannot create directory %s: %s\n"),
 								   progname, name, e);
 					ifree(name);
 					return -1;
diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c
index e620f981dd3..62279122f89 100644
--- a/src/tools/entab/entab.c
+++ b/src/tools/entab/entab.c
@@ -2,7 +2,7 @@
 **		entab.c			- add tabs to a text file
 **		by Bruce Momjian (root@candle.pha.pa.us)
 **
-** $PostgreSQL: pgsql/src/tools/entab/entab.c,v 1.16 2006/03/11 04:38:41 momjian Exp $
+** $PostgreSQL: pgsql/src/tools/entab/entab.c,v 1.17 2007/02/01 19:10:30 momjian Exp $
 **
 **	version 1.3
 **
@@ -102,7 +102,7 @@ main(int argc, char **argv)
 		else
 		{
 			if ((in_file = fopen(*argv, PG_BINARY_R)) == NULL)
-				halt("PERROR:  Can not open file %s\n", argv[0]);
+				halt("PERROR:  Cannot open file %s\n", argv[0]);
 			argv++;
 		}
author	Bruce Momjian <bruce@momjian.us>	2007-02-01 19:10:30 +0000
committer	Bruce Momjian <bruce@momjian.us>	2007-02-01 19:10:30 +0000
commit	8b4ff8b6a14096a28910fbff3d485f30dcb9a637 (patch)
tree	c250f17f4a8e3bfee442970a0666431ed8310650 /src
parent	baaec74c5a953032049015883802660edd821cac (diff)
download	postgresql-8b4ff8b6a14096a28910fbff3d485f30dcb9a637.tar.gz postgresql-8b4ff8b6a14096a28910fbff3d485f30dcb9a637.zip