]> granicus.if.org Git - postgresql/commitdiff
Wording cleanup for error messages. Also change can't -> cannot.
authorBruce Momjian <bruce@momjian.us>
Thu, 1 Feb 2007 19:10:30 +0000 (19:10 +0000)
committerBruce Momjian <bruce@momjian.us>
Thu, 1 Feb 2007 19:10:30 +0000 (19:10 +0000)
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".

103 files changed:
contrib/spi/autoinc.c
contrib/spi/insert_username.c
contrib/spi/moddatetime.c
contrib/spi/refint.c
contrib/spi/timetravel.c
contrib/tsearch2/dict_thesaurus.c
contrib/tsearch2/tsvector.c
doc/src/sgml/ecpg.sgml
doc/src/sgml/gin.sgml
doc/src/sgml/installation.sgml
doc/src/sgml/lobj.sgml
doc/src/sgml/maintenance.sgml
doc/src/sgml/perform.sgml
doc/src/sgml/plperl.sgml
doc/src/sgml/queries.sgml
doc/src/sgml/ref/create_function.sgml
doc/src/sgml/ref/create_rule.sgml
doc/src/sgml/ref/create_trigger.sgml
doc/src/sgml/ref/initdb.sgml
doc/src/sgml/ref/notify.sgml
doc/src/sgml/ref/psql-ref.sgml
doc/src/sgml/ref/rollback_to.sgml
doc/src/sgml/ref/select.sgml
doc/src/sgml/release.sgml
doc/src/sgml/rules.sgml
doc/src/sgml/sources.sgml
doc/src/sgml/spi.sgml
doc/src/sgml/sql.sgml
doc/src/sgml/syntax.sgml
doc/src/sgml/typeconv.sgml
doc/src/sgml/xfunc.sgml
doc/src/sgml/xoper.sgml
src/backend/access/gist/gistxlog.c
src/backend/access/hash/hashscan.c
src/backend/access/nbtree/nbtxlog.c
src/backend/access/transam/xact.c
src/backend/access/transam/xlog.c
src/backend/catalog/aclchk.c
src/backend/catalog/dependency.c
src/backend/catalog/index.c
src/backend/catalog/namespace.c
src/backend/commands/cluster.c
src/backend/commands/comment.c
src/backend/commands/dbcommands.c
src/backend/commands/indexcmds.c
src/backend/commands/opclasscmds.c
src/backend/commands/portalcmds.c
src/backend/commands/schemacmds.c
src/backend/commands/sequence.c
src/backend/commands/tablespace.c
src/backend/commands/user.c
src/backend/commands/vacuum.c
src/backend/executor/execQual.c
src/backend/optimizer/plan/initsplan.c
src/backend/optimizer/util/clauses.c
src/backend/parser/analyze.c
src/backend/parser/gram.y
src/backend/parser/parse_agg.c
src/backend/parser/parse_clause.c
src/backend/parser/parse_func.c
src/backend/parser/parse_oper.c
src/backend/port/dynloader/aix.c
src/backend/regex/rege_dfa.c
src/backend/rewrite/rewriteDefine.c
src/backend/rewrite/rewriteHandler.c
src/backend/storage/buffer/bufmgr.c
src/backend/storage/lmgr/lock.c
src/backend/utils/adt/genfile.c
src/backend/utils/adt/int.c
src/backend/utils/adt/int8.c
src/backend/utils/fmgr/funcapi.c
src/backend/utils/init/miscinit.c
src/backend/utils/misc/guc.c
src/bin/initdb/initdb.c
src/bin/pg_ctl/pg_ctl.c
src/bin/pg_dump/pg_backup_archiver.c
src/bin/pg_resetxlog/pg_resetxlog.c
src/bin/psql/startup.c
src/include/regex/regerrs.h
src/interfaces/ecpg/preproc/ecpg.c
src/interfaces/ecpg/preproc/preproc.y
src/interfaces/libpq/win32.c
src/pl/plperl/plperl.c
src/pl/plpgsql/src/gram.y
src/pl/plpgsql/src/pl_comp.c
src/pl/plpython/plpython.c
src/pl/tcl/pltcl.c
src/test/examples/testlo.c
src/test/regress/expected/alter_table.out
src/test/regress/expected/create_view.out
src/test/regress/expected/geometry.out
src/test/regress/expected/horology.out
src/test/regress/expected/privileges.out
src/test/regress/expected/rangefuncs.out
src/test/regress/expected/time.out
src/test/regress/expected/timetz.out
src/test/regress/expected/transactions.out
src/test/regress/expected/triggers.out
src/test/regress/pg_regress.c
src/test/regress/regress.c
src/test/thread/thread_test.c
src/timezone/zic.c
src/tools/entab/entab.c

index 5904f1f4312fbc1deff7022f085fd21af88ab777..c748b6bf1c7d85b691981b7619a271f632997bcc 100644 (file)
@@ -31,7 +31,7 @@ autoinc(PG_FUNCTION_ARGS)
                elog(ERROR, "not fired by trigger manager");
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "can't process STATEMENT events");
+               elog(ERROR, "cannot process STATEMENT events");
        if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
                /* internal error */
                elog(ERROR, "must be fired before event");
@@ -42,7 +42,7 @@ autoinc(PG_FUNCTION_ARGS)
                rettuple = trigdata->tg_newtuple;
        else
                /* internal error */
-               elog(ERROR, "can't process DELETE events");
+               elog(ERROR, "cannot process DELETE events");
 
        rel = trigdata->tg_relation;
        relname = SPI_getrelname(rel);
index 73ed17cc1c8996ec483d8929cb1d6d36805747b0..5e709f283439915c8ade9f381b8520853d087d0c 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * insert_username.c
  * $Modified: Thu Oct 16 08:13:42 1997 by brook $
- * $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.14 2006/05/30 22:12:13 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.15 2007/02/01 19:10:23 momjian Exp $
  *
  * insert user name in response to a trigger
  * usage:  insert_username (column_name)
