database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

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

Browse Source 
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".
This commit is contained in:
Bruce Momjian
2007-02-01 19:10:30 +00:00
parent baaec74c5a
commit 8b4ff8b6a1
103 changed files with 274 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interfaces/ecpg/preproc/ecpg.c
View 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");

4
src/interfaces/ecpg/preproc/preproc.y
View 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);
}

6
src/interfaces/libpq/win32.c
View 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"