Spell-check and markup police

doc/src/sgml/arch-pg.sgml

@@ -36,7 +36,7 @@
      databases  on  a  single  host.   Such  a collection of
      databases is called a cluster (of databases).   A frontend
      application  that  wishes  to  access  a  given database
-     within a cluster makes calls to an interface library (eg, libpq)
+     within a cluster makes calls to an interface library (e.g., <application>libpq</>)
      that is linked into the application.
      The library sends user requests over the network to the
      <Application>postmaster</Application>
@@ -81,7 +81,7 @@ From that  point  on,  the  frontend process and the backend
 
 <Para>
      You should also be aware that the <Application>postmaster</Application> and
-     postgres  servers  run  with  the  user-id  of the <ProductName>PostgreSQL</ProductName>
+     <application>postgres</>  servers  run  with  the  user ID  of the <ProductName>PostgreSQL</ProductName>
      <quote>superuser</>.
 Note that the <ProductName>PostgreSQL</ProductName> superuser does not
 have  to  be  any particular user (e.g., a user named 

doc/src/sgml/array.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/array.sgml,v 1.18 2001/11/29 21:02:41 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/array.sgml,v 1.19 2002/01/20 22:19:55 petere Exp $ -->
 
 <chapter id="arrays">
  <title>Arrays</title>
@@ -244,7 +244,7 @@ SELECT * FROM sal_emp WHERE pay_by_quarter **= 10000;
    A limitation of the present array implementation is that individual
    elements of an array cannot be SQL NULLs.  The entire array can be set
    to NULL, but you can't have an array with some elements NULL and some
-   not.  Fixing this is on the TODO list.
+   not.  Fixing this is on the to-do list.
   </para>
  </note>
 

doc/src/sgml/charset.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.20 2002/01/08 05:45:19 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.21 2002/01/20 22:19:55 petere Exp $ -->
 
 <chapter id="charset">
  <title>Localization</>
@@ -834,7 +834,7 @@ RESET CLIENT_ENCODING;
     </para>
     <para>
     For 7.2, <option>--enable-unicode-conversion</option> is not necessary.
-    The unicode conversion functionality is automatically enabled
+    The Unicode conversion functionality is automatically enabled
     if <option>--enable-multibyte</option> is specified.
     </para>
    </sect2>
@@ -933,7 +933,7 @@ Mar 23, 1999
 	* Fix problem with MB and locale
 
 Jan 26, 1999
-	* Add support for Big5 for fronend encoding
+	* Add support for Big5 for frontend encoding
 	  (you need to create a database with EUC_TW to use Big5)
 	* Add regression test case for EUC_TW
 	  (contributed by Jonah Kuo <email>jonahkuo@mail.ttn.com.tw</email>)
@@ -959,7 +959,7 @@ Jun 5, 1998
 	  and the frontend
 	* new command SET CLIENT_ENCODING etc. added
 	* add support for LATIN1 character set
-	* enhance 8 bit cleaness
+	* enhance 8-bit cleanliness
 
 April 21, 1998 some enhancements/fixes
 	* character_length(), position(), substring() are now aware of 

doc/src/sgml/client-auth.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.31 2001/12/27 21:37:34 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.32 2002/01/20 22:19:55 petere Exp $
 -->
 
 <chapter id="client-authentication">
@@ -457,10 +457,10 @@ local        all                                          md5  admins
    <para>
     <literal>trust</> authentication is appropriate and very convenient
     for local connections on a single-user workstation.  It is usually
-    <emphasis>not</> appropriate by itself on a multi-user machine.
+    <emphasis>not</> appropriate by itself on a multiuser machine.
-    However, you may be able to use <literal>trust</> even on a multi-user
+    However, you may be able to use <literal>trust</> even on a multiuser
     machine, if you restrict access to the postmaster's socket file using
-    filesystem permissions.  To do this, set the parameter
+    file-system permissions.  To do this, set the parameter
     <varname>unix_socket_permissions</varname> (and possibly
     <varname>unix_socket_group</varname>) in <filename>postgresql.conf</>,
     as described in <xref linkend="runtime-config-general">.  Or you could
@@ -469,7 +469,7 @@ local        all                                          md5  admins
    </para>
 
    <para>
-    Setting filesystem permissions only helps for Unix-socket connections.
+    Setting file-system permissions only helps for Unix-socket connections.
     Local TCP connections are not restricted by it; therefore, if you want
     to use permissions for local security, remove the <literal>host ...
     127.0.0.1 ...</> line from <filename>pg_hba.conf</>, or change it to a

doc/src/sgml/datatype.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.83 2002/01/07 02:29:11 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.84 2002/01/20 22:19:55 petere Exp $
 -->
 
  <chapter id="datatype">
@@ -978,7 +978,7 @@ SELECT b, char_length(b) FROM test2;
      </thead>
      <tbody>
       <row>
-       <entry>bytea</entry>
+       <entry><type>bytea</type></entry>
        <entry>4 bytes plus the actual binary string</entry>
        <entry>Variable (not specifically limited)
               length binary string</entry>

doc/src/sgml/datetime.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.25 2002/01/04 17:02:25 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datetime.sgml,v 2.26 2002/01/20 22:19:55 petere Exp $
 Date/time details
 -->
 
@@ -211,8 +211,8 @@ Date/time details
     The following table of time zones recognized by
     <productname>PostgreSQL</productname> is organized by time
     zone offset from UTC, rather than alphabetically; this is intended
-    to faciliate
+    to facilitate
-    matching local usage with recognized abreviations for cases where
+    matching local usage with recognized abbreviations for cases where
     these might differ.
 
     <table tocentry="1">
@@ -1078,8 +1078,8 @@ Date/time details
   <note>
    <para>
     SQL92 states that
-    <quote>Within the definition of a <sgmltag>datetime literal</sgmltag>,
+    <quote>Within the definition of a <quote>datetime literal</quote>,
-     the <sgmltag>datetime value</sgmltag>s are constrained by the
+     the <quote>datetime value</quote>s are constrained by the
      natural rules for dates and times
      according to the Gregorian calendar</quote>.
     Dates between 1752-09-03 and 1752-09-13, although eliminated in

doc/src/sgml/dfunc.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.19 2002/01/09 00:52:37 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.20 2002/01/20 22:19:55 petere Exp $
 -->
 
 <sect2 id="dfunc">
@@ -26,7 +26,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.19 2002/01/09 00:52:37 peter
 
  <para>
   <indexterm><primary>PIC</></>
-  Creating shared libraries is generally analoguous to linking
+  Creating shared libraries is generally analogous to linking
   executables:  first the source files are compiled into object files,
   then the object files are linked together.  The object files need to
   be created as <firstterm>position-independent code</firstterm>

doc/src/sgml/docguide.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.39 2002/01/08 15:16:16 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/docguide.sgml,v 1.40 2002/01/20 22:19:55 petere Exp $ -->
 
 <appendix id="docguide">
  <title>Documentation</title>
@@ -515,7 +515,7 @@ CATALOG "docbook-dsssl--1.<replaceable>xx</>/catalog
      will need to increase the size of
      <application>TeX</application>'s internal data structures.
      Details on this can be found in the <application>JadeTeX</application>
-     installation insructions.
+     installation instructions.
     </para>
 
     <para>
@@ -738,7 +738,7 @@ gmake man
       styles, in particular the default style. If the document
        contains <sgmltag>REFENTRY</sgmltag> sections, one must also
        replace formatting hints which tie a
-       <emphasis>preceeding</emphasis> paragraph to the current
+       <emphasis>preceding</emphasis> paragraph to the current
        paragraph, and instead tie the current paragraph to the
        following one. A utility, <application>fixrtf</application> is
        available in 
@@ -1124,7 +1124,7 @@ Later stylesheets seem to not need this adjustment - thomas 2001-11-29
      powerful mode for editing <acronym>SGML</acronym> documents.
      When properly configured, it will allow you to use
      <application>Emacs</application> to insert tags and check markup
-     consistancy.  You could use it for <acronym>HTML</acronym> as
+     consistency.  You could use it for <acronym>HTML</acronym> as
      well.  Check the <ulink
      url="http://www.lysator.liu.se/projects/about_psgml.html">PSGML
      web site</ulink> for downloads, installation instructions, and

doc/src/sgml/ecpg.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.35 2002/01/18 21:17:07 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.36 2002/01/20 22:19:55 petere Exp $
 -->
 
  <chapter id="ecpg">
@@ -397,7 +397,7 @@ struct sqlca
        <term><computeroutput>-240 (ECPG_UNKNOWN_DESCRIPTOR): Descriptor %s not found in line %d.</computeroutput></term>
        <listitem>
         <para>
-         The descriptor specified was not foundstatement you are trying to use has not been prepared.
+         The descriptor specified was not found. The statement you are trying to use has not been prepared.
         </para>
        </listitem>
       </varlistentry>
@@ -415,7 +415,7 @@ struct sqlca
        <term><computeroutput>-242 (ECPG_UNKNOWN_DESCRIPTOR_ITEM): Descriptor %s not found in line %d.</computeroutput></term>
        <listitem>
         <para>
-         The descriptor specified was not foundstatement you are trying to use has not been prepared.
+         The descriptor specified was not found. The statement you are trying to use has not been prepared.
         </para>
        </listitem>
       </varlistentry>

doc/src/sgml/func.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.90 2002/01/07 02:29:12 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.91 2002/01/20 22:19:55 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -3925,7 +3925,7 @@ SELECT TIMESTAMP 'now';
    just sequences) are special single-row tables created with
    <command>CREATE SEQUENCE</>.  A sequence object is usually used to
    generate unique identifiers for rows of a table.  The sequence functions
-   provide simple, multi-user-safe methods for obtaining successive
+   provide simple, multiuser-safe methods for obtaining successive
    sequence values from sequence objects.
   </para>
 
@@ -4367,7 +4367,7 @@ SELECT NULLIF(value, '(none)') ...
       <row>
        <entry><function>pg_get_userbyid</>(<parameter>userid</parameter>)</entry>
        <entry><type>name</></entry>
-       <entry>Get user name given sysid</>
+       <entry>Get user name given ID</>
       </row>
      </tbody>
     </tgroup>
@@ -4767,7 +4767,7 @@ OR
 
   <para>
    As usual, NULLs in the expressions or subquery rows are combined per
-   the normal rules of SQL boolean expressions.  Two rows are considered
+   the normal rules of SQL Boolean expressions.  Two rows are considered
    equal if all their corresponding members are non-null and equal; the rows
    are unequal if any corresponding members are non-null and unequal;
    otherwise the result of that row comparison is unknown (NULL).
@@ -4856,7 +4856,7 @@ AND
 
   <para>
    As usual, NULLs in the expressions or subquery rows are combined per
-   the normal rules of SQL boolean expressions.  Two rows are considered
+   the normal rules of SQL Boolean expressions.  Two rows are considered
    equal if all their corresponding members are non-null and equal; the rows
    are unequal if any corresponding members are non-null and unequal;
    otherwise the result of that row comparison is unknown (NULL).
@@ -4875,7 +4875,7 @@ AND
    The right-hand side of this form of <token>ANY</> is a parenthesized
    subquery, which must return exactly one column.  The left-hand expression
    is evaluated and compared to each row of the subquery result using the
