Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0967057

Browse files
committed
minor copy editing
1 parent b420c47 commit 0967057

11 files changed

+27
-26
lines changed

doc/src/sgml/catalogs.sgml

+2-2
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.13 2000/12/22 18:57:49 petere Exp $
3+
$Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.14 2001/03/24 23:03:26 petere Exp $
44
-->
55

66
<chapter id="catalogs">
@@ -1841,7 +1841,7 @@
18411841
Possible values are:
18421842
<itemizedlist>
18431843
<listitem>
1844-
<para>'c' = CHAR alignment, ie no alignment needed.</para>
1844+
<para>'c' = CHAR alignment, i.e., no alignment needed.</para>
18451845
</listitem>
18461846
<listitem>
18471847
<para>'s' = SHORT alignment (2 bytes on most machines).</para>

doc/src/sgml/datatype.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.51 2001/03/10 21:16:32 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.52 2001/03/24 23:03:26 petere Exp $
33
-->
44

55
<chapter id="datatype">
@@ -397,7 +397,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
397397
<note>
398398
<title>Deprecated</title>
399399
<para>
400-
The <type>money</type> is now deprecated. Use
400+
The <type>money</type> type is deprecated. Use
401401
<type>numeric</type> or <type>decimal</type> instead, in
402402
combination with the <function>to_char</function> function. The
403403
money type may become a locale-aware layer over the

doc/src/sgml/perform.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.2 2001/02/19 00:24:30 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.3 2001/03/24 23:03:26 petere Exp $
33
-->
44

55
<chapter id="performance-tips">
@@ -40,7 +40,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.2 2001/02/19 00:24:30 tgl
4040
<listitem>
4141
<para>
4242
Estimated start-up cost (time expended before output scan can start,
43-
eg, time to do the sorting in a SORT node).
43+
e.g., time to do the sorting in a SORT node).
4444
</para>
4545
</listitem>
4646

doc/src/sgml/protocol.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ The possible response messages from the backend are:
396396
<ListItem>
397397
<Para>
398398
A warning message has been issued in relation to the query.
399-
Notices are in addition to other responses, ie. the backend
399+
Notices are in addition to other responses, i.e., the backend
400400
will continue processing the command.
401401
</Para>
402402
</ListItem>
@@ -489,7 +489,7 @@ The possible response messages from the backend are:
489489
<Para>
490490
A warning message has been issued in relation to the function
491491
call.
492-
Notices are in addition to other responses, ie. the backend
492+
Notices are in addition to other responses, i.e., the backend
493493
will continue processing the command.
494494
</Para>
495495
</ListItem>

doc/src/sgml/queries.sgml

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/queries.sgml,v 1.5 2001/02/15 04:10:54 tgl Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/queries.sgml,v 1.6 2001/03/24 23:03:26 petere Exp $ -->
22

33
<chapter id="queries">
44
<title>Queries</title>
@@ -146,7 +146,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
146146
<listitem>
147147

