Add more appropriate markup.

doc/src/sgml/array.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/array.sgml,v 1.21 2002/08/05 19:43:30 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/array.sgml,v 1.22 2002/09/21 18:32:52 petere Exp $ -->
 
 <sect1 id="arrays">
  <title>Arrays</title>
@@ -251,8 +251,8 @@ SELECT * FROM sal_emp WHERE pay_by_quarter **= 10000;
  <note>
   <para>
    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
+   elements of an array cannot be SQL null values.  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 to-do list.
   </para>
  </note>
@@ -267,7 +267,7 @@ SELECT * FROM sal_emp WHERE pay_by_quarter **= 10000;
    around the array value plus delimiter characters between adjacent items.
    The delimiter character is usually a comma (<literal>,</>) but can be
    something else: it is determined by the <literal>typdelim</> setting
-   for the array's element type.  (Among the standard datatypes provided
+   for the array's element type.  (Among the standard data types provided
    in the <productname>PostgreSQL</productname> distribution, type
    <literal>box</> uses a semicolon (<literal>;</>) but all the others
    use comma.)  In a multidimensional array, each dimension (row, plane,
@@ -300,8 +300,8 @@ SELECT * FROM sal_emp WHERE pay_by_quarter **= 10000;
    if they are empty strings or contain curly braces, delimiter characters,
    double quotes, backslashes, or white space.  Double quotes and backslashes
    embedded in element values will be backslash-escaped.  For numeric
-   datatypes it is safe to assume that double quotes will never appear, but
-   for textual datatypes one should be prepared to cope with either presence
+   data types it is safe to assume that double quotes will never appear, but
+   for textual data types one should be prepared to cope with either presence
    or absence of quotes.  (This is a change in behavior from pre-7.2
    <productname>PostgreSQL</productname> releases.)
   </para>

doc/src/sgml/charset.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.28 2002/09/18 20:09:31 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.29 2002/09/21 18:32:52 petere Exp $ -->
 
 <chapter id="charset">
  <title>Localization</>
@@ -405,27 +405,27 @@ perl: warning: Falling back to the standard locale ("C").
 	</row>
 	<row>
 	 <entry><literal>LATIN1</literal></entry>
-	 <entry>ISO 8859-1 ECMA-94 Latin Alphabet No.1</entry>
+	 <entry>ISO 8859-1 <acronym>ECMA</>-94 Latin Alphabet No.1</entry>
 	</row>
 	<row>
 	 <entry><literal>LATIN2</literal></entry>
-	 <entry>ISO 8859-2 ECMA-94 Latin Alphabet No.2</entry>
+	 <entry>ISO 8859-2 <acronym>ECMA</>-94 Latin Alphabet No.2</entry>
 	</row>
 	<row>
 	 <entry><literal>LATIN3</literal></entry>
-	 <entry>ISO 8859-3 ECMA-94 Latin Alphabet No.3</entry>
+	 <entry>ISO 8859-3 <acronym>ECMA</>-94 Latin Alphabet No.3</entry>
 	</row>
 	<row>
 	 <entry><literal>LATIN4</literal></entry>
-	 <entry>ISO 8859-4 ECMA-94 Latin Alphabet No.4</entry>
+	 <entry>ISO 8859-4 <acronym>ECMA</>-94 Latin Alphabet No.4</entry>
 	</row>
 	<row>
 	 <entry><literal>LATIN5</literal></entry>
-	 <entry>ISO 8859-9 ECMA-128 Latin Alphabet No.5</entry>
+	 <entry>ISO 8859-9 <acronym>ECMA</>-128 Latin Alphabet No.5</entry>
 	</row>
 	<row>
 	 <entry><literal>LATIN6</literal></entry>
-	 <entry>ISO 8859-10 ECMA-144 Latin Alphabet No.6</entry>
+	 <entry>ISO 8859-10 <acronym>ECMA</>-144 Latin Alphabet No.6</entry>
 	</row>
 	<row>
 	 <entry><literal>LATIN7</literal></entry>
@@ -441,23 +441,23 @@ perl: warning: Falling back to the standard locale ("C").
 	</row>
 	<row>
 	 <entry><literal>LATIN10</literal></entry>
-	 <entry>ISO 8859-16 ASRO SR 14111 Latin Alphabet No.10</entry>
+	 <entry>ISO 8859-16 <acronym>ASRO</> SR 14111 Latin Alphabet No.10</entry>
 	</row>
 	<row>
 	 <entry><literal>ISO-8859-5</literal></entry>
-	 <entry>ECMA-113 Latin/Cyrillic</entry>
+	 <entry><acronym>ECMA</>-113 Latin/Cyrillic</entry>
 	</row>
 	<row>
 	 <entry><literal>ISO-8859-6</literal></entry>
-	 <entry>ECMA-114 Latin/Arabic</entry>
+	 <entry><acronym>ECMA</>-114 Latin/Arabic</entry>
 	</row>
 	<row>
 	 <entry><literal>ISO-8859-7</literal></entry>
-	 <entry>ECMA-118 Latin/Greek</entry>
+	 <entry><acronym>ECMA</>-118 Latin/Greek</entry>
 	</row>
 	<row>
 	 <entry><literal>ISO-8859-8</literal></entry>
-	 <entry>ECMA-121 Latin/Hebrew</entry>
+	 <entry><acronym>ECMA</>-121 Latin/Hebrew</entry>
 	</row>
 	<row>
 	 <entry><literal>KOI8</literal></entry>
@@ -477,7 +477,7 @@ perl: warning: Falling back to the standard locale ("C").
 	</row>
 	<row>
 	 <entry><literal>TCVN</literal></entry>
-	 <entry>Vietnamese TCVN-5712(Windows CP1258)</entry>
+	 <entry>Vietnamese <acronym>TCVN</>-5712 (Windows CP1258)</entry>
 	</row>
 	<row>
 	 <entry><literal>WIN874</literal></entry>
@@ -500,7 +500,7 @@ perl: warning: Falling back to the standard locale ("C").
 
     <important>
      <para>
-      Not all APIs supports all the encodings listed above. For example, the
+      Not all <acronym>API</>s supports all the encodings listed above. For example, the
       <productname>PostgreSQL</>
       JDBC driver does not support <literal>MULE_INTERNAL</>, <literal>LATIN6</>,
       <literal>LATIN8</>, and <literal>LATIN10</>.
@@ -572,7 +572,7 @@ $ <userinput>psql -l</userinput>
     <para>
      <productname>PostgreSQL</productname> supports an automatic
      encoding conversion between server and client for some
-     encodings. The conversion info is stored in pg_converson system
+     encodings. The conversion info is stored in <literal>pg_conversion</> system
      catalog. You can create a new conversion by using <command>CREATE
      CONVERSION</command>. PostgreSQL comes with some predefined
      conversions. They are listed in <xref
@@ -878,7 +878,7 @@ RESET CLIENT_ENCODING;
       <para>
       Using client_encoding variable.
 
-      If client_encoding variable in postgresql.conf is set, that
+      If the <varname>client_encoding</> variable in <filename>postgresql.conf</> is set, that
       client encoding is automatically selected when a connection to the
       server is made.  (This can subsequently be overridden using any of the
       other methods mentioned above.)

doc/src/sgml/client-auth.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.38 2002/09/18 20:09:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/client-auth.sgml,v 1.39 2002/09/21 18:32:52 petere Exp $
 -->
 
 <chapter id="client-authentication">
@@ -261,7 +261,7 @@ hostssl  <replaceable>database</replaceable>  <replaceable>user</replaceable>  <
         <term><literal>password</></term>
         <listitem>
          <para>
-          Same as "md5", but the password is sent in cleartext over the
+          Same as "md5", but the password is sent in clear text over the
           network. This should not be used on untrusted networks.
           See <xref linkend="auth-password"> for details.
          </para>
@@ -314,8 +314,10 @@ hostssl  <replaceable>database</replaceable>  <replaceable>user</replaceable>  <
 
          <para>
           For local connections, this only works on machines that
-          support Unix-domain socket credentials (currently Linux,
-          FreeBSD, NetBSD, and BSD/OS).
+          support Unix-domain socket credentials (currently
+          <systemitem class=osname>Linux</>, <systemitem
+          class=osname>FreeBSD</>, <systemitem class=osname>NetBSD</>,
+          and <systemitem class=osname>BSD/OS</>).
          </para>
 
          <para>
@@ -504,7 +506,7 @@ local   db1,db2,@demodbs  all                                       md5
     if you trust every user on every machine that is allowed to connect
     to the postmaster by the <filename>pg_hba.conf</> lines that specify
     <literal>trust</>.  It is seldom reasonable to use <literal>trust</>
-    for any TCP connections other than those from localhost (127.0.0.1).
+    for any TCP connections other than those from <systemitem>localhost</> (127.0.0.1).
    </para>
 
   </sect2>

doc/src/sgml/datatype.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.103 2002/09/18 21:35:20 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.104 2002/09/21 18:32:52 petere Exp $
 -->
 
  <chapter id="datatype">
@@ -703,7 +703,7 @@ CREATE TABLE <replaceable class="parameter">tablename</replaceable> (
      implied <literal>UNIQUE</literal>.  This is no longer automatic.  If
      you wish a serial column to be <literal>UNIQUE</literal> or a 
      <literal>PRIMARY KEY</literal> it must now be specified, same as with
-     any other datatype.
+     any other data type.
     </para></note>
    </sect2>
   </sect1>
@@ -2028,7 +2028,7 @@ January 8 04:05:06 1999 PST
       <listitem>
        <para>
 	The default time zone is specified as a constant integer offset 
-	from GMT/UTC. It is not possible to adapt to daylight-saving
+	from <acronym>GMT</>/<acronym>UTC</>. It is not possible to adapt to daylight-saving
 	time when doing date/time arithmetic across
 	<acronym>DST</acronym> boundaries.
        </para>
@@ -3025,14 +3025,14 @@ SELECT * FROM test;
 
        <row>
 	<entry><type>regproc</></entry>
-	<entry>pg_proc</entry>
+	<entry><structname>pg_proc</></entry>
 	<entry>Function name</entry>
 	<entry>sum</entry>
        </row>
 
        <row>
 	<entry><type>regprocedure</></entry>
-	<entry>pg_proc</entry>
+	<entry><structname>pg_proc</></entry>
 	<entry>Function with argument types</entry>
 	<entry>sum(int4)</entry>
        </row>
@@ -3098,7 +3098,7 @@ SELECT * FROM test;
 
    <para>
     Another identifier type used by the system is <type>xid</>, or transaction
-    (abbreviated xact) identifier.  This is the datatype of the system columns
+    (abbreviated <abbrev>xact</>) identifier.  This is the data type of the system columns
     <structfield>xmin</> and <structfield>xmax</>.
     Transaction identifiers are 32-bit quantities.  In a long-lived
     database it is possible for transaction IDs to wrap around.  This
@@ -3110,7 +3110,7 @@ SELECT * FROM test;
 
    <para>
     A third identifier type used by the system is <type>cid</>, or command
-    identifier.  This is the datatype of the system columns
+    identifier.  This is the data type of the system columns
     <structfield>cmin</> and <structfield>cmax</>.
     Command identifiers are also 32-bit quantities.  This creates a hard
     limit of 2<superscript>32</> (4 billion) SQL commands within a single
@@ -3121,7 +3121,7 @@ SELECT * FROM test;
 
    <para>
     A final identifier type used by the system is <type>tid</>, or tuple
-    identifier.  This is the datatype of the system column
+    identifier.  This is the data type of the system column
     <structfield>ctid</>.  A tuple ID is a pair
     (block number, tuple index within block) that identifies the
     physical location of the tuple within its table.
@@ -3172,10 +3172,10 @@ SELECT * FROM test;
     The <productname>PostgreSQL</productname> type system contains a number
     of special-purpose entries that are collectively called
     <firstterm>pseudo-types</>.  A pseudo-type cannot be used as a column
-    datatype, but it can be used to declare a function's argument or result
+    data type, but it can be used to declare a function's argument or result
     type.  Each of the available pseudo-types is useful in situations where
     a function's behavior does not correspond to simply taking or returning
-    a value of a specific SQL datatype.
+    a value of a specific SQL data type.
    </para>
 
    <para>
@@ -3198,12 +3198,12 @@ SELECT * FROM test;
 
        <row>
 	<entry><type>any</></entry>
-	<entry>Indicates that a function accepts any input datatype whatever</entry>
+	<entry>Indicates that a function accepts any input data type whatever</entry>
        </row>
 
        <row>
 	<entry><type>anyarray</></entry>
-	<entry>Indicates that a function accepts any array datatype</entry>
+	<entry>Indicates that a function accepts any array data type</entry>
        </row>
 
        <row>
@@ -3243,7 +3243,7 @@ SELECT * FROM test;
 
    <para>
     Functions coded in C (whether built-in or dynamically loaded) may be
-    declared to accept or return any of these pseudo datatypes.  It is up to
+    declared to accept or return any of these pseudo data types.  It is up to
     the function author to ensure that the function will behave safely
     when a pseudo-type is used as an argument type.
    </para>

doc/src/sgml/ddl.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.4 2002/09/12 22:05:35 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ddl.sgml,v 1.5 2002/09/21 18:32:52 petere Exp $ -->
 
 <chapter id="ddl">
  <title>Data Definition</title>
@@ -765,7 +765,7 @@ CREATE TABLE order_items (
     Note that these do not excuse you from observing any constraints.
     For example, if an action specifies <literal>SET DEFAULT</literal>
     but the default value would not satisfy the foreign key, the
-    deletion of the primary key wil fail.
+    deletion of the primary key will fail.
    </para>
 
    <para>
@@ -1425,7 +1425,7 @@ SHOW search_path;
    </para>
 
    <para>
-    The first schema in the seach path that exists is the default
+    The first schema in the search path that exists is the default
     location for creating new objects.  That is the reason that by
     default objects are created in the public schema.  When objects
     are referenced in any other context without schema qualification
@@ -1466,8 +1466,8 @@ SET search_path TO myschema;
    </para>
 
    <para>
-    The search path works in the same way for datatype names, function names,
-    and operator names as it does for table names.  Datatype and function
+    The search path works in the same way for data type names, function names,
+    and operator names as it does for table names.  Data type and function
     names can be qualified in exactly the same way as table names.  If you
     need to write a qualified operator name in an expression, there is a
     special provision: you must write
@@ -1519,7 +1519,7 @@ REVOKE CREATE ON public FROM PUBLIC;
    <para>
     In addition to <literal>public</> and user-created schemas, each
     database contains a <literal>pg_catalog</> schema, which contains
-    the system tables and all the built-in datatypes, functions, and
+    the system tables and all the built-in data types, functions, and
     operators.  <literal>pg_catalog</> is always effectively part of
     the search path.  If it is not named explicitly in the path then
     it is implicitly searched <emphasis>before</> searching the path's

doc/src/sgml/developer.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/Attic/developer.sgml,v 1.6 2001/10/09 18:45:59 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/Attic/developer.sgml,v 1.7 2002/09/21 18:32:52 petere Exp $ -->
 <!-- PostgreSQL Developer's Guide -->
 
 <book id="developer">
@@ -24,6 +24,7 @@
  &bki;
  &page;
  &geqo;
+ &gist;
  &nls;
 <!-- appendices -->
  &cvs;

doc/src/sgml/dfunc.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.21 2002/08/26 23:22:47 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.22 2002/09/21 18:32:52 petere Exp $
 -->
 
 <sect2 id="dfunc">
@@ -58,7 +58,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/dfunc.sgml,v 1.21 2002/08/26 23:22:47 momji
 
   <variablelist>
    <varlistentry>
-    <term><productname>BSD/OS</productname></term>
+    <term><systemitem class="osname">BSD/OS</></term>
     <indexterm><primary>BSD/OS</></>
     <listitem>
      <para>
@@ -70,13 +70,13 @@ gcc -fpic -c foo.c
 ld -shared -o foo.so foo.o
 </programlisting>
       This is applicable as of version 4.0 of
-      <productname>BSD/OS</productname>.
+      <systemitem class="osname">BSD/OS</>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><productname>FreeBSD</productname></term>
+    <term><systemitem class="osname">FreeBSD</></term>
     <indexterm><primary>FreeBSD</></>
     <listitem>
      <para>
@@ -88,19 +88,19 @@ gcc -fpic -c foo.c
 gcc -shared -o foo.so foo.o
 </programlisting>
       This is applicable as of version 3.0 of
-      <productname>FreeBSD</productname>.
+      <systemitem class="osname">FreeBSD</>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><productname>HP-UX</productname></term>
+    <term><systemitem class="osname">HP-UX</></term>
     <indexterm><primary>HP-UX</></>
     <listitem>
      <para>
       The compiler flag of the system compiler to create
       <acronym>PIC</acronym> is <option>+z</option>.  When using
-      <productname>GCC</productname> it's <option>-fpic</option>. The
+      <application>GCC</application> it's <option>-fpic</option>. The
       linker flag for shared libraries is <option>-b</option>.  So
 <programlisting>
 cc +z -c foo.c
@@ -113,7 +113,7 @@ gcc -fpic -c foo.c
 <programlisting>
 ld -b -o foo.sl foo.o
 </programlisting>
-      <productname>HP-UX</productname> uses the extension
+      <systemitem class="osname">HP-UX</> uses the extension
       <filename>.sl</filename> for shared libraries, unlike most other
       systems.
      </para>
@@ -121,7 +121,7 @@ ld -b -o foo.sl foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><productname>IRIX</productname></term>
+    <term><systemitem class="osname">IRIX</></term>
     <indexterm><primary>IRIX</></>
     <listitem>
      <para>
@@ -137,7 +137,7 @@ ld -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><productname>Linux</productname></term>
+    <term><systemitem class="osname">Linux</></term>
     <indexterm><primary>Linux</></>
     <listitem>
      <para>
@@ -156,7 +156,21 @@ cc -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><productname>NetBSD</productname></term>
+    <term><systemitem class="osname">MacOS X</></term>
+    <indexterm><primary>MacOS X</></>
+    <listitem>
+     <para>
+      Here is a sample.  It assumes the developer tools are installed.
+<programlisting>
+cc -c foo.c 
+cc -bundle -flat_namespace -undefined suppress -o foo.so foo.o
+</programlisting>
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><systemitem class="osname">NetBSD</></term>
     <indexterm><primary>NetBSD</></>
     <listitem>
      <para>
@@ -174,7 +188,7 @@ gcc -shared -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><productname>OpenBSD</productname></term>
+    <term><systemitem class="osname">OpenBSD</></term>
     <indexterm><primary>OpenBSD</></>
     <listitem>
      <para>
@@ -190,30 +204,16 @@ ld -Bshareable -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><productname>OS X</productname></term>
-    <indexterm><primary>OS X</></>
-    <listitem>
-     <para>
-      Here is a sample.  It assumes the developer tools are installed.
-<programlisting>
-cc -c foo.c 
-cc -bundle -flat_namespace -undefined suppress -o foo.so foo.o
-</programlisting>
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><productname>Solaris</productname></term>
+    <term><systemitem class="osname">Solaris</></term>
     <indexterm><primary>Solaris</></>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
       <option>-KPIC</option> with the Sun compiler and
-      <option>-fpic</option> with <productname>GCC</productname>.  To
+      <option>-fpic</option> with <application>GCC</>.  To
       link shared libraries, the compiler option is
       <option>-G</option> with either compiler or alternatively
-      <option>-shared</option> with <productname>GCC</productname>.
+      <option>-shared</option> with <application>GCC</>.
 <programlisting>
 cc -KPIC -c foo.c
 cc -G -o foo.so foo.o
@@ -228,7 +228,7 @@ gcc -G -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term>Tru64 UNIX</term>   
+    <term><systemitem class="osname">Tru64 UNIX</></term>   
     <indexterm><primary>Tru64 UNIX</></>
     <indexterm><primary>Digital UNIX</><see>Tru64 UNIX</></>
     <listitem>
@@ -247,7 +247,7 @@ ld -shared -expect_unresolved '*' -o foo.so foo.o
    </varlistentry>
 
    <varlistentry>
-    <term><productname>UnixWare</productname></term>
+    <term><systemitem class="osname">UnixWare</></term>
     <indexterm><primary>UnixWare</></>
     <listitem>
      <para>

doc/src/sgml/diskusage.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/diskusage.sgml,v 1.4 2002/07/05 00:14:16 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/diskusage.sgml,v 1.5 2002/09/21 18:32:52 petere Exp $
 -->
 
 <chapter id="diskusage">
@@ -16,7 +16,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/diskusage.sgml,v 1.4 2002/07/05 00:14:16 mo
    Each table has a primary heap disk file where most of the data is
    stored. To store long column values, there is also a
    <acronym>TOAST</> file associated with the table, named based on the
-   table's oid (actually pg_class.relfilenode), and an index on the
+   table's OID (actually <literal>pg_class.relfilenode</>), and an index on the
    <acronym>TOAST</> table. There also may be indexes associated with
    the base table.
   </para>

doc/src/sgml/ecpg.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.36 2002/01/20 22:19:55 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.37 2002/09/21 18:32:52 petere Exp $
 -->
 
  <chapter id="ecpg">
@@ -158,8 +158,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/ecpg.sgml,v 1.36 2002/01/20 22:19:55 petere
 <programlisting>
 exec sql include sqlca; 
 </programlisting>
-     in the include section of your file. This will define a struct and
-     a variable with the name <parameter>sqlca</parameter> as follows:
+     in the include section of your file. This will define a <type>struct</> and
+     a variable with the name <varname>sqlca</varname> as follows:
 <programlisting>
 struct sqlca
 {
@@ -198,7 +198,7 @@ struct sqlca
 
     <para>
      If an no error occurred in the last <acronym>SQL</acronym> statement.
-     <parameter>sqlca.sqlcode</parameter> will be 0 (ECPG_NO_ERROR). If
+     <parameter>sqlca.sqlcode</parameter> will be 0 (<symbol>ECPG_NO_ERROR</>). If
      <parameter>sqlca.sqlcode</parameter> is less that zero, this is a
      serious error, like the database definition does not match the
      query. If it is greater than zero, it is a normal error like the
@@ -620,8 +620,9 @@ exec sql end declare section;
         </para>
 
         <para>
-         The special types <type>VARCHAR</type> and <type>VARCHAR2</type> are converted into a named struct
-         for every variable. A declaration like:
+         The special types <type>VARCHAR</type> and
+         <type>VARCHAR2</type> are converted into a named <type>struct</> for
+         every variable. A declaration like:
 <programlisting>
 VARCHAR var[180];
 </programlisting>
@@ -1023,10 +1024,10 @@ ECPGdo(__LINE__, NULL, "select  res  from mytable where index = ?     ",
       </varlistentry>
 
       <varlistentry>
-       <term><literal>ECPGt_EOIT</literal></term>
+       <term><parameter>ECPGt_EOIT</></term>
        <listitem>
         <para>
-         An enum telling that there are no more input variables.
+         An <type>enum</> telling that there are no more input variables.
         </para>
        </listitem>
       </varlistentry>
@@ -1042,10 +1043,10 @@ ECPGdo(__LINE__, NULL, "select  res  from mytable where index = ?     ",
       </varlistentry>
 
       <varlistentry>
-       <term>ECPGt_EORT</term>
+       <term><parameter>ECPGt_EORT</></term>
        <listitem>
         <para>
-         An enum telling that there are no more variables.
+         An <type>enum</> telling that there are no more variables.
         </para>
        </listitem>
       </varlistentry>

doc/src/sgml/extend.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.16 2002/07/30 17:34:37 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.17 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="extend">
@@ -135,51 +135,51 @@ $Header: /cvsroot/pgsql/doc/src/sgml/extend.sgml,v 1.16 2002/07/30 17:34:37 tgl
       </thead>
       <tbody>
        <row>
-	<entry>pg_database</entry>
+	<entry><structname>pg_database</></entry>
 	<entry> databases</entry>
        </row>
        <row>
-	<entry>pg_class</entry>
+	<entry><structname>pg_class</></entry>
 	<entry> tables</entry>
        </row>
        <row>
-	<entry>pg_attribute</entry>
+	<entry><structname>pg_attribute</></entry>
 	<entry> table columns</entry>
        </row>
        <row>
-	<entry>pg_index</entry>
+	<entry><structname>pg_index</></entry>
 	<entry> indexes</entry>
        </row>
        <row>
-	<entry>pg_proc</entry>
+	<entry><structname>pg_proc</></entry>
 	<entry> procedures/functions </entry>
        </row>
        <row>
-	<entry>pg_type</entry>
+	<entry><structname>pg_type</></entry>
 	<entry> data types (both base and complex)</entry>
        </row>
        <row>
-	<entry>pg_operator</entry>
+	<entry><structname>pg_operator</></entry>
 	<entry> operators</entry>
        </row>
        <row>
-	<entry>pg_aggregate</entry>
+	<entry><structname>pg_aggregate</></entry>
 	<entry> aggregate functions</entry>
        </row>
        <row>
-	<entry>pg_am</entry>
+	<entry><structname>pg_am</></entry>
 	<entry> access methods</entry>
        </row>
        <row>
-	<entry>pg_amop</entry>
+	<entry><structname>pg_amop</></entry>
 	<entry> access method operators</entry>
        </row>
        <row>
-	<entry>pg_amproc</entry>
+	<entry><structname>pg_amproc</></entry>
 	<entry> access method support functions</entry>
        </row>
        <row>
-	<entry>pg_opclass</entry>
+	<entry><structname>pg_opclass</></entry>
 	<entry> access method operator classes</entry>
        </row>
       </tbody>

doc/src/sgml/features.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.6 2002/08/04 06:17:29 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.7 2002/09/21 18:32:53 petere Exp $
 -->
 
  <appendix id="features">
@@ -1089,12 +1089,12 @@ $Header: /cvsroot/pgsql/doc/src/sgml/features.sgml,v 2.6 2002/08/04 06:17:29 tho
        </row>
        <row>
         <entry>F831-01</entry>
-        <entry>Updateable scrollable cursors</entry>
+        <entry>Updatable scrollable cursors</entry>
         <entry></entry>
        </row>
        <row>
         <entry>F831-02</entry>
-        <entry>Updateable ordered cursors</entry>
+        <entry>Updatable ordered cursors</entry>
         <entry></entry>
        </row>
        <row>

doc/src/sgml/indices.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.36 2002/08/13 20:40:43 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.37 2002/09/21 18:32:53 petere Exp $ -->
 
 <chapter id="indexes">
  <title id="indexes-title">Indexes</title>
@@ -182,7 +182,7 @@ CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable>
    <note>
     <para>
      Testing has shown PostgreSQL's hash indexes to be similar or slower
-     than btree indexes, and the index size and build time for hash
+     than B-tree indexes, and the index size and build time for hash
      indexes is much worse. Hash indexes also suffer poor performance
      under high concurrency. For these reasons, hash index use is
      discouraged.
@@ -517,7 +517,7 @@ Subject: Re: [QUESTIONS] PRIMARY KEY | UNIQUE
 	</listitem>
 	<listitem>
 	 <para>
-	  Should not allow NULLs.
+	  Should not allow null values.
 	 </para>
 	</listitem>
        </itemizedlist>
@@ -540,7 +540,7 @@ Subject: Re: [QUESTIONS] PRIMARY KEY | UNIQUE
 	</listitem>
 	<listitem>
 	 <para>
-	  NULLs are acceptable.
+	  Null values are acceptable.
 	 </para>
 	</listitem>
        </itemizedlist>

doc/src/sgml/installation.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.81 2002/09/18 20:09:31 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.82 2002/09/21 18:32:53 petere Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -146,7 +146,7 @@ su - postgres
 *** You might have to rebuild your Perl installation.  Refer to
 *** the documentation for details.
 </screen>
-      (If you don't follow the onscreen output you will merely notice
+      (If you don't follow the on-screen output you will merely notice
       the the PL/Perl library object will not be installed.)  If you
       see this, you will have to re-build and install
       <productname>Perl</productname> manually to be able to build
@@ -239,7 +239,7 @@ JAVACMD=$JAVA_HOME/bin/java
      <para>
       To enable Native Language Support (<acronym>NLS</acronym>), that
       is, the ability to display a program's messages in a language
-      other than English, you need an implementation of the Gettext
+      other than English, you need an implementation of the <application>Gettext</>
       <acronym>API</acronym>.  Some operating systems have this
       built-in (e.g., <systemitem class="osname">Linux</>, <systemitem
       class="osname">NetBSD</>, <systemitem
@@ -256,7 +256,8 @@ JAVACMD=$JAVA_HOME/bin/java
 
     <listitem>
      <para>
-      Kerberos, OpenSSL, or PAM, if you want to support
+      <application>Kerberos</>, <application>OpenSSL</>, or <application>PAM</>,
+      if you want to support
       authentication using these services.
      </para>
     </listitem>
@@ -885,7 +886,7 @@ JAVACMD=$JAVA_HOME/bin/java
        <term><option>--without-readline</option></term>
        <listitem>
         <para>
-         Prevents the use of the Readline library.  This disables
+         Prevents the use of the <application>Readline</> library.  This disables
          command-line editing and history in
          <application>psql</application>, so it is not recommended.
         </para>
@@ -896,7 +897,7 @@ JAVACMD=$JAVA_HOME/bin/java
        <term><option>--without-zlib</option></term>
        <listitem>
         <para>
-         Prevents the use of the Zlib library.  This disables
+         Prevents the use of the <application>Zlib</> library.  This disables
          compression support in <application>pg_dump</application>.
          This option is only intended for those rare systems where this
          library is not available.

doc/src/sgml/jdbc.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.37 2002/09/18 20:09:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.38 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="jdbc">
@@ -57,9 +57,9 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/jdbc.sgml,v 1.37 2002/09/18 20:09:31
     instructions.  After installation, the driver should be found in
     <filename><replaceable>PREFIX</>/share/java/postgresql.jar</filename>.
     The resulting driver will be built for the version of Java you are
-    running.  If you build with a 1.1 JDK you will build a version
+    running.  If you build with a 1.1 <acronym>JDK</> you will build a version
     that supports the JDBC 1 specification, if you build with a Java 2
-    JDK (e.g., JDK 1.2 or JDK 1.3) you will build a version that
+    <acronym>JDK</> (e.g., <acronym>JDK</> 1.2 or <acronym>JDK</> 1.3) you will build a version that
     supports the JDBC 2 specification.
    </para>
   </sect2>
@@ -545,7 +545,7 @@ st.close();
     need to understand the limitations of each method.  The 
     <type>bytea</type> data type is not well suited for storing very 
     large amounts of binary data.  While a column of type 
-    <type>bytea</type> can hold upto 1Gig of binary data, it would 
+    <type>bytea</type> can hold up to 1 GB of binary data, it would 
     require a huge amount of memory (<acronym>RAM</acronym>) to 
     process such a large value.  The Large Object method for 
     storing binary data is better suited to storing very large values, 
@@ -838,7 +838,7 @@ Fastpath fp = ((org.postgresql.Connection)myconn).getFastpathAPI();
        <formalpara>
         <title>Throws:</title>
         <para>
-         SQLException by Fastpath when initializing for first time
+         <classname>SQLException</> by Fastpath when initializing for first time
         </para>
        </formalpara>
       </listitem>
@@ -1106,7 +1106,7 @@ public void addFunction(String name,
        <para>
         This adds a function to our look-up table.  User code should
         use the <function>addFunctions</function> method, which is based upon a query,
-        rather than hard coding the oid. The oid for a function is not
+        rather than hard coding the OID. The OID for a function is not
         guaranteed to remain static, even on different servers of the
         same version.
        </para>
@@ -1118,7 +1118,7 @@ public void addFunctions(ResultSet rs) throws SQLException
 </synopsis>
        <para>
         This takes a <classname>ResultSet</classname> containing two columns. Column 1
-        contains the function name, Column 2 the oid.  It reads the
+        contains the function name, Column 2 the OID.  It reads the
         entire <classname>ResultSet</classname>, loading the values into the function table.
        </para>
 
@@ -2154,21 +2154,21 @@ public int read(byte buf[],
         <para>
          <variablelist>
           <varlistentry>
-           <term>buf</term>
+           <term><parameter>buf</></term>
            <listitem>
             <simpara>destination array</simpara>
            </listitem>
           </varlistentry>
 
           <varlistentry>
-           <term>off</term>
+           <term><parameter>off</></term>
            <listitem>
             <simpara>offset within array</simpara>
            </listitem>
           </varlistentry>
 
           <varlistentry>
-           <term>len</term>
+           <term><parameter>len</></term>
            <listitem>
             <simpara>number of bytes to read</simpara>
            </listitem>
@@ -2202,21 +2202,21 @@ public void write(byte buf[],
         <para>
          <variablelist>
           <varlistentry>
-           <term>buf</term>
+           <term><parameter>buf</></term>
            <listitem>
             <simpara>destination array</simpara>
            </listitem>
           </varlistentry>
 
           <varlistentry>
-           <term>off</term>
+           <term><parameter>off</></term>
            <listitem>
             <simpara>offset within array</simpara>
            </listitem>
           </varlistentry>
 
           <varlistentry>
-           <term>len</term>
+           <term><parameter>len</></term>
            <listitem>
             <simpara>number of bytes to write</simpara>
            </listitem>
@@ -2350,21 +2350,21 @@ lobj = ((org.postgresql.Connection)myconn).getLargeObjectAPI();
 
      <variablelist>
       <varlistentry>
-       <term>public static final int WRITE</term>
+       <term><literal>public static final int WRITE</></term>
        <listitem>
         <simpara>This mode indicates we want to write to an object.</simpara>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term>public static final int READ</term>
+       <term><literal>public static final int READ</></term>
        <listitem>
         <simpara>This mode indicates we want to read an object.</simpara>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term>public static final int READWRITE</term>
+       <term><literal>public static final int READWRITE</></term>
        <listitem>
         <simpara>This mode is the default. It indicates we want read and write access to a large object.</simpara>
        </listitem>
@@ -2382,8 +2382,8 @@ public LargeObject open(int oid) throws SQLException
 </synopsis>
        <para>
         This opens an existing large object, based on its OID. This
-        method assumes that READ and WRITE access is required (the
-        default).
+        method assumes that <symbol>READ</> and
+        <symbol>WRITE</> access is required (the default).
        </para>
       </listitem>
 
@@ -2404,7 +2404,7 @@ public int create() throws SQLException
 </synopsis>
        <para>
         This creates a large object, returning its OID.
-        It defaults to READWRITE for the new object's attributes.
+        It defaults to <symbol>READWRITE</> for the new object's attributes.
        </para>
       </listitem>
 

doc/src/sgml/libpgtcl.sgml

@@ -1038,7 +1038,7 @@ pg_execute <OPTIONAL>-array <REPLACEABLE CLASS="PARAMETER">arrayVar</REPLACEABLE
 <LISTITEM>
 <PARA>Specifies the name of an array variable where result tuples are stored,
 indexed by the field names.
-This is ignored if queryString is not a SELECT statement. For SELECT
+This is ignored if <replaceable class=parameter>queryString</> is not a SELECT statement. For SELECT
 statements, if this option is not used, result tuples values are stored
 in individual variables named according to the field names in the result.
 </PARA>
@@ -1118,7 +1118,7 @@ The number of tuples affected or returned by the query.
 If the query is not a SELECT statement, the query is executed and the
 number of tuples affected by the query is returned.  If the query is an
 INSERT and a single tuple is inserted, the OID of the inserted tuple is
-stored in the oidVar variable if the optional <PARAMETER>-oid</PARAMETER>
+stored in the <replaceable>oidVar</> variable if the optional <PARAMETER>-oid</PARAMETER>
 argument is supplied.
 </PARA>
 <PARA>
@@ -1166,7 +1166,7 @@ In the following examples, error checking with <LITERAL>catch</LITERAL>
 has been omitted for clarity.
 </PARA>
 <PARA>
-Insert a row and save the OID in result_oid:
+Insert a row and save the OID in <varname>result_oid</>:
 <ProgramListing>
     pg_execute -oid result_oid $pgconn "insert into mytable values (1)"
 </ProgramListing>

doc/src/sgml/libpq.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.96 2002/09/05 22:09:42 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.97 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="libpq">
@@ -214,7 +214,7 @@ PGconn *PQconnectdb(const char *conninfo)
    environment variable (see <xref linkend="libpq-envars">)
    is checked. If the  environment  variable is not set either,
    then hardwired defaults are used.
-   The return value is a pointer to an abstract struct
+   The return value is a pointer to an abstract <type>struct</type>
    representing the connection to the backend.
    </para>
   </listitem>
@@ -457,7 +457,7 @@ struct PQconninfoOption
    Returns a connection options array.  This may
    be used to determine all possible <function>PQconnectdb</function> options and their
    current default values.  The return value points to an array of
-   <structname>PQconninfoOption</structname> structs, which ends with an entry having a NULL
+   <structname>PQconninfoOption</structname> <type>struct</>s, which ends with an entry having a NULL
    keyword pointer.  Note that the default values (<structfield>val</structfield> fields)
    will depend on environment variables and other context.
    Callers must treat the connection options data as read-only.
@@ -542,7 +542,7 @@ maintain the <structname>PGconn</structname> abstraction.  Use the accessor func
 at the contents of <structname>PGconn</structname>.  Avoid directly referencing the fields of the
 <structname>PGconn</> structure because they are subject to change in the future.
 (Beginning in <productname>PostgreSQL</productname> release 6.4, the
-definition of struct <structname>PGconn</structname> is not even provided in <filename>libpq-fe.h</filename>.
+definition of <type>struct PGconn</> is not even provided in <filename>libpq-fe.h</filename>.
 If you have old code that accesses <structname>PGconn</structname> fields directly, you can keep using it
 by including <filename>libpq-int.h</filename> too, but you are encouraged to fix the code
 soon.)
@@ -757,7 +757,7 @@ maintain the <structname>PGresult</structname> abstraction.  Use the accessor fu
 at the contents of <structname>PGresult</structname>.  Avoid directly referencing the fields of the
 <structname>PGresult</structname> structure because they are subject to change in the future.
 (Beginning in <productname>PostgreSQL</productname> 6.4, the
-definition of struct <structname>PGresult</structname> is not even provided in <filename>libpq-fe.h</>.  If you
+definition of <type>struct PGresult</> is not even provided in <filename>libpq-fe.h</>.  If you
 have old code that accesses <structname>PGresult</structname> fields directly, you can keep using it
 by including <filename>libpq-int.h</filename> too, but you are encouraged to fix the code
 soon.)
@@ -813,7 +813,7 @@ exposes a bug in the client software.
 <listitem>
 <para>
 <function>PQresStatus</function>
-	Converts the enumerated type returned by PQresultStatus into
+	Converts the enumerated type returned by <function>PQresultStatus</> into
 	a string constant describing the status code.
 <synopsis>
 char *PQresStatus(ExecStatusType status);
@@ -868,7 +868,7 @@ This is <application>libpq</>'s internal routine to allocate and initialize an e
 <structname>PGresult</structname> object.  It is exported because some applications find it
 useful to generate result objects (particularly objects with error
 status) themselves.  If <parameter>conn</parameter> is not NULL and status indicates an error,
-the connection's current errorMessage is copied into the <structname>PGresult.</structname>
+the connection's current error message is copied into the <structname>PGresult.</structname>
 Note that <function>PQclear</function> should eventually be called on the object, just
 as with a <structname>PGresult</structname> returned by <application>libpq</application> itself.
 </para>
@@ -976,7 +976,7 @@ strings overlap.
    The <parameter>from</parameter> parameter points to an escaped string
    such as might be returned by <function>PQgetvalue</function> of a
    <type>BYTEA</type> column. <function>PQunescapeBytea</function> converts
-   this NUL terminated string representation into binary, filling a buffer.
+   this string representation into its binary representation, filling the supplied buffer.
    It returns a pointer to the buffer which is NULL on error, and the size
    of the buffer in <parameter>to_length</parameter>. The pointer may
    subsequently be used as an argument to the function
@@ -1092,7 +1092,7 @@ int PQfsize(const PGresult *res,
 <listitem>
 <para>
 <function>PQbinaryTuples</function>
-          Returns 1 if the PGresult contains binary tuple data,
+          Returns 1 if the <structname>PGresult</> contains binary tuple data,
 	  0 if it contains ASCII data.
 <synopsis>
 int PQbinaryTuples(const PGresult *res);
@@ -1392,7 +1392,7 @@ PGresult *PQgetResult(PGconn *conn);
 	  indicating that the command is done.  (If called when no command is
 	  active, <function>PQgetResult</function> will just return NULL at once.)
 	  Each non-NULL result from <function>PQgetResult</function> should be processed using
-	  the same PGresult accessor functions previously described.
+	  the same <structname>PGresult</> accessor functions previously described.
 	  Don't forget to free each result object with <function>PQclear</function> when done with it.
 	  Note that <function>PQgetResult</function> will block only if a query is active and the
 	  necessary response data has not yet been read by <function>PQconsumeInput</function>.
@@ -1606,7 +1606,7 @@ typedef struct {
     } u;
 } PQArgBlock;
 </synopsis>
-     <function>PQfn</function> always returns a valid <structname>PGresult*</structname>. The resultStatus
+     <function>PQfn</function> always returns a valid <structname>PGresult*</structname>. The result status
      should be checked before the result is used.   The
      caller is responsible for  freeing  the  <structname>PGresult</structname>  with
      <function>PQclear</function> when it is no longer needed.
@@ -1647,7 +1647,7 @@ messages can be detected by calling <function>PQnotifies</function>.
           Returns  the next notification from a list of unhandled
           notification messages received from the backend.  Returns NULL if
           there are no pending notifications.  Once a notification is
-	  returned from PQnotifies, it is considered handled and will be
+	  returned from <function>PQnotifies</>, it is considered handled and will be
 	  removed from the list of notifications.
 <synopsis>
 PGnotify* PQnotifies(PGconn *conn);
@@ -1932,7 +1932,7 @@ void PQuntrace(PGconn *conn)
 <para>
 <function>PQsetNoticeProcessor</function>
 <indexterm><primary>notice processor</></>
-Control reporting of notice and warning messages generated by libpq.
+Control reporting of notice and warning messages generated by <application>libpq</>.
 <synopsis>
 typedef void (*PQnoticeProcessor) (void *arg, const char *message);
 

doc/src/sgml/maintenance.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.18 2002/09/18 20:09:32 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.19 2002/09/21 18:32:53 petere Exp $
 -->
 
 <chapter id="maintenance">
@@ -380,14 +380,14 @@ VACUUM
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</productname> is unable to reuse btree index
+   <productname>PostgreSQL</productname> is unable to reuse B-tree index
    pages in certain cases. The problem is that if indexed rows are
    deleted, those index pages can only be reused by rows with similar
    values. For example, if indexed rows are deleted and newly
    inserted/updated rows have much higher values, the new rows can't use
    the index space made available by the deleted rows. Instead, such
    new rows must be placed on new index pages. In such cases, disk
-   space used by the index will grow indefinately, even if
+   space used by the index will grow indefinitely, even if
    <command>VACUUM</> is run frequently.
   </para>
   <para>
@@ -426,7 +426,7 @@ VACUUM
    The simplest production-grade approach to managing log output is to
    send it all to <application>syslog</> and let
    <application>syslog</> deal with file rotation. To do this, set
-   <literal>syslog</> to 2 (log to syslog only) in
+   <literal>syslog</> to 2 (log to <application>syslog</> only) in
    <filename>postgresql.conf</>. Then you can send a
    <literal>SIGHUP</literal> signal to the <application>syslog</>
    daemon whenever you want to force it to start writing a new log
@@ -434,7 +434,7 @@ VACUUM
   </para>
 
   <para>
-   On many systems, however, syslog is not very reliable, particularly
+   On many systems, however, <application>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 <systemitem>stderr</> to some type of

doc/src/sgml/monitoring.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/monitoring.sgml,v 1.13 2002/08/31 17:14:27 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/monitoring.sgml,v 1.14 2002/09/21 18:32:53 petere Exp $
 -->
 
 <chapter id="monitoring">
@@ -172,7 +172,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
    Each individual server process transmits new access counts to the collector
    just before waiting for another client command; so a query still in
    progress does not affect the displayed totals.  Also, the collector itself
-   emits new totals at most once per PGSTAT_STAT_INTERVAL (500 milliseconds
+   emits new totals at most once per <varname>pgstat_stat_interval</varname> (500 milliseconds
    by default).  So the displayed totals lag behind actual activity.
   </para>
 
@@ -204,7 +204,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
     <tbody>
      <row>
       <entry><structname>pg_stat_activity</></entry>
-      <entry>One row per server process, showing process PID, database,
+      <entry>One row per server process, showing process <acronym>PID</>, database,
       user, and current query.  The current query column is only available
       to superusers; for others it reads as NULL.  (Note that because of
       the collector's reporting delay, current query will only be up-to-date
@@ -274,13 +274,13 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
 
      <row>
       <entry><structname>pg_statio_sys_tables</></entry>
-      <entry>Same as pg_statio_all_tables, except that only system tables
+      <entry>Same as <structname>pg_statio_all_tables</>, except that only system tables
       are shown.</entry>
      </row>
 
      <row>
       <entry><structname>pg_statio_user_tables</></entry>
-      <entry>Same as pg_statio_all_tables, except that only user tables
+      <entry>Same as <structname>pg_statio_all_tables</>, except that only user tables
       are shown.</entry>
      </row>
 
@@ -293,13 +293,13 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
 
      <row>
       <entry><structname>pg_statio_sys_indexes</></entry>
-      <entry>Same as pg_statio_all_indexes, except that only indexes on
+      <entry>Same as <structname>pg_statio_all_indexes</>, except that only indexes on
       system tables are shown.</entry>
      </row>
 
      <row>
       <entry><structname>pg_statio_user_indexes</></entry>
-      <entry>Same as pg_statio_all_indexes, except that only indexes on
+      <entry>Same as <structname>pg_statio_all_indexes</>, except that only indexes on
       user tables are shown.</entry>
      </row>
 
@@ -312,14 +312,14 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
 
      <row>
       <entry><structname>pg_statio_sys_sequences</></entry>
-      <entry>Same as pg_statio_all_sequences, except that only system
+      <entry>Same as <structname>pg_statio_all_sequences</>, except that only system
       sequences are shown.  (Presently, no system sequences are defined,
       so this view is always empty.)</entry>
      </row>
 
      <row>
       <entry><structname>pg_statio_user_sequences</></entry>
-      <entry>Same as pg_statio_all_sequences, except that only user
+      <entry>Same as <structname>pg_statio_all_sequences</>, except that only user
       sequences are shown.</entry>
      </row>
     </tbody>
@@ -540,7 +540,7 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
   <para>
    The function <function>pg_stat_get_backend_idset</function> provides
    a convenient way to generate one row for each active backend.  For
-   example, to show the PIDs and current queries of all backends:
+   example, to show the <acronym>PID</>s and current queries of all backends:
 
 <programlisting>
 SELECT pg_stat_get_backend_pid(S.backendid) AS procpid,
@@ -657,10 +657,10 @@ FROM (SELECT pg_stat_get_backend_idset() AS backendid) AS S;
 	   <entry><structfield>transaction</structfield></entry>
 	   <entry><type>xid</type></entry>
 	   <entry>The ID of a transaction, or NULL if the lockable object
-	   is a relation.  Every transaction holds ExclusiveLock on its
+	   is a relation.  Every transaction holds an exclusive lock on its
 	   transaction ID for its entire duration.  If one transaction finds
 	   it necessary to wait specifically for another transaction, it
-	   does so by attempting to acquire ShareLock on the other transaction
+	   does so by attempting to acquire share lock on the other transaction
 	   ID.  That will succeed only when the other transaction terminates
 	   and releases its locks.
 	   </entry>

doc/src/sgml/mvcc.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.27 2002/08/17 13:04:14 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/mvcc.sgml,v 2.28 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="mvcc">
@@ -498,7 +498,7 @@ ERROR:  Can't serialize access due to concurrent update
 	 EXCLUSIVE</literal>, <literal>EXCLUSIVE</literal>, and
 	 <literal>ACCESS EXCLUSIVE</literal> lock modes.
 	 This mode protects a table against
-	 concurrent schema changes and VACUUMs.
+	 concurrent schema changes and <command>VACUUM</> runs.
 	</para>
 
 	<para>

doc/src/sgml/perform.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.20 2002/03/24 17:11:37 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/perform.sgml,v 1.21 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="performance-tips">
@@ -527,11 +527,11 @@ regression=#
  </sect1>
 
  <sect1 id="explicit-joins">
-  <title>Controlling the Planner with Explicit JOINs</title>
+  <title>Controlling the Planner with Explicit <literal>JOIN</> Clauses</title>
 
   <para>
    Beginning with <productname>PostgreSQL</productname> 7.1 it is possible
-   to control the query planner to some extent by using explicit JOIN
+   to control the query planner to some extent by using explicit <literal>JOIN</>
    syntax.  To see why this matters, we first need some background.
   </para>
 

doc/src/sgml/plperl.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/plperl.sgml,v 2.17 2002/09/18 20:09:32 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/plperl.sgml,v 2.18 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="plperl">
@@ -162,7 +162,7 @@ SELECT name, empcomp(employee) FROM employee;
    Access to the database itself from your Perl function can be done via
    an experimental module <ulink
    url="http://www.cpan.org/modules/by-module/DBD/APILOS/"><literal>DBD::PgSPI</literal></ulink>
-   (also available at <ulink url="http://www.cpan.org/SITES.html">CPAN
+   (also available at <ulink url="http://www.cpan.org/SITES.html"><acronym>CPAN</>
    mirror sites</ulink>). This module makes available a
    <acronym>DBI</>-compliant database-handle named
    <varname>$pg_dbh</varname> that can be used to perform queries
@@ -230,14 +230,14 @@ CREATE FUNCTION badfunc() RETURNS integer AS '
    restricted --- for example, one might want a Perl function that
    sends mail.  To handle these cases, PL/Perl can also be installed
    as an <quote>untrusted</> language (usually called
-   <quote>PL/PerlU</quote>).  In this case the full Perl language is
+   <application>PL/PerlU</application>).  In this case the full Perl language is
    available.  If the <command>createlang</command> program is used to
    install the language, the language name <literal>plperlu</literal>
    will select the untrusted PL/Perl variant.
   </para>
 
   <para>
-   The writer of a PL/PerlU function must take care that the function
+   The writer of a <application>PL/PerlU</> function must take care that the function
    cannot be used to do anything unwanted, since it will be able to do
    anything that could be done by a user logged in as the database
    administrator.  Note that the database system allows only database

doc/src/sgml/plpgsql.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.7 2002/09/14 20:11:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/plpgsql.sgml,v 1.8 2002/09/21 18:32:53 petere Exp $
 -->
 
 <chapter id="plpgsql"> 
@@ -126,7 +126,7 @@ END;
 	 The <application>PL/pgSQL</application> EXECUTE statement is not
 	 related to the EXECUTE statement supported by the
 	 <productname>PostgreSQL</productname> backend. The backend
-	 EXECUTE statement cannot be used within PL/PgSQL functions (and
+	 EXECUTE statement cannot be used within <application>PL/pgSQL</> functions (and
 	 is not needed).
 	</para>
    </note>
@@ -849,7 +849,7 @@ SELECT INTO <replaceable>target</replaceable> <replaceable>expressions</replacea
     </para>
 
     <para>
-     If the SELECT query returns zero rows, NULLs are assigned to the
+     If the SELECT query returns zero rows, null values are assigned to the
      target(s).  If the SELECT query returns multiple rows, the first
      row is assigned to the target(s) and the rest are discarded.
      (Note that <quote>the first row</> is not well-defined unless you've
@@ -877,8 +877,8 @@ IF NOT FOUND THEN
 END IF;
 </programlisting>
 
-     Alternatively, you can use the IS NULL (or ISNULL) conditional to
-     test for NULLity of a RECORD/ROW result.  Note that there is no
+     Alternatively, you can use the <literal>IS NULL</literal> (or <literal>ISNULL</>) conditional to
+     test for whether a RECORD/ROW result is null.  Note that there is no
      way to tell whether any additional rows might have been discarded.
     </para>
 
@@ -1205,7 +1205,7 @@ RETURN NEXT <replaceable>expression</replaceable>;
 
      RETURN NEXT does not actually return from the function; it simply
      saves away the value of the expression (or record or row variable,
-     as appropriate for the datatype being returned).
+     as appropriate for the data type being returned).
      Execution then continues with the next statement in the
      <application>PL/pgSQL</> function.  As successive RETURN NEXT
      commands are executed, the result set is built up.  A final
@@ -1215,17 +1215,17 @@ RETURN NEXT <replaceable>expression</replaceable>;
 
    <note>
     <para>
-	  The current implementation of RETURN NEXT for PL/PgSQL stores
-	  the entire result set before returning from the function, as
-	  discussed above.  That means that if a PL/PgSQL function
-	  produces a very large result set, performance may be poor: data
-	  will be written to disk to avoid memory exhaustion, but the
-	  function itself will not return until the entire
-	  result set has been generated.  A future version of PL/PgSQL may
-	  allow users to allow users to define set-returning functions
-	  that do not have this limitation.  Currently, the point at which
-	  data begins being written to disk is controlled by the
-	  <option>SORT_MEM</> configuration variable.  Administrators who
+     The current implementation of RETURN NEXT for
+     <application>PL/pgSQL</> stores the entire result set before
+     returning from the function, as discussed above.  That means that
+     if a <application>PL/pgSQL</> function produces a very large result set,
+     performance may be poor: data will be written to disk to avoid
+     memory exhaustion, but the function itself will not return until
+     the entire result set has been generated.  A future version of
+     <application>PL/pgSQL</> may allow users to allow users to define set-returning
+     functions that do not have this limitation.  Currently, the point
+     at which data begins being written to disk is controlled by the
+     <varname>SORT_MEM</> configuration variable.  Administrators who
      have sufficient memory to store larger result sets in memory
      should consider increasing this parameter.
     </para>
@@ -1236,14 +1236,27 @@ RETURN NEXT <replaceable>expression</replaceable>;
     <title>Conditionals</title>
 
     <para>
-     <function>IF</function> statements let you execute commands based on
-      certain conditions.
-      <application>PL/pgSQL</> has four forms of IF: IF-THEN, IF-THEN-ELSE,
-      IF-THEN-ELSE IF, and IF-THEN-ELSIF-THEN-ELSE.
+     <literal>IF</> statements let you execute commands based on
+     certain conditions.  <application>PL/pgSQL</> has four forms of
+     <literal>IF</>:
+    <itemizedlist>
+     <listitem>
+      <para><literal>IF ... THEN</></>
+     </listitem>
+     <listitem>
+      <para><literal>IF ... THEN ... ELSE</></>
+     </listitem>
+     <listitem>
+      <para><literal>IF ... THEN ... ELSE IF</> and</>
+     </listitem>
+     <listitem>
+      <para><literal>IF ... THEN ... ELSIF ... THEN ... ELSE</></>
+     </listitem>
+    </itemizedlist>
     </para>
 
     <sect3>
-     <title>IF-THEN</title>
+     <title><literal>IF-THEN</></title>
 
        <para>
 <synopsis>
@@ -1265,7 +1278,7 @@ END IF;
      </sect3>
 
      <sect3>
-      <title>IF-THEN-ELSE</title>
+      <title><literal>IF-THEN-ELSE</></title>
 
        <para>
 <synopsis>
@@ -1300,7 +1313,7 @@ END IF;
      </sect3>
 
      <sect3>
-      <title>IF-THEN-ELSE IF</title>
+      <title><literal>IF-THEN-ELSE IF</></title>
 
        <para>
         IF statements can be nested, as in the following example:
@@ -1326,7 +1339,7 @@ END IF;
      </sect3>
 
      <sect3>
-      <title>IF-THEN-ELSIF-ELSE</title>
+      <title><literal>IF-THEN-ELSIF-ELSE</></title>
 
        <para>
 <synopsis>
@@ -1344,10 +1357,11 @@ IF <replaceable>boolean-expression</replaceable> THEN
 END IF;
 </synopsis>
 
-        IF-THEN-ELSIF-ELSE provides a more convenient method of checking
-	many alternatives in one statement.  Formally it is equivalent
-	to nested IF-THEN-ELSE-IF-THEN commands, but only one END IF
-	is needed.
+        <literal>IF-THEN-ELSIF-ELSE</> provides a more convenient
+        method of checking many alternatives in one statement.
+        Formally it is equivalent to nested
+        <literal>IF-THEN-ELSE-IF-THEN</> commands, but only one
+        <literal>END IF</> is needed.
        </para>
 
        <para>
@@ -1673,7 +1687,7 @@ OPEN <replaceable>unbound-cursor</replaceable> FOR SELECT ...;
 	to execute.  The cursor cannot be open already, and it must
 	have been declared as an unbound cursor (that is, as a simple
 	<type>refcursor</> variable).  The SELECT query is treated
-	in the same way as other SELECTs in <application>PL/pgSQL</>:
+	in the same way as other SELECT statements in <application>PL/pgSQL</>:
 	<application>PL/pgSQL</> variable names are substituted,
 	and the query plan is cached for possible re-use.
 
@@ -1706,7 +1720,7 @@ OPEN curs1 FOR EXECUTE ''SELECT * FROM '' || quote_ident($1);
      </sect3>
 
     <sect3>
-     <title>OPENing a bound cursor</title>
+     <title>Opening a bound cursor</title>
 
        <para>
 <synopsis>
@@ -1802,7 +1816,7 @@ CLOSE curs1;
         caller. This is used to return multiple rows or columns from the
         function. The function opens the cursor and returns the cursor
         name to the caller. The caller can then FETCH rows from the
-        cursor. The cursor can be CLOSEd by the caller, or it will be
+        cursor. The cursor can be closed by the caller, or it will be
         closed automatically when the transaction closes.
 
        </para>
@@ -2067,7 +2081,7 @@ RAISE EXCEPTION ''Inexistent ID --> %'',user_id;
        Data type array of <type>text</type>; the arguments from
               the <command>CREATE TRIGGER</command> statement.
        The index counts from 0 and can be given as an expression. Invalid
-       indices (&lt; 0 or &gt;= tg_nargs) result in a NULL value.
+       indices (&lt; 0 or &gt;= <varname>tg_nargs</>) result in a null value.
       </para>
      </listitem>
     </varlistentry>
@@ -2387,7 +2401,7 @@ LANGUAGE 'plpgsql';
 
        <row>
         <entry>2</entry>
-        <entry>In assignments, SELECTs, to delimit strings, etc.</entry>
+        <entry>In assignments, SELECT statements, to delimit strings, etc.</entry>
         <entry><programlisting>
 a_output := ''Blah'';
 SELECT * FROM users WHERE f_name=''foobar'';

doc/src/sgml/plpython.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/plpython.sgml,v 1.11 2002/09/18 20:09:32 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/plpython.sgml,v 1.12 2002/09/21 18:32:53 petere Exp $ -->
 
 <chapter id="plpython">
  <title>PL/Python - Python Procedural Language</title>
@@ -221,9 +221,12 @@ plan = plpy.prepare("SOME OTHER QUERY")
    execution environment, further restricts it to prevent the use of
    the file <function>open</> call, and allows only modules from a
    specific list to be imported.  Presently, that list includes:
-   array, bisect, binascii, calendar, cmath, codecs, errno, marshal,
-   math, md5, mpz, operator, pcre, pickle, random, re, regex, sre,
-   sha, string, StringIO, struct, time, whrandom, and zlib.
+   <literal>array</>, <>bisect</>, <>binascii</>, <>calendar</>,
+   <>cmath</>, <>codecs</>, <>errno</>, <>marshal</>, <>math</>,
+   <>md5</>, <>mpz</>, <>operator</>, <>pcre</>, <>pickle</>,
+   <>random</>, <>re</>, <>regex</>, <>sre</>, <>sha</>, <>string</>,
+   <>StringIO</>, <>struct</>, <>time</>, <>whrandom</>, and
+   <>zlib</>.
   </para>
  </sect1>
 

doc/src/sgml/pltcl.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.21 2002/08/22 00:01:40 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.22 2002/09/21 18:32:53 petere Exp $
 -->
 
  <chapter id="pltcl">
@@ -50,22 +50,22 @@ $Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.21 2002/08/22 00:01:40 tgl E
    <para>
     Sometimes it is desirable to write Tcl functions that are not restricted
     to safe Tcl --- for example, one might want a Tcl function that sends
-    mail.  To handle these cases, there is a variant of PL/Tcl called PL/TclU
+    mail.  To handle these cases, there is a variant of <application>PL/Tcl</> called <literal>PL/TclU</>
     (for untrusted Tcl).  This is the exact same language except that a full
-    Tcl interpreter is used.  <emphasis>If PL/TclU is used, it must be
+    Tcl interpreter is used.  <emphasis>If <application>PL/TclU</> is used, it must be
     installed as an untrusted procedural language</emphasis> so that only
-    database superusers can create functions in it.  The writer of a PL/TclU
+    database superusers can create functions in it.  The writer of a <application>PL/TclU</>
     function must take care that the function cannot be used to do anything
     unwanted, since it will be able to do anything that could be done by
     a user logged in as the database administrator.
    </para>
    <para>
-    The shared object for the PL/Tcl and PL/TclU call handlers is
+    The shared object for the <application>PL/Tcl</> and <application>PL/TclU</> call handlers is
     automatically built and installed in the
     <productname>PostgreSQL</productname> 
     library directory if Tcl/Tk support is specified
     in the configuration step of the installation procedure.  To install
-    PL/Tcl and/or PL/TclU in a particular database, use the
+    <application>PL/Tcl</> and/or <application>PL/TclU</> in a particular database, use the
     <filename>createlang</filename> script, for example
     <literal>createlang pltcl <replaceable>dbname</></literal> or
     <literal>createlang pltclu <replaceable>dbname</></literal>.
@@ -81,7 +81,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/pltcl.sgml,v 2.21 2002/08/22 00:01:40 tgl E
     <title>PL/Tcl Functions and Arguments</title>
 
     <para>
-     To create a function in the PL/Tcl language, use the standard syntax
+     To create a function in the <application>PL/Tcl</> language, use the standard syntax
 
      <programlisting>
 CREATE FUNCTION <replaceable>funcname</replaceable> (<replaceable>argument-types</replaceable>) RETURNS <replaceable>return-type</replaceable> AS '
@@ -89,8 +89,8 @@ CREATE FUNCTION <replaceable>funcname</replaceable> (<replaceable>argument-types
 ' LANGUAGE 'pltcl';
      </programlisting>
 
-     PL/TclU is the same, except that the language should be specified as
-     <literal>'pltclu'</>.
+     <application>PL/TclU</> is the same, except that the language should be specified as
+     <literal>pltclu</>.
     </para>
 
     <para>
@@ -197,7 +197,7 @@ CREATE FUNCTION overpaid_2 (EMP) RETURNS bool AS '
      all PL/Tcl procedures executed in one backend share the same
      safe Tcl interpreter.  So, any global Tcl variable is accessible to
      all PL/Tcl procedure calls, and will persist for the duration of the
-     SQL client connection.  (Note that PL/TclU functions likewise share
+     SQL client connection.  (Note that <application>PL/TclU</> functions likewise share
      global data, but they are in a different Tcl interpreter and cannot
      communicate with PL/Tcl functions.)
     </para>
@@ -248,7 +248,7 @@ CREATE FUNCTION overpaid_2 (EMP) RETURNS bool AS '
 	setting up the query as a cursor and then saying <literal>FETCH n</>.
        </para>
        <para>
-	If the query is a SELECT statement, the values of the SELECT's
+	If the query is a <literal>SELECT</> statement, the values of the statement's
 	result columns are placed into Tcl variables named after the columns.
         If the <literal>-array</> option is given, the column values are
 	instead stored into the named associative array, with the SELECT
@@ -267,7 +267,7 @@ spi_exec "SELECT count(*) AS cnt FROM pg_proc"
 	</programlisting>
 
 	will set the Tcl variable <literal>$cnt</> to the number of rows in
-	the pg_proc system catalog.
+	the <structname>pg_proc</> system catalog.
        </para>
        <para>
         If the optional <replaceable>loop-body</> argument is given, it is
@@ -337,7 +337,7 @@ spi_exec -array C "SELECT * FROM pg_class" {
        <para>
 	The optional value for <literal>-nulls</> is a string of spaces and
 	<literal>'n'</> characters telling <function>spi_execp</function>
-	which of the arguments are NULLs. If given, it must have exactly the
+	which of the arguments are null values. If given, it must have exactly the
 	same length as the <replaceable>value-list</replaceable>.  If it
 	is not given, all the argument values are non-NULL.
        </para>
@@ -504,7 +504,7 @@ SELECT 'doesn''t' AS ret
        <listitem>
 	<para>
 	 A Tcl list of the table field names, prefixed with an empty list
-         element. So looking up an element name in the list with Tcl's
+         element. So looking up an element name in the list with <application>Tcl</>'s
          <function>lsearch</> command returns the element's number starting
 	 with 1 for the first column, the same way the fields are customarily
 	 numbered in <productname>PostgreSQL</productname>.
@@ -639,7 +639,7 @@ CREATE TRIGGER trig_mytab_modcount BEFORE INSERT OR UPDATE ON mytab
         While the <literal>unknown</> module could actually contain any
 	initialization script you need, it normally defines a Tcl
 	<quote>unknown</> procedure that is invoked whenever Tcl does
-	not recognize an invoked procedure name.  PL/Tcl's standard version
+	not recognize an invoked procedure name.  <application>PL/Tcl</>'s standard version
 	of this procedure tries to find a module in <literal>pltcl_modules</>
 	that will define the required procedure.  If one is found, it is
 	loaded into the interpreter, and then execution is allowed to
@@ -674,7 +674,7 @@ CREATE TRIGGER trig_mytab_modcount BEFORE INSERT OR UPDATE ON mytab
      differ. Tcl, however, requires all procedure names to be distinct.
      PL/Tcl deals with this by making the internal Tcl procedure names contain
      the object 
-     ID of the procedure's pg_proc row as part of their name. Thus,
+     ID of the procedure's <structname>pg_proc</> row as part of their name. Thus,
      <productname>PostgreSQL</productname> functions with the same name
      and different argument types will be different Tcl procedures too.  This
      is not normally a concern for a PL/Tcl programmer, but it might be visible

doc/src/sgml/programmer.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.41 2002/09/18 20:07:15 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/programmer.sgml,v 1.42 2002/09/21 18:32:53 petere Exp $
 
 PostgreSQL Programmer's Guide.
 -->
@@ -60,7 +60,6 @@ PostgreSQL Programmer's Guide.
   &rules;
   &xindex;
   &indexcost;
-  &gist;
   &trigger;
   &spi;
  </part>

doc/src/sgml/ref/alter_table.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.49 2002/08/15 02:59:18 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_table.sgml,v 1.50 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -249,7 +249,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
      <para>
       These forms change whether a column is marked to allow NULL
       values or to reject NULL values.  You may only <literal>SET NOT NULL</>
-      when the table contains no NULLs in the column.
+      when the table contains no null values in the column.
      </para>
     </listitem>
    </varlistentry>
@@ -279,7 +279,7 @@ ALTER TABLE <replaceable class="PARAMETER">table</replaceable>
       compressible data. <literal>EXTERNAL</literal> is for external,
       uncompressed data and <literal>EXTENDED</literal> is for external,
       compressed data.  <literal>EXTENDED</literal> is the default for all
-      datatypes that support it.  The use of <literal>EXTERNAL</literal> will
+      data types that support it.  The use of <literal>EXTERNAL</literal> will
       make substring operations on a TEXT column faster, at the penalty of
       increased storage space.
      </para>

doc/src/sgml/ref/alter_user.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.22 2002/05/17 01:19:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/alter_user.sgml,v 1.23 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -226,7 +226,7 @@ ALTER USER manuel VALID UNTIL 'Jan 31 2030';
   <para>
    Change a user's valid until date, specifying that his
    authorization should expire at midday on 4th May 1998 using
-   the time zone which is one hour ahead of UTC:
+   the time zone which is one hour ahead of <acronym>UTC</>:
 <programlisting>
 ALTER USER chris VALID UNTIL 'May 4 12:00:00 1998 +1';
 </programlisting>

doc/src/sgml/ref/begin.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/begin.sgml,v 1.19 2002/08/30 22:45:25 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/begin.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -125,7 +125,7 @@ WARNING:  BEGIN: already a transaction in progress
    Guide</citetitle> for details.)
    In SERIALIZABLE mode queries will see only changes committed before
    the entire
-   transaction began (actually, before execution of the first DML statement
+   transaction began (actually, before execution of the first <acronym>DML</> statement
    in the transaction).
   </para>
 

doc/src/sgml/ref/cluster.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/cluster.sgml,v 1.19 2002/08/11 02:43:57 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/cluster.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -169,7 +169,7 @@ SELECT <replaceable class="parameter">columnlist</replaceable> INTO TABLE <repla
 
     which uses the <productname>PostgreSQL</productname> sorting code in 
     the ORDER BY clause to create the desired order; this is usually much
-    faster than an indexscan for
+    faster than an index scan for
     unordered data. You then drop the old table, use
     <command>ALTER TABLE...RENAME</command>
     to rename <replaceable class="parameter">newtable</replaceable> to the old name, and

doc/src/sgml/ref/clusterdb.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.3 2002/09/05 22:05:50 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.4 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -71,8 +71,8 @@ PostgreSQL documentation
     
     <variablelist>
      <varlistentry>
-      <term>-d <replaceable class="parameter">dbname</replaceable></term>
-      <term>--dbname <replaceable class="parameter">dbname</replaceable></term>
+      <term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--dbname <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
 	Specifies the name of the database to be clustered.
@@ -86,8 +86,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-a</term>
-      <term>--all</term>
+      <term><option>-a</></term>
+      <term><option>--all</></term>
       <listitem>
        <para>
 	Cluster all databases.
@@ -96,8 +96,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-t <replaceable class="parameter">table</replaceable></term>
-      <term>--table <replaceable class="parameter">table</replaceable></term>
+      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
+      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
       <listitem>
        <para>
 	Clusters <replaceable class="parameter">table</replaceable> only.
@@ -114,8 +114,8 @@ PostgreSQL documentation
     
     <variablelist>
      <varlistentry>
-      <term>-h <replaceable class="parameter">host</replaceable></term>
-      <term>--host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -127,8 +127,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p <replaceable class="parameter">port</replaceable></term>
-      <term>--port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or local Unix domain socket file 
@@ -139,8 +139,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-U <replaceable class="parameter">username</replaceable></term>
-      <term>--username <replaceable class="parameter">username</replaceable></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as
@@ -149,8 +149,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-W</term>
-      <term>--password</term>
+      <term><option>-W</></term>
+      <term><option>--password</></term>
       <listitem>
        <para>
         Force password prompt.
@@ -159,8 +159,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e</term>
-      <term>--echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Echo the commands that <application>clusterdb</application> generates
@@ -170,8 +170,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-q</term>
-      <term>--quiet</term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
         Do not display a response.

doc/src/sgml/ref/copy.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.39 2002/08/30 16:00:41 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.40 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -477,7 +477,7 @@ order is detected here.
       <listitem>
        <para>
 int32 bit mask to denote important aspects of the file format. Bits are
-numbered from 0 (LSB) to 31 (MSB) --- note that this field is stored
+numbered from 0 (<acronym>LSB</>) to 31 (<acronym>MSB</>) --- note that this field is stored
 with source's endianness, as are all subsequent integer fields. Bits
 16-31 are reserved to denote critical file format issues; a reader
 should abort if it finds an unexpected bit set in this range. Bits 0-15
@@ -539,8 +539,8 @@ is left for a later release.
 Each tuple begins with an int16 count of the number of fields in the
 tuple.  (Presently, all tuples in a table will have the same count, but
 that might not always be true.)  Then, repeated for each field in the
-tuple, there is an int16 typlen word possibly followed by field data.
-The typlen field is interpreted thus:
+tuple, there is an int16 <structfield>typlen</> word possibly followed by field data.
+The <structfield>typlen</> field is interpreted thus:
 
     <variablelist>
      <varlistentry>
@@ -557,7 +557,7 @@ The typlen field is interpreted thus:
       <listitem>
        <para>
         Field is a fixed-length data type.  Exactly N
-	bytes of data follow the typlen word.
+	bytes of data follow the <structfield>typlen</> word.
        </para>
       </listitem>
      </varlistentry>
@@ -566,8 +566,8 @@ The typlen field is interpreted thus:
       <term>-1</term>
       <listitem>
        <para>
-	Field is a varlena data type.  The next four
-	bytes are the varlena header, which contains
+	Field is a <literal>varlena</> data type.  The next four
+	bytes are the <literal>varlena</> header, which contains
 	the total value length including itself.
        </para>
       </listitem>
@@ -585,8 +585,8 @@ The typlen field is interpreted thus:
     </para>
 
     <para>
-For non-NULL fields, the reader can check that the typlen matches the
-expected typlen for the destination column.  This provides a simple
+For non-NULL fields, the reader can check that the <structfield>typlen</> matches the
+expected <structfield>typlen</> for the destination column.  This provides a simple
 but very useful check that the data is as expected.
     </para>
 
@@ -602,7 +602,7 @@ you from moving a binary file across machines).
     <para>
 If OIDs are included in the dump, the OID field immediately follows the
 field-count word.  It is a normal field except that it's not included
-in the field-count.  In particular it has a typlen --- this will allow
+in the field-count.  In particular it has a <structfield>typlen</> --- this will allow
 handling of 4-byte vs 8-byte OIDs without too much pain, and will allow
 OIDs to be shown as NULL if that ever proves desirable.
     </para>

doc/src/sgml/ref/create_aggregate.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.20 2002/05/18 15:44:47 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_aggregate.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -233,7 +233,7 @@ CREATE AGGREGATE
    If the state transition function is not strict, then it will be called
    unconditionally at each input value, and must deal with NULL inputs
    and NULL transition values for itself.  This allows the aggregate
-   author to have full control over the aggregate's handling of NULLs.
+   author to have full control over the aggregate's handling of null values.
   </para>
   
   <para>

doc/src/sgml/ref/create_conversion.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.3 2002/08/22 00:01:40 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/create_conversion.sgml,v 1.4 2002/09/21 18:32:54 petere Exp $ -->
 
 <refentry id="SQL-CREATECONVERSION">
  <refmeta>
@@ -139,7 +139,7 @@ CREATE [DEFAULT] CONVERSION <replaceable>conversion_name</replaceable>
   <title>Examples</title>
 
   <para>
-   To create a conversion from encoding UNICODE to LATIN1 using myfunc:
+   To create a conversion from encoding UNICODE to LATIN1 using <function>myfunc</>:
 <programlisting>
 CREATE CONVERSION myconv FOR 'UNICODE' TO 'LATIN1' FROM myfunc;
 </programlisting>

doc/src/sgml/ref/create_database.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.28 2002/06/17 05:40:32 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.29 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -114,7 +114,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
       <term><computeroutput>ERROR:  user '<replaceable class="parameter">username</replaceable>' is not allowed to create/drop databases</computeroutput></term>
       <listitem>
        <para>
-        You must have the special CREATEDB privilege to create databases.
+        You must have the special <literal>CREATEDB</> privilege to create databases.
         See <xref linkend="SQL-CREATEUSER" endterm="SQL-CREATEUSER-title">.
        </para>
       </listitem>
@@ -186,7 +186,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
    Normally, the creator becomes the owner of the new database.
    Superusers can create databases owned by other users using the
    <option>OWNER</> clause. They can even create databases owned by
-   users with no special privileges. Non-superusers with CREATEDB
+   users with no special privileges. Non-superusers with <literal>CREATEDB</>
    privilege can only create databases owned by themselves.
   </para>
 

doc/src/sgml/ref/create_function.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.42 2002/08/22 00:01:40 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_function.sgml,v 1.43 2002/09/21 18:32:54 petere Exp $
 -->
 
 <refentry id="SQL-CREATEFUNCTION">
@@ -77,7 +77,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
 	Depending on the implementation language it may also be allowed
 	to specify <quote>pseudo-types</> such as <type>cstring</>.
 	Pseudo-types indicate that the actual argument type is either
-	incompletely specified, or outside the set of ordinary SQL datatypes.
+	incompletely specified, or outside the set of ordinary SQL data types.
       </para>
      </listitem>
     </varlistentry>
@@ -171,7 +171,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
        <literal>CALLED ON NULL INPUT</literal> (the default) indicates
        that the function will be called normally when some of its
        arguments are null.  It is then the function author's
-       responsibility to check for NULLs if necessary and respond
+       responsibility to check for null values if necessary and respond
        appropriately.
       </para>
 
@@ -247,7 +247,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
 
       <variablelist>
        <varlistentry>
-        <term>isStrict</term>
+        <term><literal>isStrict</></term>
         <listitem>
          <para>
           Equivalent to <literal>STRICT</literal> or <literal>RETURNS NULL ON NULL INPUT</literal>
@@ -256,7 +256,7 @@ CREATE [ OR REPLACE ] FUNCTION <replaceable class="parameter">name</replaceable>
        </varlistentry>
 
        <varlistentry>
-        <term>isCachable</term>
+        <term><literal>isCachable</></term>
         <listitem>
          <para>
           <literal>isCachable</literal> is an obsolete equivalent of

doc/src/sgml/ref/create_index.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.36 2002/08/13 20:40:43 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.37 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -266,7 +266,7 @@ ERROR: Cannot create index: 'index_name' already exists.
   <para>
     The expression used in the <command>WHERE</command> clause may refer
     only to columns of the underlying table (but it can use all columns,
-    not only the one(s) being indexed).  Presently, sub-SELECTs and
+    not only the one(s) being indexed).  Presently, subqueries and
     aggregate expressions are also forbidden in <command>WHERE</command>.
   </para>
 
@@ -331,7 +331,7 @@ ERROR: Cannot create index: 'index_name' already exists.
    </para>
    <para>
      Testing has shown PostgreSQL's hash indexes to be similar or slower
-     than btree indexes, and the index size and build time for hash
+     than B-tree indexes, and the index size and build time for hash
      indexes is much worse. Hash indexes also suffer poor performance
      under high concurrency. For these reasons, hash index use is
      discouraged.

doc/src/sgml/ref/create_opclass.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.2 2002/08/22 00:01:40 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_opclass.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -52,8 +52,8 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       <listitem>
        <para>
         If present, the operator class will become the default index
-	operator class for its datatype.  At most one operator class
-	can be the default for a specific datatype and access method.
+	operator class for its data type.  At most one operator class
+	can be the default for a specific data type and access method.
        </para>
       </listitem>
      </varlistentry>
@@ -61,7 +61,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       <term><replaceable class="parameter">data_type</replaceable></term>
       <listitem>
        <para>
-        The column datatype that this operator class is for.
+        The column data type that this operator class is for.
        </para>
       </listitem>
      </varlistentry>
@@ -95,10 +95,10 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       <term><replaceable class="parameter">type</replaceable></term>
       <listitem>
        <para>
-        The input datatype(s) of an operator, or <literal>NONE</> to
-	signify a left-unary or right-unary operator.  The input datatypes
+        The input data type(s) of an operator, or <literal>NONE</> to
+	signify a left-unary or right-unary operator.  The input data types
 	may be omitted in the normal case where they are the same as the
-	operator class's datatype.
+	operator class's data type.
        </para>
       </listitem>
      </varlistentry>
@@ -135,7 +135,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       <term><replaceable class="parameter">parameter_types</replaceable></term>
       <listitem>
        <para>
-        The parameter datatype(s) of the function.
+        The parameter data type(s) of the function.
        </para>
       </listitem>
      </varlistentry>
@@ -143,8 +143,8 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       <term><replaceable class="parameter">storage_type</replaceable></term>
       <listitem>
        <para>
-        The datatype actually stored in the index.  Normally this is the
-	same as the column datatype, but some index access methods (only
+        The data type actually stored in the index.  Normally this is the
+	same as the column data type, but some index access methods (only
 	GIST at this writing) allow it to be different.  The
 	<literal>STORAGE</> clause must be omitted unless the index access
 	method allows a different type to be used.
@@ -191,9 +191,9 @@ CREATE OPERATOR CLASS
    <replaceable class="parameter">name</replaceable>.
   </para>
   <para>
-   An operator class defines how a particular datatype can be used with
+   An operator class defines how a particular data type can be used with
    an index.  The operator class specifies that certain operators will fill
-   particular roles or <quote>strategies</> for this datatype and this
+   particular roles or <quote>strategies</> for this data type and this
    access method.  The operator class also specifies the support procedures to
    be used by 
    the index access method when the operator class is selected for an
@@ -210,7 +210,7 @@ CREATE OPERATOR CLASS
   </para>
   <para>
    The user who defines an operator class becomes its owner.  The user
-   must own the datatype for which the operator class is being defined,
+   must own the data type for which the operator class is being defined,
    and must have execute permission for all referenced operators and functions.
   </para>
 
@@ -248,7 +248,7 @@ CREATE OPERATOR CLASS
   </title>
   <para>
    The following example command defines a GiST index operator class
-   for datatype <literal>_int4</> (array of int4).  See
+   for data type <literal>_int4</> (array of int4).  See
    <filename>contrib/intarray/</> for the complete example.
   </para>
 

doc/src/sgml/ref/create_operator.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.31 2002/08/23 02:54:18 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_operator.sgml,v 1.32 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -268,10 +268,10 @@ CREATE OPERATOR
    are always equivalent.
   </para>
   <para>
-   At least one of LEFTARG and RIGHTARG must be defined.  For
+   At least one of <literal>LEFTARG</> and <literal>RIGHTARG</> must be defined.  For
    binary operators, both should be defined. For right  unary
-   operators,  only  LEFTARG  should  be defined, while for left
-   unary operators only RIGHTARG should be defined.
+   operators,  only  <literal>LEFTARG</>  should  be defined, while for left
+   unary operators only <literal>RIGHTARG</> should be defined.
   </para>
   <para>
    The
@@ -335,39 +335,43 @@ MYBOXES.description !== box '((0,0), (1,1))'
    it also works to just have both operators refer to each other.)
   </para>
   <para>
-   The HASHES, MERGES, SORT1, SORT2, LTCMP, and GTCMP options are present to
-   support the 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 <type>boolean</type>) by iterative substitution [WONG76].  In
-   addition, <productname>PostgreSQL</productname> can use a hash-join
-   algorithm along the lines of [SHAP86]; however, it must know whether this
-   strategy is applicable.  The current hash-join algorithm is only correct
-   for operators that represent equality tests; furthermore, equality of the
-   data type must mean bitwise equality of the representation of the type.
-   (For example, a data type that contains unused bits that don't matter for
-   equality tests could not be hash-joined.)  The HASHES flag indicates to the
-   query optimizer that a hash join may safely be used with this
-   operator.
-  </para>
-  <para>
-   Similarly, the MERGES flag indicates whether merge-sort is a usable join
-   strategy for this operator.  A merge join requires that the two input
-   datatypes have consistent orderings, and that the mergejoin operator
-   behave like equality with respect to that ordering.  For example, it is
-   possible to merge-join equality between an integer and a float variable by
-   sorting both inputs in ordinary 
-   numeric order.  Execution of a merge join requires that the system be
-   able to identify four operators related to the mergejoin equality operator:
-   less-than comparison for the left input datatype,
-   less-than comparison for the right input datatype,
-   less-than comparison between the two datatypes, and
-   greater-than comparison between the two datatypes.  It is possible to
-   specify these by name, as the SORT1, SORT2, LTCMP, and GTCMP options
-   respectively.  The system will fill in the default names <literal>&lt;</>,
-   <literal>&lt;</>, <literal>&lt;</>, <literal>&gt;</> respectively if
-   any of these are omitted when MERGES is specified.  Also, MERGES will
-   be assumed to be implied if any of these four operator options appear.
+   The <literal>HASHES</>, <literal>MERGES</>, <literal>SORT1</>,
+   <literal>SORT2</>, <literal>LTCMP</>, and <literal>GTCMP</> options
+   are present to support the 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 <type>boolean</type>) by iterative
+   substitution <!--[WONG76]-->.  In addition,
+   <productname>PostgreSQL</productname> can use a hash-join algorithm
+   <!--along the lines of [SHAP86]-->; however, it must know whether this
+   strategy is applicable.  The current hash-join algorithm is only
+   correct for operators that represent equality tests; furthermore,
+   equality of the data type must mean bitwise equality of the
+   representation of the type.  (For example, a data type that
+   contains unused bits that don't matter for equality tests could not
+   be hash-joined.)  The <literal>HASHES</> flag indicates to the query optimizer
+   that a hash join may safely be used with this operator.
+  </para>
+  <para>
+   Similarly, the <literal>MERGES</> flag indicates whether merge-sort
+   is a usable join strategy for this operator.  A merge join requires
+   that the two input data types have consistent orderings, and that
+   the merge-join operator behave like equality with respect to that
+   ordering.  For example, it is possible to merge-join equality
+   between an integer and a float variable by sorting both inputs in
+   ordinary numeric order.  Execution of a merge join requires that
+   the system be able to identify four operators related to the
+   merge-join equality operator: less-than comparison for the left
+   input data type, less-than comparison for the right input data
+   type, less-than comparison between the two data types, and
+   greater-than comparison between the two data types.  It is possible
+   to specify these by name, as the <literal>SORT1</>,
+   <literal>SORT2</>, <literal>LTCMP</>, and <literal>GTCMP</> options
+   respectively.  The system will fill in the default names
+   <literal>&lt;</>, <literal>&lt;</>, <literal>&lt;</>,
+   <literal>&gt;</> respectively if any of these are omitted when
+   <literal>MERGES</> is specified.  Also, <literal>MERGES</> will be
+   assumed to be implied if any of these four operator options appear.
   </para>
   <para>
    If  other join strategies are found to be practical,
@@ -380,14 +384,15 @@ MYBOXES.description !== box '((0,0), (1,1))'
    be worth the complexity involved.
   </para>
   <para>
-   The RESTRICT and JOIN options assist the query optimizer in estimating
-   result sizes.  If a clause of the form:
-   <programlisting>
-MYBOXES.description &lt;&lt;&lt; box '((0,0), (1,1))'
-   </programlisting>
+   The <literal>RESTRICT</> and <literal>JOIN</> options assist the
+   query optimizer in estimating result sizes.  If a clause of the
+   form:
+<programlisting>
+myboxes.description &lt;&lt;&lt; box '((0,0), (1,1))'
+</programlisting>
    is present in the qualification,
    then <productname>PostgreSQL</productname> may have to
-   estimate the fraction of the  instances  in  MYBOXES  that
+   estimate the fraction of the  instances  in <literal>myboxes</> that
    satisfy  the clause.  The function
    <replaceable class="parameter">res_proc</replaceable>
    must be a registered function (meaning  it  is  already  defined  using
@@ -400,7 +405,7 @@ MYBOXES.description &lt;&lt;&lt; box '((0,0), (1,1))'
   <para>
    Similarly, when the operands of the operator both  contain
    instance  variables, the query optimizer must estimate the
-   size of the resulting join.  The function  join_proc  will
+   size of the resulting join.  The function <function>join_proc</> will
    return  another floating-point number which will be multiplied
    by the cardinalities of the two tables involved  to
    compute the expected result size.

doc/src/sgml/ref/create_schema.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.2 2002/05/18 15:44:47 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_schema.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -33,7 +33,7 @@ CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">username</replaceable
       <term><replaceable class="parameter">schemaname</replaceable></term>
       <listitem>
        <para>
-	The name of a schema to be created.  If this is omitted, the username
+	The name of a schema to be created.  If this is omitted, the user name
 	is used as the schema name.
        </para>
       </listitem>
@@ -111,7 +111,7 @@ ERROR:  namespace "<replaceable class="parameter">schemaname</replaceable>" alre
 
   <para>
    A schema is essentially a namespace:
-   it contains named objects (tables, datatypes, functions, and operators)
+   it contains named objects (tables, data types, functions, and operators)
    whose names may duplicate those of other objects existing in other
    schemas.  Named objects are accessed either by <quote>qualifying</>
    their names with the schema name as a prefix, or by setting a search

doc/src/sgml/ref/create_type.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.34 2002/08/29 00:17:01 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_type.sgml,v 1.35 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -208,7 +208,7 @@ CREATE TYPE
    specified schema.  Otherwise it is created in the current schema (the one
    at the front of the search path; see <literal>CURRENT_SCHEMA()</>).
    The type name must be distinct from the name of any existing type or
-   domain in the same schema.  (Because tables have associated datatypes,
+   domain in the same schema.  (Because tables have associated data types,
    type names also must not conflict with table names in the same schema.)
   </para>
 
@@ -231,10 +231,10 @@ CREATE TYPE
    <type>cstring</type>, <type>OID</type>, <type>int4</type>.
    (The first argument is the input text as a C string, the second
    argument is the element type in case this is an array type,
-   and the third is the typmod of the destination column, if known.)
-   It should return a value of the datatype itself.
+   and the third is the <literal>typmod</> of the destination column, if known.)
+   It should return a value of the data type itself.
    The output function may be
-   declared as taking one argument of the new datatype,  or as taking
+   declared as taking one argument of the new data type,  or as taking
    two arguments of which the second is type <type>OID</type>.
    (The second argument is again the array element type for array types.)
    The output function should return type <type>cstring</type>.
@@ -245,9 +245,9 @@ CREATE TYPE
    can be declared to have results or inputs of the new type, when they have
    to be created before the new type can be created.  The answer is that the
    input function must be created first, then the output function, then the
-   datatype.
+   data type.
    <productname>PostgreSQL</productname> will first see the name of the new
-   datatype as the return type of the input function.  It will create a
+   data type as the return type of the input function.  It will create a
    <quote>shell</> type, which is simply a placeholder entry in
    <literal>pg_type</>, and link the input function definition to the shell
    type.  Similarly the output function will be linked to the (now already
@@ -273,7 +273,7 @@ CREATE TYPE
    positive integer, or variable  length, indicated by setting
    <replaceable class="parameter">internallength</replaceable>
    to <option>VARIABLE</option>.  (Internally, this is represented
-   by setting typlen to -1.)  The internal representation of all
+   by setting <literal>typlen</> to -1.)  The internal representation of all
    variable-length types must start with an integer giving the total
    length of this value of the type.
   </para>
@@ -346,7 +346,7 @@ CREATE TYPE
   <para>
    The second form of <command>CREATE TYPE</command>
    creates a composite type.
-   The composite type is specified by a list of column names and datatypes.
+   The composite type is specified by a list of column names and data types.
    This is essentially the same as the row type
    of a table, but using <command>CREATE TYPE</command> avoids the need to
    create an actual table when all that is wanted is to define a type.

doc/src/sgml/ref/create_view.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_view.sgml,v 1.19 2002/09/02 20:04:39 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_view.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -235,7 +235,7 @@ CREATE VIEW <replaceable class="parameter">view</replaceable> [ <replaceable cla
       <listitem>
        <para>
 	This option is to do with updatable views.
-	All INSERTs and UPDATEs on the view will be
+	All <command>INSERT</> and <command>UPDATE</> commands on the view will be
 	checked to ensure data satisfy the view-defining
 	condition. If they do not, the update will be rejected.
        </para>

doc/src/sgml/ref/createdb.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.28 2002/08/10 16:57:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.29 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -61,7 +61,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term>-h, --host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -72,7 +73,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p, --port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or the local Unix domain socket file 
@@ -82,7 +84,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-U, --username <replaceable class="parameter">username</replaceable></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as
@@ -91,7 +94,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-W, --password</term>
+      <term><option>-W</></term>
+      <term><option>--password</></term>
       <listitem>
        <para>
         Force password prompt.
@@ -100,7 +104,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e, --echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Echo the queries that <application>createdb</application> generates
@@ -110,7 +115,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-q, --quiet</term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
         Do not display a response.
@@ -119,7 +125,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-O, --owner <replaceable class="parameter">owner</replaceable></term>
+      <term><option>-O <replaceable class="parameter">owner</replaceable></></term>
+      <term><option>--owner <replaceable class="parameter">owner</replaceable></></term>
       <listitem>
        <para>
 	Specifies the database user who will own the new database.
@@ -128,7 +135,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-D, --location <replaceable class="parameter">datadir</replaceable></term>
+      <term><option>-D <replaceable class="parameter">datadir</replaceable></></term>
+      <term><option>--location <replaceable class="parameter">datadir</replaceable></></term>
       <listitem>
        <para>
 	Specifies the alternative location for the database.  See also <xref
@@ -138,7 +146,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-T, --template <replaceable class="parameter">template</replaceable></term>
+      <term><option>-T <replaceable class="parameter">template</replaceable></></term>
+      <term><option>--template <replaceable class="parameter">template</replaceable></></term>
       <listitem>
        <para>
         Specifies the template database from which to build this database.
@@ -147,7 +156,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-E, --encoding <replaceable class="parameter">encoding</replaceable></term>
+      <term><option>-E <replaceable class="parameter">encoding</replaceable></></term>
+      <term><option>--encoding <replaceable class="parameter">encoding</replaceable></></term>
       <listitem>
        <para>
         Specifies the character encoding scheme to be used in this database.

doc/src/sgml/ref/createlang.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.26 2002/08/10 16:57:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.27 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -69,7 +69,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-d, --dbname <replaceable class="parameter">dbname</replaceable></term>
+      <term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--dbname <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
 	Specifies to which database the language should be added.
@@ -80,7 +81,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e, --echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Displays SQL commands as they are executed.
@@ -89,7 +91,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-l, --list</term>
+      <term><option>-l</></term>
+      <term><option>--list</></term>
       <listitem>
        <para>
         Shows a list of already installed languages in the target database
@@ -99,7 +102,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--L <replaceable class="parameter">directory</replaceable></term>
+      <term><option>-L <replaceable class="parameter">directory</replaceable></></term>
       <listitem>
        <para>
 	Specifies the directory in which the language interpreter is
@@ -118,7 +121,8 @@ PostgreSQL documentation
     
     <variablelist>
      <varlistentry>
-      <term>-h, --host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -130,7 +134,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p, --port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or local Unix domain socket file 
@@ -141,7 +146,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-U, --username <replaceable class="parameter">username</replaceable></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as
@@ -150,7 +156,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-W, --password</term>
+      <term><option>-W</></term>
+      <term><option>--password</></term>
       <listitem>
        <para>
         Force password prompt.

doc/src/sgml/ref/createuser.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.27 2002/08/10 16:57:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.28 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -39,7 +39,7 @@ PostgreSQL documentation
 
   <para>
    Being a superuser also implies the ability to bypass access permission
-   checks within the database, so superuser-dom should not be granted lightly.
+   checks within the database, so superuserdom should not be granted lightly.
   </para>
 
   <para>
@@ -64,7 +64,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term>-h, --host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -76,7 +77,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p, --port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or local Unix domain socket file 
@@ -87,7 +89,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e, --echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Echo the queries that <application>createuser</application> generates
@@ -97,7 +100,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-q, --quiet</term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
         Do not display a response.
@@ -106,7 +110,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-d, --createdb</term>
+      <term><option>-d</></term>
+      <term><option>--createdb</></term>
       <listitem>
        <para>
 	The new user is allowed to create databases.
@@ -115,7 +120,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-D, --no-createdb</term>
+      <term><option>-D</></term>
+      <term><option>--no-createdb</></term>
       <listitem>
        <para>
 	The new user is not allowed to create databases.
@@ -124,7 +130,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-a, --adduser</term>
+      <term><option>-a</></term>
+      <term><option>--adduser</></term>
       <listitem>
        <para>
 	The new user is allowed to create other users.
@@ -135,7 +142,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-A, --no-adduser</term>
+      <term><option>-A</></term>
+      <term><option>--no-adduser</></term>
       <listitem>
        <para>
 	The new user is not allowed to create other users (i.e.,
@@ -145,7 +153,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-P, --pwprompt</term>
+      <term><option>-P</></term>
+      <term><option>--pwprompt</></term>
       <listitem>
        <para>
        If given, <application>createuser</application> will issue a prompt for
@@ -156,7 +165,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-i, --sysid <replaceable class="parameter">uid</replaceable></term>
+      <term><option>-i <replaceable class="parameter">uid</replaceable></></term>
+      <term><option>--sysid <replaceable class="parameter">uid</replaceable></></term>
       <listitem>
        <para>
        Allows you to pick a non-default user id for the new user. This is not
@@ -166,7 +176,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-E, --encrypted</term>
+      <term><option>-E</></term>
+      <term><option>--encrypted</></term>
       <listitem>
        <para>
 	Encrypts the user's password stored in the database. If not
@@ -176,7 +187,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-N, --unencrypted</term>
+      <term><option>-N</></term>
+      <term><option>--unencrypted</></term>
       <listitem>
        <para>
 	Does not encrypt the user's password stored in the database. If

doc/src/sgml/ref/drop_conversion.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.2 2002/07/22 13:00:00 ishii Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_conversion.sgml,v 1.3 2002/09/21 18:32:54 petere Exp $ -->
 
 <refentry id="SQL-DROPCONVERSION">
  <refmeta>
@@ -76,7 +76,7 @@ DROP CONVERSION <replaceable>conversion_name</replaceable>
   <title>Examples</title>
 
   <para>
-   To drop the conversion named myname:
+   To drop the conversion named <literal>myname</>:
 <programlisting>
 DROP CONVERSION myname;
 </programlisting>

doc/src/sgml/ref/drop_opclass.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.1 2002/07/29 22:14:10 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_opclass.sgml,v 1.2 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -134,7 +134,7 @@ DROP OPERATOR CLASS
    Usage
   </title>
   <para>
-   Remove btree operator class <literal>widget_ops</literal>:
+   Remove B-tree operator class <literal>widget_ops</literal>:
 
    <programlisting>
 DROP OPERATOR CLASS widget_ops USING btree;

doc/src/sgml/ref/dropdb.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.17 2002/08/10 16:57:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.18 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -54,7 +54,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term>-h, --host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -66,7 +67,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p, --port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or local Unix domain socket file 
@@ -77,7 +79,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-U, --username <replaceable class="parameter">username</replaceable></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as
@@ -86,7 +89,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-W, --password</term>
+      <term><option>-W</></term>
+      <term><option>--password</></term>
       <listitem>
        <para>
         Force password prompt.
@@ -95,7 +99,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e, --echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Echo the queries that <application>dropdb</application> generates
@@ -105,7 +110,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-q, --quiet</term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
         Do not display a response.
@@ -114,7 +120,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-i, --interactive</term>
+      <term><option>-i</></term>
+      <term><option>--interactive</></term>
       <listitem>
        <para>
        Issues a verification prompt before doing anything destructive.

doc/src/sgml/ref/droplang.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.20 2002/08/10 16:57:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -69,7 +69,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>[-d, --dbname] <replaceable class="parameter">dbname</replaceable></term>
+      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></></term>
       <listitem>
        <para>
 	Specifies from which database the language should be removed.
@@ -80,7 +81,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e, --echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Displays SQL commands as they are executed.
@@ -89,7 +91,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-l, --list</term>
+      <term><option>-l</></term>
+      <term><option>--list</></term>
       <listitem>
        <para>
         Shows a list of already installed languages in the target database
@@ -107,7 +110,8 @@ PostgreSQL documentation
     
     <variablelist>
      <varlistentry>
-      <term>-h, --host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -119,7 +123,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p, --port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or local Unix domain socket file 
@@ -130,7 +135,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-U, --username <replaceable class="parameter">username</replaceable></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
+      <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
         User name to connect as
@@ -139,7 +145,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-W, --password</term>
+      <term><option>-W</></term>
+      <term><option>--password</></term>
       <listitem>
        <para>
         Force password prompt.

doc/src/sgml/ref/dropuser.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.20 2002/08/10 16:57:31 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.21 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -56,7 +56,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term>-h, --host <replaceable class="parameter">host</replaceable></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
+      <term><option>--host <replaceable class="parameter">host</replaceable></></term>
       <listitem>
        <para>
 	Specifies the host name of the machine on which the 
@@ -68,7 +69,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-p, --port <replaceable class="parameter">port</replaceable></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
+      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
       <listitem>
        <para>
 	Specifies the Internet TCP/IP port or local Unix domain socket file 
@@ -79,7 +81,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-e, --echo</term>
+      <term><option>-e</></term>
+      <term><option>--echo</></term>
       <listitem>
        <para>
         Echo the queries that <application>dropuser</application> generates
@@ -89,7 +92,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-q, --quiet</term>
+      <term><option>-q</></term>
+      <term><option>--quiet</></term>
       <listitem>
        <para>
         Do not display a response.
@@ -98,7 +102,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>-i, --interactive</term>
+      <term><option>-i</></term>
+      <term><option>--interactive</></term>
       <listitem>
        <para>
         Prompt for confirmation before actually removing the user.

doc/src/sgml/ref/initdb.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.21 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.22 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -114,8 +114,8 @@ PostgreSQL documentation
    <para>
     <variablelist>
      <varlistentry>
-      <term>--pgdata=<replaceable class="parameter">directory</replaceable></term>
-      <term>-D <replaceable class="parameter">directory</replaceable></term>
+      <term><option>--pgdata=<replaceable class="parameter">directory</replaceable></option></term>
+      <term><option>-D <replaceable class="parameter">directory</replaceable></option></term>
       <listitem>
        <para>
         This option specifies the directory where the database system
@@ -130,23 +130,23 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--username=<replaceable class="parameter">username</replaceable></term>
-      <term>-U <replaceable class="parameter">username</replaceable></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         Selects the user name of the database superuser. This defaults
         to the name of the effective user running
         <command>initdb</command>. It is really not important what the
         superuser's name is, but one might choose to keep the
-        customary name <quote>postgres</quote>, even if the operating
+        customary name <systemitem>postgres</systemitem>, even if the operating
         system user's name is different.
        </para>
       </listitem>
      </varlistentry>
  
      <varlistentry>
-      <term>--pwprompt</term>
-      <term>-W</term>
+      <term><option>--pwprompt</option></term>
+      <term><option>-W</option></term>
       <listitem>
        <para>
         Makes <command>initdb</command> prompt for a password
@@ -159,8 +159,8 @@ PostgreSQL documentation
      </varlistentry>
  
      <varlistentry>
-      <term>--encoding=<replaceable class="parameter">encoding</replaceable></term>
-      <term>-E <replaceable class="parameter">encoding</replaceable></term>
+      <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></option></term>
+      <term><option>-E <replaceable class="parameter">encoding</replaceable></option></term>
       <listitem>
        <para>
         Selects the encoding of the template database. This will also
@@ -173,7 +173,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--locale=<replaceable>locale</replaceable></term>
+      <term><option>--locale=<replaceable>locale</replaceable></option></term>
       <listitem>
        <para>
         Sets the default locale for the database cluster.  If this
@@ -184,12 +184,12 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--lc-collate=<replaceable>locale</replaceable></term>
-      <term>--lc-ctype=<replaceable>locale</replaceable></term>
-      <term>--lc-messages=<replaceable>locale</replaceable></term>
-      <term>--lc-monetary=<replaceable>locale</replaceable></term>
-      <term>--lc-numeric=<replaceable>locale</replaceable></term>
-      <term>--lc-time=<replaceable>locale</replaceable></term>
+      <term><option>--lc-collate=<replaceable>locale</replaceable></option></term>
+      <term><option>--lc-ctype=<replaceable>locale</replaceable></option></term>
+      <term><option>--lc-messages=<replaceable>locale</replaceable></option></term>
+      <term><option>--lc-monetary=<replaceable>locale</replaceable></option></term>
+      <term><option>--lc-numeric=<replaceable>locale</replaceable></option></term>
+      <term><option>--lc-time=<replaceable>locale</replaceable></option></term>
 
       <listitem>
        <para>
@@ -206,7 +206,7 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term>-L <replaceable class="parameter">directory</replaceable></term>
+      <term><option>-L <replaceable class="parameter">directory</replaceable></option></term>
       <listitem>
        <para>
         Specifies where <command>initdb</command> should find
@@ -218,8 +218,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--noclean</term>
-      <term>-n</term>
+      <term><option>-n</option></term>
+      <term><option>--noclean</option></term>
       <listitem>
        <para>
 	By default, when <command>initdb</command>
@@ -232,8 +232,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term>--debug</term>
-      <term>-d</term>
+      <term><option>-d</option></term>
+      <term><option>--debug</option></term>
       <listitem>
        <para>
 	Print debugging output from the bootstrap backend and a few other

doc/src/sgml/ref/insert.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/insert.sgml,v 1.18 2002/04/24 02:31:30 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/insert.sgml,v 1.19 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -55,8 +55,8 @@ INSERT INTO <replaceable class="PARAMETER">table</replaceable> [ ( <replaceable
       <term>DEFAULT VALUES</term>
       <listitem>
        <para>
-	All columns will be filled by NULLs or by values specified
-	when the table was created using DEFAULT clauses.
+	All columns will be filled by null values or by values specified
+	when the table was created using <literal>DEFAULT</> clauses.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/ref/listen.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/listen.sgml,v 1.14 2002/08/13 20:40:43 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/listen.sgml,v 1.15 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -115,12 +115,12 @@ WARNING:  Async_Listen: We are already listening on <replaceable class="PARAMETE
   <para>
    The method a frontend application must use to detect notify events depends on
    which <productname>PostgreSQL</productname> application programming interface it
-   uses.  With the basic libpq library, the application issues
+   uses.  With the <application>libpq</> library, the application issues
    <command>LISTEN</command> as an ordinary SQL command, and then must
    periodically call the routine <function>PQnotifies</function> to find out
    whether any notify events have been received.  Other interfaces such as
-   libpgtcl provide higher-level methods for handling notify events; indeed,
-   with libpgtcl the application programmer should not even issue
+   <application>libpgtcl</> provide higher-level methods for handling notify events; indeed,
+   with <application>libpgtcl</> the application programmer should not even issue
    <command>LISTEN</command> or <command>UNLISTEN</command> directly.  See the
    documentation for the library you are using for more details.
   </para>

doc/src/sgml/ref/lock.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.33 2002/05/30 20:45:18 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.34 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -118,7 +118,7 @@ where <replaceable class="PARAMETER">lockmode</replaceable> is one of:
 	Conflicts with SHARE UPDATE EXCLUSIVE, SHARE, SHARE ROW EXCLUSIVE,
 	EXCLUSIVE and
 	ACCESS EXCLUSIVE modes. This mode protects a table against
-	concurrent schema changes and VACUUMs.
+	concurrent schema changes and <command>VACUUM</> runs.
        </para>
 
        <note>
@@ -289,8 +289,8 @@ ERROR <replaceable class="PARAMETER">name</replaceable>: Table does not exist.
      To achieve a similar effect when running a transaction
      at the SERIALIZABLE isolation level, you have to execute the
      <command>LOCK TABLE</>
-     statement before executing any DML statement.  A serializable
-     transaction's view of data will be frozen when its first DML statement
+     statement before executing any <acronym>DML</> statement.  A serializable
+     transaction's view of data will be frozen when its first <acronym>DML</> statement
      begins.  A later <command>LOCK</> will still prevent concurrent writes
      --- but it
      won't ensure that what the transaction reads corresponds to the latest

doc/src/sgml/ref/notify.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/notify.sgml,v 1.18 2002/08/13 20:40:44 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/notify.sgml,v 1.19 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -95,7 +95,7 @@ NOTIFY
   </para>
   <para>
    The information passed to the frontend for a notify event includes the notify
-   condition name and the notifying backend process's PID.  It is up to the
+   condition name and the notifying backend process's <acronym>PID</>.  It is up to the
    database designer to define the condition names that will be used in a given
    database and what each one means.
   </para>
@@ -109,7 +109,7 @@ NOTIFY
   </para>
   <para>
    <command>NOTIFY</command> provides a simple form of signal or
-   IPC (interprocess communication) mechanism for a collection of processes
+   <acronym>IPC</> (interprocess communication) mechanism for a collection of processes
    accessing the same <productname>PostgreSQL</productname> database.
    Higher-level mechanisms can be built by using tables in the database to
    pass additional data (beyond a mere condition name) from notifier to
@@ -158,8 +158,8 @@ NOTIFY
    re-reading a database table to find the same updates that that frontend just
    wrote out.  In <productname>PostgreSQL</productname> 6.4 and later, it is
    possible to avoid such extra work by noticing whether the notifying backend
-   process's PID (supplied in the notify event message) is the same as one's own
-   backend's PID (available from libpq).  When they are the same, the notify
+   process's <acronym>PID</> (supplied in the notify event message) is the same as one's own
+   backend's <acronym>PID</> (available from <application>libpq</>).  When they are the same, the notify
    event is one's own work bouncing back, and can be ignored.  (Despite what was
    said in the preceding paragraph, this is a safe technique.
    <productname>PostgreSQL</productname> keeps self-notifies separate from notifies
@@ -191,7 +191,7 @@ NOTIFY
    </para>
    <para>
     In <productname>PostgreSQL</productname> releases prior to 6.4, the backend
-    PID delivered in a notify message was always the PID of the frontend's own
+    <acronym>PID</> delivered in a notify message was always the <acronym>PID</> of the frontend's own
     backend.  So it was not possible to distinguish one's own notifies from other
     clients' notifies in those earlier releases.
    </para>

doc/src/sgml/ref/pg_ctl-ref.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.15 2002/07/28 15:22:20 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.16 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -148,7 +148,7 @@ PostgreSQL documentation
        <para>
         Append the server log output to
         <replaceable>filename</replaceable>.  If the file does not
-        exist, it is created.  The umask is set to 077, so access to
+        exist, it is created.  The <systemitem>umask</> is set to 077, so access to
         the log file from other users is disallowed by default.
        </para>
       </listitem>

doc/src/sgml/ref/postmaster.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.31 2002/07/28 15:22:21 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postmaster.sgml,v 1.32 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -146,7 +146,7 @@ PostgreSQL documentation
         Disables <function>fsync</function> calls for performance
         improvement, at the risk of data corruption in event of a
         system crash.  This parameter corresponds to setting
-        fsync=false in postgresql.conf. Read the detailed
+        <literal>fsync=false</> in <filename>postgresql.conf</>. Read the detailed
         documentation before using this!
        </para>
        <para>
@@ -176,7 +176,7 @@ PostgreSQL documentation
         Allows clients to connect via TCP/IP (Internet domain)
 	connections.  Without this option, only local Unix domain
         socket connections are accepted. This option corresponds
-        to setting tcpip_socket=true in postgresql.conf.
+        to setting <literal>tcpip_socket=true</> in <filename>postgresql.conf</>.
        </para>
        <para>
         <option>--tcpip_socket=false</option> has the opposite
@@ -350,7 +350,7 @@ PostgreSQL documentation
     <listitem>
      <para>
       Default character encoding used by clients.  (The clients may
-      override this invidiually.)  This value can also be set in the
+      override this individually.)  This value can also be set in the
       configuration file.
      </para>
     </listitem>
@@ -382,7 +382,7 @@ PostgreSQL documentation
 
     <listitem>
      <para>
-      Default port (preferrably set in the configuration file)
+      Default port (preferably set in the configuration file)
      </para>
     </listitem>
    </varlistentry>
@@ -520,10 +520,11 @@ StreamServerPort: cannot bind to port
   </para>
 
   <para>
-   The <option>--</> options will not work on FreeBSD or OpenBSD.
+   The <option>--</> options will not work on <systemitem
+   class="osname">FreeBSD</> or <systemitem class="osname">OpenBSD</>.
    Use <option>-c</> instead. This is a bug in the affected operating
-   systems; a future release of <productname>PostgreSQL</productname> will
-   provide a workaround if this is not fixed.
+   systems; a future release of <productname>PostgreSQL</productname>
+   will provide a workaround if this is not fixed.
   </para>
 
  </refsect1>
@@ -547,7 +548,7 @@ StreamServerPort: cannot bind to port
 </screen>
    This command will start up <application>postmaster</application>
    communicating through the port 1234. In order to connect to this
-   <application>postmaster</application> using psql, you would need to
+   <application>postmaster</application> using <application>psql</>, you would need to
    run it as
 <screen>
 <prompt>$</prompt> <userinput>psql -p 1234</userinput>

doc/src/sgml/ref/reindex.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.12 2002/06/23 03:45:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/reindex.sgml,v 1.13 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -193,14 +193,15 @@ REINDEX
       as there is in <application>psql</>.  To continue a command
       across multiple lines, you must type backslash just before each
       newline except the last one.
-      Also, you won't have any of the conveniences of readline processing
+      Also, you won't have any of the conveniences of command-line editing
       (no command history, for example).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      To quit the backend, type EOF (control-D, usually).
+      To quit the backend, type <acronym>EOF</> (<keycombo
+      action="simul"><keycap>Control</><keycap>D</></>, usually).
      </para>
     </listitem>
 

doc/src/sgml/ref/reset.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.14 2002/05/17 01:19:16 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/reset.sgml,v 1.15 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -79,7 +79,7 @@ SET <replaceable class="parameter">variable</replaceable> TO DEFAULT
  <refsect1>
   <title>Examples</title>
   <para>
-   Set DateStyle to its default value:
+   Set <varname>DateStyle</> to its default value:
 
 <screen>
 RESET DateStyle;
@@ -87,7 +87,7 @@ RESET DateStyle;
   </para>
 
   <para>
-   Set Geqo to its default value:
+   Set <varname>geqo</> to its default value:
 
 <screen>   
 RESET GEQO;

doc/src/sgml/ref/select.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.60 2002/08/30 16:00:41 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/select.sgml,v 1.61 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -451,8 +451,8 @@ where <replaceable class="PARAMETER">from_item</replaceable> can be:
     (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.
-    Note that only the JOIN's own ON or USING condition is considered while
+    width of the joined table by inserting null values for the right-hand columns.
+    Note that only the <literal>JOIN</>'s own ON or USING condition is considered while
     deciding which rows have matches.  Outer ON or WHERE conditions are
     applied afterwards.
    </para>
@@ -647,11 +647,13 @@ SELECT name FROM distributors ORDER BY code;
    </para>
     
    <para>
-    Optionally one may add the keyword DESC (descending)
-    or ASC (ascending) after each column name in the ORDER BY clause.
-    If not specified, ASC is assumed by default.  Alternatively, a
-    specific ordering operator name may be specified.  ASC is equivalent
-    to USING &lt; and DESC is equivalent to USING &gt;.
+    Optionally one may add the key word <literal>DESC</> (descending)
+    or <literal>ASC</> (ascending) after each column name in the
+    <literal>ORDER BY</> clause.  If not specified, <literal>ASC</> is
+    assumed by default.  Alternatively, a specific ordering operator
+    name may be specified.  <literal>ASC</> is equivalent to
+    <literal>USING &lt;</> and <literal>DESC</> is equivalent to
+    <literal>USING &gt;</>.
    </para>
 
    <para>
@@ -689,7 +691,7 @@ SELECT name FROM distributors ORDER BY code;
    <para>
     The UNION operator computes the collection (set union) of the rows
     returned by the queries involved.
-    The two SELECTs that represent the direct operands of the UNION must
+    The two SELECT statements that represent the direct operands of the UNION must
     produce the same number of columns, and corresponding columns must be
     of compatible data types.
    </para>
@@ -1064,7 +1066,7 @@ SELECT * FROM distributors_2(111) AS (f1 int, f2 text);
    <para>
 <productname>PostgreSQL</productname> allows one to omit 
 the <command>FROM</command> clause from a query. This feature
-was retained from the original PostQuel query language.  It has
+was retained from the original PostQUEL query language.  It has
 a straightforward use to compute the results of simple expressions:
 
   <programlisting>
@@ -1075,7 +1077,7 @@ SELECT 2+2;
         4
   </programlisting>
 
-Some other DBMSes cannot do this except by introducing a dummy one-row
+Some other SQL databases cannot do this except by introducing a dummy one-row
 table to do the select from.  A less obvious use is to abbreviate a
 normal select from one or more tables:
 

doc/src/sgml/ref/set.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.64 2002/08/04 05:09:36 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/set.sgml,v 1.65 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -113,7 +113,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
 
    <variablelist>
     <varlistentry>
-     <term>DATESTYLE</term>
+     <term><varname>DATESTYLE</></term>
      <listitem>
       <para>
        Choose the date/time representation style. Two separate
@@ -126,7 +126,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
 
        <variablelist>
         <varlistentry>
-         <term>ISO</term>
+         <term><literal>ISO</></term>
          <listitem>
           <para>
            Use ISO 8601-style dates and times (<literal>YYYY-MM-DD
@@ -136,7 +136,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
         </varlistentry>
 
         <varlistentry>
-         <term>SQL</term>
+         <term><literal>SQL</></term>
          <listitem>
           <para>
            Use Oracle/Ingres-style dates and times. Note that this
@@ -147,7 +147,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
         </varlistentry>
 
         <varlistentry>
-         <term>PostgreSQL</term>
+         <term><literal>PostgreSQL</></term>
          <listitem>
           <para>
            Use traditional <productname>PostgreSQL</productname> format.
@@ -156,7 +156,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
         </varlistentry>
 
         <varlistentry>
-         <term>German</term>
+         <term><literal>German</></term>
          <listitem>
           <para>
            Use <literal>dd.mm.yyyy</literal> for numeric date representations.
@@ -173,7 +173,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
 
        <variablelist>
         <varlistentry>
-         <term>European</term>
+         <term><literal>European</></term>
          <listitem>
           <para>
            Use <literal>dd/mm/yyyy</literal> for numeric date representations.
@@ -182,8 +182,8 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
         </varlistentry>
 
         <varlistentry>
-         <term>NonEuropean</term>
-         <term>US</term>
+         <term><literal>NonEuropean</></term>
+         <term><literal>US</></term>
          <listitem>
           <para>
            Use <literal>mm/dd/yyyy</literal> for numeric date representations.
@@ -209,7 +209,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
       </para>
 
       <para>
-       There are several now-deprecated means for setting the datestyle
+       There are several now-deprecated means for setting the date style
        in addition to the normal methods of setting it via <command>SET</> or
        a configuration-file entry:
        <simplelist>
@@ -225,9 +225,9 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
         </member>
         <member>
          Setting the client's <envar>PGDATESTYLE</envar> environment variable.
-         If PGDATESTYLE is set in the frontend environment of a client
-         based on libpq, libpq will automatically set DATESTYLE to the
-         value of PGDATESTYLE during connection start-up.  This is
+         If <envar>PGDATESTYLE</envar> is set in the frontend environment of a client
+         based on <application>libpq</>, <application>libpq</> will automatically set <varname>DATESTYLE</> to the
+         value of <envar>PGDATESTYLE</envar> during connection start-up.  This is
          equivalent to a manually issued <command>SET DATESTYLE</>.
         </member>
        </simplelist>
@@ -283,7 +283,7 @@ SELECT setseed(<replaceable>value</replaceable>);
       <para>
        Shows the server-side multibyte encoding.  (At present, this
        parameter can be shown but not set, because the encoding is
-       determined at initdb time.)
+       determined at <application>initdb</> time.)
       </para>
      </listitem>
     </varlistentry>
@@ -373,7 +373,7 @@ SELECT setseed(<replaceable>value</replaceable>);
 
       <para>
        If the <envar>PGTZ</envar> environment variable is set in the frontend
-       environment of a client based on libpq, libpq will automatically
+       environment of a client based on <application>libpq</>, <application>libpq</> will automatically
        <command>SET TIMEZONE</command> to the value of
        <envar>PGTZ</envar> during connection start-up. 
       </para>

doc/src/sgml/ref/set_session_auth.sgml

-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.6 2002/05/17 01:19:16 tgl Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/set_session_auth.sgml,v 1.7 2002/09/21 18:32:54 petere Exp $ -->
 <refentry id="SQL-SET-SESSION-AUTHORIZATION">
  <docinfo>
   <date>2001-04-21</date>
@@ -48,7 +48,7 @@ RESET SESSION AUTHORIZATION
    The session user identifier may be changed only if the initial session
    user (the <firstterm>authenticated user</firstterm>) had the
    superuser privilege.  Otherwise, the command is accepted only if it
-   specifies the authenticated username.
+   specifies the authenticated user name.
   </para>
 
   <para>

doc/src/sgml/ref/unlisten.sgml

 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.19 2002/08/13 20:40:44 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/unlisten.sgml,v 1.20 2002/09/21 18:32:54 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -90,7 +90,7 @@ UNLISTEN { <replaceable class="PARAMETER">notifyname</replaceable> | * }
   <para>
    <command>UNLISTEN</command>
    is used to remove an existing <command>NOTIFY</command> registration.
-   UNLISTEN cancels any existing registration of the current
+   <command>UNLISTEN</command> cancels any existing registration of the current
    <productname>PostgreSQL</productname> session as a listener on the notify
    condition <replaceable class="PARAMETER">notifyname</replaceable>.
    The special condition wildcard <literal>*</literal> cancels all listener registrations
@@ -117,7 +117,7 @@ UNLISTEN { <replaceable class="PARAMETER">notifyname</replaceable> | * }
     as a name up to 64 characters long.
    </para>
    <para>
-    The backend does not complain if you UNLISTEN something you were not
+    The backend does not complain if you unlisten something you were not
     listening for.
     Each backend will automatically execute <command>UNLISTEN *</command> when
     exiting.
@@ -143,7 +143,7 @@ Asynchronous NOTIFY 'virtual' from backend with pid '8448' received
   </para>
 
   <para>
-   Once UNLISTEN has been executed, further NOTIFY commands will be
+   Once <command>UNLISTEN</> has been executed, further <command>NOTIFY</> commands will be
    ignored:
 
 <programlisting>