Skip to content

Commit 1b555ce

Browse files
committed
Replace incorrect uses of 'which' with 'that'. (so-called "wicked which")
1 parent 04b3160 commit 1b555ce

24 files changed

+86
-111
lines changed

doc/src/sgml/advanced.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.17 2000/12/18 23:39:37 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.18 2000/12/22 18:57:49 petere Exp $
33
-->
44

55
<chapter id="advanced">
@@ -23,7 +23,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.17 2000/12/18 23:39:37 tg
2323

2424
<para>
2525
Let's create two classes. The capitals class contains
26-
state capitals which are also cities. Naturally, the
26+
state capitals that are also cities. Naturally, the
2727
capitals class should inherit from cities.
2828

2929
<programlisting>

doc/src/sgml/arch-dev.sgml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.11 2000/12/21 22:55:26 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/arch-dev.sgml,v 2.12 2000/12/22 18:57:49 petere Exp $
33
-->
44

55
<chapter id="overview">
@@ -357,7 +357,7 @@ XXX merge in the figures later... - thomas 1999-01-29
357357
the parser as input and steps recursively through it. If
358358
a <literal>SelectStmt</literal> node is found, it is transformed
359359
to a <literal>Query</literal>
360-
node which will be the top most node of the new data structure. Figure
360+
node that will be the top most node of the new data structure. Figure
361361
\ref{transformed} shows the transformed data structure (the part
362362
for the transformed <firstterm>where clause</firstterm> is given in figure
363363
\ref{transformed_where} because there was not enough space to show all
@@ -371,7 +371,7 @@ XXX merge in the figures later... - thomas 1999-01-29
371371
created containing the relation name, the <firstterm>alias name</firstterm> and
372372
the <firstterm>relation id</firstterm>. From now on the relation ids are used to
373373
refer to the <firstterm>relations</firstterm> given in the query. All <abbrev>RTE</abbrev> nodes
374-
are collected in the <firstterm>range table entry list</firstterm> which is connected
374+
are collected in the <firstterm>range table entry list</firstterm> that is connected
375375
to the field <literal>rtable</literal> of the <literal>Query</literal> node. If a name of a
376376
relation that is not known to the system is detected in the query an
377377
error will be returned and the query processing will be aborted.
@@ -668,7 +668,7 @@ current context are performed.
668668
</para>
669669

670670
<para>
671-
The top node of the plan is a <literal>MergeJoin</literal> node which has two
671+
The top node of the plan is a <literal>MergeJoin</literal> node that has two
672672
successors, one attached to the field <literal>lefttree</literal> and the second
673673
attached to the field <literal>righttree</literal>. Each of the subnodes represents
674674
one relation of the join. As mentioned above a merge sort
@@ -861,7 +861,7 @@ the {\it aggregate function} used in the query.
861861

862862
A check is made that every attribute grouped for appears only without
863863
an {\it aggregate function} in the {\it targetlist} and that every
864-
attribute which appears without an {\it aggregate function} in the
864+
attribute that appears without an {\it aggregate function} in the
865865
{\it targetlist} is grouped for.
866866
%
867867

@@ -1050,7 +1050,7 @@ the {\it parser} transform the {\it operator tree} attached to the field
10501050
transformation of the {\it operator tree} for the {\it where clause}. This
10511051
is possible because both trees are built up by the same grammar rules
10521052
of the {\it parser} and are therefore compatible. Additional checks
1053-
which make sure that the {\it having clause} involves at least one
1053+
that make sure that the {\it having clause} involves at least one
10541054
{\it aggregate function} etc. are performed at a later point in time
10551055
in the {\it planner/optimizer} stage. \\
10561056
\\
@@ -1061,7 +1061,7 @@ parts of the affected code are presented instead of the whole
10611061
functions. Every added source line will be marked by a {\tt '+'} at the
10621062
beginning of the line and every changed source line will be marked by
10631063
a {\tt '!'} throughout the following code listings. Whenever a part of
1064-
the code which is not relevant at the moment is skipped, three
1064+
the code that is not relevant at the moment is skipped, three
10651065
vertical dots are inserted instead.
10661066
%
10671067
\pagebreak
@@ -1961,7 +1961,7 @@ node.
19611961

19621962
Unfortunately this is not the only thing to do. Remember from section
19631963
\ref{aggregates} {\it How Aggregate Functions are Implemented} that
1964-
the {\it targetlist} is searched for {\it aggregate functions} which
1964+
the {\it targetlist} is searched for {\it aggregate functions} that
19651965
are appended to a list that will be attached to the field {\tt aggs}
19661966
of the {\tt AGG} node. This was sufficient as long as {\it aggregate
19671967
functions} have only been allowed to appear within the {\it
@@ -3158,7 +3158,7 @@ operators).
31583158
%
31593159
\end{itemize}
31603160
%
3161-
Here is a part of the grammar which is responsible for {\tt select}
3161+
Here is a part of the grammar that is responsible for {\tt select}
31623162
statements having the code building up the data structures inserted:
31633163
%
31643164
\pagebreak

doc/src/sgml/bki.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.4 2000/09/29 20:21:33 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/bki.sgml,v 1.5 2000/12/22 18:57:49 petere Exp $
33

44
Transcribed from the original bki.man.5 documentation
55
- Thomas Lockhart 1998-08-03
@@ -53,7 +53,7 @@ and the <acronym>SQL</acronym> command <command>CREATE DATABASE</command>.
5353

5454
<para>
5555
Commands are composed of a command name followed by space separated
56-
arguments. Arguments to a command which begin with a "$" are
56+
arguments. Arguments to a command that begin with a "$" are
5757
treated specially. If "$$" are the first two characters, then
5858
the first "$" is ignored and the argument is then processed
5959
normally. If the "$" is followed by space, then it is treated

doc/src/sgml/catalogs.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
Documentation of the system catalogs, directed toward PostgreSQL developers
3-
$Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.12 2000/12/11 18:26:37 momjian Exp $
3+
$Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.13 2000/12/22 18:57:49 petere Exp $
44
-->
55

66
<chapter id="catalogs">
@@ -492,7 +492,7 @@
492492
stored in the attribute is the OID of a tuple in the
493493
<structname>pg_proc</structname> catalog. The
494494
<structname>pg_proc</structname> tuple contains the query
495-
string which defines this set - i.e., the query to run to get
495+
string that defines this set - i.e., the query to run to get
496496
the set. So the <structfield>atttypid</structfield> (see
497497
above) refers to the type returned by this query, but the
498498
actual length of this attribute is the length (size) of an

doc/src/sgml/cvs.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.11 2000/12/21 22:55:26 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/cvs.sgml,v 1.12 2000/12/22 18:57:49 petere Exp $
33
CVS code repository
44
Thomas Lockhart
55
-->
@@ -655,7 +655,7 @@ $ which cvsup
655655
</programlisting>
656656

657657
and if you want to build a static binary to move to systems
658-
which may not have Modula-3 installed, try:
658+
that may not have Modula-3 installed, try:
659659

660660
<programlisting>
661661
# make M3FLAGS="-DNOGUI -DSTATIC"

doc/src/sgml/datatype.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.45 2000/12/22 18:00:24 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.46 2000/12/22 18:57:49 petere Exp $
33
-->
44

55
<chapter id="datatype">
@@ -238,7 +238,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.45 2000/12/22 18:00:24 tg
238238
of <acronym>SQL92</acronym> are also supported.
239239
Although we strive for <acronym>SQL92</acronym> compliance,
240240
there are some aspects of the standard
241-
which are ill considered and which should not live through subsequent standards.
241+
that are ill considered and which should not live through subsequent standards.
242242
<productname>Postgres</productname> will not make great efforts to
243243
conform to these features; however, these tend to apply in little-used
244244
or obsure cases, and a typical user is not likely to run into them.
@@ -910,7 +910,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
910910

911911
<para>
912912
This type is defined by SQL92, but the definition exhibits
913-
fundamental deficiencies which renders the type nearly useless. In
913+
fundamental deficiencies that render the type nearly useless. In
914914
most cases, a combination of <type>date</type>,
915915
<type>time</type>, and <type>timestamp</type>
916916
should provide a complete range of date/time functionality
@@ -974,7 +974,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
974974
1999-01-08 04:05:06 -8:00
975975
</programlisting>
976976

977-
is a valid <type>timestamp</type> value, which is <acronym>ISO</acronym>-compliant.
977+
is a valid <type>timestamp</type> value that is <acronym>ISO</acronym>-compliant.
978978
In addition, the wide-spread format
979979

980980
<programlisting>
@@ -1267,7 +1267,7 @@ January 8 04:05:06 1999 PST
12671267

12681268
<para>
12691269
To address these difficulties, we recommend using date/time
1270-
types which contain both date and time when using time zones. We
1270+
types that contain both date and time when using time zones. We
12711271
recommend <emphasis>not</emphasis> using the SQL92 type TIME
12721272
WITH TIME ZONE (though it is supported by
12731273
<productname>Postgres</productname> for legacy applications and
@@ -1574,7 +1574,7 @@ January 8 04:05:06 1999 PST
15741574
<title>Box</title>
15751575

15761576
<para>
1577-
Boxes are represented by pairs of points which are opposite
1577+
Boxes are represented by pairs of points that are opposite
15781578
corners of the box.
15791579
</para>
15801580

doc/src/sgml/docguide.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.29 2000/11/11 13:53:49 petere Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.30 2000/12/22 18:57:49 petere Exp $ -->
22

33
<appendix label="DG2" id="docguide">
44
<title>Documentation</title>
@@ -435,7 +435,7 @@ CATALOG "docbook31/docbook.cat"
435435
<para>
436436
<productname>JadeTeX</productname> does not at the time of
437437
writing come with much of an installation guide, but there is a
438-
<filename>makefile</filename> which shows what is needed. It
438+
<filename>makefile</filename> that shows what is needed. It
439439
also includes a directory <filename>cooked</filename>, wherein
440440
you'll find some of the macro packages it needs, but not all, and
441441
not complete -- at least last we looked.
@@ -824,7 +824,7 @@ exit
824824
Not all documents have figures.
825825
You can grep the <acronym>SGML</acronym> source files for
826826
the string "<literal>graphic</literal>" to identify those parts of the
827-
documentation which may have figures. A few figures are replicated in
827+
documentation that may have figures. A few figures are replicated in
828828
various parts of the documentation.
829829
</para>
830830
</note>
@@ -969,7 +969,7 @@ exit
969969

970970
<step performance="required">
971971
<para>
972-
Lop off the parts of the document which are not needed.
972+
Lop off the parts of the document that are not needed.
973973
</para>
974974

975975
<para>

doc/src/sgml/indices.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<para>
55
Indexes are commonly used to enhance database
66
performance. They should be defined on table columns (or class
7-
attributes) which are used as qualifications in repetitive queries.
7+
attributes) that are used as qualifications in repetitive queries.
88
Inappropriate use will result in slower performance, since update
99
and insertion times are increased in the presence of indices.
1010
</para>
@@ -285,7 +285,7 @@ Subject: Re: [QUESTIONS] PRIMARY KEY | UNIQUE
285285
<para>
286286
Thus, you may query a table by any combination of its columns, despite the
287287
fact that you don't have an index on these columns. The indexes are merely
288-
an implementational aid which each <acronym>RDBMS</acronym> offers
288+
an implementational aid that each <acronym>RDBMS</acronym> offers
289289
you, in order to cause
290290
commonly used queries to be done more efficiently.
291291
Some <acronym>RDBMS</acronym> may give you
@@ -306,14 +306,14 @@ CREATE MEMSTORE ON &lt;table&gt; COLUMNS &lt;cols&gt;
306306
</para>
307307

308308
<para>
309-
So, if you want to use a combination of fields which is not unique as a
309+
So, if you want to use a combination of fields that is not unique as a
310310
secondary key, you really don't have to specify anything - just start
311311
retrieving by that combination! However, if you want to make the retrieval
312312
efficient, you'll have to resort to the means your
313313
<acronym>RDBMS</acronym> provider gives you
314314
- be it an index, my imaginary MEMSTORE command, or an intelligent
315315
<acronym>RDBMS</acronym>
316-
which creates indices without your knowledge based on the fact that you have
316+
that creates indices without your knowledge based on the fact that you have
317317
sent it many queries based on a specific combination of keys... (It learns
318318
from experience).
319319
</para>

doc/src/sgml/installation.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.32 2000/12/20 17:23:39 thomas Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.33 2000/12/22 18:57:49 petere Exp $ -->
22

33
<chapter id="installation">
44
<title><![%flattext-install-include[<productname>PostgreSQL</>]]> Installation Instructions</title>
@@ -204,7 +204,7 @@ su - postgres
204204
</para>
205205

206206
<para>
207-
On systems which have <productname>PostgreSQL</> started at boot time, there is
207+
On systems that have <productname>PostgreSQL</> started at boot time, there is
208208
probably a start-up file that will accomplish the same thing. For
209209
example, on a Red Hat Linux system one might find that
210210
<screen>

doc/src/sgml/jdbc.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.16 2000/12/21 22:55:27 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.17 2000/12/22 18:57:49 petere Exp $
33
-->
44

55
<chapter id="jdbc">
@@ -1299,7 +1299,7 @@ java.lang.Object
12991299
public class PGpath extends PGobject implements Serializable,
13001300
Cloneable
13011301

1302-
This implements a path (a multiple segmented line, which may be
1302+
This implements a path (a multiply segmented line, which may be
13031303
closed)
13041304

13051305
Variables

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy