Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5f9869d

Browse files
committed
Use "alternative" instead of "alternate" where it is clearer.
1 parente9d7bd2 commit5f9869d

File tree

20 files changed

+37
-37
lines changed

20 files changed

+37
-37
lines changed

‎contrib/dblink/doc/misc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$PostgreSQL: pgsql/contrib/dblink/doc/misc,v 1.4 2006/09/02 21:11:15 joe Exp $
1+
$PostgreSQL: pgsql/contrib/dblink/doc/misc,v 1.5 2007/11/07 12:24:23 petere Exp $
22
==================================================================
33
Name
44

@@ -63,12 +63,12 @@ Name
6363

6464
dblink_build_sql_insert -- builds an insert statement using a local
6565
tuple, replacing the selection key field
66-
values withalternate supplied values
66+
values withalternative supplied values
6767
dblink_build_sql_delete -- builds a delete statement using supplied
6868
values for selection key field values
6969
dblink_build_sql_update -- builds an update statement using a local
7070
tuple, replacing the selection key field
71-
values withalternate supplied values
71+
values withalternative supplied values
7272

7373

7474
Synopsis

‎contrib/tsearch2/docs/tsearch2-guide.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ <h2><a name=casting>Casting Vectors and Queries</a></h2>
701701
Their order was lost,
702702
as was the number of times each lexeme appeared.
703703
You must keep in mind that directly creating vectors with casting
704-
is<i>not</i> analternate means of parsing;
704+
is<i>not</i> analternative means of parsing;
705705
it is a way of directly entering lexemes into a vector<i>without</i> parsing.
706706
<p>
707707
Queries can also be created through casting,

‎doc/src/sgml/datatype.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.214 2007/11/05 16:45:52 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.215 2007/11/07 12:24:23 petere Exp $ -->
22

33
<chapter id="datatype">
44
<title id="datatype-title">Data Types</title>
@@ -1180,7 +1180,7 @@ SELECT b, char_length(b) FROM test2;
11801180
general, to escape an octet, it is converted into the three-digit
11811181
octal number equivalent of its decimal octet value, and preceded
11821182
by two backslashes. <xref linkend="datatype-binary-sqlesc">
1183-
shows the characters that must be escaped, and gives thealternate
1183+
shows the characters that must be escaped, and gives thealternative
11841184
escape sequences where applicable.
11851185
</para>
11861186

‎doc/src/sgml/ecpg.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.83 2007/04/17 17:30:35 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.84 2007/11/07 12:24:23 petere Exp $ -->
22

33
<chapter id="ecpg">
44
<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@@ -1771,7 +1771,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt
17711771
<literal>%Ow</literal>
17721772
<literal>%OW</literal>
17731773
<literal>%Oy</literal>
1774-
are supposed to providealternate representations.
1774+
are supposed to providealternative representations.
17751775
</para>
17761776
<para>
17771777
Additionally <literal>%OB</literal> implemented to represent

‎doc/src/sgml/ref/create_role.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.9 2007/01/31 23:26:03 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_role.sgml,v 1.10 2007/11/07 12:24:23 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -167,7 +167,7 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
167167
privileges, but are not users in the usual sense of the word.
168168
If not specified,
169169
<literal>NOLOGIN</literal> is the default, except when
170-
<command>CREATE ROLE</> is invoked through itsalternate spelling
170+
<command>CREATE ROLE</> is invoked through itsalternative spelling
171171
<command>CREATE USER</>.
172172
</para>
173173
</listitem>

‎doc/src/sgml/ref/create_rule.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.52 2007/11/07 12:24:23 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -39,7 +39,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
3939

4040
<para>
4141
The <productname>PostgreSQL</productname> rule system allows one to
42-
define analternate action to be performed on insertions, updates,
42+
define analternative action to be performed on insertions, updates,
4343
or deletions in database tables. Roughly speaking, a rule causes
4444
additional commands to be executed when a given command on a given
4545
table is executed. Alternatively, an <literal>INSTEAD</literal>

‎src/backend/access/common/heaptuple.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
*
5858
*
5959
* IDENTIFICATION
60-
* $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.117 2007/04/06 04:21:41 tgl Exp $
60+
* $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.118 2007/11/07 12:24:23 petere Exp $
6161
*
6262
*-------------------------------------------------------------------------
6363
*/
@@ -489,7 +489,7 @@ heap_attisnull(HeapTuple tup, int attnum)
489489
*
490490
*This caches attribute offsets in the attribute descriptor.
491491
*
492-
*Analternate way to speed things up would be to cache offsets
492+
*Analternative way to speed things up would be to cache offsets
493493
*with the tuple, but that seems more difficult unless you take
494494
*the storage hit of actually putting those offsets into the
495495
*tuple you send to disk. Yuck.