@@ -37,7 +37,7 @@ insert_username(PG_FUNCTION_ARGS)
                elog(ERROR, "insert_username: not fired by trigger manager");
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "insert_username: can't process STATEMENT events");
+               elog(ERROR, "insert_username: cannot process STATEMENT events");
        if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
                /* internal error */
                elog(ERROR, "insert_username: must be fired before event");
@@ -48,7 +48,7 @@ insert_username(PG_FUNCTION_ARGS)
                rettuple = trigdata->tg_newtuple;
        else
                /* internal error */
-               elog(ERROR, "insert_username: can't process DELETE events");
+               elog(ERROR, "insert_username: cannot process DELETE events");
 
        rel = trigdata->tg_relation;
        relname = SPI_getrelname(rel);
index ca4e6c0f33e59c866b83d5b0b97d35d0b1393448..b4c9fe4de96b9901b1407f2539b37781cb6e8200 100644 (file)
@@ -1,7 +1,7 @@
 /*
 moddatetime.c
 
-$PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.13 2006/05/30 22:12:13 tgl Exp $
+$PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.14 2007/02/01 19:10:23 momjian Exp $
 
 What is this?
 It is a function to be called from a trigger for the purpose of updating
@@ -43,7 +43,7 @@ moddatetime(PG_FUNCTION_ARGS)
 
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "moddatetime: can't process STATEMENT events");
+               elog(ERROR, "moddatetime: cannot process STATEMENT events");
 
        if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
                /* internal error */
@@ -56,7 +56,7 @@ moddatetime(PG_FUNCTION_ARGS)
                rettuple = trigdata->tg_newtuple;
        else
                /* internal error */
-               elog(ERROR, "moddatetime: can't process DELETE events");
+               elog(ERROR, "moddatetime: cannot process DELETE events");
 
        rel = trigdata->tg_relation;
        relname = SPI_getrelname(rel);
index 17735fca845f0b0433197593971f30697b252aee..c0c55eb080e07140cfa399f487b1ca9a0462f2c4 100644 (file)
@@ -77,7 +77,7 @@ check_primary_key(PG_FUNCTION_ARGS)
        /* Should be called for ROW trigger */
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "check_primary_key: can't process STATEMENT events");
+               elog(ERROR, "check_primary_key: cannot process STATEMENT events");
 
        /* If INSERTion then must check Tuple to being inserted */
        if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
@@ -86,7 +86,7 @@ check_primary_key(PG_FUNCTION_ARGS)
        /* Not should be called for DELETE */
        else if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "check_primary_key: can't process DELETE events");
+               elog(ERROR, "check_primary_key: cannot process DELETE events");
 
        /* If UPDATion the must check new Tuple, not old one */
        else
@@ -277,12 +277,12 @@ check_foreign_key(PG_FUNCTION_ARGS)
        /* Should be called for ROW trigger */
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "check_foreign_key: can't process STATEMENT events");
+               elog(ERROR, "check_foreign_key: cannot process STATEMENT events");
 
        /* Not should be called for INSERT */
        if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "check_foreign_key: can't process INSERT events");
+               elog(ERROR, "check_foreign_key: cannot process INSERT events");
 
        /* Have to check tg_trigtuple - tuple being deleted */
        trigtuple = trigdata->tg_trigtuple;
index 026e4ac81330d2c508574af347202acf5045540f..a1f69a10fbb7292ae2dce4b0d28baf01688a64ba 100644 (file)
@@ -115,7 +115,7 @@ timetravel(PG_FUNCTION_ARGS)
 
        /* Should be called for ROW trigger */
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-               elog(ERROR, "timetravel: can't process STATEMENT events");
+               elog(ERROR, "timetravel: cannot process STATEMENT events");
 
        /* Should be called BEFORE */
        if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
@@ -261,7 +261,7 @@ timetravel(PG_FUNCTION_ARGS)
                        elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[a_time_off]);
 
                if (oldtimeon != newtimeon || oldtimeoff != newtimeoff)
-                       elog(ERROR, "timetravel (%s): you can't change %s and/or %s columns (use set_timetravel)",
+                       elog(ERROR, "timetravel (%s): you cannot change %s and/or %s columns (use set_timetravel)",
                                 relname, args[a_time_on], args[a_time_off]);
        }
        if (oldtimeoff != NOEND_ABSTIME)
index 3975e4e832fbbacedb205d1bf79484695b6b280c..b61c149aff149e08dad4daf069e2fd8bfb384b36 100644 (file)
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/dict_thesaurus.c,v 1.7 2006/12/26 14:54:24 teodor Exp $ */
+/* $PostgreSQL: pgsql/contrib/tsearch2/dict_thesaurus.c,v 1.8 2007/02/01 19:10:23 momjian Exp $ */
 
 /*
  * thesaurus
@@ -186,7 +186,7 @@ thesaurusRead(char *filename, DictThesaurus * d)
 
        fh = fopen(to_absfilename(filename), "r");
        if (!fh)
-               elog(ERROR, "Thesaurus: can't open '%s' file", filename);
+               elog(ERROR, "Thesaurus: cannot open '%s' file", filename);
 
        while (fgets(str, sizeof(str), fh))
        {
index 1abf1914e3392fb056b94ed544b76b6cc2121e65..f4e83ec14962dc04c8e99fcfd4475e194248b5d8 100644 (file)
@@ -859,7 +859,7 @@ tsearch2(PG_FUNCTION_ARGS)
        trigdata = (TriggerData *) fcinfo->context;
        if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
                /* internal error */
-               elog(ERROR, "TSearch: Can't process STATEMENT events");
+               elog(ERROR, "TSearch: Cannot process STATEMENT events");
        if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
                /* internal error */
                elog(ERROR, "TSearch: Must be fired BEFORE event");
index 757a4fff40201b3e96ae733c74e968aeae06aaf0..91271311b81f31fae2890bf704b7d281a4d3bc5d 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.79 2007/02/01 00:28:16 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.80 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="ecpg">
  <title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@@ -522,7 +522,7 @@ EXEC SQL TYPE serial_t IS long;
       <listitem>
       <para>
        You can declare pointers to the most common types. Note however that