148148
<synopsis>
149-
<replaceable>T1</replaceable> { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable> ON <replaceable>boolean expression</replaceable>
149+
<replaceable>T1</replaceable> { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable> ON <replaceable>boolean_expression</replaceable>
150150
<replaceable>T1</replaceable> { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable> USING ( <replaceable>join column list</replaceable> )
151151
<replaceable>T1</replaceable> NATURAL { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable>
152152
</synopsis>
@@ -403,9 +403,9 @@ FROM (SELECT * FROM T1) DT1, T2, T3
403403
<para>
404404
The syntax of the WHERE clause is
405405
<synopsis>
406-
WHERE <replaceable>search condition</replaceable>
406+
WHERE <replaceable>search_condition</replaceable>
407407
</synopsis>
408-
where <replaceable>search condition</replaceable> is any value
408+
where <replaceable>search_condition</replaceable> is any value
409409
expression as defined in <xref linkend="sql-expressions"> that
410410
returns a value of type <type>boolean</type>.
411411
</para>
@@ -579,10 +579,11 @@ SELECT pid AS "Products",
579579
<title>Select Lists</title>
580580

581581
<para>
582-
The table expression in the <command>SELECT</command> command
582+
As shown in the previous section,
583+
the table expression in the <command>SELECT</command> command
583584
constructs an intermediate virtual table by possibly combining
584585
tables, views, eliminating rows, grouping, etc. This table is
585-
finally passed on to processing by the select list. The select
586+
finally passed on to processing by the <firstterm>select list</firstterm>. The select
586587
list determines which <emphasis>columns</emphasis> of the
587588
intermediate table are actually output. The simplest kind of select list
588589
is <literal>*</literal> which emits all columns that the table

doc/src/sgml/ref/psql-ref.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.46 2001/02/03 19:09:46 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.47 2001/03/24 23:03:26 petere Exp $
33
Postgres documentation
44
-->
55

@@ -1923,7 +1923,7 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
19231923
Observe the correct number of backslashes (6)! You can resolve it this way: After
19241924
<application>psql</application> has parsed this line, it passes
19251925
<literal>sed -e "s/'/\\\'/g" < my_file.txt</literal> to the shell. The shell
1926-
will do it's own thing inside the double quotes and execute <filename>sed</filename>
1926+
will do its own thing inside the double quotes and execute <filename>sed</filename>
19271927
with the arguments <literal>-e</literal> and <literal>s/'/\\'/g</literal>.
19281928
When <application>sed</application> parses this it will replace the two
19291929
backslashes with a single one and then do the substitution. Perhaps at

doc/src/sgml/ref/select.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.39 2001/03/20 20:54:41 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.40 2001/03/24 23:03:26 petere Exp $
33
Postgres documentation
44
-->
55

@@ -397,7 +397,7 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
397397

398398
<para>
399399
LEFT OUTER JOIN returns all rows in the qualified Cartesian product
400-
(ie, all combined rows that pass its ON condition), plus one copy of each
400+
(i.e., all combined rows that pass its ON condition), plus one copy of each
401401
row in the left-hand table for which there was no right-hand row that
402402
passed the ON condition. This left-hand row is extended to the full
403403
width of the joined table by inserting NULLs for the right-hand columns.

doc/src/sgml/sql.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.19 2001/02/15 04:10:54 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.20 2001/03/24 23:03:26 petere Exp $
33
-->
44

55
<chapter id="sql">
@@ -1410,7 +1410,7 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
14101410

14111411
<para>
14121412
Also observe that it makes no sense to ask for an aggregate of an
1413-
aggregate, eg, AVG(MAX(sno)), because a SELECT only does one pass
1413+
aggregate, e.g., AVG(MAX(sno)), because a SELECT only does one pass
14141414
of grouping and aggregation. You can get a result of this kind by
14151415
using a temporary table or a sub-SELECT in the FROM clause to
14161416
do the first level of aggregation.

doc/src/sgml/xaggr.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/xaggr.sgml,v 1.10 2001/01/13 23:58:55 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/xaggr.sgml,v 1.11 2001/03/24 23:03:26 petere Exp $
33
-->
44

55
<chapter id="xaggr">
@@ -74,7 +74,7 @@ SELECT complex_sum(a) FROM test_complex;
7474
the state variable and then start applying the transition function
7575
at the second non-null input value. <productname>Postgres</productname>
7676
will do that automatically if the initial condition is NULL and
77-
the transition function is marked "strict" (ie, not to be called
77+
the transition function is marked "strict" (i.e., not to be called
7878
for NULL inputs).
7979
</para>
8080

doc/src/sgml/xindex.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/xindex.sgml,v 1.13 2001/01/13 23:58:55 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/xindex.sgml,v 1.14 2001/03/24 23:03:26 petere Exp $
33
Postgres documentation
44
-->
55

@@ -107,7 +107,7 @@ SELECT oid FROM pg_am WHERE amname = 'btree';
107107
impose a strict ordering on keys, lesser to greater. Since
108108
<productname>Postgres</productname> allows the user to define operators,
109109
<productname>Postgres</productname> cannot look at the name of an operator
110-
(eg, "&gt;" or "&lt;") and tell what kind of comparison it is. In fact,
110+
(e.g., "&gt;" or "&lt;") and tell what kind of comparison it is. In fact,
111111
some access methods don't impose any ordering at all. For example,
112112
<acronym>R-tree</acronym>s express a rectangle-containment relationship,
113113
whereas a hashed data structure expresses only bitwise similarity based

doc/src/sgml/y2k.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.9 2001/02/03 19:03:27 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.10 2001/03/24 23:03:26 petere Exp $
33
-->
44

55
<sect1 id="y2k">
@@ -18,7 +18,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.9 2001/02/03 19:03:27 pe
1818
<para>
1919
The <productname>PostgreSQL</productname> Global Development Group provides
2020
the <productname>PostgreSQL</productname> software code tree as a public service,
21-
without warranty and without liability for it's behavior or performance.
21+
without warranty and without liability for its behavior or performance.
2222
However, at the time of writing:
2323
</para>
2424

0 commit comments

Comments
 (0)