diff options
| author | Bruce Momjian | 2007-02-01 19:10:30 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2007-02-01 19:10:30 +0000 |
| commit | fa04e23ef0747b6b5a85d35bcab1e237277bbb0d (patch) | |
| tree | 3f3bf2a6305f40a24ca6e30f39b1ccd3a177271a | |
| parent | 07061e170b796a3fb84ad7e2639a5531e73e90de (diff) | |
Wording cleanup for error messages. Also change can't -> cannot.
Standard English uses "may", "can", and "might" in different ways:
may - permission, "You may borrow my rake."
can - ability, "I can lift that log."
might - possibility, "It might rain today."
Unfortunately, in conversational English, their use is often mixed, as
in, "You may use this variable to do X", when in fact, "can" is a better
choice. Similarly, "It may crash" is better stated, "It might crash".
103 files changed, 187 insertions, 187 deletions
diff --git a/contrib/spi/autoinc.c b/contrib/spi/autoinc.c index 5904f1f431..c748b6bf1c 100644 --- a/contrib/spi/autoinc.c +++ b/contrib/spi/autoinc.c @@ -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); diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c index dc9a7bdccc..2b784edd20 100644 --- a/contrib/spi/insert_username.c +++ b/contrib/spi/insert_username.c @@ -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); diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c index f5cf8a2c0b..b42dcaa48c 100644 --- a/contrib/spi/moddatetime.c +++ b/contrib/spi/moddatetime.c @@ -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); diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index 17735fca84..c0c55eb080 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -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; diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c index 026e4ac813..a1f69a10fb 100644 --- a/contrib/spi/timetravel.c +++ b/contrib/spi/timetravel.c @@ -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) diff --git a/contrib/tsearch2/dict_thesaurus.c b/contrib/tsearch2/dict_thesaurus.c index 824f6f0ac6..cf3925f80c 100644 --- a/contrib/tsearch2/dict_thesaurus.c +++ b/contrib/tsearch2/dict_thesaurus.c @@ -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)) { diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c index 1abf1914e3..f4e83ec149 100644 --- a/contrib/tsearch2/tsvector.c +++ b/contrib/tsearch2/tsvector.c @@ -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"); diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index 9e200d4ddf..e1f51979ec 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -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. diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml index f78c5e7464..e0e9224bf3 100644 --- a/doc/src/sgml/gin.sgml +++ b/doc/src/sgml/gin.sgml @@ -209,7 +209,7 @@ <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> diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 65afb9801c..04f1604390 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -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 diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml index 0131335ba3..7e46303bfd 100644 --- a/doc/src/sgml/lobj.sgml +++ b/doc/src/sgml/lobj.sgml @@ -437,7 +437,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); } /* @@ -445,7 +445,7 @@ importFile(PGconn *conn, char *filename) */ lobjId = lo_creat(conn, INV_READ | INV_WRITE); if (lobjId == 0) - fprintf(stderr, "can't create large object\n"); + fprintf(stderr, "cannot create large object\n"); 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 < 0) { - fprintf(stderr, "can't open large object %d\n", + fprintf(stderr, "cannot open large object %d\n", 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 < 0) { - fprintf(stderr, "can't open large object %d\n", + fprintf(stderr, "cannot open large object %d\n", lobjId); } @@ -550,7 +550,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 %d\n", + fprintf(stderr, "cannot open large object %d\n", lobjId); } @@ -560,7 +560,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename) fd = open(filename, O_CREAT | O_WRONLY, 0666); if (fd < 0) { /* error */ - fprintf(stderr, "can't open unix file %s\n", + fprintf(stderr, "cannot open unix file %s\n", filename); } diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml index ec128a020f..4e60f9b4d2 100644 --- a/doc/src/sgml/maintenance.sgml +++ b/doc/src/sgml/maintenance.sgml @@ -296,7 +296,7 @@ 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 — 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> diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml index 075cc60563..4b5aafb108 100644 --- a/doc/src/sgml/perform.sgml +++ b/doc/src/sgml/perform.sgml @@ -437,7 +437,7 @@ EXPLAIN ANALYZE SELECT * FROM tenk1 t1, tenk2 t2 WHERE t1.unique1 < 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 diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml index fbfb8424cb..70d8a8f09a 100644 --- a/doc/src/sgml/plperl.sgml +++ b/doc/src/sgml/plperl.sgml @@ -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, '<', $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 = <$fh>; 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; diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index bf4f1d9d8e..0f347be1eb 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -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> diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml index 2deb9b48ab..3c3a2d9597 100644 --- a/doc/src/sgml/ref/create_function.sgml +++ b/doc/src/sgml/ref/create_function.sgml @@ -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> diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml index 528cb5f7cb..798b9b4305 100644 --- a/doc/src/sgml/ref/create_rule.sgml +++ b/doc/src/sgml/ref/create_rule.sgml @@ -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> diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index be4973dd4b..711c091d41 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -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> diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index a987537ac6..9a942a810f 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -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> diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml index f8deb333e8..e94c5f43bf 100644 --- a/doc/src/sgml/ref/notify.sgml +++ b/doc/src/sgml/ref/notify.sgml @@ -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> diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 4ed2f465a7..e667e7ddc1 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -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> diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml index 1b1e018503..2fcdb860c5 100644 --- a/doc/src/sgml/ref/rollback_to.sgml +++ b/doc/src/sgml/ref/rollback_to.sgml @@ -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> diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 148b8d1ba8..94147a0294 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -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> diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml index d64514fc67..39dd3a7280 100644 --- a/doc/src/sgml/release.sgml +++ b/doc/src/sgml/release.sgml @@ -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> diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index 187ce2c0c2..5eea4c8381 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -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*</>. diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index 85cd864700..a04f414200 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -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> diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml index 0b79e8556a..0b4624aa90 100644 --- a/doc/src/sgml/spi.sgml +++ b/doc/src/sgml/spi.sgml @@ -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> diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml index fcf1cb96ec..8528f447b4 100644 --- a/doc/src/sgml/sql.sgml +++ b/doc/src/sgml/sql.sgml @@ -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) diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml index 1b9391e3dd..bc488afdd0 100644 --- a/doc/src/sgml/syntax.sgml +++ b/doc/src/sgml/syntax.sgml @@ -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 diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml index a4997c058b..a49c58f6b5 100644 --- a/doc/src/sgml/typeconv.sgml +++ b/doc/src/sgml/typeconv.sgml @@ -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> diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml index 953270feaf..dac5668eb4 100644 --- a/doc/src/sgml/xfunc.sgml +++ b/doc/src/sgml/xfunc.sgml @@ -114,7 +114,7 @@ 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 diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml index 9b8a818f0b..2859d0008f 100644 --- a/doc/src/sgml/xoper.sgml +++ b/doc/src/sgml/xoper.sgml @@ -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.) diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 16d8ca21da..7343a5a286 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -687,7 +687,7 @@ gistContinueInsert(gistIncompleteInsert *insert) } if (ntodelete == 0) - elog(PANIC, "gistContinueInsert: can't find pointer to page(s)"); + elog(PANIC, "gistContinueInsert: cannot find pointer to page(s)"); /* * we check space with subtraction only first tuple to delete, diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index 31bfdaf1e0..b5722cdadf 100644 --- a/src/backend/access/hash/hashscan.c +++ b/src/backend/access/hash/hashscan.c @@ -99,7 +99,7 @@ _hash_dropscan(IndexScanDesc scan) last = chk; if (chk == NULL) - elog(ERROR, "hash scan list trashed; can't find 0x%p", (void *) scan); + elog(ERROR, "hash scan list trashed; cannot find 0x%p", (void *) scan); if (last == NULL) HashScans = chk->hashsl_next; diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index 60faf4afed..58df250071 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -142,7 +142,7 @@ _bt_restore_page(Page page, char *from, int len) itemsz = MAXALIGN(itemsz); if (PageAddItem(page, (Item) from, itemsz, FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) - elog(PANIC, "_bt_restore_page: can't add item to page"); + elog(PANIC, "_bt_restore_page: cannot add item to page"); from += itemsz; } } diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 3b18248efd..d1526185ee 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -2582,7 +2582,7 @@ RequireTransactionChain(void *stmtNode, const char *stmtType) ereport(ERROR, (errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION), /* translator: %s represents an SQL statement name */ - errmsg("%s may only be used in transaction blocks", + errmsg("%s can only be used in transaction blocks", stmtType))); } diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 56a59a06bf..4b7fcebc72 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4670,8 +4670,8 @@ StartupXLOG(void) ereport(LOG, (errmsg("database system was interrupted while in recovery at log time %s", str_time(ControlFile->checkPointCopy.time)), - errhint("If this has occurred more than once some data may be corrupted" - " and you may need to choose an earlier recovery target."))); + errhint("If this has occurred more than once some data might be corrupted" + " and you might need to choose an earlier recovery target."))); else if (ControlFile->state == DB_IN_PRODUCTION) ereport(LOG, (errmsg("database system was interrupted; last known up at %s", diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 201dc114e8..0229923cab 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -998,7 +998,7 @@ ExecGrant_Language(InternalGrant *istmt) (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("language \"%s\" is not trusted", NameStr(pg_language_tuple->lanname)), - errhint("Only superusers may use untrusted languages."))); + errhint("Only superusers can use untrusted languages."))); /* * Get owner ID and working copy of existing ACL. If there's no ACL, diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index ff68741cf8..61452a82fb 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -607,7 +607,7 @@ recursiveDeletion(const ObjectAddress *object, (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST), errmsg("cannot drop %s because %s requires it", objDescription, otherObjDesc), - errhint("You may drop %s instead.", + errhint("You can drop %s instead.", otherObjDesc))); } diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 59d4224314..ac47961638 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -667,7 +667,7 @@ index_create(Oid heapRelationId, /* Shouldn't have any expressions */ if (indexInfo->ii_Expressions) - elog(ERROR, "constraints can't have index expressions"); + elog(ERROR, "constraints cannot have index expressions"); conOid = CreateConstraintEntry(indexRelationName, namespaceId, diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 338195c3e4..fd80a2d146 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -236,7 +236,7 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation) if (newRelation->schemaname) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), - errmsg("temporary tables may not specify a schema name"))); + errmsg("temporary tables cannot specify a schema name"))); /* Initialize temp namespace if first time through */ if (!OidIsValid(myTempNamespace)) InitTempTableNamespace(); diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index b9f9fdd579..d44adaf133 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -376,9 +376,9 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck) errmsg("cannot cluster on index \"%s\" because access method does not handle null values", RelationGetRelationName(OldIndex)), recheck - ? errhint("You may be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.", + ? errhint("You might be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.", NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)) - : errhint("You may be able to work around this by marking column \"%s\" NOT NULL.", + : errhint("You might be able to work around this by marking column \"%s\" NOT NULL.", NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)))); } else if (colno < 0) diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index ca9b448d9d..8ae04dfcab 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -584,7 +584,7 @@ CommentDatabase(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("database name may not be qualified"))); + errmsg("database name cannot be qualified"))); database = strVal(linitial(qualname)); /* @@ -632,7 +632,7 @@ CommentTablespace(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("tablespace name may not be qualified"))); + errmsg("tablespace name cannot be qualified"))); tablespace = strVal(linitial(qualname)); oid = get_tablespace_oid(tablespace); @@ -669,7 +669,7 @@ CommentRole(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("role name may not be qualified"))); + errmsg("role name cannot be qualified"))); role = strVal(linitial(qualname)); oid = get_roleid_checked(role); @@ -702,7 +702,7 @@ CommentNamespace(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("schema name may not be qualified"))); + errmsg("schema name cannot be qualified"))); namespace = strVal(linitial(qualname)); oid = GetSysCacheOid(NAMESPACENAME, @@ -1161,7 +1161,7 @@ CommentLanguage(List *qualname, char *comment) if (list_length(qualname) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("language name may not be qualified"))); + errmsg("language name cannot be qualified"))); language = strVal(linitial(qualname)); oid = GetSysCacheOid(LANGNAME, diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index c7e7274e94..217d7740a5 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -707,7 +707,7 @@ RenameDatabase(const char *oldname, const char *newname) if (db_id == MyDatabaseId) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("current database may not be renamed"))); + errmsg("current database cannot be renamed"))); /* * Make sure the database does not have active sessions. This is the same diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 93c033a7ca..ac1d92862d 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -315,7 +315,7 @@ DefineIndex(RangeVar *heapRelation, if (list_length(rangetable) != 1 || getrelid(1, rangetable) != relationId) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("index expressions and predicates may refer only to the table being indexed"))); + errmsg("index expressions and predicates can refer only to the table being indexed"))); } /* diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 8ddea90c32..fd8ae1c116 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -508,7 +508,7 @@ DefineOpClass(CreateOpClassStmt *stmt) else if (!amstorage) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("storage type may not be different from data type for access method \"%s\"", + errmsg("storage type cannot be different from data type for access method \"%s\"", stmt->amname))); } @@ -932,7 +932,7 @@ AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid, case OPCLASS_ITEM_STORAGETYPE: ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("STORAGE may not be specified in ALTER OPERATOR FAMILY"))); + errmsg("STORAGE cannot be specified in ALTER OPERATOR FAMILY"))); break; default: elog(ERROR, "unrecognized item type: %d", item->itemtype); diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index cabc794b66..0dc7e27151 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -88,7 +88,7 @@ PerformCursorOpen(DeclareCursorStmt *stmt, ParamListInfo params) if (query->into) ereport(ERROR, (errcode(ERRCODE_INVALID_CURSOR_DEFINITION), - errmsg("DECLARE CURSOR may not specify INTO"))); + errmsg("DECLARE CURSOR cannot specify INTO"))); if (query->rowMarks != NIL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index e27995986e..90c3fd554b 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -159,7 +159,7 @@ RemoveSchema(List *names, DropBehavior behavior, bool missing_ok) if (list_length(names) != 1) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("schema name may not be qualified"))); + errmsg("schema name cannot be qualified"))); namespaceName = strVal(linitial(names)); namespaceId = GetSysCacheOid(NAMESPACENAME, diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index bb1d9c2452..4a23a72479 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -1121,7 +1121,7 @@ init_params(List *options, bool isInit, snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value); ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("START value (%s) can't be less than MINVALUE (%s)", + errmsg("START value (%s) cannot be less than MINVALUE (%s)", bufs, bufm))); } if (new->last_value > new->max_value) @@ -1133,7 +1133,7 @@ init_params(List *options, bool isInit, snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value); ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("START value (%s) can't be greater than MAXVALUE (%s)", + errmsg("START value (%s) cannot be greater than MAXVALUE (%s)", bufs, bufm))); } diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index d967669848..4194e30923 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -228,7 +228,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt) if (strchr(location, '\'')) ereport(ERROR, (errcode(ERRCODE_INVALID_NAME), - errmsg("tablespace location may not contain single quotes"))); + errmsg("tablespace location cannot contain single quotes"))); /* * Allowing relative paths seems risky diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 3115d6981d..85fb15fc47 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -1007,11 +1007,11 @@ RenameRole(const char *oldname, const char *newname) if (roleid == GetSessionUserId()) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("session user may not be renamed"))); + errmsg("session user cannot be renamed"))); if (roleid == GetOuterUserId()) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("current user may not be renamed"))); + errmsg("current user cannot be renamed"))); /* make sure the new name doesn't exist */ if (SearchSysCacheExists(AUTHNAME, diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index b775b00072..78086d64a1 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -905,7 +905,7 @@ vac_truncate_clog(TransactionId frozenXID) { ereport(WARNING, (errmsg("some databases have not been vacuumed in over 2 billion transactions"), - errdetail("You may have already suffered transaction-wraparound data loss."))); + errdetail("You might have already suffered transaction-wraparound data loss."))); return; } @@ -1407,7 +1407,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, * release write lock before commit there.) */ ereport(NOTICE, - (errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink relation", + (errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation", relname, blkno, offnum, HeapTupleHeaderGetXmin(tuple.t_data)))); do_shrinking = false; break; @@ -1420,7 +1420,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel, * release write lock before commit there.) */ ereport(NOTICE, - (errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink relation", + (errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation", relname, blkno, offnum, HeapTupleHeaderGetXmax(tuple.t_data)))); do_shrinking = false; break; @@ -1900,7 +1900,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, /* Quick exit if we have no vtlinks to search in */ if (vacrelstats->vtlinks == NULL) { - elog(DEBUG2, "parent item in update-chain not found --- can't continue repair_frag"); + elog(DEBUG2, "parent item in update-chain not found --- cannot continue repair_frag"); break; /* out of walk-along-page loop */ } @@ -2040,7 +2040,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, if (vtlp == NULL) { /* see discussion above */ - elog(DEBUG2, "parent item in update-chain not found --- can't continue repair_frag"); + elog(DEBUG2, "parent item in update-chain not found --- cannot continue repair_frag"); chain_move_failed = true; break; /* out of check-all-items loop */ } @@ -2075,7 +2075,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel, HeapTupleHeaderGetXmin(tp.t_data)))) { ReleaseBuffer(Pbuf); - elog(DEBUG2, "too old parent tuple found --- can't continue repair_frag"); + elog(DEBUG2, "too old parent tuple found --- cannot continue repair_frag"); chain_move_failed = true; break; /* out of check-all-items loop */ } diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 8d1e18dad5..a04b8c9dee 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -3465,7 +3465,7 @@ ExecInitExpr(Expr *node, PlanState *parent) if (naggs != aggstate->numaggs) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), - errmsg("aggregate function calls may not be nested"))); + errmsg("aggregate function calls cannot be nested"))); } else { diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 7e1b95e5d5..5549a2d37f 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -636,9 +636,9 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, * Otherwise the parser messed up. */ if (!bms_is_subset(relids, qualscope)) - elog(ERROR, "JOIN qualification may not refer to other relations"); + elog(ERROR, "JOIN qualification cannot refer to other relations"); if (ojscope && !bms_is_subset(relids, ojscope)) - elog(ERROR, "JOIN qualification may not refer to other relations"); + elog(ERROR, "JOIN qualification cannot refer to other relations"); /* * If the clause is variable-free, our normal heuristic for pushing it diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 52bb3a8fc7..e6cc29f1d6 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -482,7 +482,7 @@ count_agg_clauses_walker(Node *node, AggClauseCounts *counts) if (contain_agg_clause((Node *) aggref->args)) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), - errmsg("aggregate function calls may not be nested"))); + errmsg("aggregate function calls cannot be nested"))); /* * Having checked that, we need not recurse into the argument. diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 952bf45de8..ebfd35e2dd 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -646,7 +646,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt, if (selectQuery->into) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("INSERT ... SELECT may not specify INTO"))); + errmsg("INSERT ... SELECT cannot specify INTO"))); /* * Make the source be a subquery in the INSERT's rangetable, and add @@ -1803,7 +1803,7 @@ transformIndexStmt(ParseState *pstate, IndexStmt *stmt) if (expression_returns_set(ielem->expr)) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("index expression may not return a set"))); + errmsg("index expression cannot return a set"))); } } @@ -1892,7 +1892,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, if (list_length(pstate->p_rtable) != 2) /* naughty, naughty... */ ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("rule WHERE condition may not contain references to other relations"))); + errmsg("rule WHERE condition cannot contain references to other relations"))); /* aggregates not allowed (but subselects are okay) */ if (pstate->p_hasAggs) @@ -1967,7 +1967,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, stmt->whereClause != NULL) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions"))); + errmsg("rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions"))); /* * If the action is INSERT...SELECT, OLD/NEW have been pushed down @@ -2003,11 +2003,11 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, if (has_old) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON SELECT rule may not use OLD"))); + errmsg("ON SELECT rule cannot use OLD"))); if (has_new) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON SELECT rule may not use NEW"))); + errmsg("ON SELECT rule cannot use NEW"))); break; case CMD_UPDATE: /* both are OK */ @@ -2016,13 +2016,13 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt, if (has_old) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON INSERT rule may not use OLD"))); + errmsg("ON INSERT rule cannot use OLD"))); break; case CMD_DELETE: if (has_new) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("ON DELETE rule may not use NEW"))); + errmsg("ON DELETE rule cannot use NEW"))); break; default: elog(ERROR, "unrecognized event type: %d", @@ -2663,7 +2663,7 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt) if (contain_vars_of_level((Node *) selectQuery, 1)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level"))); + errmsg("UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level"))); } /* @@ -2987,7 +2987,7 @@ transformReturningList(ParseState *pstate, List *returningList) if (list_length(pstate->p_rtable) != length_rtable) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("RETURNING may not contain references to other relations"))); + errmsg("RETURNING cannot contain references to other relations"))); /* mark column origins */ markTargetListOrigins(pstate, rlist); @@ -3206,7 +3206,7 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt) if (((Query *) stmt->query)->into) ereport(ERROR, (errcode(ERRCODE_INVALID_CURSOR_DEFINITION), - errmsg("DECLARE CURSOR may not specify INTO"))); + errmsg("DECLARE CURSOR cannot specify INTO"))); return result; } diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 71bedce4ab..31fc2ed27c 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -2266,7 +2266,7 @@ CreateAsStmt: if (n->into != NULL) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("CREATE TABLE AS may not specify INTO"))); + errmsg("CREATE TABLE AS cannot specify INTO"))); $4->istemp = $2; n->into = $4; n->intoColNames = $5; diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index f9b32c87ab..0f1c07ba4a 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -70,7 +70,7 @@ transformAggregateCall(ParseState *pstate, Aggref *agg) if (checkExprHasAggs((Node *) agg->args)) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), - errmsg("aggregate function calls may not be nested"))); + errmsg("aggregate function calls cannot be nested"))); } if (min_varlevel < 0) diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 333ec7982c..87ffee5744 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -452,7 +452,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r) if (query->into != NULL) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("subquery in FROM may not have SELECT INTO"))); + errmsg("subquery in FROM cannot have SELECT INTO"))); /* * The subquery cannot make use of any variables from FROM items created @@ -472,7 +472,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r) if (contain_vars_of_level((Node *) query, 1)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("subquery in FROM may not refer to other relations of same query level"))); + errmsg("subquery in FROM cannot refer to other relations of same query level"))); } /* @@ -521,7 +521,7 @@ transformRangeFunction(ParseState *pstate, RangeFunction *r) if (contain_vars_of_level(funcexpr, 0)) ereport(ERROR, (errcode(ERRCODE_INVALID_COLUMN_REFERENCE), - errmsg("function expression in FROM may not refer to other relations of same query level"))); + errmsg("function expression in FROM cannot refer to other relations of same query level"))); } /* diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 2aae6b5866..a3e693ba8a 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -213,7 +213,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, func_signature_string(funcname, nargs, actual_arg_types)), errhint("Could not choose a best candidate function. " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); else ereport(ERROR, @@ -222,7 +222,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, func_signature_string(funcname, nargs, actual_arg_types)), errhint("No function matches the given name and argument types. " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); } @@ -282,7 +282,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, if (retset) ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), - errmsg("aggregates may not return sets"), + errmsg("aggregates cannot return sets"), parser_errposition(pstate, location))); } diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index ea18783b01..5a2414d594 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -771,7 +771,7 @@ op_error(ParseState *pstate, List *op, char oprkind, errmsg("operator is not unique: %s", op_signature_string(op, oprkind, arg1, arg2)), errhint("Could not choose a best candidate operator. " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); else ereport(ERROR, @@ -779,7 +779,7 @@ op_error(ParseState *pstate, List *op, char oprkind, errmsg("operator does not exist: %s", op_signature_string(op, oprkind, arg1, arg2)), errhint("No operator matches the given name and argument type(s). " - "You may need to add explicit type casts."), + "You might need to add explicit type casts."), parser_errposition(pstate, location))); } diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index 64aca56ee2..31bf9cbbf0 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -235,11 +235,11 @@ caterr(char *s) strcat(errbuf, "to many errors"); break; case L_ERROR_NOLIB: - strcat(errbuf, "can't load library"); + strcat(errbuf, "cannot load library"); strcat(errbuf, p); break; case L_ERROR_UNDEF: - strcat(errbuf, "can't find symbol"); + strcat(errbuf, "cannot find symbol"); strcat(errbuf, p); break; case L_ERROR_RLDBAD: diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c index 71942fa553..cd0f1cb080 100644 --- a/src/backend/regex/rege_dfa.c +++ b/src/backend/regex/rege_dfa.c @@ -691,7 +691,7 @@ pickss(struct vars * v, /* used only for debug flags */ } /* nobody's old enough?!? -- something's really wrong */ - FDEBUG(("can't find victim to replace!\n")); + FDEBUG(("cannot find victim to replace!\n")); assert(NOTREACHED); ERR(REG_ASSERT); return d->ssets; diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index df082f63f8..cc529029a0 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -349,7 +349,7 @@ DefineQueryRewrite(RuleStmt *stmt) (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("could not convert table \"%s\" to a view because it has triggers", event_obj->relname), - errhint("In particular, the table may not be involved in any foreign key relationships."))); + errhint("In particular, the table cannot be involved in any foreign key relationships."))); if (event_relation->rd_rel->relhasindex) ereport(ERROR, diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 7308c5fbe1..e321e61efa 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -790,7 +790,7 @@ process_matched_tle(TargetEntry *src_tle, } else { - elog(ERROR, "can't happen"); + elog(ERROR, "cannot happen"); newexpr = NULL; } diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index c5d57e7fc7..9c8e3036fc 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -2126,7 +2126,7 @@ AbortBufferIO(void) buf->tag.rnode.spcNode, buf->tag.rnode.dbNode, buf->tag.rnode.relNode), - errdetail("Multiple failures --- write error may be permanent."))); + errdetail("Multiple failures --- write error might be permanent."))); } } TerminateBufferIO(buf, false, BM_IO_ERROR); diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index c78d65fecc..8451085a31 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -581,7 +581,7 @@ LockAcquire(const LOCKTAG *locktag, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } locallock->lock = lock; @@ -647,7 +647,7 @@ LockAcquire(const LOCKTAG *locktag, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } locallock->proclock = proclock; @@ -2272,7 +2272,7 @@ lock_twophase_recover(TransactionId xid, uint16 info, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } /* @@ -2337,7 +2337,7 @@ lock_twophase_recover(TransactionId xid, uint16 info, ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), errmsg("out of shared memory"), - errhint("You may need to increase max_locks_per_transaction."))); + errhint("You might need to increase max_locks_per_transaction."))); } /* diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 11bd4d7abc..84c5f31d35 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -118,7 +118,7 @@ pg_read_file(PG_FUNCTION_ARGS) if (bytes_to_read < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("requested length may not be negative"))); + errmsg("requested length cannot be negative"))); /* not sure why anyone thought that int64 length was a good idea */ if (bytes_to_read > (MaxAllocSize - VARHDRSZ)) diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 3b0afb80a2..5e995aeec9 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -1397,7 +1397,7 @@ generate_series_step_int4(PG_FUNCTION_ARGS) if (step == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("step size may not equal zero"))); + errmsg("step size cannot equal zero"))); /* create a function context for cross-call persistence */ funcctx = SRF_FIRSTCALL_INIT(); diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 46302c7611..e831d99506 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -1209,7 +1209,7 @@ generate_series_step_int8(PG_FUNCTION_ARGS) if (step == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("step size may not equal zero"))); + errmsg("step size cannot equal zero"))); /* create a function context for cross-call persistence */ funcctx = SRF_FIRSTCALL_INIT(); diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index 2b82c4edaf..526be5b237 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -99,7 +99,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS) else { /* second and subsequent calls */ - elog(ERROR, "init_MultiFuncCall may not be called more than once"); + elog(ERROR, "init_MultiFuncCall cannot be called more than once"); /* never reached, but keep compiler happy */ retval = NULL; diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index ec5e538b77..3f588bf965 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -1079,7 +1079,7 @@ ValidatePgVersion(const char *path) path), errdetail("File \"%s\" does not contain valid data.", full_path), - errhint("You may need to initdb."))); + errhint("You might need to initdb."))); FreeFile(file); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 9e8613e481..fd3fb20d8f 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1196,7 +1196,7 @@ static struct config_int ConfigureNamesInt[] = { {"work_mem", PGC_USERSET, RESOURCES_MEM, gettext_noop("Sets the maximum memory to be used for query workspaces."), - gettext_noop("This much memory may be used by each internal " + gettext_noop("This much memory can be used by each internal " "sort operation and hash table before switching to " "temporary disk files."), GUC_UNIT_KB @@ -2120,7 +2120,7 @@ static struct config_string ConfigureNamesString[] = { {"log_directory", PGC_SIGHUP, LOGGING_WHERE, gettext_noop("Sets the destination directory for log files."), - gettext_noop("May be specified as relative to the data directory " + gettext_noop("Can be specified as relative to the data directory " "or as absolute path."), GUC_SUPERUSER_ONLY }, diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 201efb2c30..a0472aa8e9 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -876,7 +876,7 @@ check_encodings_match(int pg_enc, const char *ctype) _("%s: warning: encoding mismatch\n"), progname); fprintf(stderr, _("The encoding you selected (%s) and the encoding that the selected\n" - "locale uses (%s) are not known to match. This may lead to\n" + "locale uses (%s) are not known to match. This might lead to\n" "misbehavior in various character string processing functions. To fix\n" "this situation, rerun %s and either do not specify an encoding\n" "explicitly, or choose a matching combination.\n"), @@ -1052,7 +1052,7 @@ check_input(char *path) else fprintf(stderr, _("%s: could not access file \"%s\": %s\n" - "This may mean you have a corrupted installation or identified\n" + "This might mean you have a corrupted installation or identified\n" "the wrong directory with the invocation option -L.\n"), progname, path, strerror(errno)); exit(1); @@ -2580,7 +2580,7 @@ main(int argc, char *argv[]) if (pwprompt && pwfilename) { - fprintf(stderr, _("%s: password prompt and password file may not be specified together\n"), progname); + fprintf(stderr, _("%s: password prompt and password file cannot be specified together\n"), progname); exit(1); } diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index c0daae03dd..1561e00afd 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -522,7 +522,7 @@ do_start(void) { old_pid = get_pgpid(); if (old_pid != 0) - write_stderr(_("%s: another server may be running; " + write_stderr(_("%s: another server might be running; " "trying to start server anyway\n"), progname); } @@ -1443,7 +1443,7 @@ do_help(void) printf(_(" -c, --core-files not applicable on this platform\n")); #endif printf(_("\nOptions for stop or restart:\n")); - printf(_(" -m SHUTDOWN-MODE may be \"smart\", \"fast\", or \"immediate\"\n")); + printf(_(" -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n")); printf(_("\nShutdown modes are:\n")); printf(_(" smart quit after all clients have disconnected\n")); diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 50dbf011b4..3741b1b3bf 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -2701,7 +2701,7 @@ ReadHead(ArchiveHandle *AH) (unsigned long) AH->intSize); if (AH->intSize > sizeof(int)) - write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations may fail\n"); + write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations might fail\n"); if (AH->version >= K_VERS_1_7) AH->offSize = (*AH->ReadBytePtr) (AH); diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index a003985fe7..cd0fe70caf 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -341,7 +341,7 @@ main(int argc, char *argv[]) if (ControlFile.state != DB_SHUTDOWNED && !force) { printf(_("The database server was not shut down cleanly.\n" - "Resetting the transaction log may cause data to be lost.\n" + "Resetting the transaction log might cause data to be lost.\n" "If you want to proceed anyway, use -f to force reset.\n")); exit(1); } diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index c80bba243c..95aa2c3718 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -755,7 +755,7 @@ checkWin32Codepage(void) if (wincp != concp) { printf(_("Warning: Console code page (%u) differs from Windows code page (%u)\n" - " 8-bit characters may not work correctly. See psql reference\n" + " 8-bit characters might not work correctly. See psql reference\n" " page \"Notes for Windows users\" for details.\n\n"), concp, wincp); } diff --git a/src/include/regex/regerrs.h b/src/include/regex/regerrs.h index aeec9878a4..2e14f9cc69 100644 --- a/src/include/regex/regerrs.h +++ b/src/include/regex/regerrs.h @@ -59,7 +59,7 @@ }, { - REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug" + REG_ASSERT, "REG_ASSERT", "\"cannot happen\" -- you found a bug" }, { diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c index 890aff9b07..1a88adb55c 100644 --- a/src/interfaces/ecpg/preproc/ecpg.c +++ b/src/interfaces/ecpg/preproc/ecpg.c @@ -39,7 +39,7 @@ help(const char *progname) printf(" -c automatically generate C code from embedded SQL code;\n" " currently this works for EXEC SQL TYPE\n"); printf(" -C MODE set compatibility mode;\n" - " MODE may be one of \"INFORMIX\", \"INFORMIX_SE\"\n"); + " MODE can be one of \"INFORMIX\", \"INFORMIX_SE\"\n"); #ifdef YYDEBUG printf(" -d generate parser debug output\n"); #endif @@ -49,7 +49,7 @@ help(const char *progname) printf(" -I DIRECTORY search DIRECTORY for include files\n"); printf(" -o OUTFILE write result to OUTFILE\n"); printf(" -r OPTION specify runtime behaviour;\n" - " OPTION may only be \"no_indicator\"\n"); + " OPTION can only be \"no_indicator\"\n"); printf(" -t turn on autocommit of transactions\n"); printf(" --help show this help, then exit\n"); printf(" --regression run in regression testing mode\n"); diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 7657d61e69..9159ece8fb 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -1673,7 +1673,7 @@ CreateAsStmt: CREATE OptTemp TABLE qualified_name OptCreateAs OptWith OnCommitO SelectStmt { if (FoundInto == 1) - mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE / AS SELECT may not specify INTO"); + mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE / AS SELECT cannot specify INTO"); $$ = cat_str(10, make_str("create"), $2, make_str("table"), $4, $5, $6, $7, $8, make_str("as"), $11); } diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c index 0ce8a25236..6d14771207 100644 --- a/src/interfaces/libpq/win32.c +++ b/src/interfaces/libpq/win32.c @@ -110,7 +110,7 @@ static struct WSErrorEntry WSAEADDRINUSE, "Address already in use" }, { - WSAEADDRNOTAVAIL, "Can't assign requested address" + WSAEADDRNOTAVAIL, "Cannot assign requested address" }, { WSAENETDOWN, "Network is down" @@ -137,10 +137,10 @@ static struct WSErrorEntry WSAENOTCONN, "Socket is not connected" }, { - WSAESHUTDOWN, "Can't send after socket shutdown" + WSAESHUTDOWN, "Cannot send after socket shutdown" }, { - WSAETOOMANYREFS, "Too many references, can't splice" + WSAETOOMANYREFS, "Too many references, cannot splice" }, { WSAETIMEDOUT, "Connection timed out" diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 61923ae0e5..c11f1cecab 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -350,7 +350,7 @@ check_interp(bool trusted) else { elog(ERROR, - "can not allocate second Perl interpreter on this platform"); + "cannot allocate second Perl interpreter on this platform"); } @@ -1538,7 +1538,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger) free(prodesc); ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("trigger functions may only be called " + errmsg("trigger functions can only be called " "as triggers"))); } else diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index 159a64391e..e3276b4fd5 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -478,7 +478,7 @@ decl_aliasitem : T_WORD plpgsql_convert_ident(yytext, &name, 1); if (name[0] != '$') - yyerror("only positional parameters may be aliased"); + yyerror("only positional parameters can be aliased"); plpgsql_ns_setlocal(false); nsi = plpgsql_ns_lookup(name, NULL); diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index 8144bd4b7e..6e4f00bec3 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -521,7 +521,7 @@ do_compile(FunctionCallInfo fcinfo, else if (rettypeid == TRIGGEROID) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("trigger functions may only be called as triggers"))); + errmsg("trigger functions can only be called as triggers"))); else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 898848b982..632eb70e34 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -811,7 +811,7 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc) if (proc->setof == NULL) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("returned object can not be iterated"), + errmsg("returned object cannot be iterated"), errdetail("SETOF must be returned as iterable object"))); } @@ -1191,7 +1191,7 @@ PLy_procedure_create(FunctionCallInfo fcinfo, Oid tgreloid, if (procStruct->prorettype == TRIGGEROID) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("trigger functions may only be called as triggers"))); + errmsg("trigger functions can only be called as triggers"))); else ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -1731,7 +1731,7 @@ PLyMapping_ToTuple(PLyTypeInfo * info, PyObject * mapping) so = PyObject_Str(value); if (so == NULL) - PLy_elog(ERROR, "can't convert mapping type"); + PLy_elog(ERROR, "cannot convert mapping type"); valuestr = PyString_AsString(so); values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc @@ -1820,7 +1820,7 @@ PLySequence_ToTuple(PLyTypeInfo * info, PyObject * sequence) so = PyObject_Str(value); if (so == NULL) - PLy_elog(ERROR, "can't convert sequence type"); + PLy_elog(ERROR, "cannot convert sequence type"); valuestr = PyString_AsString(so); values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc ,valuestr @@ -1891,7 +1891,7 @@ PLyObject_ToTuple(PLyTypeInfo * info, PyObject * object) so = PyObject_Str(value); if (so == NULL) - PLy_elog(ERROR, "can't convert object type"); + PLy_elog(ERROR, "cannot convert object type"); valuestr = PyString_AsString(so); values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc ,valuestr diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 20b059717f..5f54b6a08f 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -1061,7 +1061,7 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid) free(prodesc); ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("trigger functions may only be called as triggers"))); + errmsg("trigger functions can only be called as triggers"))); } else { diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c index 61a414bce3..e71715f89f 100644 --- a/src/test/examples/testlo.c +++ b/src/test/examples/testlo.c @@ -46,7 +46,7 @@ importFile(PGconn *conn, char *filename) fd = open(filename, O_RDONLY, 0666); if (fd < 0) { /* error */ - fprintf(stderr, "can't open unix file\"%s\"\n", filename); + fprintf(stderr, "cannot open unix file\"%s\"\n", filename); } /* @@ -54,7 +54,7 @@ importFile(PGconn *conn, char *filename) */ lobjId = lo_creat(conn, INV_READ | INV_WRITE); if (lobjId == 0) - fprintf(stderr, "can't create large object"); + fprintf(stderr, "cannot create large object"); lobj_fd = lo_open(conn, lobjId, INV_WRITE); @@ -84,7 +84,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len) lobj_fd = lo_open(conn, lobjId, INV_READ); if (lobj_fd < 0) - fprintf(stderr, "can't open large object %u", lobjId); + fprintf(stderr, "cannot open large object %u", lobjId); lo_lseek(conn, lobj_fd, start, SEEK_SET); buf = malloc(len + 1); @@ -115,7 +115,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len) lobj_fd = lo_open(conn, lobjId, INV_WRITE); if (lobj_fd < 0) - fprintf(stderr, "can't open large object %u", lobjId); + fprintf(stderr, "cannot open large object %u", lobjId); lo_lseek(conn, lobj_fd, start, SEEK_SET); buf = malloc(len + 1); @@ -160,7 +160,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename) */ lobj_fd = lo_open(conn, lobjId, INV_READ); if (lobj_fd < 0) - fprintf(stderr, "can't open large object %u", lobjId); + fprintf(stderr, "cannot open large object %u", lobjId); /* * open the file to be written to @@ -168,7 +168,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename) fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666); if (fd < 0) { /* error */ - fprintf(stderr, "can't open unix file\"%s\"", + fprintf(stderr, "cannot open unix file\"%s\"", filename); } diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index 8776cb9073..a1a61f710c 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -1315,7 +1315,7 @@ alter table anothertab alter column atcol1 drop default; alter table anothertab alter column atcol1 type boolean using case when atcol1 % 2 = 0 then true else false end; -- fails ERROR: operator does not exist: boolean <= integer -HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. +HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts. alter table anothertab drop constraint anothertab_chk; alter table anothertab alter column atcol1 type boolean using case when atcol1 % 2 = 0 then true else false end; diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out index 79eed2b7a6..0ef4bffe0b 100644 --- a/src/test/regress/expected/create_view.out +++ b/src/test/regress/expected/create_view.out @@ -78,11 +78,11 @@ CREATE VIEW temp_view_test.v2 AS SELECT * FROM base_table; -- should fail CREATE VIEW temp_view_test.v3_temp AS SELECT * FROM temp_table; NOTICE: view "v3_temp" will be a temporary view -ERROR: temporary tables may not specify a schema name +ERROR: temporary tables cannot specify a schema name -- should fail CREATE SCHEMA test_schema CREATE TEMP VIEW testview AS SELECT 1; -ERROR: temporary tables may not specify a schema name +ERROR: temporary tables cannot specify a schema name -- joins: if any of the join relations are temporary, the view -- should also be temporary -- should be non-temp diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index f307788cf1..e90952cc2f 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection ERROR: operator does not exist: lseg # point LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection ^ -HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. +HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts. -- closest point SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest FROM LSEG_TBL l, POINT_TBL p; diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out index f8cc66492c..fb4f33ed6b 100644 --- a/src/test/regress/expected/horology.out +++ b/src/test/regress/expected/horology.out @@ -306,7 +306,7 @@ SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time ERROR: operator does not exist: date - time with time zone LINE 1: SELECT date '1991-02-03' - time with time zone '04:05:06 UTC... ^ -HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. +HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts. -- -- timestamp, interval arithmetic -- diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index 5404969c60..bcb2ea54ae 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -235,7 +235,7 @@ REVOKE ALL PRIVILEGES ON LANGUAGE sql FROM PUBLIC; GRANT USAGE ON LANGUAGE sql TO regressuser1; -- ok GRANT USAGE ON LANGUAGE c TO PUBLIC; -- fail ERROR: language "c" is not trusted -HINT: Only superusers may use untrusted languages. +HINT: Only superusers can use untrusted languages. SET SESSION AUTHORIZATION regressuser1; GRANT USAGE ON LANGUAGE sql TO regressuser2; -- fail WARNING: no privileges were granted for "sql" diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out index 000d4e36c5..8abc323a70 100644 --- a/src/test/regress/expected/rangefuncs.out +++ b/src/test/regress/expected/rangefuncs.out @@ -19,7 +19,7 @@ INSERT INTO foo2 VALUES(1, 111); CREATE FUNCTION foot(int) returns setof foo2 as 'SELECT * FROM foo2 WHERE fooid = $1;' LANGUAGE SQL; -- supposed to fail with ERROR select * from foo2, foot(foo2.fooid) z where foo2.f2 = z.f2; -ERROR: function expression in FROM may not refer to other relations of same query level +ERROR: function expression in FROM cannot refer to other relations of same query level -- function in subselect select * from foo2 where f2 in (select f2 from foot(foo2.fooid) z where z.fooid = foo2.fooid) ORDER BY 1,2; fooid | f2 diff --git a/src/test/regress/expected/time.out b/src/test/regress/expected/time.out index dce09d0790..6e21828cf7 100644 --- a/src/test/regress/expected/time.out +++ b/src/test/regress/expected/time.out @@ -83,4 +83,4 @@ SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL; ERROR: operator is not unique: time without time zone + time without time zone LINE 1: SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL; ^ -HINT: Could not choose a best candidate operator. You may need to add explicit type casts. +HINT: Could not choose a best candidate operator. You might need to add explicit type casts. diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out index 5fdda250cc..44e8b25b30 100644 --- a/src/test/regress/expected/timetz.out +++ b/src/test/regress/expected/timetz.out @@ -90,4 +90,4 @@ SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TIMETZ_TBL; ERROR: operator does not exist: time with time zone + time with time zone LINE 1: SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TI... ^ -HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. +HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts. diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out index 8d3be84d63..c8fe0522bf 100644 --- a/src/test/regress/expected/transactions.out +++ b/src/test/regress/expected/transactions.out @@ -285,11 +285,11 @@ SELECT a FROM savepoints WHERE a BETWEEN 18 AND 22; DROP TABLE savepoints; -- only in a transaction block: SAVEPOINT one; -ERROR: SAVEPOINT may only be used in transaction blocks +ERROR: SAVEPOINT can only be used in transaction blocks ROLLBACK TO SAVEPOINT one; -ERROR: ROLLBACK TO SAVEPOINT may only be used in transaction blocks +ERROR: ROLLBACK TO SAVEPOINT can only be used in transaction blocks RELEASE SAVEPOINT one; -ERROR: RELEASE SAVEPOINT may only be used in transaction blocks +ERROR: RELEASE SAVEPOINT can only be used in transaction blocks -- Only "rollback to" allowed in aborted state BEGIN; SAVEPOINT one; diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index 1af4d9e289..a7990a5e18 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -241,7 +241,7 @@ select set_ttdummy(1); -- we want to correct some "date" update tttest set price_on = -1 where price_id = 1; -ERROR: ttdummy (tttest): you can't change price_on and/or price_off columns (use set_ttdummy) +ERROR: ttdummy (tttest): you cannot change price_on and/or price_off columns (use set_ttdummy) -- but this doesn't work -- try in this way select set_ttdummy(0); diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index e8aa0111e7..c01fb7c159 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -630,7 +630,7 @@ initialize_environment(void) unsetenv("LC_ALL"); unsetenv("LANG"); unsetenv("LANGUAGE"); - /* On Windows the default locale may not be English, so force it */ + /* On Windows the default locale cannot be English, so force it */ #if defined(WIN32) || defined(__CYGWIN__) putenv("LANG=en"); #endif @@ -1486,7 +1486,7 @@ help(void) printf(_(" --multibyte=ENCODING use ENCODING as the multibyte encoding\n")); printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n")); printf(_(" --schedule=FILE use test ordering schedule from FILE\n")); - printf(_(" (may be used multiple times to concatenate)\n")); + printf(_(" (can be used multiple times to concatenate)\n")); printf(_(" --srcdir=DIR absolute path to source directory (for VPATH builds)\n")); printf(_(" --temp-install=DIR create a temporary installation in DIR\n")); printf(_(" --no-locale use C locale\n")); diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index a1f9286bd8..a4520d34ff 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -483,11 +483,11 @@ ttdummy(PG_FUNCTION_ARGS) if (!CALLED_AS_TRIGGER(fcinfo)) elog(ERROR, "ttdummy: not fired by trigger manager"); if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) - elog(ERROR, "ttdummy: can't process STATEMENT events"); + elog(ERROR, "ttdummy: cannot process STATEMENT events"); if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) elog(ERROR, "ttdummy: must be fired before event"); if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) - elog(ERROR, "ttdummy: can't process INSERT event"); + elog(ERROR, "ttdummy: cannot process INSERT event"); if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event)) newtuple = trigdata->tg_newtuple; @@ -541,7 +541,7 @@ ttdummy(PG_FUNCTION_ARGS) elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]); if (oldon != newon || oldoff != newoff) - elog(ERROR, "ttdummy (%s): you can't change %s and/or %s columns (use set_ttdummy)", + elog(ERROR, "ttdummy (%s): you cannot change %s and/or %s columns (use set_ttdummy)", relname, args[0], args[1]); if (newoff != TTDUMMY_INFINITY) diff --git a/src/test/thread/thread_test.c b/src/test/thread/thread_test.c index 8ce9d34cf7..93dff6d6db 100644 --- a/src/test/thread/thread_test.c +++ b/src/test/thread/thread_test.c @@ -187,7 +187,7 @@ main(int argc, char *argv[]) #if !defined(HAVE_GETADDRINFO) && !defined(HAVE_GETHOSTBYNAME_R) if (gethostname(myhostname, MAXHOSTNAMELEN) != 0) { - fprintf(stderr, "Can not get local hostname **\nexiting\n"); + fprintf(stderr, "Cannot get local hostname **\nexiting\n"); exit(1); } #endif diff --git a/src/timezone/zic.c b/src/timezone/zic.c index cc4fdb6725..08a7d89ce9 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -645,7 +645,7 @@ dolink(const char *fromfile, const char *tofile) const char *e = strerror(errno); (void) fprintf(stderr, - _("%s: Can't link from %s to %s: %s\n"), + _("%s: Cannot link from %s to %s: %s\n"), progname, fromname, toname, e); (void) exit(EXIT_FAILURE); } @@ -831,7 +831,7 @@ infile(const char *name) { const char *e = strerror(errno); - (void) fprintf(stderr, _("%s: Can't open %s: %s\n"), + (void) fprintf(stderr, _("%s: Cannot open %s: %s\n"), progname, name, e); (void) exit(EXIT_FAILURE); } @@ -1566,7 +1566,7 @@ writezone(const char *name) { const char *e = strerror(errno); - (void) fprintf(stderr, _("%s: Can't remove %s: %s\n"), + (void) fprintf(stderr, _("%s: Cannot remove %s: %s\n"), progname, fullname, e); (void) exit(EXIT_FAILURE); } @@ -1578,7 +1578,7 @@ writezone(const char *name) { const char *e = strerror(errno); - (void) fprintf(stderr, _("%s: Can't create %s: %s\n"), + (void) fprintf(stderr, _("%s: Cannot create %s: %s\n"), progname, fullname, e); (void) exit(EXIT_FAILURE); } @@ -1863,7 +1863,7 @@ outzone(const struct zone * zpfirst, int zonecount) (void) strcpy(startbuf, zp->z_format); eat(zp->z_filename, zp->z_linenum); if (*startbuf == '\0') - error(_("can't determine time zone abbreviation to use just after until time")); + error(_("cannot determine time zone abbreviation to use just after until time")); else addtt(starttime, addtype(startoff, startbuf, @@ -2342,7 +2342,7 @@ mkdirs(char *argname) if (errno != EEXIST || !itsdir(name)) { (void) fprintf(stderr, - _("%s: Can't create directory %s: %s\n"), + _("%s: Cannot create directory %s: %s\n"), progname, name, e); ifree(name); return -1; diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c index 71d76d64df..cd0a86a018 100644 --- a/src/tools/entab/entab.c +++ b/src/tools/entab/entab.c @@ -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++; } |