Make some sentences consistent with similar ones.

Euler Taveira de Oliveira

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 9b9fed3..6c37d09 100644 (file)
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.22 2006/07/30 02:07:18 alvherre Exp $
+ *             $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.23 2006/10/03 21:21:35 momjian Exp $
  *
  * NOTES
  *             Each global transaction is associated with a global transaction
@@ -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 79a021c..7923199 100644 (file)
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.39 2006/09/25 15:17:34 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.40 2006/10/03 21:21:36 momjian Exp $
  *
  * DESCRIPTION
  *       The "DefineFoo" routines take the parse tree and pick out the
@@ -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 fd081d5..615d4c9 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.77 2006/09/25 15:17:34 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.78 2006/10/03 21:21:36 momjian Exp $
  *
  * DESCRIPTION
  *       These routines take the parse tree and pick out the
@@ -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 04c91f4..2aed55e 100644 (file)
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.31 2006/06/16 20:23:44 adunstan Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.32 2006/10/03 21:21:36 momjian Exp $
  *
  * DESCRIPTION
  *       The "DefineFoo" routines take the parse tree and pick out the
@@ -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 5f4e053..f912424 100644 (file)
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.67 2006/07/14 14:52:18 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.68 2006/10/03 21:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 e965e95..e53ae3b 100644 (file)
--- 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.37 2006/07/14 14:52:18 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.38 2006/10/03 21:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 23dc503..6d63356 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.207 2006/09/04 21:15:56 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.208 2006/10/03 21:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 67ddd28..defe453 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.142 2006/09/15 21:28:08 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.143 2006/10/03 21:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 e57724a..f08001c 100644 (file)
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.66 2006/09/05 21:08:36 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.67 2006/10/03 21:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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;
        }