-       you can not use pointers as target variables of queries without
+       you cannot use pointers as target variables of queries without
        auto-allocation. See <xref linkend="ecpg-descriptors"> for more
        information on auto-allocation.
       </para>
@@ -1084,7 +1084,7 @@ int PGTYPESnumeric_from_decimal(decimal *src, numeric *dst);
        <literal>src</> points to into the numeric variable that
        <literal>dst</> points to. It returns 0 on success and -1 if an error
        occurs. Since the decimal type is implemented as a limited version of
-       the numeric type, overflow can not occur with this conversion.
+       the numeric type, overflow cannot occur with this conversion.
       </para>
      </listitem>
     </varlistentry>
@@ -4548,7 +4548,7 @@ EXEC SQL DEFINE MYNUMBER 12;
 EXEC SQL UPDATE Tbl SET col = MYNUMBER;
 </programlisting>
     then ecpg will already do the substitution and your C compiler will never
-    see any name or identifier <literal>MYNUMBER</>. Note that you can not use
+    see any name or identifier <literal>MYNUMBER</>. Note that you cannot use
     <literal>#define</literal> for a constant that you are going to use in an
     embedded SQL query because in this case the embedded SQL precompiler is not
     able to see this declaration.
index 0a78e798f8655d1dce753b20e30e6d27c1af4514..4c5f585566d96b97a67875e17adcd44625d3ebbf 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.9 2007/01/31 20:56:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.10 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="GIN">
 <title>GIN Indexes</title>
   <acronym>GIN</acronym> will emit an error.  Depending on the operator,
   a void query might match all, some, or none of the indexed values (for
   example, every array contains the empty array, but does not overlap the
-  empty array), and <acronym>GIN</acronym> can't determine the correct
+  empty array), and <acronym>GIN</acronym> cannot determine the correct
   answer, nor produce a full-index-scan result if it could determine that
   that was correct.
  </para>
index 5eed0f8ebde64cdb2ed0123c75345de1da70fc04..ffe1b916b238ca32183318c61325eb5e10fe3037 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.280 2007/02/01 00:28:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.281 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1040,7 +1040,7 @@ su - postgres
        <listitem>
         <para>
          Enables <firstterm>assertion</> checks in the server, which test for
-         many <quote>can't happen</> conditions.  This is invaluable for
+         many <quote>cannot happen</> conditions.  This is invaluable for
          code development purposes, but the tests slow things down a little.
          Also, having the tests turned on won't necessarily enhance the
          stability of your server!  The assertion checks are not categorized
index 604bf61fc2eb9e04c752abd19ced20f5773ac58a..06137e4f27056b425990fada23b122da7fa6d278 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.43 2007/01/31 20:56:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.44 2007/02/01 19:10:24 momjian Exp $ -->
 
  <chapter id="largeObjects">
   <title id="largeObjects-title">Large Objects</title>