-   given <replaceable>operator</replaceable>, which must yield a boolean
+   given <replaceable>operator</replaceable>, which must yield a Boolean
    result.
    The result of <token>ANY</> is TRUE if any true result is obtained.
    The result is FALSE if no true result is found (including the special
@@ -4921,7 +4921,7 @@ AND
 
   <para>
    As usual, NULLs in the expressions or subquery rows are combined per
-   the normal rules of SQL boolean expressions.  Two rows are considered
+   the normal rules of SQL Boolean expressions.  Two rows are considered
    equal if all their corresponding members are non-null and equal; the rows
    are unequal if any corresponding members are non-null and unequal;
    otherwise the result of that row comparison is unknown (NULL).
@@ -4939,7 +4939,7 @@ AND
    The right-hand side of this form of <token>ALL</> is a parenthesized
    subquery, which must return exactly one column.  The left-hand expression
    is evaluated and compared to each row of the subquery result using the
-   given <replaceable>operator</replaceable>, which must yield a boolean
+   given <replaceable>operator</replaceable>, which must yield a Boolean
    result.
    The result of <token>ALL</> is TRUE if all rows yield TRUE
    (including the special case where the subquery returns no rows).
@@ -4984,7 +4984,7 @@ AND
 
   <para>
    As usual, NULLs in the expressions or subquery rows are combined per
-   the normal rules of SQL boolean expressions.  Two rows are considered
+   the normal rules of SQL Boolean expressions.  Two rows are considered
    equal if all their corresponding members are non-null and equal; the rows
    are unequal if any corresponding members are non-null and unequal;
    otherwise the result of that row comparison is unknown (NULL).
@@ -5014,7 +5014,7 @@ AND
 
   <para>
    As usual, NULLs in the expressions or subquery rows are combined per
-   the normal rules of SQL boolean expressions.  Two rows are considered
+   the normal rules of SQL Boolean expressions.  Two rows are considered
    equal if all their corresponding members are non-null and equal; the rows
    are unequal if any corresponding members are non-null and unequal;
    otherwise the result of the row comparison is unknown (NULL).

doc/src/sgml/geqo.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.22 2002/01/08 18:03:26 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/geqo.sgml,v 1.23 2002/01/20 22:19:56 petere Exp $
 Genetic Optimizer
 -->
 
@@ -93,7 +93,7 @@ Genetic Optimizer
     determined, randomized search. The set of possible solutions for the
     optimization problem is considered as a
     <firstterm>population</firstterm> of <firstterm>individuals</firstterm>.
-    The degree of adaption of an individual to its environment is specified
+    The degree of adaptation of an individual to its environment is specified
     by its <firstterm>fitness</firstterm>.
    </para>
 
@@ -147,7 +147,7 @@ Genetic Optimizer
 +=========================================+
 | INITIALIZE P(t)                         |
 +=========================================+
-| evalute FITNESS of P(t)                 |
+| evaluate FITNESS of P(t)                |
 +=========================================+
 | while not STOPPING CRITERION do         |
 |   +-------------------------------------+
@@ -157,7 +157,7 @@ Genetic Optimizer
 |   +-------------------------------------+
 |   | P(t+1) := SELECTION{P''(t) + P(t)}  |
 |   +-------------------------------------+
-|   | evalute FITNESS of P''(t)           |
+|   | evaluate FITNESS of P''(t)          |
 |   +-------------------------------------+
 |   | t := t + 1                          |
 +===+=====================================+
@@ -182,7 +182,7 @@ Genetic Optimizer
 </literallayout>
     is encoded by the integer string '4-1-3-2',
     which means, first join relation '4' and '1', then '3', and
-    then '2', where 1, 2, 3, 4 are relids within the
+    then '2', where 1, 2, 3, 4 are relation IDs within the
     <productname>PostgreSQL</productname> optimizer.
    </para>
 

doc/src/sgml/jdbc.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.34 2001/11/29 05:35:51 barry Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.35 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="jdbc">
@@ -728,7 +728,7 @@ ps.close();
    </para>
 
    <para>
-    Alternativly you could be storing a very large file and want to use
+    Alternatively you could be storing a very large file and want to use
     the <classname>LargeObject</classname> <acronym>API</acronym> to 
     store the file:
 <programlisting>

doc/src/sgml/libpgtcl.sgml

@@ -1194,8 +1194,8 @@ The oid of the large object created.
 <TITLE>Usage
 </TITLE>
 <PARA>
-mode can be any OR'ing together of INV_READ and INV_WRITE. 
+mode can be any or'ing together of <literal>INV_READ</> and <literal>INV_WRITE</>.
-The OR delimiter character is <literal>|</literal>.
+The <quote>or</quote> operator is <literal>|</literal>.
 <ProgramListing>
 [pg_lo_creat $conn "INV_READ|INV_WRITE"]
 </ProgramListing>

doc/src/sgml/lobj.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/lobj.sgml,v 1.25 2002/01/07 02:29:12 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/lobj.sgml,v 1.26 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="largeObjects">
@@ -175,7 +175,7 @@ Oid lo_import(PGconn *<replaceable class="parameter">conn</replaceable>, const c
 <synopsis>
 int lo_export(PGconn *<replaceable class="parameter">conn</replaceable>, Oid <replaceable class="parameter">lobjId</replaceable>, const char *<replaceable class="parameter">filename</replaceable>)
 </synopsis>
-     The <parameter>lobjId</parameter> argument specifies  the  Oid  of  the  large
+     The <parameter>lobjId</parameter> argument specifies  the  OID  of  the  large
      object  to  export  and the <parameter>filename</parameter> argument specifies
      the operating system name name of the file.
     </para>
@@ -189,7 +189,7 @@ int lo_export(PGconn *<replaceable class="parameter">conn</replaceable>, Oid <re
 <synopsis>
 int lo_open(PGconn *conn, Oid lobjId, int mode)
 </synopsis>
-     The <parameter>lobjId</parameter> argument specifies  the  Oid  of  the  large
+     The <parameter>lobjId</parameter> argument specifies  the  OID  of  the  large
      object  to  open.   The  <parameter>mode</parameter>  bits control whether the
      object is opened  for  reading  (<symbol>INV_READ</>),  writing (<symbol>INV_WRITE</symbol>),  or
      both.
@@ -269,7 +269,7 @@ int lo_close(PGconn *conn, int fd)
 <synopsis>
 Oid lo_unlink(PGconn *<replaceable class="parameter">conn</replaceable>, Oid lobjId)
 </synopsis>
-     The <parameter>lobjId</parameter> argument specifies  the  Oid  of  the  large
+     The <parameter>lobjId</parameter> argument specifies  the  OID  of  the  large
      object  to  remove.
     </para>
    </sect2>

doc/src/sgml/maintenance.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.10 2001/11/28 20:49:10 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.11 2002/01/20 22:19:56 petere Exp $
 -->
 
 <chapter id="maintenance">
@@ -377,16 +377,16 @@ VACUUM
    It's a good idea to save the database server's log output somewhere,
    rather than just routing it to <filename>/dev/null</>.  The log output
    is invaluable when it comes time to diagnose problems.  However, the
-   log output tends to be voluminuous (especially at higher debug levels)
+   log output tends to be voluminous (especially at higher debug levels)
    and you won't want to save it indefinitely.  You need to <quote>rotate</>
    the log files so that new log files are started and old ones thrown
    away every so often.
   </para>
 
   <para>
-   If you simply direct the postmaster's stderr into a file, the only way
+   If you simply direct the postmaster's <systemitem>stderr</> into a file, the only way
    to truncate the log file is to stop and restart the postmaster.  This
-   may be okay for development setups but you won't want to run a production
+   may be OK for development setups but you won't want to run a production
    server that way.
   </para>
 
@@ -406,9 +406,9 @@ VACUUM
    On many systems, however, syslog is not very reliable, particularly
    with large log messages; it may truncate or drop messages just when
    you need them the most.  You may find it more useful to pipe the
-   <application>postmaster</>'s stderr to some type of log rotation script.
+   <application>postmaster</>'s <systemitem>stderr</> to some type of log rotation script.
    If you start the postmaster with <application>pg_ctl</>, then the
-   postmaster's stderr is already redirected to stdout, so you just need a
+   postmaster's <systemitem>stderr</> is already redirected to <systemitem>stdout</>, so you just need a
    pipe command:
    
 <screen>

doc/src/sgml/manage.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/manage.sgml,v 1.20 2001/11/21 05:53:41 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/manage.sgml,v 1.21 2002/01/20 22:19:56 petere Exp $
 -->
 
  <Chapter Id="manage">
@@ -94,7 +94,7 @@ ERROR:  CREATE DATABASE: Permission denied.
      <listitem>
       <para>
        Running the <productname>PostgreSQL</productname> interactive
-       terminal program, called <quote>psql</quote>, which allows you
+       terminal program, called <application>psql</application>, which allows you
        to interactively enter, edit, and execute
        <acronym>SQL</acronym> commands.
       </para>

doc/src/sgml/mvcc.sgml

@@ -1,9 +1,9 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.21 2001/11/28 20:49:10 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.22 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="mvcc">
-  <title>Multi-Version Concurrency Control</title>
+  <title>Multiversion Concurrency Control</title>
 
   <indexterm>
    <primary>concurrency</primary>
@@ -11,10 +11,10 @@ $Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.21 2001/11/28 20:49:10 petere
 
   <abstract>
    <para>
-    Multi-Version Concurrency Control
+    Multiversion Concurrency Control
     (MVCC)
     is an advanced technique for improving database performance in a
-    multi-user environment. 
+    multiuser environment. 
     Vadim Mikheev (<email>vadim@krs.ru</email>) provided
     the implementation for <productname>PostgreSQL</productname>.
    </para>

doc/src/sgml/nls.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.2 2001/11/21 05:53:41 thomas Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/nls.sgml,v 1.3 2002/01/20 22:19:56 petere Exp $ -->
 
 <chapter id="nls">
  <docinfo>
@@ -333,7 +333,7 @@ textdomain("<replaceable>progname</replaceable>");
 
    <step>
     <para>
-     Whereever a message that is a candidate for translation is found,
+     Wherever a message that is a candidate for translation is found,
      a call to <function>gettext()</function> needs to be inserted.  E.g.,
 <programlisting>
 fprintf(stderr, "panic level %d\n", lvl);
@@ -473,7 +473,7 @@ printf("number of copied files: %d", n);
      <para>
       If you want to communicate something to the translator, such as
       about how a message is intended to line up with other output,
-      precede the occurance of the string with a comment that starts
+      precede the occurrance of the string with a comment that starts
       with <literal>translator</literal>, e.g.,
 <programlisting>
 /* translator: This message is not what it seems to be. */

doc/src/sgml/perform.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.15 2001/11/28 20:49:10 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.16 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="performance-tips">
@@ -403,7 +403,7 @@ regression=#
   </para>
 
   <table>
-   <title>pg_stats Columns</title>
+   <title><structname>pg_stats</structname> Columns</title>
 
    <tgroup cols=3>
     <thead>
@@ -416,31 +416,31 @@ regression=#
 
     <tbody>
      <row>
-      <entry>tablename</entry>
+      <entry><literal>tablename</literal></entry>
       <entry><type>name</type></entry>
       <entry>Name of table containing column</entry>
      </row>
 
      <row>
-      <entry>attname</entry>
+      <entry><literal>attname</literal></entry>
       <entry><type>name</type></entry>
       <entry>Column described by this row</entry>
      </row>
 
      <row>
-      <entry>null_frac</entry>
+      <entry><literal>null_frac</literal></entry>
       <entry><type>real</type></entry>
       <entry>Fraction of column's entries that are NULL</entry>
      </row>
 
      <row>
-      <entry>avg_width</entry>
+      <entry><literal>avg_width</literal></entry>
       <entry><type>integer</type></entry>
       <entry>Average width in bytes of column's entries</entry>
      </row>
 
      <row>
-      <entry>n_distinct</entry>
+      <entry><literal>n_distinct</literal></entry>
       <entry><type>real</type></entry>
       <entry>If greater than zero, the estimated number of distinct values
       in the column.  If less than zero, the negative of the number of
@@ -454,14 +454,14 @@ regression=#
      </row>
 
      <row>
-      <entry>most_common_vals</entry>
+      <entry><literal>most_common_vals</literal></entry>
       <entry><type>text[]</type></entry>
       <entry>A list of the most common values in the column. (Omitted if
       no values seem to be more common than any others.)</entry>
      </row>
 
      <row>
-      <entry>most_common_freqs</entry>
+      <entry><literal>most_common_freqs</literal></entry>
       <entry><type>real[]</type></entry>
       <entry>A list of the frequencies of the most common values,
       ie, number of occurrences of each divided by total number of rows.

doc/src/sgml/problems.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/problems.sgml,v 2.12 2002/01/07 02:29:13 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/problems.sgml,v 2.13 2002/01/20 22:19:56 petere Exp $
 -->
 
 <sect1 id="bug-reporting">
@@ -265,7 +265,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/problems.sgml,v 2.12 2002/01/07 02:29:13 pe
    backend server process is quite different from crash of the parent
    <quote>postmaster</> process; please don't say <quote>the postmaster
    crashed</> when you mean a single backend went down, nor vice versa.
-   Also, client programs such as the interactive frontend <quote>psql</quote>
+   Also, client programs such as the interactive frontend <quote><application>psql</application></quote>
    are completely separate from the backend.  Please try to be specific
    about whether the problem is on the client or server side.
   </para>
@@ -305,7 +305,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/problems.sgml,v 2.12 2002/01/07 02:29:13 pe
    development of <productname>PostgreSQL</productname> and it would be nice
    if we could keep the bug reports separate. We might choose to take up a
    discussion
-   about your bug report on pgsql-hackers, if the problem needs more review.
+   about your bug report on <literal>pgsql-hackers</literal>, if the problem needs more review.
   </para>
 
   <para>

doc/src/sgml/query.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.24 2002/01/07 02:29:13 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.25 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="tutorial-sql">
@@ -21,7 +21,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.24 2002/01/07 02:29:13 peter
 
    <para>
     In the examples that follow, we assume that you have created a
-    database named <quote>mydb</quote>, as described in the previous
+    database named <literal>mydb</literal>, as described in the previous
     chapter, and have started <application>psql</application>.
    </para>
 
@@ -693,7 +693,7 @@ SELECT city, max(temp_lo)
 
    <para>
     It is important to understand the interaction between aggregates and
-    SQL's <literal>WHERE</literal> and <literal>HAVING</literal> clauses.
+    <acronym>SQL</acronym>'s <literal>WHERE</literal> and <literal>HAVING</literal> clauses.
     The fundamental difference between <literal>WHERE</literal> and
     <literal>HAVING</literal> is this: <literal>WHERE</literal> selects
     input rows before groups and aggregates are computed (thus, it controls

doc/src/sgml/recovery.sgml

@@ -13,7 +13,7 @@
   Database recovery is necessary in the event of hardware or software
   failure. There are several categories of failures; some of these
   require relatively minor adjustments to the database, while others
-  may depend on the existance of previously prepared database dumps
+  may depend on the existence of previously prepared database dumps
   and other recovery data sets. It should be emphasized that if your
   data is important and/or difficult to regenerate, then you should
   have considered and prepared for various failure scenarios.
@@ -44,7 +44,7 @@
    that the database be recovered from a previously prepared database
    dump. This dump must be prepared using
    <application>pg_dumpall</application>, and updates to the database
-   occuring after the database installation was dumped will be lost. 
+   occurring after the database installation was dumped will be lost. 
   </para>
  </sect1>
 

doc/src/sgml/ref/alter_table.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.34 2001/12/08 03:24:33 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.35 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -246,7 +246,7 @@ DROP TABLE temp;
    Usage
   </title>
   <para>
-   To add a column of type VARCHAR to a table:
+   To add a column of type <type>varchar</type> to a table:
    <programlisting>
 ALTER TABLE distributors ADD COLUMN address VARCHAR(30);
    </programlisting>
@@ -288,7 +288,7 @@ ALTER TABLE distributors ADD CONSTRAINT distfk FOREIGN KEY (address) REFERENCES
   </para>
 
   <para> 
-   To add a (multi-column) unique constraint to a table:
+   To add a (multicolumn) unique constraint to a table:
    <programlisting>
 ALTER TABLE distributors ADD CONSTRAINT dist_id_zipcode_key UNIQUE (dist_id, zipcode);
    </programlisting>

doc/src/sgml/ref/analyze.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/analyze.sgml,v 1.5 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/analyze.sgml,v 1.6 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 

doc/src/sgml/ref/close.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/close.sgml,v 1.9 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/close.sgml,v 1.10 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -125,7 +125,7 @@ NOTICE PerformPortalClose: portal "<replaceable class="PARAMETER">cursor</replac
    Usage
   </title>
   <para>
-   Close the cursor liahona:
+   Close the cursor <literal>liahona</literal>:
   </para>
   <programlisting>
 CLOSE liahona;

doc/src/sgml/ref/copy.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.26 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.27 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -74,7 +74,7 @@ COPY [ BINARY ] <replaceable class="parameter">table</replaceable> [ WITH OIDS ]
       <term><replaceable class="parameter">filename</replaceable></term>
       <listitem>
        <para>
-	The absolute Unix pathname of the input or output file.
+	The absolute Unix file name of the input or output file.
        </para>
       </listitem>
      </varlistentry>
@@ -262,8 +262,8 @@ ERROR: <replaceable>reason</replaceable>
     directly by the backend, not by the client application.  Therefore,
     they must reside on or be accessible to the database server machine,
     not the client.  They must be accessible to and readable or writable
-    by the <application>PostgreSQL</application> user (the userid the
+    by the <application>PostgreSQL</application> user (the user ID the
-    backend runs as), not the client.
+    server runs as), not the client.
     <command>COPY</command> naming a file is only allowed to database
     superusers, since it allows writing on any file that the backend has
     privileges to write on.

doc/src/sgml/ref/create_constraint.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.4 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_constraint.sgml,v 1.5 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -67,7 +67,7 @@ CREATE CONSTRAINT TRIGGER <replaceable class="parameter">name</replaceable>
       <term><replaceable class="PARAMETER">constraint</replaceable></term>
       <listitem>
        <para>
-	Actual onstraint specification.
+	Actual constraint specification.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/ref/create_database.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.22 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.23 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -51,7 +51,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
       <term><replaceable class="parameter">dbpath</replaceable></term>
       <listitem>
        <para>
-	An alternate filesystem location in which to store the new database,
+	An alternate file-system location in which to store the new database,
 	specified as a string literal;
 	or <literal>DEFAULT</literal> to use the default location.
        </para>

doc/src/sgml/ref/create_group.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_group.sgml,v 1.6 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_group.sgml,v 1.7 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -110,7 +110,7 @@ where <replaceable class="PARAMETER">option</replaceable> can be:
   </title>
   <para>
    CREATE GROUP will create a new group in the database installation.
-   Refer to the adminstrator's guide for information about using groups
+   Refer to the <citetitle>Administrator's Guide</citetitle> for information about using groups
    for authentication.
    You must be a database superuser to use this command.
   </para>

doc/src/sgml/ref/create_index.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.25 2001/12/08 03:24:34 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.26 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -77,7 +77,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
       <listitem>
        <para>
 	The name of the access method to be used for
-	the index. The default access method is BTREE.
+	the index. The default access method is <literal>BTREE</literal>.
 	<application>PostgreSQL</application> provides four access methods for indexes:
 
 	<variablelist>
@@ -86,7 +86,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
 	  <listitem>
 	   <para>
 	    an implementation of Lehman-Yao
-	    high-concurrency btrees.
+	    high-concurrency B-trees.
 	   </para>
 	  </listitem>
 	 </varlistentry>
@@ -94,7 +94,7 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
 	 <varlistentry>
 	  <term>RTREE</term>
 	  <listitem>
-	   <para>implements standard rtrees using Guttman's
+	   <para>implements standard R-trees using Guttman's
 	    quadratic split algorithm.
 	   </para>
 	  </listitem>
@@ -221,7 +221,7 @@ ERROR: Cannot create index: 'index_name' already exists.
    In the first syntax shown above, the key field(s) for the
    index are specified as column names.
    Multiple fields can be specified if the index access method supports
-   multi-column indexes.
+   multicolumn indexes.
   </para>
 
   <para>
@@ -236,10 +236,10 @@ ERROR: Cannot create index: 'index_name' already exists.
   </para>
 
   <para>
-   <application>PostgreSQL</application> provides btree, rtree, hash, and GiST access methods for
+   <application>PostgreSQL</application> provides B-tree, R-tree, hash, and GiST access methods for
-   indexes.  The btree access method is an implementation of
+   indexes.  The B-tree access method is an implementation of
-   Lehman-Yao high-concurrency btrees.  The rtree access method
+   Lehman-Yao high-concurrency B-trees.  The R-tree access method
-   implements standard rtrees using Guttman's quadratic split algorithm.
+   implements standard R-trees using Guttman's quadratic split algorithm.
    The hash access method is an implementation of Litwin's linear
    hashing.  We mention the algorithms used solely to indicate that all
    of these access methods are fully dynamic and do not have to be
@@ -293,7 +293,7 @@ ERROR: Cannot create index: 'index_name' already exists.
 
    <para>
     The <productname>PostgreSQL</productname>
-    query optimizer will consider using a btree index whenever
+    query optimizer will consider using a B-tree index whenever
     an indexed attribute is involved in a comparison using one of:
 
     <simplelist type="inline">
@@ -307,7 +307,7 @@ ERROR: Cannot create index: 'index_name' already exists.
 
    <para>
     The <productname>PostgreSQL</productname>
-    query optimizer will consider using an rtree index whenever
+    query optimizer will consider using an R-tree index whenever
     an indexed attribute is involved in a comparison using one of:
 
     <simplelist type="inline">
@@ -329,17 +329,17 @@ ERROR: Cannot create index: 'index_name' already exists.
    </para>
 
    <para>
-    Currently, only the btree and gist access methods support multi-column
+    Currently, only the B-tree and gist access methods support multi-column
     indexes. Up to 16 keys may be specified by default (this limit
     can be altered when building
-    <application>PostgreSQL</application>).  Only btree currently supports
+    <application>PostgreSQL</application>).  Only B-tree currently supports
     unique indexes.
    </para>
 
   <para>
    An <firstterm>operator class</firstterm> can be specified for each
    column of an index.  The operator class identifies the operators to
-   be used by the index for that column.  For example, a btree index on
+   be used by the index for that column.  For example, a B-tree index on
    four-byte integers would use the <literal>int4_ops</literal> class;
    this operator class includes comparison functions for four-byte
    integers.  In practice the default operator class for the field's
@@ -355,7 +355,7 @@ ERROR: Cannot create index: 'index_name' already exists.
     <listitem>
      <para>
       The operator classes <literal>box_ops</literal> and
-      <literal>bigbox_ops</literal> both support rtree indexes on the
+      <literal>bigbox_ops</literal> both support R-tree indexes on the
       <literal>box</literal> data type.
       The difference between them is that <literal>bigbox_ops</literal>
       scales box coordinates down, to avoid floating-point exceptions from
@@ -389,7 +389,7 @@ SELECT am.amname AS acc_method,
   <title>
    Usage
   </title>
-  <para>To create a btree index on the field <literal>title</literal>
+  <para>To create a B-tree index on the field <literal>title</literal>
    in the table <literal>films</literal>:
   </para>
   <programlisting>
@@ -402,7 +402,7 @@ CREATE UNIQUE INDEX title_idx
 Is this example correct?
 </comment>
   <para>
-   To create a rtree index on a point attribute so that we
+   To create a R-tree index on a point attribute so that we
    can efficiently use box operators on the result of the
    conversion function:
   </para>

doc/src/sgml/ref/create_operator.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.23 2002/01/07 02:29:15 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.24 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -175,7 +175,7 @@ CREATE
   </para>
   <para>
    The operator <replaceable class="parameter">name</replaceable>
-   is a sequence of up to NAMEDATALEN-1 (31 by default) characters
+   is a sequence of up to <symbol>NAMEDATALEN</>-1 (31 by default) characters
    from the following list:
    <literallayout>
 + - * / &lt; &gt; = ~ ! @ # % ^ &amp; | ` ? $
@@ -186,7 +186,7 @@ CREATE
     <listitem>
      <para>
      <literal>$</literal> cannot be defined as a single-character operator,
-     although it can be part of a multi-character operator name.
+     although it can be part of a multicharacter operator name.
      </para>
     </listitem>
     <listitem>
@@ -197,7 +197,7 @@ CREATE
     </listitem>
     <listitem>
      <para>
-     A multi-character operator name cannot end in <literal>+</literal> or
+     A multicharacter operator name cannot end in <literal>+</literal> or
      <literal>-</literal>,
      unless the name also contains at least one of these characters:
      <literallayout>
@@ -299,7 +299,7 @@ MYBOXES.description !== box '((0,0), (1,1))'
    query  optimizer in performing joins.  
    <productname>PostgreSQL</productname> can always
    evaluate a join (i.e., processing a clause with two  tuple
-   variables separated by an operator that returns a boolean)
+   variables separated by an operator that returns a <type>boolean</type>)
    by iterative substitution [WONG76].  
    In addition, <productname>PostgreSQL</productname>
    can use a hash-join algorithm along

doc/src/sgml/ref/create_sequence.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.23 2001/12/08 03:24:35 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_sequence.sgml,v 1.24 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -265,9 +265,9 @@ SELECT * FROM <replaceable>seqname</replaceable>;
     will be lost when that session ends.  Furthermore, although multiple backends are guaranteed to
     allocate distinct sequence values, the values may be generated out of
     sequence when all the backends are considered.  (For example, with a <replaceable class="parameter">cache</replaceable>
-    setting of 10, backend A might reserve values 1..10 and return nextval=1, 
+    setting of 10, backend A might reserve values 1..10 and return <function>nextval</function>=1, 
     then
-    backend B might reserve values 11..20 and return nextval=11 before backend
+    backend B might reserve values 11..20 and return <function>nextval</function>=11 before backend
     A has generated nextval=2.)  Thus, with a <replaceable class="parameter">cache</replaceable> setting of one it is safe
     to assume that <function>nextval</> values are generated sequentially; with a <replaceable class="parameter">cache</replaceable>
     setting greater than one you should only assume that the <function>nextval</> values

doc/src/sgml/ref/create_table.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.51 2002/01/03 06:26:22 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.52 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -367,7 +367,7 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
       match type.  There are three match types: <literal>MATCH
       FULL</>, <literal>MATCH PARTIAL</>, and a default match type if
       none is specified. <literal>MATCH FULL</> will not allow one
-      column of a multi-column foreign key to be NULL unless all
+      column of a multicolumn foreign key to be NULL unless all
       foreign key columns are NULL. The default match type allows some
       foreign key columns to be NULL while other parts of the foreign
       key are not NULL. <literal>MATCH PARTIAL</> is not yet
@@ -583,7 +583,7 @@ and <replaceable class="PARAMETER">table_constraint</replaceable> is:
     <para>
      Unique constraints and primary keys are not inherited in the
      current implementation.  This makes the combination of
-     inheritance and unique constraints rather disfunctional.
+     inheritance and unique constraints rather dysfunctional.
     </para>
    </listitem>
   </itemizedlist>
@@ -800,7 +800,7 @@ CREATE { GLOBAL | LOCAL } TEMPORARY TABLE <replaceable class="parameter">table</
     The <literal>NULL</> <quote>constraint</quote> (actually a
     non-constraint) is a <productname>PostgreSQL</productname>
     extension to SQL92 that is included for compatibility with some
-    other RDBMSes (and for symmetry with the <literal>NOT
+    other RDBMS (and for symmetry with the <literal>NOT
     NULL</literal> constraint).  Since it is the default for any
     column, its presence is simply noise.
    </para>

doc/src/sgml/ref/create_trigger.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.21 2001/12/08 03:24:35 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.22 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -232,7 +232,7 @@ CREATE TABLE distributors (
        <listitem>
         <para>
          SQL99 allows you to define aliases for the <quote>old</quote>
-         and <quote>new</quote> rows or tables for use in the definiton
+         and <quote>new</quote> rows or tables for use in the definition
          of the triggered action (e.g., <literal>CREATE TRIGGER ... ON
          tablename REFERENCING OLD ROW AS somename NEW ROW AS
          othername ...</literal>).  Since

doc/src/sgml/ref/create_type.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.25 2001/12/08 03:24:35 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.26 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -358,7 +358,7 @@ CREATE
     identical things, and you want to allow the N things to be accessed
     directly by subscripting, in addition to whatever operations you plan
     to provide for the type as a whole.  For example, type <type>name</>
-    allows its constitutent <type>char</>s to be accessed this way.
+    allows its constituent <type>char</>s to be accessed this way.
     A 2-D <type>point</> type could allow its two component floats to be
     accessed like <literal>point[0]</> and <literal>point[1]</>.
     Note that

doc/src/sgml/ref/createdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.23 2001/12/08 03:24:35 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.24 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -238,7 +238,7 @@ PostgreSQL documentation
   <informalexample>
    <para>
     To create the database <literal>demo</literal> using the
-    server on host eden, port 5000, using the
+    server on host <literal>eden</>, port 5000, using the
     <literal>LATIN1</literal> encoding scheme with a look at the
     underlying query:
 <screen>

doc/src/sgml/ref/createuser.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.22 2001/12/08 03:24:35 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.23 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -255,7 +255,7 @@ PostgreSQL documentation
   <informalexample>
    <para>
     To create the same user <literal>joe</literal> using the
-    server on host eden, port 5000, avoiding the prompts and
+    server on host <literal>eden</>, port 5000, avoiding the prompts and
     taking a look at the underlying query:
 <screen>
 <prompt>$ </prompt><userinput>createuser -p 5000 -h eden -D -A -e joe</userinput>

doc/src/sgml/ref/drop_aggregate.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.14 2001/12/08 03:24:35 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_aggregate.sgml,v 1.15 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 

doc/src/sgml/ref/drop_operator.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.12 2001/12/08 03:24:36 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_operator.sgml,v 1.13 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -176,7 +176,7 @@ DROP OPERATOR ^ (int4, int4);
    </programlisting>
   </para>
   <para>
-   Remove left unary negation operator (<literal>! b</literal>) for booleans:
+   Remove left unary negation operator (<literal>! b</literal>) for <type>boolean</type>:
    <programlisting>
 DROP OPERATOR ! (none, bool);
    </programlisting>

doc/src/sgml/ref/drop_type.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.13 2001/12/08 03:24:36 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_type.sgml,v 1.14 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 

doc/src/sgml/ref/drop_user.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.13 2001/12/08 03:24:36 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.14 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 

doc/src/sgml/ref/dropdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.13 2001/12/08 03:24:36 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.14 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -40,7 +40,7 @@ PostgreSQL documentation
 	Specifies the host name of the machine on which the 
 	server
 	is running.  If host begins with a slash, it is used 
-	as the directory for the unix domain socket.
+	as the directory for the Unix domain socket.
        </para>
       </listitem>
      </varlistentry>
@@ -193,7 +193,7 @@ PostgreSQL documentation
   <informalexample>
    <para>
     To destroy the database <literal>demo</literal> using the
-    server on host eden, port 5000, with verification and a peek
+    server on host <literal>eden</literal>, port 5000, with verification and a peek
     at the underlying query:
 <screen>
 <prompt>$ </prompt><userinput>dropdb -p 5000 -h eden -i -e demo</userinput>

doc/src/sgml/ref/dropuser.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.15 2001/12/08 03:24:36 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.16 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -184,7 +184,7 @@ PostgreSQL documentation
   <informalexample>
    <para>
     To remove user <literal>joe</literal> using the postmaster on host
-    eden, port 5000, with verification and a peek at the underlying
+    <literal>eden</literal>, port 5000, with verification and a peek at the underlying
     query:
 <screen>
 <prompt>$ </prompt><userinput>dropuser -p 5000 -h eden -i -e joe</userinput>

doc/src/sgml/ref/ecpg-ref.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.17 2002/01/18 20:32:54 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.18 2002/01/20 22:19:56 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -84,7 +84,7 @@ PostgreSQL documentation
       <term>-o <replaceable>outfile</replaceable></term>
       <listitem>
        <para>
-	Specifies that <application>ecpg</application> should write all its output to outfile.
+	Specifies that <application>ecpg</application> should write all its output to <replaceable>outfile</replaceable>.
 	If no such option is given the output is written to
 	<filename><replaceable>name</replaceable>.c</filename>,
 	assuming the input file was 
@@ -255,7 +255,7 @@ EXEC SQL INCLUDE sqlca;
       The <literal>sqlca</literal> is in lowercase.
       While SQL convention may be 
       followed, i.e., using uppercase to separate embedded SQL 
-      from C statements, sqlca (which includes the <filename>sqlca.h</>
+      from C statements, <literal>sqlca</literal> (which includes the <filename>sqlca.h</>
       header file) <emphasis>must</> be lowercase.  This is because the
       EXEC SQL prefix indicates that this inclusion will be parsed by
       <application>ecpg</application>.
@@ -268,7 +268,7 @@ EXEC SQL INCLUDE sqlca;
     </note>
 
    <para>
-    The sqlprint command is used with the EXEC SQL WHENEVER
+    The <literal>sqlprint</literal> command is used with the <literal>EXEC SQL WHENEVER</literal>
     statement to turn on error handling throughout the 
     program:
 

doc/src/sgml/ref/grant.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/grant.sgml,v 1.18 2002/01/18 01:04:53 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/grant.sgml,v 1.19 2002/01/20 22:19:57 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -216,7 +216,7 @@ GRANT INSERT ON films TO PUBLIC;
   </para>
 
   <para>
-   Grant all privileges to user manuel on view kinds:
+   Grant all privileges to user <literal>manuel</literal> on view <literal>kinds</literal>:
 
 <programlisting>
 GRANT ALL PRIVILEGES ON kinds TO manuel;

doc/src/sgml/ref/load.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/load.sgml,v 1.11 2001/11/18 20:35:02 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/load.sgml,v 1.12 2002/01/20 22:19:57 petere Exp $
 -->
 
 <refentry id="SQL-LOAD">

doc/src/sgml/ref/pg_config-ref.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.8 2001/09/16 16:11:09 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.9 2002/01/20 22:19:57 petere Exp $ -->
 
 <refentry id="app-pgconfig">
  <docinfo>
@@ -50,7 +50,7 @@
    To use <application>pg_config</>, supply one or more of the following options:
    <variablelist>
     <varlistentry>
-     <term>--bindir</>
+     <term><option>--bindir</option></>
      <listitem>
       <para>
        Print the location of user executables. Use this, for example, to find
@@ -61,7 +61,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>--includedir</>
+     <term><option>--includedir</option></>
      <listitem>
       <para>
        Print the location of C and C++ header files of the client interfaces.
@@ -70,7 +70,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>--includedir-server</>
+     <term><option>--includedir-server</option></>
      <listitem>
       <para>
        Print the location of C and C++ header files for server
@@ -80,7 +80,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>--libdir</>
+     <term><option>--libdir</option></>
      <listitem>
       <para>
        Print the location of object code libraries.
@@ -89,7 +89,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>--pkglibdir</>
+     <term><option>--pkglibdir</option></>
      <listitem>
       <para>
        Print the location of dynamically loadable modules, or where
@@ -101,7 +101,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>--configure</>
+     <term><option>--configure</option></>
      <listitem>
       <para>
        Print the options that were given to the <filename>configure</>
@@ -115,7 +115,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term>--version</>
+     <term><option>--version</option></>
      <listitem>
       <para>
        Print the version of <productname>PostgreSQL</> and exit.

doc/src/sgml/ref/select_into.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/select_into.sgml,v 1.15 2001/12/08 03:24:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/select_into.sgml,v 1.16 2002/01/20 22:19:57 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -132,7 +132,7 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
      is functionally equivalent to <command>SELECT INTO</command>.
      <command>CREATE TABLE AS</command> is the recommended syntax, since
      <command>SELECT INTO</command> is not standard.  In fact, this form of
-     <command>SELECT INTO</command> is not available in PL/pgSQL or ecpg,
+     <command>SELECT INTO</command> is not available in <application>PL/pgSQL</application> or <xref linkend="app-ecpg">,
      because they interpret the INTO clause differently.
     </para>
    </note>
@@ -147,7 +147,7 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
    <para>
     SQL92 uses <command>SELECT ... INTO</command> to represent selecting
     values into scalar variables of a host program, rather than creating
-    a new table.  This indeed is the usage found in PL/pgSQL and ecpg.
+    a new table.  This indeed is the usage found in <application>PL/pgSQL</application> and <xref linkend="app-ecpg">.
     The <productname>PostgreSQL</productname> usage of <command>SELECT
     INTO</command> to represent table creation is historical.  It's best
     to use <command>CREATE TABLE AS</command> for this purpose in new code.

doc/src/sgml/ref/set_session_auth.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.3 2001/11/18 20:35:02 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.4 2002/01/20 22:19:57 petere Exp $ -->
 <refentry id="SQL-SET-SESSION-AUTHORIZATION">
  <docinfo>
   <date>2001-04-21</date>
@@ -25,7 +25,7 @@ SET SESSION AUTHORIZATION '<parameter>username</parameter>'
 
   <para>
    This command sets the session user identifier and the current user
-   identifer of the current SQL-session context to be
+   identifier of the current SQL-session context to be
    <parameter>username</parameter>.
   </para>
 
@@ -34,7 +34,7 @@ SET SESSION AUTHORIZATION '<parameter>username</parameter>'
    authenticated) user name provided by the client.  The current user
    identifier is normally equal to the session user identifier, but
    may change temporarily in the context of <quote>setuid</quote>
-   functions and similar mechanisms.  The current user identifer is
+   functions and similar mechanisms.  The current user identifier is
    relevant for permission checking.
   </para>
 

doc/src/sgml/ref/set_transaction.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.7 2001/12/08 03:24:39 thomas Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_transaction.sgml,v 1.8 2002/01/20 22:19:57 petere Exp $ -->
 <refentry id="SQL-SET-TRANSACTION">
  <docinfo>
   <date>2000-11-24</date>
@@ -29,7 +29,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL
    This command sets the transaction isolation level.  The
    <command>SET TRANSACTION</command> command sets the characteristics
    for the current SQL-transaction. It has no effect on any subsequent
-   transactions.  This command cannot be used after the first DML
+   transactions.  This command cannot be used after the first query or data-modification
    statement (<command>SELECT</command>, <command>INSERT</command>,
    <command>DELETE</command>, <command>UPDATE</command>,
    <command>FETCH</command>, <command>COPY</command>) of a transaction
@@ -59,7 +59,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL
      <listitem>
       <para>
        The current transaction can only see rows committed before
-       first DML statement was executed in this transaction.
+       first query or data-modification statement was executed in this transaction.
       </para>
       <tip>
        <para>
@@ -101,7 +101,7 @@ SET default_transaction_isolation = '<replaceable>value</replaceable>'
     <productname>PostgreSQL</productname> does not provide the
     isolation levels <option>READ UNCOMMITTED</option> 
     and <option>REPEATABLE READ</option>. Because
-    of multi-version concurrency control, the serializable level is not
+    of multiversion concurrency control, the serializable level is not
     truly serializable. See the <citetitle>User's Guide</citetitle> for
     details.
    </para>

doc/src/sgml/regress.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/regress.sgml,v 1.24 2002/01/07 02:29:13 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/regress.sgml,v 1.25 2002/01/20 22:19:56 petere Exp $ -->
 
  <chapter id="regress">
   <title id="regress-title">Regression Tests</title>
@@ -86,7 +86,7 @@
   <tip>
    <para>
     The parallel regression test starts quite a few processes under your
-    userid.  Presently, the maximum concurrency is twenty parallel test
+    user ID.  Presently, the maximum concurrency is twenty parallel test
     scripts, which means sixty processes --- there's a backend, a psql,
     and usually a shell parent process for the psql for each test script.
     So if your system enforces a per-user limit on the number of processes,

doc/src/sgml/release.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.112 2002/01/09 00:52:37 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.113 2002/01/20 22:19:56 petere Exp $
 -->
 
 <appendix id="release">
@@ -182,7 +182,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.112 2002/01/09 00:52:37 pe
     <title>Server Operation</title>
 <literallayout>
 Create temporary files in a separate directory (Bruce)
-Delete orphanded temporary files on postmaster startup (Bruce)
+Delete orphaned temporary files on postmaster startup (Bruce)
 Added unique indexes to some system tables (Tom)
 System table operator reorganization (Oleg Bartunov, Teodor Sigaev, Tom)
 Renamed pg_log to pg_clog (Tom)
@@ -268,7 +268,7 @@ New IS UNKNOWN, IS NOT UNKNOWN Boolean tests (Tom)
 New SHARE UPDATE EXCLUSIVE lock mode (Tom)
 New EXPLAIN ANALYZE command that shows run times and row counts (Martijn van Oosterhout)
 Fix problem with LIMIT and subqueries (Tom)
-Fix for LIMIT, DISTINCT ON pushed into subqueryies (Tom)
+Fix for LIMIT, DISTINCT ON pushed into subqueries (Tom)
 Fix nested EXCEPT/INTERSECT (Tom)
 </literallayout>
    </sect3>
@@ -336,7 +336,7 @@ New TIMESTAMP WITHOUT TIMEZONE data type (Thomas)
 Add ISO date/time specification with "T", yyyy-mm-ddThh:mm:ss (Thomas)
 New xid/int comparison functions (Hiroshi)
 Add precision to TIME, TIMESTAMP, and INVERVAL data types (Thomas)
-Modify type coersion logic to attempt binary-compatible functions first (Tom)
+Modify type coercion logic to attempt binary-compatible functions first (Tom)
 New encode() function installed by default (Marko Kreen)
 Improved to_*() conversion functions (Karel Zak)
 Optimize LIKE/ILIKE when using single-byte encodings (Tatsuo)

doc/src/sgml/rules.sgml

@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/rules.sgml,v 1.20 2002/01/07 02:29:13 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/rules.sgml,v 1.21 2002/01/20 22:19:56 petere Exp $ -->
 
 <Chapter Id="rules">
 <Title>The Rule System</Title>
@@ -342,14 +342,14 @@
     integer values. We create that as
 
 <ProgramListing>
-    CREATE FUNCTION min(integer, integer) RETURNS integer AS
+CREATE FUNCTION min(integer, integer) RETURNS integer AS '
-        'BEGIN
+    BEGIN
         IF $1 < $2 THEN
             RETURN $1;
         END IF;
         RETURN $2;
-        END;'
+    END;
-    LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 </ProgramListing>
 </Para>
 
@@ -520,12 +520,12 @@
     rule <literal>_RETshoelace</literal> with the parse tree
 
 <ProgramListing>
-    <FirstTerm>SELECT s.sl_name, s.sl_avail,
+<emphasis>SELECT s.sl_name, s.sl_avail,
        s.sl_color, s.sl_len, s.sl_unit,
        float8mul(s.sl_len, u.un_fact) AS sl_len_cm
   FROM shoelace *OLD*, shoelace *NEW*,
        shoelace_data s, unit u
-     WHERE bpchareq(s.sl_unit, u.un_name);</FirstTerm>
+ WHERE bpchareq(s.sl_unit, u.un_name);</emphasis>
 </ProgramListing>
 
     Note that the parser changed the calculation and qualification into
@@ -534,7 +534,7 @@
 </Para>
 
 <Para>
-    To expand the view, the rewriter simply creates a subselect rangetable
+    To expand the view, the rewriter simply creates a subselect range-table
     entry containing the rule's action parse tree, and substitutes this
     range table entry for the original one that referenced the view.  The 
     resulting rewritten parse tree is almost the same as if Al had typed
@@ -558,7 +558,7 @@
      participate directly in the query, since they aren't referenced by
      the sub-query's join tree or target list.  The rewriter uses them
      to store the access permission check info that was originally present
-     in the rangetable entry that referenced the view.  In this way, the
+     in the range-table entry that referenced the view.  In this way, the
      executor will still check that the user has proper permissions to access
      the view, even though there's no direct use of the view in the rewritten
      query.
@@ -566,8 +566,8 @@
 
 <Para>
     That was the first rule applied.  The rule system will continue checking
-    the remaining rangetable entries in the top query (in this example there
+    the remaining range-table entries in the top query (in this example there
-    are no more), and it will recursively check the rangetable entries in
+    are no more), and it will recursively check the range-table entries in
     the added sub-query to see if any of them reference views.  (But it
     won't expand *OLD* or *NEW* --- otherwise we'd have infinite recursion!)
     In this example, there are no rewrite rules for shoelace_data or unit,
@@ -781,11 +781,11 @@
 
 <Para>
     To resolve this problem, another entry is added to the target list
-    in UPDATE (and also in DELETE) statements: the current tuple ID (ctid).
+    in UPDATE (and also in DELETE) statements: the current tuple ID (CTID).
     This is a system attribute containing the file
     block number and position in the block for the row. Knowing the table,
-    the ctid can be used to retrieve the original t1 row to be updated.
+    the CTID can be used to retrieve the original t1 row to be updated.
-    After adding the ctid to the target list, the query actually looks like
+    After adding the CTID to the target list, the query actually looks like
 
 <ProgramListing>
 SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
@@ -794,8 +794,8 @@
     Now another detail of <ProductName>PostgreSQL</ProductName> enters the
     stage. At this moment, table rows aren't overwritten and this is why
     ABORT TRANSACTION is fast. In an UPDATE, the new result row is inserted
-    into the table (after stripping ctid) and in the tuple header of the row 
+    into the table (after stripping CTID) and in the tuple header of the row 
-    that ctid pointed to the cmax and xmax entries are set to the current
+    that CTID pointed to the cmax and xmax entries are set to the current
     command counter and current transaction ID. Thus the old row is hidden
     and after the transaction committed the vacuum cleaner can really move
     it out.
@@ -1048,13 +1048,13 @@
 <Para>
     The parse trees found in the actions of the <Filename>pg_rewrite</Filename>
     system catalog are only templates. Since they can reference the
-    rangetable entries for NEW and OLD, some substitutions have to be made
+    range-table entries for NEW and OLD, some substitutions have to be made
     before they can be used. For any reference to NEW, the target list of
     the original query is searched for a corresponding entry. If found,
     that entry's expression replaces the reference. Otherwise
     NEW means the same as OLD (for an UPDATE) or is replaced by NULL
     (for an INSERT). Any reference to OLD is replaced by a
-    reference to the rangetable entry which is the resultrelation.
+    reference to the range-table entry which is the result relation.
 </Para>
 
 <Para>
@@ -1115,9 +1115,9 @@
     rule action for update rules).
 
 <ProgramListing>
-    <FirstTerm>UPDATE shoelace_data SET sl_avail = 6
+<emphasis>UPDATE shoelace_data SET sl_avail = 6
   FROM shoelace_data shoelace_data
-     WHERE bpchareq(shoelace_data.sl_name, 'sl7');</FirstTerm>
+ WHERE bpchareq(shoelace_data.sl_name, 'sl7');</emphasis>
 </ProgramListing>
 
     There is a rule <literal>log_shoelace</literal> that is ON UPDATE with the rule
@@ -1138,7 +1138,7 @@
 
     This is a little strange-looking since you can't normally write
     INSERT ... VALUES ... FROM.  The FROM clause here is just to indicate
-    that there are rangetable entries in the parsetree for *NEW* and *OLD*.
+    that there are range-table entries in the parse tree for *NEW* and *OLD*.
     These are needed so that they can be referenced by variables in the
     INSERT command's querytree.
 </Para>
@@ -1154,7 +1154,7 @@
        *NEW*.sl_name, *NEW*.sl_avail,
        current_user, current_timestamp
   FROM shoelace_data *NEW*, shoelace_data *OLD*,
-           <FirstTerm>shoelace_data shoelace_data</FirstTerm>;
+       <emphasis>shoelace_data shoelace_data</emphasis>;
 </ProgramListing>
 
     In step 2 the rule qualification is added to it, so the result set
@@ -1166,7 +1166,7 @@
        current_user, current_timestamp
   FROM shoelace_data *NEW*, shoelace_data *OLD*,
        shoelace_data shoelace_data
-     <FirstTerm>WHERE int4ne(*NEW*.sl_avail, *OLD*.sl_avail)</FirstTerm>;
+ <emphasis>WHERE int4ne(*NEW*.sl_avail, *OLD*.sl_avail)</emphasis>;
 </ProgramListing>
 
     This is even stranger-looking, since INSERT ... VALUES doesn't have
@@ -1185,7 +1185,7 @@
   FROM shoelace_data *NEW*, shoelace_data *OLD*,
        shoelace_data shoelace_data
  WHERE int4ne(*NEW*.sl_avail, *OLD*.sl_avail)
-       <FirstTerm>AND bpchareq(shoelace_data.sl_name, 'sl7')</FirstTerm>;
+   <emphasis>AND bpchareq(shoelace_data.sl_name, 'sl7')</emphasis>;
 </ProgramListing>
 
     Step 4 substitutes NEW references by the target list entries from the
@@ -1194,11 +1194,11 @@
 
 <ProgramListing>
 INSERT INTO shoelace_log VALUES(
-           <FirstTerm>shoelace_data.sl_name</FirstTerm>, <FirstTerm>6</FirstTerm>,
+       <emphasis>shoelace_data.sl_name</emphasis>, <emphasis>6</emphasis>,
        current_user, current_timestamp
   FROM shoelace_data *NEW*, shoelace_data *OLD*,
        shoelace_data shoelace_data
-     WHERE int4ne(<FirstTerm>6</FirstTerm>, *OLD*.sl_avail)
+ WHERE int4ne(<emphasis>6</emphasis>, *OLD*.sl_avail)
    AND bpchareq(shoelace_data.sl_name, 'sl7');
 </ProgramListing>
 
@@ -1210,7 +1210,7 @@
        current_user, current_timestamp
   FROM shoelace_data *NEW*, shoelace_data *OLD*,
        shoelace_data shoelace_data
-     WHERE int4ne(6, <FirstTerm>shoelace_data.sl_avail</FirstTerm>)
+ WHERE int4ne(6, <emphasis>shoelace_data.sl_avail</emphasis>)
    AND bpchareq(shoelace_data.sl_name, 'sl7');
 </ProgramListing>
 
@@ -1246,10 +1246,10 @@
 
 <ProgramListing>
 INSERT INTO shoelace_log VALUES(
-           shoelace_data.sl_name, <FirstTerm>shoelace_data.sl_avail</FirstTerm>,
+       shoelace_data.sl_name, <emphasis>shoelace_data.sl_avail</emphasis>,
        current_user, current_timestamp)
   FROM shoelace_data
-     WHERE <FirstTerm>shoelace_data.sl_avail</FirstTerm> != shoelace_data.sl_avail
+ WHERE <emphasis>shoelace_data.sl_avail</emphasis> != shoelace_data.sl_avail
    AND shoelace_data.sl_name = 'sl7';
 </ProgramListing>
 
@@ -1273,7 +1273,7 @@
        current_user, current_timestamp
   FROM shoelace_data
  WHERE 0 != shoelace_data.sl_avail
-       AND <FirstTerm>shoelace_data.sl_color = 'black'</FirstTerm>;
+   AND <emphasis>shoelace_data.sl_color = 'black'</emphasis>;
 </ProgramListing>
 
     This parse tree will surely insert three new log entries. And
@@ -1534,8 +1534,7 @@
        shoelace_log shoelace_log
  WHERE bpchareq(s.sl_name,  showlace_arrive.arr_name)
    AND bpchareq(shoelace_data.sl_name, s.sl_name);
-       AND int4ne(int4pl(s.sl_avail, shoelace_arrive.arr_quant),
+   AND int4ne(int4pl(s.sl_avail, shoelace_arrive.arr_quant), s.sl_avail);
-                                                    s.sl_avail);
 </ProgramListing>
     
     After that the rule system runs out of rules and returns the 
@@ -1666,7 +1665,7 @@ Merge Join
              WHERE sl_name = shoelace.sl_name);
 </ProgramListing>
 
-    Voil<EFBFBD>:
+    <foreignphrase>Voil<69></foreignphrase>:
 
 <ProgramListing>
 al_bundy=> SELECT * FROM shoelace;

doc/src/sgml/runtime.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.102 2002/01/09 00:52:38 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.103 2002/01/20 22:19:56 petere Exp $
 -->
 
 <Chapter Id="runtime">
@@ -187,7 +187,7 @@ $ <userinput>postmaster -D /usr/local/pgsql/data</userinput>
 <screen>
 $ <userinput>postmaster -D /usr/local/pgsql/data &gt; logfile 2&gt;&amp;1 &amp;</userinput>
 </screen>
-   It is an extremely good idea to keep the server's stdout and stderr
+   It is an extremely good idea to keep the server's <systemitem>stdout</> and <systemitem>stderr</>
    output around somewhere, as suggested here. It will help both for auditing
    purposes and to diagnose problems.
    (See <xref linkend="logfile-maintenance"> for a more thorough discussion
@@ -1208,9 +1208,9 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
 
        <para>
         It should be noted that the performance penalty from doing
-	fsyncs is considerably less in <productname>PostgreSQL</> version
+	<function>fsync</>s is considerably less in <productname>PostgreSQL</> version
 	7.1 than it was in prior releases.  If you previously suppressed
-	fsyncs because of performance problems, you may wish to reconsider
+	<function>fsync</>s because of performance problems, you may wish to reconsider
 	your choice.
        </para>
 
@@ -1263,9 +1263,9 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
 	subprocess.  The default is 1000.  The limit actually used by the code
 	is the smaller of this setting and the result of
 	<literal>sysconf(_SC_OPEN_MAX)</literal>.
-	Therefore, on systems where sysconf returns a reasonable limit,
+	Therefore, on systems where <function>sysconf</> returns a reasonable limit,
 	you don't need to worry about this setting.  But on some platforms
-	(notably, most BSD systems), sysconf returns a value that is much
+	(notably, most BSD systems), <function>sysconf</> returns a value that is much
 	larger than the system can really support when a large number of
 	processes all try to open that many files.  If you find yourself
 	seeing <quote>Too many open files</> failures, try reducing this
@@ -1599,7 +1599,7 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
        <para>
         Time delay between writing a commit record to the WAL buffer and
 	flushing the buffer out to disk, in microseconds.  A nonzero delay
-	allows multiple transactions to be committed with only one fsync,
+	allows multiple transactions to be committed with only one <function>fsync</function> system call,
 	if system load is high enough that additional transactions become
 	ready to commit within the given interval.  But the delay is just
 	wasted time if no other transactions become ready to commit.
@@ -1659,10 +1659,10 @@ dynamic_library_path = '/usr/local/lib/postgresql:/home/my_project/lib:$libdir'
        <para>
         Method used for forcing WAL updates out to disk.  Possible
 	values are
-	<literal>FSYNC</> (call fsync() at each commit),
+	<literal>FSYNC</> (call <function>fsync()</> at each commit),
-	<literal>FDATASYNC</> (call fdatasync() at each commit),
+	<literal>FDATASYNC</> (call <function>fdatasync()</> at each commit),
-	<literal>OPEN_SYNC</> (write WAL files with open() option O_SYNC), or
+	<literal>OPEN_SYNC</> (write WAL files with <function>open()</> option <symbol>O_SYNC</>), or
-	<literal>OPEN_DATASYNC</> (write WAL files with open() option O_DSYNC).
+	<literal>OPEN_DATASYNC</> (write WAL files with <function>open()</> option <symbol>O_DSYNC</>).
 	Not all of these choices are available on all platforms.
         This option can only be set at server start or in the
 	<filename>postgresql.conf</filename> file.

doc/src/sgml/sources.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/sources.sgml,v 2.5 2001/11/21 06:09:45 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/sources.sgml,v 2.6 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="source">
@@ -14,7 +14,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/sources.sgml,v 2.5 2001/11/21 06:09:45 thom
    </para>
 
    <para>
-    For emacs, add the following (or something similar)
+    For Emacs, add the following (or something similar)
     to your <filename>~/.emacs</filename> 
     initialization file:
 

doc/src/sgml/start.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.21 2001/11/28 20:49:10 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.22 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="tutorial-start">
@@ -152,7 +152,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/start.sgml,v 1.21 2001/11/28 20:49:10 peter
 
    <para>
     To create a new database, in this example named
-    <quote>mydb</quote>, you use the following command:
+    <literal>mydb</literal>, you use the following command:
 <screen>
 <prompt>$</prompt> <userinput>createdb mydb</userinput>
 </screen>
@@ -244,7 +244,7 @@ createdb: database creation failed
    <para>
     If you don't want to use your database anymore you can remove it.
     For example, if you are the owner (creator) of the database
-    <quote>mydb</quote>, you can destroy it using the following
+    <literal>mydb</literal>, you can destroy it using the following
     command:
 <screen>
 <prompt>$</prompt> <userinput>dropdb mydb</userinput>
@@ -272,7 +272,7 @@ createdb: database creation failed
      <listitem>
       <para>
        Running the <productname>PostgreSQL</productname> interactive
-       terminal program, called <quote>psql</quote>, which allows you
+       terminal program, called <application><firstterm>psql</></application>, which allows you
        to interactively enter, edit, and execute
        <acronym>SQL</acronym> commands.
       </para>
@@ -300,7 +300,7 @@ createdb: database creation failed
 
     You probably want to start up <command>psql</command>, to try out
     the examples in this tutorial.  It can be activated for the
-    <quote>mydb</quote> database by typing the command:
+    <literal>mydb</literal> database by typing the command:
 <screen>
 <prompt>$</prompt> <userinput>psql mydb</userinput>
 </screen>

doc/src/sgml/syntax.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.57 2002/01/09 23:38:06 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/syntax.sgml,v 1.58 2002/01/20 22:19:56 petere Exp $
 -->
 
 <chapter id="sql-syntax">
@@ -1039,7 +1039,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
     <xref linkend="sql-syntax-constants-generic">.  A cast applied to an
     unadorned string literal represents the initial assignment of a type
     to a literal constant value, and so it will succeed for any type
-    (if the string literal's contents are acceptable input syntax for the
+    (if the contents of the string literal are acceptable input syntax for the
     data type).
    </para>
 

doc/src/sgml/typeconv.sgml

@@ -43,7 +43,7 @@ has an associated data type which determines its behavior and allowed usage.
 <productname>PostgreSQL</productname> has an extensible type system that is
 much more general and flexible than other <acronym>RDBMS</acronym> implementations.
 Hence, most type conversion behavior in <productname>PostgreSQL</productname>
-should be governed by general rules rather than by ad-hoc heuristics, to allow
+should be governed by general rules rather than by <foreignphrase>ad hoc</> heuristics, to allow
 mixed-type expressions to be meaningful even with user-defined types.
 </para>
 
@@ -178,7 +178,7 @@ Implicit conversions should never have surprising or unpredictable outcomes.
 
 <listitem>
 <para>
-User-defined types, of which the parser has no a-priori knowledge, should be
+User-defined types, of which the parser has no <foreignphrase>a priori</> knowledge, should be
 <quote>higher</quote> in the type hierarchy. In mixed-type expressions, native types shall always
 be converted to a user-defined type (of course, only if conversion is necessary).
 </para>

doc/src/sgml/xfunc.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.46 2002/01/07 02:29:14 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/xfunc.sgml,v 1.47 2002/01/20 22:19:56 petere Exp $
 -->
 
  <chapter id="xfunc">
@@ -215,7 +215,7 @@ SELECT one();
     <para>
      Notice that we defined a column alias within the function body for the result of the function
      (with  the  name <literal>RESULT</>),  but this column alias is not visible
-     outside the function.  Hence,  the  result  is labelled <literal>one</>
+     outside the function.  Hence,  the  result  is labeled <literal>one</>
      instead of <literal>RESULT</>.
     </para>