diff --git a/contrib/dblink/doc/misc b/contrib/dblink/doc/misc index 3834afd872..db31e8f153 100644 --- a/contrib/dblink/doc/misc +++ b/contrib/dblink/doc/misc @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/contrib/dblink/doc/misc,v 1.4 2006/09/02 21:11:15 joe Exp $ +$PostgreSQL: pgsql/contrib/dblink/doc/misc,v 1.5 2007/11/07 12:24:23 petere Exp $ ================================================================== Name @@ -63,12 +63,12 @@ Name dblink_build_sql_insert -- builds an insert statement using a local tuple, replacing the selection key field - values with alternate supplied values + values with alternative supplied values dblink_build_sql_delete -- builds a delete statement using supplied values for selection key field values dblink_build_sql_update -- builds an update statement using a local tuple, replacing the selection key field - values with alternate supplied values + values with alternative supplied values Synopsis diff --git a/contrib/tsearch2/docs/tsearch2-guide.html b/contrib/tsearch2/docs/tsearch2-guide.html index d2d764580c..29b7518391 100644 --- a/contrib/tsearch2/docs/tsearch2-guide.html +++ b/contrib/tsearch2/docs/tsearch2-guide.html @@ -701,7 +701,7 @@ simply as a list of lexemes to be included in the vector. Their order was lost, as was the number of times each lexeme appeared. You must keep in mind that directly creating vectors with casting -is not an alternate means of parsing; +is not an alternative means of parsing; it is a way of directly entering lexemes into a vector without parsing.