@@ -437,7 +437,7 @@ importFile(PGconn *conn, char *filename)
     fd = open(filename, O_RDONLY, 0666);
     if (fd &lt; 0)
     {                           /* error */
-        fprintf(stderr, &quot;can't open unix file %s\n&quot;, filename);
+        fprintf(stderr, &quot;cannot open unix file %s\n&quot;, filename);
     }
 
     /*
@@ -445,7 +445,7 @@ importFile(PGconn *conn, char *filename)
      */
     lobjId = lo_creat(conn, INV_READ | INV_WRITE);
     if (lobjId == 0)
-        fprintf(stderr, &quot;can't create large object\n&quot;);
+        fprintf(stderr, &quot;cannot create large object\n&quot;);
 
     lobj_fd = lo_open(conn, lobjId, INV_WRITE);
 
@@ -476,7 +476,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
     lobj_fd = lo_open(conn, lobjId, INV_READ);
     if (lobj_fd &lt; 0)
     {
-        fprintf(stderr, &quot;can't open large object %d\n&quot;,
+        fprintf(stderr, &quot;cannot open large object %d\n&quot;,
                 lobjId);
     }
 
@@ -508,7 +508,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
     lobj_fd = lo_open(conn, lobjId, INV_WRITE);
     if (lobj_fd &lt; 0)
     {
-        fprintf(stderr, &quot;can't open large object %d\n&quot;,
+        fprintf(stderr, &quot;cannot open large object %d\n&quot;,
                 lobjId);
     }
 
@@ -550,7 +550,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
     lobj_fd = lo_open(conn, lobjId, INV_READ);
     if (lobj_fd &lt; 0)
     {
-        fprintf(stderr, &quot;can't open large object %d\n&quot;,
+        fprintf(stderr, &quot;cannot open large object %d\n&quot;,
                 lobjId);
     }
 
@@ -560,7 +560,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
     fd = open(filename, O_CREAT | O_WRONLY, 0666);
     if (fd &lt; 0)
     {                           /* error */
-        fprintf(stderr, &quot;can't open unix file %s\n&quot;,
+        fprintf(stderr, &quot;cannot open unix file %s\n&quot;,
                 filename);
     }
 
index 498f87c6a687cfa68b30c60afff1adc02b6c1bf6..fe5369c19c3bfb759810f906b8240f1394add8a9 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.69 2007/02/01 00:28:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.70 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="maintenance">
  <title>Routine Database Maintenance Tasks</title>
     wraparound</>: the XID counter wraps around to zero, and all of a sudden
     transactions that were in the past appear to be in the future &mdash; which
     means their outputs become invisible.  In short, catastrophic data loss.
-    (Actually the data is still there, but that's cold comfort if you can't
+    (Actually the data is still there, but that's cold comfort if you cannot
     get at it.)  To avoid this, it is necessary to vacuum every table
     in every database at least once every two billion transactions.
    </para>
index 3c254abb64180fcd7aabd10c800bf2d0a0ea0296..5c2a9599455d82ee8b64186ec3897b8e279566b7 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/perform.sgml,v 1.62 2007/02/01 00:28:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/perform.sgml,v 1.63 2007/02/01 19:10:24 momjian Exp $ -->
 
  <chapter id="performance-tips">
   <title>Performance Tips</title>
@@ -437,7 +437,7 @@ EXPLAIN ANALYZE SELECT * FROM tenk1 t1, tenk2 t2 WHERE t1.unique1 &lt; 100 AND t
    <para>
     It is worth noting that <command>EXPLAIN</> results should not be extrapolated
     to situations other than the one you are actually testing; for example,
-    results on a toy-sized table can't be assumed to apply to large tables.
+    results on a toy-sized table cannot be assumed to apply to large tables.
     The planner's cost estimates are not linear and so it might choose
     a different plan for a larger or smaller table.  An extreme example
     is that on a table that only occupies one disk page, you'll nearly
index 26933dbf6780c1934cfb0ae70959d7673fd6c7a6..1983f89f28b5e0e70ef525893551edd19695de94 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.62 2007/02/01 00:28:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.63 2007/02/01 19:10:24 momjian Exp $ -->
 
  <chapter id="plperl">
   <title>PL/Perl - Perl Procedural Language</title>
@@ -397,7 +397,7 @@ CREATE OR REPLACE FUNCTION lotsa_md5 (INTEGER) RETURNS SETOF foo_type AS $$
     my $t = localtime;
     elog(NOTICE, "opening file $file at $t" );
     open my $fh, '&lt;', $file # ooh, it's a file access!
-        or elog(ERROR, "can't open $file for reading: $!");
+        or elog(ERROR, "cannot open $file for reading: $!");
     my @words = &lt;$fh&gt;;
     close $fh;
     $t = localtime;
@@ -541,7 +541,7 @@ CREATE OR REPLACE FUNCTION set_var(name text, val text) RETURNS text AS $$
     if ($_SHARED{$_[0]} = $_[1]) {
         return 'ok';
     } else {
-        return "can't set shared variable $_[0] to $_[1]";
+        return "cannot set shared variable $_[0] to $_[1]";
     }
 $$ LANGUAGE plperl;
 
index 28e801698cf7b461341f5889c2ada21679fc8fe3..b5b5542d51aedf5f33db356afcef085b6919a420 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/queries.sgml,v 1.43 2007/02/01 00:28:17 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/queries.sgml,v 1.44 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="queries">
  <title>Queries</title>
@@ -591,7 +591,7 @@ FROM (SELECT * FROM table1) AS alias_name
 
     <para>
      This example is equivalent to <literal>FROM table1 AS
-     alias_name</literal>.  More interesting cases, which can't be
+     alias_name</literal>.  More interesting cases, which cannot be
      reduced to a plain join, arise when the subquery involves
      grouping or aggregation.
     </para>
index 9e26248d427efa98021ddfb9332ea6510873c97b..f4811f061aeb64d64a7609fdf859e05805ad520e 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.72 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.73 2007/02/01 19:10:24 momjian Exp $
 -->
 
 <refentry id="SQL-CREATEFUNCTION">
@@ -61,7 +61,7 @@ CREATE [ OR REPLACE ] FUNCTION
    Also, <command>CREATE OR REPLACE FUNCTION</command> will not let
    you change the return type of an existing function.  To do that,
    you must drop and recreate the function.  (When using <literal>OUT</>
-   parameters, that means you can't change the names or types of any
+   parameters, that means you cannot change the names or types of any
    <literal>OUT</> parameters except by dropping the function.)
   </para>
 
index 31bc6d964656b45fe5dc6813ef1e53167f3a4a77..6d42196d573f67a62441af2b339c479cba2248d3 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.50 2007/02/01 00:28:18 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -138,7 +138,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
       Any <acronym>SQL</acronym> conditional expression (returning
       <type>boolean</type>).  The condition expression cannot refer
       to any tables except <literal>NEW</> and <literal>OLD</>, and
-      can not contain aggregate functions.
+      cannot contain aggregate functions.
      </para>
     </listitem>
    </varlistentry>
index 329bee7c5e3cde182de461e6c3cacb912e427b8b..9cbdcf91651503a2044b7ce5f4726ace10aed3f6 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.46 2007/01/31 23:26:03 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.47 2007/02/01 19:10:24 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -71,7 +71,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
   </para>
 
   <para>
-   <command>SELECT</command> does not modify any rows so you can not
+   <command>SELECT</command> does not modify any rows so you cannot
    create <command>SELECT</command> triggers. Rules and views are more
    appropriate in such cases.
   </para>
index 6942ad0dfe4cc76e8c5de284a111e87f6c4b19a0..07147c10ecab63b780f9a0ec841c9c8db69262b7 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.39 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.40 2007/02/01 19:10:24 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -79,7 +79,7 @@ PostgreSQL documentation
    locale and character set encoding. The collation order
    (<literal>LC_COLLATE</>) and character set classes
    (<literal>LC_CTYPE</>, e.g. upper, lower, digit) are fixed for all
-   databases and can not be changed. Collation orders other than
+   databases and cannot be changed. Collation orders other than
    <literal>C</> or <literal>POSIX</> also have a performance penalty.
    For these reasons it is important to choose the right locale when
    running <command>initdb</command>. The remaining locale categories
@@ -266,7 +266,7 @@ PostgreSQL documentation
        By default, when <command>initdb</command>
        determines that an error prevented it from completely creating the database
        cluster, it removes any files it might have created before discovering
-       that it can't finish the job. This option inhibits tidying-up and is
+       that it cannot finish the job. This option inhibits tidying-up and is
        thus useful for debugging.
        </para>
       </listitem>
index 9ac1f1db1656651cc859f82276ac246752b015dc..5a1ffc3be7adfcf1f6944449a17be5372b41ea35 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/notify.sgml,v 1.29 2007/01/31 23:26:04 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/notify.sgml,v 1.30 2007/02/01 19:10:24 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -64,7 +64,7 @@ NOTIFY <replaceable class="PARAMETER">name</replaceable>
    to a particular table, a useful programming technique is to put the
    <command>NOTIFY</command> in a rule that is triggered by table updates.
    In this way, notification happens automatically when the table is changed,
-   and the application programmer can't accidentally forget to do it.
+   and the application programmer cannot accidentally forget to do it.
   </para>
 
   <para>
index c670c947c73d22cba7419e948489bb5e58685807..3f6d3244f8b6df8b093481db2fe682679fdf6eb6 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.182 2007/02/01 00:28:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.183 2007/02/01 19:10:24 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -543,7 +543,7 @@ PostgreSQL documentation
     determined at compile time.
     Since the database server uses the same default, you will not have
     to specify the port in most cases. The default user name is your
-    Unix user name, as is the default database name. Note that you can't
+    Unix user name, as is the default database name. Note that you cannot
     just connect to any database under any user name. Your database
     administrator should have informed you about your access rights.
     </para>
index 8a65772a23e2546f55cb4c8d6d51592a35b8cc1e..6570803a2ca1bbd20bf8ceb3340dca783b781b3f 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_to.sgml,v 1.8 2006/09/16 00:30:20 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_to.sgml,v 1.9 2007/02/01 19:10:24 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -82,7 +82,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
    left it pointing to (that is, <command>FETCH</> is not rolled back).
    Closing a cursor is not undone by rolling back, either.
    A cursor whose execution causes a transaction to abort is put in a
-   can't-execute state, so while the transaction can be restored using
+   cannot-execute state, so while the transaction can be restored using
    <command>ROLLBACK TO SAVEPOINT</>, the cursor can no longer be used.
   </para>
  </refsect1>
index 4f45fe54471d276c21f9d570e3481492c0a7ae61..689a4985665ef6a56a6bab188b84c277b3bc4f8a 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.98 2007/02/01 00:28:19 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.99 2007/02/01 19:10:25 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -892,8 +892,8 @@ FOR SHARE [ OF <replaceable class="parameter">table_name</replaceable> [, ...] ]
 
    <para>
     <literal>FOR UPDATE</literal> and <literal>FOR SHARE</literal> cannot be
-    used in contexts where returned rows can't be clearly identified with
-    individual table rows; for example they can't be used with aggregation.
+    used in contexts where returned rows cannot be clearly identified with
+    individual table rows; for example they cannot be used with aggregation.
    </para>
 
   <caution>
index 0b58f7ea67789a3681b3f6ceec922908c17c03b1..8c73c0472a4a18f6ddc65eb90c35cbb65c240475 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.495 2007/02/01 07:00:32 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.496 2007/02/01 19:10:24 momjian Exp $ -->
 <!--
 
 Typical markup:
@@ -16382,7 +16382,7 @@ Jdbc cleanups(Peter)
 Show backend status on ps command line(only works on some platforms)(Bruce)
 Pg_hba.conf now has a sameuser option in the database field
 Make lo_unlink take oid param, not int4
-New DISABLE_COMPLEX_MACRO for compilers that can't handle our macros(Bruce)
+New DISABLE_COMPLEX_MACRO for compilers that cannot handle our macros(Bruce)
 Libpgtcl now handles NOTIFY as a Tcl event, need not send dummy queries(Tom)
 libpgtcl cleanups(Tom)
 Add -error option to libpgtcl's pg_result command(Tom)
@@ -16737,7 +16737,7 @@ Better identify tcl and tk libs and includes(Bruce)
     places where subselects provide a better solution for your queries.  I
     think you will find that there are more uses for subselects than you might
     think.  Vadim has put us on the big SQL map with subselects, and fully
-    functional ones too.  The only thing you can't do with subselects is to
+    functional ones too.  The only thing you cannot do with subselects is to
     use them in the target list.
    </para>
    <para>
index 0da38fdeabb32bacebb3f55e1f0b2ac1a0f7a6a0..8b4bee7c0a5e76fd4e0b26f15e8ae67fe5e0225d 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.50 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="rules">
 <title>The Rule System</title>
@@ -1078,7 +1078,7 @@ INSERT INTO shoelace_log VALUES (
   FROM shoelace_data *NEW*, shoelace_data *OLD*;
 </programlisting>
 
-    (This looks a little strange since you can't normally write
+    (This looks a little strange since you cannot normally write
     <literal>INSERT ... VALUES ... FROM</>.  The <literal>FROM</>
     clause here is just to indicate that there are range-table entries
     in the query tree for <literal>*NEW*</> and <literal>*OLD*</>.
index d4830eca57ae24020c8e2065f61a25c2a3986865..0c9f10d8201cefe520b6337cb51f8a614a0a95ef 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.23 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.24 2007/02/01 19:10:24 momjian Exp $ -->
 
  <chapter id="source">
   <title>PostgreSQL Coding Conventions</title>
@@ -95,7 +95,7 @@ ereport(ERROR,
                 func_signature_string(funcname, nargs,
                                       actual_arg_types)),
          errhint("Unable to choose a best candidate function. "
-                 "You may need to add explicit typecasts.")));
+                 "You might need to add explicit typecasts.")));
 </programlisting>
     This illustrates the use of format codes to embed run-time values into
     a message text.  Also, an optional <quote>hint</> message is provided.
@@ -145,7 +145,7 @@ ereport(ERROR,
      <function>errmsg_internal(const char *msg, ...)</function> is the same as
      <function>errmsg</>, except that the message string will not be
      included in the internationalization message dictionary.
-     This should be used for <quote>can't happen</> cases that are probably
+     This should be used for <quote>cannot happen</> cases that are probably
      not worth expending translation effort on.
     </para>
    </listitem>
@@ -224,7 +224,7 @@ ereport(level, (errmsg_internal("format string", ...)));
     Therefore, <function>elog</> should be used only for internal errors and
     low-level debug logging.  Any message that is likely to be of interest to
     ordinary users should go through <function>ereport</>.  Nonetheless,
-    there are enough internal <quote>can't happen</> error checks in the
+    there are enough internal <quote>cannot happen</> error checks in the
     system that <function>elog</> is still widely used; it is preferred for
     those messages for its notational simplicity.
    </para>
@@ -528,7 +528,7 @@ BETTER: could not open file %s (I/O failure)
     not helpful information.  If the error text doesn't make as much sense
     without the function name, reword it. 
 <programlisting>
-BAD:    pg_atoi: error in "z": can't parse "z"
+BAD:    pg_atoi: error in "z": cannot parse "z"
 BETTER: invalid input syntax for integer: "z"
 </programlisting>
    </para>
index 2344219f68f6c27983f56b865381ce5b85125b1f..88461e71ba7085f17b97decdc2c3b36ca555defc 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.51 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.52 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="spi">
  <title>Server Programming Interface</title>
@@ -2954,7 +2954,7 @@ INSERT INTO a SELECT * FROM a;
       (either an ordinary function or a trigger) follow one or the
       other of the above rules depending on the read/write flag passed
       to SPI.  Commands executed in read-only mode follow the first
-      rule: they can't see changes of the calling command.  Commands executed
+      rule: they cannot see changes of the calling command.  Commands executed
       in read-write mode follow the second rule: they can see all changes made
       so far.
      </para>
index 238e8b300559dfb142ce0b9f553bd0c32835295e..02d9f2c0ff3e90a67e39e1a0f540a489a1444623 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.44 2007/01/31 20:56:19 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.45 2007/02/01 19:10:24 momjian Exp $ -->
 
  <chapter id="sql-intro">
   <title>SQL</title>
@@ -1557,7 +1557,7 @@ SELECT *
 
        <para>
         If we want to know the highest average part price among all our
-       suppliers, we can't write MAX(AVG(PRICE)), but we can write:
+       suppliers, we cannot write MAX(AVG(PRICE)), but we can write:
 
        <programlisting>
 SELECT MAX(subtable.avgprice)
index 3ddedf57d497bf9423cdfd1fd1a58af18d0919a5..f18d4c1480eb1086c7628a22feac74e5c297ba05 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.113 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.114 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter id="sql-syntax">
  <title>SQL Syntax</title>
@@ -1425,7 +1425,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
 </synopsis>
     However, this only works for types whose names are also valid as
     function names.  For example, <literal>double precision</literal>
-    can't be used this way, but the equivalent <literal>float8</literal>
+    cannot be used this way, but the equivalent <literal>float8</literal>
     can.  Also, the names <literal>interval</>, <literal>time</>, and
     <literal>timestamp</> can only be used in this fashion if they are
     double-quoted, because of syntactic conflicts.  Therefore, the use of
index 3745b937f0c3ba3f7f3bcd74a0464f22cb23de93..af4a8e916cb007a876d1816bc6eec01e501002f6 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.50 2007/01/31 21:03:37 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $ -->
 
 <chapter Id="typeconv">
 <title>Type Conversion</title>
@@ -447,10 +447,10 @@ try a similar case with <literal>~</>, we get:
 SELECT ~ '20' AS "negation";
 
 ERROR:  operator is not unique: ~ "unknown"
-HINT:  Could not choose a best candidate operator. You may need to add explicit
+HINT:  Could not choose a best candidate operator. You might need to add explicit
 type casts.
 </screen>
-This happens because the system can't decide which of the several
+This happens because the system cannot decide which of the several
 possible <literal>~</> operators should be preferred.  We can help
 it out with an explicit cast:
 <screen>
index 6e2cd9029acef8b6548b400ef70e962250b980a3..ce60bb2a81bf38c01388e923cc01d94dcc14f037 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.124 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.125 2007/02/01 19:10:24 momjian Exp $ -->
 
  <sect1 id="xfunc">
   <title>User-Defined Functions</title>
      Besides <command>SELECT</command> queries, the commands can include data
      modification queries (<command>INSERT</command>,
      <command>UPDATE</command>, and <command>DELETE</command>), as well as
-     other SQL commands. (The only exception is that you can't put
+     other SQL commands. (The only exception is that you cannot put
      <command>BEGIN</>, <command>COMMIT</>, <command>ROLLBACK</>, or
      <command>SAVEPOINT</> commands into a <acronym>SQL</acronym> function.)
      However, the final command 
index 9c98aa18205699eefaa512f41c1177568c137168..fdfa48a212205d9a1e1450a58cf86784e0534f1f 100644 (file)
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/xoper.sgml,v 1.40 2007/02/01 00:28:18 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/xoper.sgml,v 1.41 2007/02/01 19:10:24 momjian Exp $ -->
 
  <sect1 id="xoper">
   <title>User-Defined Operators</title>
@@ -355,7 +355,7 @@ table1.column1 OP table2.column2
      Care should be exercised when preparing a hash function, because there
      are machine-dependent ways in which it might fail to do the right thing.
      For example, if your data type is a structure in which there might be
-     uninteresting pad bits, you can't simply pass the whole structure to
+     uninteresting pad bits, you cannot simply pass the whole structure to
      <function>hash_any</>.  (Unless you write your other operators and
      functions to ensure that the unused bits are always zero, which is the
      recommended strategy.)
index ab2288a97f0f67886d513b24e526f6aa123c2fac..821cc221bbb7df51f7650211d0e20b1e4c0d8335 100644 (file)
@@ -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,
index f7d0bb00043ea5015a6b17172663ac23870ddc0b..3230c65008eddfe1b34f314eff05791f7b20c58d 100644 (file)
@@ -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;
index b39f283acc87fa60de4135cbcde3422b8d246812..5dce2083088bf6e62b60d0609bc3c66d15a90592 100644 (file)
@@ -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;
        }
 }
index e42d6a8ae6a9e8fbc2e607ccdb918b3b10aca84a..4ee1cc711cd6ef1189b6f4e955da46b094a597cf 100644 (file)
@@ -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)));
 }
 
index 53a464694cf4274b005ce3975edd4f697394ccef..62fbab8d9506a8006040ca8d61f8503badf708a2 100644 (file)
@@ -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",
index 328f8ccfda7e9b249c66365b41d6839c569d6c79..b1210841fff99b3dc6971dfd770191920f26bc55 100644 (file)
@@ -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,
index 639bfc2169fb599e4ddd9553b31411f2bc5c9cd8..2041125d4d085d6f5cda95352aef84eb1c3f6d25 100644 (file)
@@ -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)));
                                }
 