‎src/backend/access/common/indextuple.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.82 2007/04/06 04:21:41 tgl Exp $
12+
* $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.83 2007/11/07 12:24:24 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -186,7 +186,7 @@ index_form_tuple(TupleDesc tupleDescriptor,
186186
*
187187
*This caches attribute offsets in the attribute descriptor.
188188
*
189-
*Analternate way to speed things up would be to cache offsets
189+
*Analternative way to speed things up would be to cache offsets
190190
*with the tuple, but that seems more difficult unless you take
191191
*the storage hit of actually putting those offsets into the
192192
*tuple you send to disk. Yuck.

‎src/backend/access/heap/heapam.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.243 2007/10/16 17:05:26 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.244 2007/11/07 12:24:24 petere Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1056,7 +1056,7 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode)
10561056
/* ----------------
10571057
*heap_beginscan- begin relation scan
10581058
*
1059-
* heap_beginscan_bm is analternate entry point for setting up a HeapScanDesc
1059+
* heap_beginscan_bm is analternative entry point for setting up a HeapScanDesc
10601060
* for a bitmap heap scan. Although that scan technology is really quite
10611061
* unlike a standard seqscan, there is just enough commonality to make it
10621062
* worth using the same data structure.

‎src/backend/catalog/pg_operator.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.100 2007/01/05 22:19:25 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.101 2007/11/07 12:24:24 petere Exp $
1212
*
1313
* NOTES
1414
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -597,7 +597,7 @@ OperatorCreate(const char *operatorName,
597597
/*
598598
* If a commutator and/or negator link is provided, update the other
599599
* operator(s) to point at this one, if they don't already have a link.
600-
* This supports analternate style of operator definition wherein the
600+
* This supports analternative style of operator definition wherein the
601601
* user first defines one operator without giving negator or commutator,
602602
* then defines the other operator of the pair with the proper commutator
603603
* or negator attribute. That style doesn't require creation of a shell,

‎src/backend/libpq/README.SSL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ that establishes an SSH tunnel when the program is launched:
196196
/usr/bin/ssh -1 -i $IDENTITY -n $HOST 'sleep 60' & \
197197
/usr/bin/psql -h $HOST -p 5555 $1
198198

199-
Alternately, the system could run a daemon that establishes and maintains
199+
Alternatively, the system could run a daemon that establishes and maintains
200200
the tunnel. This is preferrable when multiple users need to establish
201201
similar tunnels to the same remote site.
202202

‎src/backend/libpq/be-secure.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.80 2007/05/18 01:20:16 tgl Exp $
14+
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.81 2007/11/07 12:24:24 petere Exp $
1515
*
1616
* Since the server static private key ($DataDir/server.key)
1717
* will normally be stored unencrypted so that the database
@@ -151,7 +151,7 @@ char *SSLCipherSuites = NULL;
151151
*unsecured connection without fully informing the user.
152152
*Very uncool.
153153
*
154-
*Alternately, the backend could attempt to load these files
154+
*Alternatively, the backend could attempt to load these files
155155
*on startup if SSL is enabled - and refuse to start if any
156156
*do not exist - but this would tend to piss off DBAs.
157157
*

‎src/bin/pg_dump/dumputils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
99
* Portions Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.37 2007/07/10 00:21:31 tgl Exp $
11+
* $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.38 2007/11/07 12:24:24 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -776,7 +776,7 @@ AddAcl(PQExpBuffer aclbuf, const char *keyword)
776776
* schemavar: name of query variable to match against a schema-name pattern.
777777
* Can be NULL if no schema.
778778
* namevar: name of query variable to match against an object-name pattern.
779-
* altnamevar: NULL, or name of analternate variable to match against name.
779+
* altnamevar: NULL, or name of analternative variable to match against name.
780780
* visibilityrule: clause to use if we want to restrict to visible objects
781781
* (for example, "pg_catalog.pg_table_is_visible(p.oid)").Can be NULL.
782782
*

‎src/bin/pg_dump/pg_backup_archiver.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
*
1919
* IDENTIFICATION
20-
*$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.75 2007/02/19 15:05:06 mha Exp $
20+
*$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.76 2007/11/07 12:24:24 petere Exp $
2121
*
2222
*-------------------------------------------------------------------------
2323
*/
@@ -225,7 +225,7 @@ typedef struct _archiveHandle
225225
StartBlobPtrStartBlobPtr;
226226
EndBlobPtrEndBlobPtr;
227227