Queries can also be created through casting, diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index 5f173c907a..9cebbff719 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -1,4 +1,4 @@ - + Data Types @@ -1180,7 +1180,7 @@ SELECT b, char_length(b) FROM test2; general, to escape an octet, it is converted into the three-digit octal number equivalent of its decimal octet value, and preceded by two backslashes. - shows the characters that must be escaped, and gives the alternate + shows the characters that must be escaped, and gives the alternative escape sequences where applicable. diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index d8ebbd46b8..e57b5222d0 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -1,4 +1,4 @@ - + <application>ECPG</application> - Embedded <acronym>SQL</acronym> in C @@ -1771,7 +1771,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt %Ow %OW %Oy - are supposed to provide alternate representations. + are supposed to provide alternative representations. Additionally %OB implemented to represent diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index 1ad27d221c..17c3a5399d 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -1,5 +1,5 @@ @@ -167,7 +167,7 @@ where option can be: privileges, but are not users in the usual sense of the word. If not specified, NOLOGIN is the default, except when - CREATE ROLE is invoked through its alternate spelling + CREATE ROLE is invoked through its alternative spelling CREATE USER. diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml index 6d42196d57..73181f0228 100644 --- a/doc/src/sgml/ref/create_rule.sgml +++ b/doc/src/sgml/ref/create_rule.sgml @@ -1,5 +1,5 @@ @@ -39,7 +39,7 @@ CREATE [ OR REPLACE ] RULE name AS The PostgreSQL rule system allows one to - define an alternate action to be performed on insertions, updates, + define an alternative action to be performed on insertions, updates, or deletions in database tables. Roughly speaking, a rule causes additional commands to be executed when a given command on a given table is executed. Alternatively, an INSTEAD diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index f1a80d6fee..a6dab8da12 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -57,7 +57,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.117 2007/04/06 04:21:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.118 2007/11/07 12:24:23 petere Exp $ * *------------------------------------------------------------------------- */ @@ -489,7 +489,7 @@ heap_attisnull(HeapTuple tup, int attnum) * * This caches attribute offsets in the attribute descriptor. * - * An alternate way to speed things up would be to cache offsets + * An alternative way to speed things up would be to cache offsets * with the tuple, but that seems more difficult unless you take * the storage hit of actually putting those offsets into the * tuple you send to disk. Yuck. diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 471d28c28c..5412ca0cf3 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.82 2007/04/06 04:21:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.83 2007/11/07 12:24:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -186,7 +186,7 @@ index_form_tuple(TupleDesc tupleDescriptor, * * This caches attribute offsets in the attribute descriptor. * - * An alternate way to speed things up would be to cache offsets + * An alternative way to speed things up would be to cache offsets * with the tuple, but that seems more difficult unless you take * the storage hit of actually putting those offsets into the * tuple you send to disk. Yuck. diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 95890a86c4..052393fc6b 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.243 2007/10/16 17:05:26 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.244 2007/11/07 12:24:24 petere Exp $ * * * INTERFACE ROUTINES @@ -1056,7 +1056,7 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode) /* ---------------- * heap_beginscan - begin relation scan * - * heap_beginscan_bm is an alternate entry point for setting up a HeapScanDesc + * heap_beginscan_bm is an alternative entry point for setting up a HeapScanDesc * for a bitmap heap scan. Although that scan technology is really quite * unlike a standard seqscan, there is just enough commonality to make it * worth using the same data structure. diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 10a1285205..55a0cc0839 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.100 2007/01/05 22:19:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.101 2007/11/07 12:24:24 petere Exp $ * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. @@ -597,7 +597,7 @@ OperatorCreate(const char *operatorName, /* * If a commutator and/or negator link is provided, update the other * operator(s) to point at this one, if they don't already have a link. - * This supports an alternate style of operator definition wherein the + * This supports an alternative style of operator definition wherein the * user first defines one operator without giving negator or commutator, * then defines the other operator of the pair with the proper commutator * or negator attribute. That style doesn't require creation of a shell, diff --git a/src/backend/libpq/README.SSL b/src/backend/libpq/README.SSL index 9b00a4f0ff..b45d53c829 100644 --- a/src/backend/libpq/README.SSL +++ b/src/backend/libpq/README.SSL @@ -196,7 +196,7 @@ that establishes an SSH tunnel when the program is launched: /usr/bin/ssh -1 -i $IDENTITY -n $HOST 'sleep 60' & \ /usr/bin/psql -h $HOST -p 5555 $1 -Alternately, the system could run a daemon that establishes and maintains +Alternatively, the system could run a daemon that establishes and maintains the tunnel. This is preferrable when multiple users need to establish similar tunnels to the same remote site. diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index dfff484db8..efb8ecbb77 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.80 2007/05/18 01:20:16 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.81 2007/11/07 12:24:24 petere Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -151,7 +151,7 @@ char *SSLCipherSuites = NULL; * unsecured connection without fully informing the user. * Very uncool. * - * Alternately, the backend could attempt to load these files + * Alternatively, the backend could attempt to load these files * on startup if SSL is enabled - and refuse to start if any * do not exist - but this would tend to piss off DBAs. * diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index 02e3264658..c202338346 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -8,7 +8,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_dump/dumputils.c,v 1.37 2007/07/10 00:21:31 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.38 2007/11/07 12:24:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -776,7 +776,7 @@ AddAcl(PQExpBuffer aclbuf, const char *keyword) * schemavar: name of query variable to match against a schema-name pattern. * Can be NULL if no schema. * namevar: name of query variable to match against an object-name pattern. - * altnamevar: NULL, or name of an alternate variable to match against name. + * altnamevar: NULL, or name of an alternative variable to match against name. * visibilityrule: clause to use if we want to restrict to visible objects * (for example, "pg_catalog.pg_table_is_visible(p.oid)"). Can be NULL. * diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 9e6e06daa8..d8520ec9d6 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.75 2007/02/19 15:05:06 mha Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.76 2007/11/07 12:24:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -225,7 +225,7 @@ typedef struct _archiveHandle StartBlobPtr StartBlobPtr; EndBlobPtr EndBlobPtr; - CustomOutPtr CustomOutPtr; /* Alternate script output routine */ + CustomOutPtr CustomOutPtr; /* Alternative script output routine */ /* Stuff for direct DB connection */ char *archdbname; /* DB name *read* from archive */ diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 319f295228..d38d6ff4d8 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.94 2007/10/28 21:55:52 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.95 2007/11/07 12:24:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -507,7 +507,7 @@ help(void) printf(_("\nConnection options:\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); - printf(_(" -l, --database=dbname specify an alternate default database\n")); + printf(_(" -l, --database=dbname specify an alternative default database\n")); printf(_(" -p, --port=PORT database server port number\n")); printf(_(" -U, --username=NAME connect as specified database user\n")); printf(_(" -W, --password force password prompt (should happen automatically)\n")); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 32a27c972c..e7f46c6384 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -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/include/access/htup.h,v 1.94 2007/09/20 17:56:32 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.95 2007/11/07 12:24:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -406,7 +406,7 @@ do { \ /* - * MinimalTuple is an alternate representation that is used for transient + * MinimalTuple is an alternative representation that is used for transient * tuples inside the executor, in places where transaction status information * is not required, the tuple rowtype is known, and shaving off a few bytes * is worthwhile because we need to store many tuples. The representation diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index 8b17ae8b9e..3a6c6e6906 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.67 2007/06/12 16:01:31 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.68 2007/11/07 12:24:24 petere Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,7 @@ * String definitions for standard time quantities. * * These strings are the defaults used to form output time strings. - * Other alternate forms are hardcoded into token tables in datetime.c. + * Other alternative forms are hardcoded into token tables in datetime.c. * ---------------------------------------------------------------- */ diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 7f2cd54345..675ec9597a 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -2,7 +2,7 @@ * pltcl.c - PostgreSQL support for Tcl as * procedural language (PL) * - * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.115 2007/10/05 17:06:11 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.116 2007/11/07 12:24:24 petere Exp $ * **********************************************************************/ @@ -505,7 +505,7 @@ pltcl_call_handler(PG_FUNCTION_ARGS) /* - * Alternate handler for unsafe functions + * Alternative handler for unsafe functions */ PG_FUNCTION_INFO_V1(pltclu_call_handler); diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out index e6213a5d9b..7c95e53d67 100644 --- a/src/test/regress/expected/timestamptz.out +++ b/src/test/regress/expected/timestamptz.out @@ -153,7 +153,7 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 -0097'); ERROR: time zone displacement out of range: "Feb 16 17:32:01 -0097" INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC'); ERROR: timestamp out of range: "Feb 16 17:32:01 5097 BC" --- Alternate field order that we've historically supported (sort of) +-- Alternative field order that we've historically supported (sort of) -- with regular and POSIXy timezone specs SELECT 'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz; timestamptz diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql index 6cac1a33c7..7ed0963b00 100644 --- a/src/test/regress/sql/timestamptz.sql +++ b/src/test/regress/sql/timestamptz.sql @@ -127,7 +127,7 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Jan 01 17:32:01 2001'); INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 -0097'); INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC'); --- Alternate field order that we've historically supported (sort of) +-- Alternative field order that we've historically supported (sort of) -- with regular and POSIXy timezone specs SELECT 'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz; SELECT 'Wed Jul 11 10:51:14 GMT-4 2001'::timestamptz;