index 2cfd828bd520e0b9e51f375206a9336cbfc3989a..52554c3b21d05d44600d8264647f7020eeeb5686 100644 (file)
@@ -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,
index e66a6e888376058bb1091089e70da8f3ebd3e490..7c2cd4b8a4970902c07aecb5696298d5b290da7d 100644 (file)
@@ -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();
index 78ceef357fe069d449912bd43a99219690452678..2a16b12be1d54635a808498d564860017e738264 100644 (file)
@@ -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)
index 2f6a38d42d2364e407b2a99d48ff6facce2e68b1..344099ebdf6ff7a135724b156f200d34d7b146d1 100644 (file)
@@ -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,
index 38db4ae3b9247aa06783f3414b01f6825254bb9d..be16791342e9b84a746d7351fe1fb464b3fa240b 100644 (file)
@@ -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
index a71831271101e801e7dfc0ef76a26c147e453c91..b01093106c02c49a949dc3dabd98c962470fe4a8 100644 (file)
@@ -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")));
        }
 
        /*
index 802b6909525301946b7f95f1cbef1469f12178cf..12bca5119fe306b5defca11be300a4fb73e8f02f 100644 (file)
@@ -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);
index 998a2729a8494d6fc0e4f5cc1aa9ada8378acbd4..7bb7f4a33ee8a35502e2eaab10a5e9849518544b 100644 (file)
@@ -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),
index 7b65dbcfe366d0121f37529014f8ad4ec5b79fe8..09c2ca9f6338a4ff591eee217c92a21b7e206a59 100644 (file)
@@ -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,
index 73ef84d5ffdd6c55769713e16ea97e00b314b965..bd06bfb5da3f63fef607f90ec1cb2f7a20284024 100644 (file)
@@ -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)));
        }
 
index d2cb245f150ad647e4bab5580b37b9bef42023ac..80c5a927a3015c1bfb4f99817309deff3b78418d 100644 (file)
@@ -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
index 923505901f3d91e49b2dcc4f01b637529c0e70c4..cbbc31ca6f088e43c60674394f5e6a08bb1017bf 100644 (file)
@@ -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,
index e3c21f9e64220f433a69ac6372ef6e38b2ddb20a..43647d7989fc12da5365981984779e26b454df0d 100644 (file)
@@ -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 */
                                        }