228-
CustomOutPtrCustomOutPtr;/*Alternate script output routine */
228+
CustomOutPtrCustomOutPtr;/*Alternative script output routine */
229229

230230
/* Stuff for direct DB connection */
231231
char*archdbname;/* DB name *read* from archive */

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1994, Regents of the University of California
77
*
88
*
9-
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.94 2007/10/28 21:55:52 tgl Exp $
9+
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.95 2007/11/07 12:24:24 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -507,7 +507,7 @@ help(void)
507507

508508
printf(_("\nConnection options:\n"));
509509
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
510-
printf(_(" -l, --database=dbname specify analternate default database\n"));
510+
printf(_(" -l, --database=dbname specify analternative default database\n"));
511511
printf(_(" -p, --port=PORT database server port number\n"));
512512
printf(_(" -U, --username=NAME connect as specified database user\n"));
513513
printf(_(" -W, --password force password prompt (should happen automatically)\n"));

‎src/include/access/htup.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/access/htup.h,v 1.94 2007/09/20 17:56:32 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/access/htup.h,v 1.95 2007/11/07 12:24:24 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -406,7 +406,7 @@ do { \
406406

407407

408408
/*
409-
* MinimalTuple is analternate representation that is used for transient
409+
* MinimalTuple is analternative representation that is used for transient
410410
* tuples inside the executor, in places where transaction status information
411411
* is not required, the tuple rowtype is known, and shaving off a few bytes
412412
* is worthwhile because we need to store many tuples.The representation

‎src/include/utils/datetime.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
1010
* Portions Copyright (c) 1994, Regents of the University of California
1111
*
12-
* $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.67 2007/06/12 16:01:31 tgl Exp $
12+
* $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.68 2007/11/07 12:24:24 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -29,7 +29,7 @@
2929
* String definitions for standard time quantities.
3030
*
3131
* These strings are the defaults used to form output time strings.
32-
* Otheralternate forms are hardcoded into token tables in datetime.c.
32+
* Otheralternative forms are hardcoded into token tables in datetime.c.
3333
* ----------------------------------------------------------------
3434
*/
3535

‎src/pl/tcl/pltcl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* pltcl.c- PostgreSQL support for Tcl as
33
* procedural language (PL)
44
*
5-
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.115 2007/10/05 17:06:11 tgl Exp $
5+
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.116 2007/11/07 12:24:24 petere Exp $
66
*
77
**********************************************************************/
88

@@ -505,7 +505,7 @@ pltcl_call_handler(PG_FUNCTION_ARGS)
505505

506506

507507
/*
508-
*Alternate handler for unsafe functions
508+
*Alternative handler for unsafe functions
509509
*/
510510
PG_FUNCTION_INFO_V1(pltclu_call_handler);
511511

‎src/test/regress/expected/timestamptz.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 -0097');
153153
ERROR: time zone displacement out of range: "Feb 16 17:32:01 -0097"
154154
INSERT INTO TIMESTAMPTZ_TBL VALUES ('Feb 16 17:32:01 5097 BC');
155155
ERROR: timestamp out of range: "Feb 16 17:32:01 5097 BC"
156-
--Alternate field order that we've historically supported (sort of)
156+
--Alternative field order that we've historically supported (sort of)
157157
-- with regular and POSIXy timezone specs
158158
SELECT 'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz;
159159
timestamptz

‎src/test/regress/sql/timestamptz.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('Jan 01 17:32:01 2001');
127127
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Feb 16 17:32:01 -0097');
128128
INSERT INTO TIMESTAMPTZ_TBLVALUES ('Feb 16 17:32:01 5097 BC');
129129

130-
--Alternate field order that we've historically supported (sort of)
130+
--Alternative field order that we've historically supported (sort of)
131131
-- with regular and POSIXy timezone specs
132132
SELECT'Wed Jul 11 10:51:14 America/New_York 2001'::timestamptz;
133133
SELECT'Wed Jul 11 10:51:14 GMT-4 2001'::timestamptz;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp