Make some sentences consistent with similar ones.

Euler Taveira de Oliveira

9 files changed, 13 insertions, 13 deletions

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 9c93dd62b2..fd94bd1920 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1250,7 +1250,7 @@ RemoveTwoPhaseFile(TransactionId xid, bool giveWarning)
 		if (errno != ENOENT || giveWarning)
 			ereport(WARNING,
 					(errcode_for_file_access(),
-				   errmsg("could not remove two-phase state file \"%s\": %m",
+				   errmsg("could not remove twophase state file \"%s\": %m",
 						  path)));
 }
 
diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index 7a35f15374..82b046ca82 100644
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -219,7 +219,7 @@ RemoveAggregate(RemoveFuncStmt *stmt)
 	{
 		/* we only get here if stmt->missing_ok is true */
 		ereport(NOTICE,
-				(errmsg("aggregate %s(%s) does not exist ... skipping",
+				(errmsg("aggregate %s(%s) does not exist, skipping",
 						NameListToString(aggName),
 						TypeNameListToString(aggArgs))));
 		return;
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 8f1e879878..01438308ec 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -690,7 +690,7 @@ RemoveFunction(RemoveFuncStmt *stmt)
 	{
 		/* can only get here if stmt->missing_ok */
 		ereport(NOTICE,
-				(errmsg("function %s(%s) does not exist ... skipping",
+				(errmsg("function %s(%s) does not exist, skipping",
 						NameListToString(functionName),
 						TypeNameListToString(argTypes))));
 		return;
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 4ccc3aa399..e10d60e8c6 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -218,7 +218,7 @@ RemoveOperator(RemoveFuncStmt *stmt)
    if (stmt->missing_ok &&!OidIsValid(operOid) )
    {
        ereport(NOTICE,
-               (errmsg("operator %s does not exist ... skipping",
+               (errmsg("operator %s does not exist, skipping",
                        NameListToString(operatorName))));
        return;
    }
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 0c3c1dcd2e..0ad950f897 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -401,7 +401,7 @@ DropProceduralLanguage(DropPLangStmt *stmt)
 					 errmsg("language \"%s\" does not exist", languageName)));
 		else 
 			ereport(NOTICE,
-					(errmsg("language \"%s\" does not exist ... skipping", 
+					(errmsg("language \"%s\" does not exist, skipping", 
 							languageName)));
  
 		return;
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 115f1ffe65..000f62ebd0 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -412,7 +412,7 @@ DropTableSpace(DropTableSpaceStmt *stmt)
 		else
 		{
 			ereport(NOTICE,
-					(errmsg("tablespace \"%s\" does not exist ... skipping",
+					(errmsg("tablespace \"%s\" does not exist, skipping",
 							tablespacename)));
 			/* XXX I assume I need one or both of these next two calls */
 			heap_endscan(scandesc);
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 4aa5816512..119f2b7752 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -487,7 +487,7 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior,
 							trigname, get_rel_name(relid))));
 		else
 			ereport(NOTICE,
-					(errmsg("trigger \"%s\" for table \"%s\" does not exist ...skipping",
+					(errmsg("trigger \"%s\" for table \"%s\" does not exist, skipping",
 							trigname, get_rel_name(relid))));
 		/* cleanup */
 		systable_endscan(tgscan);
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index fc94149b02..3dce4f43f6 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -784,11 +784,11 @@ CheckLDAPAuth(Port *port)
     {
 #ifndef WIN32
         ereport(LOG,
-                (errmsg("could not initialize LDAP: error %d", 
+                (errmsg("could not initialize LDAP: error code %d", 
                         errno)));
 #else
         ereport(LOG,
-                (errmsg("could not initialize LDAP: error %d", 
+                (errmsg("could not initialize LDAP: error code %d", 
                         (int) LdapGetLastError())));
 #endif
         return STATUS_ERROR;
@@ -797,7 +797,7 @@ CheckLDAPAuth(Port *port)
     if ((r = ldap_set_option(ldap, LDAP_OPT_PROTOCOL_VERSION, &ldapversion)) != LDAP_SUCCESS)
     {
         ereport(LOG,
-                (errmsg("could not set LDAP protocol version: error %d", r)));
+                (errmsg("could not set LDAP protocol version: error code %d", r)));
         return STATUS_ERROR;
     }
     
@@ -843,7 +843,7 @@ CheckLDAPAuth(Port *port)
 #endif
         {
             ereport(LOG,
-                    (errmsg("could not start LDAP TLS session: error %d", r)));
+                    (errmsg("could not start LDAP TLS session: error code %d", r)));
             return STATUS_ERROR;
         }
     }
@@ -858,7 +858,7 @@ CheckLDAPAuth(Port *port)
     if (r != LDAP_SUCCESS)
     {
         ereport(LOG,
-                (errmsg("LDAP login failed for user \"%s\" on server \"%s\": error %d",
+                (errmsg("LDAP login failed for user \"%s\" on server \"%s\": error code %d",
 						fulluser, server, r)));
         return STATUS_ERROR;
     }
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index f1962be853..141323fa52 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -61,7 +61,7 @@ RemoveRewriteRule(Oid owningRel, const char *ruleName, DropBehavior behavior,
 							ruleName, get_rel_name(owningRel))));
 		else
 			ereport(NOTICE,
-					(errmsg("rule \"%s\" for relation \"%s\" does not exist ... skipping",
+					(errmsg("rule \"%s\" for relation \"%s\" does not exist, skipping",
 							ruleName, get_rel_name(owningRel))));
 		return;
 	}