diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 9f449833acde46da7a378a8c839c81f3bf7495fa..c856c792b88f09485d01646ff275762d7ddd3b8d 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -1,6 +1,6 @@
<!--
Documentation of the system catalogs, directed toward PostgreSQL developers
- $Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.13 2000/12/22 18:57:49 petere Exp $
+ $Header: /cvsroot/pgsql/doc/src/sgml/catalogs.sgml,v 2.14 2001/03/24 23:03:26 petere Exp $
-->
<chapter id="catalogs">
@@ -1841,7 +1841,7 @@
Possible values are:
<itemizedlist>
<listitem>
- <para>'c' = CHAR alignment, ie no alignment needed.</para>
+ <para>'c' = CHAR alignment, i.e., no alignment needed.</para>
</listitem>
<listitem>
<para>'s' = SHORT alignment (2 bytes on most machines).</para>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index e4e38f6b44e802a5dac23725e86743378d5670ed..2687a4295f06e53a5af37a3e5c755e37b5d0dc67 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.51 2001/03/10 21:16:32 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.52 2001/03/24 23:03:26 petere Exp $
-->
<chapter id="datatype">
@@ -397,7 +397,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (<replaceabl
<note>
<title>Deprecated</title>
<para>
- The <type>money</type> is now deprecated. Use
+ The <type>money</type> type is deprecated. Use
<type>numeric</type> or <type>decimal</type> instead, in
combination with the <function>to_char</function> function. The
money type may become a locale-aware layer over the
diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index 35ed28875f67b9eda3e9a6cb58b4e779bab2b8f4..77e1c77d8f6056e8aee8501be1f55eb9f6700c92 100644
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.2 2001/02/19 00:24:30 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.3 2001/03/24 23:03:26 petere Exp $
-->
<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
<listitem>
<para>
Estimated start-up cost (time expended before output scan can start,
- eg, time to do the sorting in a SORT node).
+ e.g., time to do the sorting in a SORT node).
</para>
</listitem>
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 5a813ed33939f69a99155305c46cbaf8840baed7..e83cf8cbe8a7b192d093aae960a30c34bbbbcbb3 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -396,7 +396,7 @@ The possible response messages from the backend are:
<ListItem>
<Para>
A warning message has been issued in relation to the query.
- Notices are in addition to other responses, ie. the backend
+ Notices are in addition to other responses, i.e., the backend
will continue processing the command.
</Para>
</ListItem>
@@ -489,7 +489,7 @@ The possible response messages from the backend are:
<Para>
A warning message has been issued in relation to the function
call.
- Notices are in addition to other responses, ie. the backend
+ Notices are in addition to other responses, i.e., the backend
will continue processing the command.
</Para>
</ListItem>
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index 28b356da4d203384af5ed7ec836341cd18d2e0a9..28aeccf96f9e2040596cd5f61fa19a2cb89f8c1a 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/queries.sgml,v 1.5 2001/02/15 04:10:54 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/queries.sgml,v 1.6 2001/03/24 23:03:26 petere Exp $ -->
<chapter id="queries">
<title>Queries</title>
@@ -146,7 +146,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
<listitem>
<synopsis>
-<replaceable>T1</replaceable> { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable> ON <replaceable>boolean expression</replaceable>
+<replaceable>T1</replaceable> { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable> ON <replaceable>boolean_expression</replaceable>
<replaceable>T1</replaceable> { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable> USING ( <replaceable>join column list</replaceable> )
<replaceable>T1</replaceable> NATURAL { <optional>INNER</optional> | { LEFT | RIGHT | FULL } <optional>OUTER</optional> } JOIN <replaceable>T2</replaceable>
</synopsis>
@@ -403,9 +403,9 @@ FROM (SELECT * FROM T1) DT1, T2, T3
<para>
The syntax of the WHERE clause is
<synopsis>
-WHERE <replaceable>search condition</replaceable>
+WHERE <replaceable>search_condition</replaceable>
</synopsis>
- where <replaceable>search condition</replaceable> is any value
+ where <replaceable>search_condition</replaceable> is any value
expression as defined in <xref linkend="sql-expressions"> that
returns a value of type <type>boolean</type>.
</para>
@@ -579,10 +579,11 @@ SELECT pid AS "Products",
<title>Select Lists</title>
<para>
- The table expression in the <command>SELECT</command> command
+ As shown in the previous section,
+ the table expression in the <command>SELECT</command> command
constructs an intermediate virtual table by possibly combining
tables, views, eliminating rows, grouping, etc. This table is
- finally passed on to processing by the select list. The select
+ finally passed on to processing by the <firstterm>select list</firstterm>. The select
list determines which <emphasis>columns</emphasis> of the
intermediate table are actually output. The simplest kind of select list
is <literal>*</literal> which emits all columns that the table
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 0aa9ca47358802d8f77def343717c428b6bd6bbf..85efbf56425b429dfbd32719b8cf62bdb09c1b36 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.46 2001/02/03 19:09:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.47 2001/03/24 23:03:26 petere Exp $
Postgres documentation
-->
@@ -1923,7 +1923,7 @@ testdb=> <userinput>\set content `sed -e "s/'/\\\\\\'/g" < my_file.txt`</userinp
Observe the correct number of backslashes (6)! You can resolve it this way: After
<application>psql</application> has parsed this line, it passes
<literal>sed -e "s/'/\\\'/g" < my_file.txt</literal> to the shell. The shell
- will do it's own thing inside the double quotes and execute <filename>sed</filename>
+ will do its own thing inside the double quotes and execute <filename>sed</filename>
with the arguments <literal>-e</literal> and <literal>s/'/\\'/g</literal>.
When <application>sed</application> parses this it will replace the two
backslashes with a single one and then do the substitution. Perhaps at
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index f971359d8b2cb42dd5fae4731da0092389ea9f0e..d9311c95a07dab9ab3e6e7232156942a7339ae8f 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.39 2001/03/20 20:54:41 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.40 2001/03/24 23:03:26 petere Exp $
Postgres documentation
-->
@@ -397,7 +397,7 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
<para>
LEFT OUTER JOIN returns all rows in the qualified Cartesian product
- (ie, all combined rows that pass its ON condition), plus one copy of each
+ (i.e., all combined rows that pass its ON condition), plus one copy of each
row in the left-hand table for which there was no right-hand row that
passed the ON condition. This left-hand row is extended to the full
width of the joined table by inserting NULLs for the right-hand columns.
diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml
index 7b21d34b8d798dc514b2fc99459d6b6e3d0ed32f..3b57195c877697d4989e0f0842802b8b86aeb9c4 100644
--- a/doc/src/sgml/sql.sgml
+++ b/doc/src/sgml/sql.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.19 2001/02/15 04:10:54 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.20 2001/03/24 23:03:26 petere Exp $
-->
<chapter id="sql">
@@ -1410,7 +1410,7 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
<para>
Also observe that it makes no sense to ask for an aggregate of an
- aggregate, eg, AVG(MAX(sno)), because a SELECT only does one pass
+ aggregate, e.g., AVG(MAX(sno)), because a SELECT only does one pass
of grouping and aggregation. You can get a result of this kind by
using a temporary table or a sub-SELECT in the FROM clause to
do the first level of aggregation.
diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml
index 693cb6defea3d9792c3225329d5675d451cbb71b..cd9cea2fc5453db6cbb421a2ebbe83fff4b4b17b 100644
--- a/doc/src/sgml/xaggr.sgml
+++ b/doc/src/sgml/xaggr.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xaggr.sgml,v 1.10 2001/01/13 23:58:55 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xaggr.sgml,v 1.11 2001/03/24 23:03:26 petere Exp $
-->
<chapter id="xaggr">
@@ -74,7 +74,7 @@ SELECT complex_sum(a) FROM test_complex;
the state variable and then start applying the transition function
at the second non-null input value. <productname>Postgres</productname>
will do that automatically if the initial condition is NULL and
- the transition function is marked "strict" (ie, not to be called
+ the transition function is marked "strict" (i.e., not to be called
for NULL inputs).
</para>
diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml
index f2df6b562421152660b9eed1bbf5e72ce4fbb0e4..dc062710e03cdfbbd52df68acb7f37ba0d4f5633 100644
--- a/doc/src/sgml/xindex.sgml
+++ b/doc/src/sgml/xindex.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xindex.sgml,v 1.13 2001/01/13 23:58:55 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xindex.sgml,v 1.14 2001/03/24 23:03:26 petere Exp $
Postgres documentation
-->
@@ -107,7 +107,7 @@ SELECT oid FROM pg_am WHERE amname = 'btree';
impose a strict ordering on keys, lesser to greater. Since
<productname>Postgres</productname> allows the user to define operators,
<productname>Postgres</productname> cannot look at the name of an operator
- (eg, ">" or "<") and tell what kind of comparison it is. In fact,
+ (e.g., ">" or "<") and tell what kind of comparison it is. In fact,
some access methods don't impose any ordering at all. For example,
<acronym>R-tree</acronym>s express a rectangle-containment relationship,
whereas a hashed data structure expresses only bitwise similarity based
diff --git a/doc/src/sgml/y2k.sgml b/doc/src/sgml/y2k.sgml
index 9d9b7b4a63c45820d557e0102599008aef66c541..330d67abbe5efe561e27de75ed8c701606399e8b 100644
--- a/doc/src/sgml/y2k.sgml
+++ b/doc/src/sgml/y2k.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.9 2001/02/03 19:03:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/y2k.sgml,v 1.10 2001/03/24 23:03:26 petere Exp $
-->
<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
<para>
The <productname>PostgreSQL</productname> Global Development Group provides
the <productname>PostgreSQL</productname> software code tree as a public service,
- without warranty and without liability for it's behavior or performance.
+ without warranty and without liability for its behavior or performance.
However, at the time of writing:
</para>