index 75a9e42a24df3ac1fb97a640990197c6173f73e9..732c1ab849f6bfa525ff754104b666a61729f9b2 100644 (file)
@@ -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
                                {
index b49df212709d0a55eef2f9aed32122a274829e3a..63b03bd28a53c93c9c9b79bfd940d26705da8352 100644 (file)
@@ -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
index bfeb3375701b46fa611006599e14e36f5e595811..aac66abfba52c4583539a6fa8ad99694c3043768 100644 (file)
@@ -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.
index 4117fbb6da5d537eff6398fdfdccced36d0f78f1..0eb81d6d8982d0dbc54e283bfd9efa2d5302e07d 100644 (file)
@@ -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;
 }
index c256d73eadb084c5b1623ae842645b24a4158a2f..1f1dfdb761d5e239484a10d71b9c069e7f0083e1 100644 (file)
@@ -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;
index 961b78aa2097a92401d62f56f920a4dd6e89bf07..1409285cda45a1d52de15064a7000fa9b57f24ef 100644 (file)
@@ -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)
index 9792671fec6c05dd8d3289aa5f3c69dab0215d6c..0c718adc32a5f7cd19b457179da58f5fc103c36b 100644 (file)
@@ -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")));
        }
 
        /*
index bbe2bc857055f69720dff3dbfc712436176f0ab6..888dc200d1f74a23787f8c21723a851b4a63ca78 100644 (file)
@@ -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)));
        }
 
index 55c403672189f03efaad2ce461a0689a3a2529ab..c8d295047b39587436253533ecc5a93dd4c28826 100644 (file)
@@ -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)));
 }
 
index 64aca56ee2869a0c1ddbc049c6ea32e138a98dcb..31bf9cbbf0dcc2a0131f88669fd3c3c34a3bde3c 100644 (file)
@@ -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:
index c769994d12b58d2ab6df33b09b29c2e262a4529c..8248db6984d1d556041eac390984ed6be097239d 100644 (file)
@@ -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;
index abafba2f54d179b9426298c0d61ea542f9011706..d4212a440890300ae5210301eada5ef900669dc4 100644 (file)
@@ -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,
index 4e0baf9c2d307e9cc953430060676da7fb2ed533..8c0e6530dfec3f2b19aafef174c029fa319fb5ce 100644 (file)
@@ -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;
        }
 
index 7b4576fadbe5a68a497946a6c1f0657202daa738..867699b045adfb0b78caf4fa1519691d9688fe56 100644 (file)
@@ -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);
index 3117f90157864991232f64b96d58551c2d38b043..fa062a1f7b77a4c85a334a2a498abd4515100da5 100644 (file)
@@ -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.")));
        }
 
        /*
index 035f5bf046714b63aa21d7803aec88ed9102774e..af277875c5632b296b442bc4211b0690159691ca 100644 (file)
@@ -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))
index 6e35e9ad9d1555c9e3a863976116db4204e7d441..fce3bb89fbab0e28e630011789b548c813fc8690 100644 (file)
@@ -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();
index 7d0fbf9ed1ef9c5bfcad33e376624d6ab7fd0005..7f0d1df93ccfe525304ff15ed659565b9e99d264 100644 (file)
@@ -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();
index b49bae2b4375f67f2a8c4d5a42c6646872ded71c..218b7646b7594cdd556ffe7c031ddd80d1fae216 100644 (file)
@@ -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;
index 4fad4a5cab3bacb2ab6895553ee8cfd86c0174bf..a5967454afdb94a2a621a80aa59ee9dcf02d5ff3 100644 (file)
@@ -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);
 
index dad28983336307855599440d7f944ec38737b0cd..1c8a4893d9530b1b04cfd679bdeeecc34ab94e27 100644 (file)
@@ -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
                },
index d374c9c14aecae29502270e01ca8303060d06d6c..ea7b949aa002578d2334c85169c7da1fd89845d6 100644 (file)
@@ -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);
        }
 
index 6806d3f8c67db4334797b9469f87f1668f8a1663..5e430047c3591c8f36f8e68a9b83032673ec23c5 100644 (file)
@@ -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"));
index cd84c608827636914088e0fc3b935352b3d8974b..c64d68e38029004f1da1e265cabdd0ffbb8cc8ac 100644 (file)
@@ -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);
index f5bf5761a23eeb0e3e75b7e616593ac5a88c0358..9705baced7cadbe873a6837aafc37cdbaba15b2c 100644 (file)
@@ -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);
        }
index 6ea1e88ecb682f6e6c206e5507559facb92a4b8e..f8b9744273e6ae53a677baa4c95b09f636fa0cf0 100644 (file)
@@ -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);
        }
index 77baf97f4bbdc446f7dae76b6e9f5517eee96468..74bf86958fc300b8b2027b1023971fa86f96bfe1 100644 (file)
@@ -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"
 },
 
 {
index c8b2327289bb4b7991cd838698c51d39d9222860..5352f7f86cd2514b032a3cb618ef708d68138e2a 100644 (file)
@@ -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");
index a70b3ed7763bbcbb9a8c41f1e825821bcd8bf81d..ccc021daff2261705881f88a872ab21b70fb03ef 100644 (file)
@@ -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);
                }
index 0ce8a252366d2c4b7c82da875bb4aaa508612217..6d1477120703ba014a97abb1933a3db4fde8d431 100644 (file)
@@ -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"
index c7b09de35f4ed267f144c8c7888370d91065d237..0cf8c57a137fe7a63210bba00ba73690388bc444 100644 (file)
@@ -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
index 6ab8d4e98ebd6530afb2b68170c8765add9521a8..0e6e017a8286c0f1cc6c09d720a3154898861e84 100644 (file)
@@ -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);
index f9eb233e8c4516c9a9d837578878678a52169e4f..3ca2ca28b3fbb790fc1ab34213b09020d5b7f4c4 100644 (file)
@@ -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),
index 689a232b0e780071ae3d14129de836cadc4fe66b..cd0f701581eb479c19d6d2f0a020daf4a0eb9d20 100644 (file)
@@ -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
index c6efa75331fdb949d534a09175aff4de2ac81f65..7611fa7cc76ca8460059bfc0193c510382abb730 100644 (file)
@@ -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
                                {
index 9f1eb55a2337c35233b6c8f85df56401fa3bbf7b..d65908ec0e658d7acea014487b0c5168159a25eb 100644 (file)
@@ -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);
        }
 
index 8776cb90737ac3fd8e35158bcc8a260ed2c52d19..a1a61f710cf3c7cdd55511313350408f07584dbc 100644 (file)
@@ -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;
index 79eed2b7a6ee2463e4bf64df9b965e6b4d7d4357..0ef4bffe0b5805d34cfaf43cf9c775612051dba6 100644 (file)
@@ -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
index f307788cf14555b4f89d520111eebdafc1691cbc..e90952cc2f4dc5681138dd79a72d12c3b215dcb5 100644 (file)
@@ -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;
index f8cc66492cefb78ebbb556ebf616036a20e4d8bf..fb4f33ed6b1142174f79bc0be3d34a766c593312 100644 (file)
@@ -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
 --
index 5404969c6089813c415a5cc048add3816d9c76fb..bcb2ea54aed0714218dc2c5eeb5233dcd1b365ad 100644 (file)
@@ -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"
index 000d4e36c52951662b3e4b9680d9a7c7bc41c867..8abc323a70e451c7fdf03cb9b42b4497677794f3 100644 (file)
@@ -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  
index dce09d0790a1bb783b1284426e532c92de77ef82..6e21828cf7c25e01d5f9986aed0df4745596b3b2 100644 (file)
@@ -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.
index 5fdda250cc2e3e4f64f96ec8d56a2ae86af4d9cd..44e8b25b3010956fbf7db471bb666dd10074004f 100644 (file)
@@ -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.
index 8d3be84d63d6bff46c73f4e47f9665ed0c678e87..c8fe0522bfe001b1cb4309ded045a64180d2bb4e 100644 (file)
@@ -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;
index 1af4d9e2890184e61433cb390217996dcfa00ccc..a7990a5e18989512005988dcc37bae66d749a5ec 100644 (file)
@@ -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);
index 3da5ccf7d7102bc66cf73fdb1c2a6959b352af2b..b06dd1bf2cac1b98b1211e00dccd0a31394b6d7d 100644 (file)
@@ -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"));
index e8ff412af3ce44580c13ceb6e6117275171bfefd..551b157a16915879e029f94a5e3ad52ad9e334ee 100644 (file)
@@ -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)
index 88d5dcf244d31db1445a51b7cd85f4ab010e5c87..9e6f5183b910a44194d1c98d92d75ade0128da92 100644 (file)
@@ -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
index af5fc36f15267cc70f745cc84164aa52037a9eea..08237965e4f516405f0c21e428757e1cdc1a7776 100644 (file)
@@ -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;
index e620f981dd37056e1c6a55d916c18df59d9c0a95..62279122f891be058cad34e3dbba1ffb1c311332 100644 (file)
@@ -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++;
                }