Another big editing pass for consistent content and presentation.

d258ba01 · Peter Eisentraut · e27334f4 · d258ba01 · d258ba01 · d258ba01
Commit d258ba01 authored Mar 24, 2003 by Peter Eisentraut
38 changed files
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/backup.sgml,v 2.25 2003/03/18 00:02:11 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/backup.sgml,v 2.26 2003/03/24 14:32:50 petere Exp $
 -->
 <chapter id="backup">
 <title>Backup and Restore</title>
@@ -110,7 +110,7 @@ psql <replaceable class="parameter">dbname</replaceable> &lt; <replaceable class
    <application>psql</> (e.g., with <literal>createdb -T template0
    <replaceable class="parameter">dbname</></literal>).
    <application>psql</> supports similar options to <application>pg_dump</> 
-    for controlling the database server location and the user names. See
+    for controlling the database server location and the user name. See
    its reference page for more information.
   </para>

@@ -135,7 +135,7 @@ psql <replaceable class="parameter">dbname</replaceable> &lt; <replaceable class
   <para>
    The ability of <application>pg_dump</> and <application>psql</> to
    write to or read from pipes makes it possible to dump a database
-    directly from one server to another, for example
+    directly from one server to another; for example:
 <programlisting>
 pg_dump -h <replaceable>host1</> <replaceable>dbname</> | psql -h <replaceable>host2</> <replaceable>dbname</>
 </programlisting>
@@ -179,27 +179,19 @@ pg_dumpall &gt; <replaceable>outfile</>
  <sect2 id="backup-dump-large">
   <title>Large Databases</title>

-   <note>
-    <title>Acknowledgement</title>
-    <para>
-     Originally written by Hannu Krosing
-     (<email>hannu@trust.ee</email>) on 1999-06-19
-    </para>
-   </note>
-
   <para>
    Since <productname>PostgreSQL</productname> allows tables larger
    than the maximum file size on your system, it can be problematic
-    to dump the table to a file, since the resulting file will likely
+    to dump such a table to a file, since the resulting file will likely
    be larger than the maximum size allowed by your system. As
-    <application>pg_dump</> writes to the standard output, you can
-    just use standard *nix tools to work around this possible problem.
+    <application>pg_dump</> can write to the standard output, you can
+    just use standard Unix tools to work around this possible problem.
   </para>

   <formalpara>
    <title>Use compressed dumps.</title>
    <para>
-     Use your favorite compression program, for example
+     You can use your favorite compression program, for example
     <application>gzip</application>.

 <programlisting>
@@ -222,9 +214,10 @@ cat <replaceable class="parameter">filename</replaceable>.gz | gunzip | psql <re
   </formalpara>

   <formalpara>
-    <title>Use <application>split</>.</title>
+    <title>Use <command>split</>.</title>
    <para>
-     This allows you to split the output into pieces that are
+     The <command>split</command> command
+     allows you to split the output into pieces that are
     acceptable in size to the underlying file system. For example, to
     make chunks of 1 megabyte:

@@ -338,7 +331,7 @@ tar -cf backup.tar /usr/local/pgsql/data

    <listitem>
     <para>
-      If you have dug into the details of the file system layout you
+      If you have dug into the details of the file system layout of the data you
      may be tempted to try to back up or restore only certain
      individual tables or databases from their respective files or
      directories. This will <emphasis>not</> work because the
@@ -348,7 +341,7 @@ tar -cf backup.tar /usr/local/pgsql/data
      all transactions. A table file is only usable with this
      information. Of course it is also impossible to restore only a
      table and the associated <filename>pg_clog</filename> data
-      because that will render all other tables in the database
+      because that would render all other tables in the database
      cluster useless.
     </para>
    </listitem>
@@ -381,7 +374,7 @@ tar -cf backup.tar /usr/local/pgsql/data
   server, using <application>pg_dump</>. (There are checks in place
   that prevent you from doing the wrong thing, so no harm can be done
   by confusing these things.) The precise installation procedure is
-   not subject of this section, these details are in <xref linkend="installation">.
+   not subject of this section; these details are in <xref linkend="installation">.
  </para>

  <para>
@@ -393,7 +386,7 @@ tar -cf backup.tar /usr/local/pgsql/data
 pg_dumpall -p 5432 | psql -d template1 -p 6543
 </programlisting>

-   to transfer your data, or use an intermediate file if you want.
+   to transfer your data.  Or use an intermediate file if you want.
   Then you can shut down the old server and start the new server at
   the port the old one was running at. You should make sure that the
   database is not updated after you run <application>pg_dumpall</>,
@@ -413,7 +406,7 @@ pg_dumpall -p 5432 | psql -d template1 -p 6543
 pg_dumpall > backup
 pg_ctl stop
 mv /usr/local/pgsql /usr/local/pgsql.old
-cd /usr/src/postgresql-&version;
+cd ~/postgresql-&version;
 gmake install
 initdb -D /usr/local/pgsql/data
 postmaster -D /usr/local/pgsql/data

--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
--- a/doc/src/sgml/diskusage.sgml
+++ b/doc/src/sgml/diskusage.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/diskusage.sgml,v 1.8 2002/11/15 03:11:16 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/diskusage.sgml,v 1.9 2003/03/24 14:32:50 petere Exp $
 -->

 <chapter id="diskusage">
@@ -33,32 +33,32 @@ $Header: /cvsroot/pgsql/doc/src/sgml/diskusage.sgml,v 1.8 2002/11/15 03:11:16 mo
  <para>
   You can monitor disk space from three places: from
   <application>psql</> using <command>VACUUM</> information, from
-   <application>psql</> using <filename>contrib/dbsize</>, and from
-   the command line using <application>contrib/oid2name</>. Using
-   <application>psql</> on a recently vacuumed (or analyzed) database,
+   <application>psql</> using the tools in <filename>contrib/dbsize</>, and from
+   the command line using the tools in <filename>contrib/oid2name</>. Using
+   <application>psql</> on a recently vacuumed or analyzed database,
   you can issue queries to see the disk usage of any table:
 <programlisting>
-play=# SELECT relfilenode, relpages
-play-# FROM pg_class
-play-# WHERE relname = 'customer';
+SELECT relfilenode, relpages FROM pg_class WHERE relname = 'customer';
+
 relfilenode | relpages 
 -------------+----------
       16806 |       60
 (1 row)
 </programlisting>
+   Each page is typically 8 kilobytes. (Remember, <literal>relpages</>
+   is only updated by <command>VACUUM</> and <command>ANALYZE</>.)
  </para>

-  <para>   
-   Each page is typically 8 kilobytes. (Remember, <literal>relpages</>
-   is only updated by <command>VACUUM</> and <command>ANALYZE</>.) To
-   show the space used by <acronym>TOAST</> tables, use a query based on
-   the heap relfilenode shown above:
+  <para>
+   To show the space used by <acronym>TOAST</> tables, use a query
+   like the following, substituting the <literal>relfilenode</literal>
+   number of the heap (determined by the query above):
 <programlisting>
-play=# SELECT relname, relpages
-play-# FROM pg_class
-play-# WHERE relname = 'pg_toast_16806' OR
-play-#       relname = 'pg_toast_16806_index'
-play-# ORDER BY relname;
+SELECT relname, relpages
+    FROM pg_class
+    WHERE relname = 'pg_toast_16806' OR relname = 'pg_toast_16806_index'
+    ORDER BY relname;
+
       relname        | relpages 
 ----------------------+----------
 pg_toast_16806       |        0
@@ -67,14 +67,15 @@ play-# ORDER BY relname;
  </para>

  <para>
-   You can easily display index usage too:
+   You can easily display index sizes, too:
 <programlisting>
-play=# SELECT c2.relname, c2.relpages
-play-# FROM pg_class c, pg_class c2, pg_index i
-play-# WHERE c.relname = 'customer' AND
-play-#       c.oid = i.indrelid AND
-play-#       c2.oid = i.indexrelid
-play-# ORDER BY c2.relname;
+SELECT c2.relname, c2.relpages
+    FROM pg_class c, pg_class c2, pg_index i
+    WHERE c.relname = 'customer'
+        AND c.oid = i.indrelid
+        AND c2.oid = i.indexrelid
+        ORDER BY c2.relname;
+
       relname        | relpages 
 ----------------------+----------
 customer_id_indexdex |       26
@@ -82,11 +83,11 @@ play-# ORDER BY c2.relname;
  </para>

  <para>
-   It is easy to find your largest files using <application>psql</>:
+   It is easy to find your largest tables and indexes using this
+   information:
 <programlisting>
-play=# SELECT relname, relpages
-play-# FROM pg_class
-play-# ORDER BY relpages DESC;
+SELECT relname, relpages FROM pg_class ORDER BY relpages DESC;
+
       relname        | relpages 
 ----------------------+----------
 bigtable             |     3290
@@ -97,12 +98,12 @@ play-# ORDER BY relpages DESC;
  <para>
   <filename>contrib/dbsize</> loads functions into your database that allow
   you to find the size of a table or database from inside
-   <application>psql</> without the need for <command>VACUUM/ANALYZE.</>
+   <application>psql</> without the need for <command>VACUUM</> or <command>ANALYZE</>.
  </para>

  <para>
   You can also use <filename>contrib/oid2name</> to show disk usage. See
-   <filename>README.oid2name</> for examples. It includes a script that
+   <filename>README.oid2name</> in that directory for examples. It includes a script that
   shows disk usage for each database.
  </para>
 </sect1>
@@ -114,7 +115,7 @@ play-# ORDER BY relpages DESC;
   The most important disk monitoring task of a database administrator
   is to make sure the disk doesn't grow full.  A filled data disk may
   result in subsequent corruption of database indexes, but not of the
-   fundamental data tables. If the WAL files are on the same disk (as
+   tables themselves. If the WAL files are on the same disk (as
   is the case for a default configuration) then a filled disk during
   database initialization may result in corrupted or incomplete WAL
   files. This failure condition is detected and the database server
@@ -129,8 +130,8 @@ play-# ORDER BY relpages DESC;
   information of such a setup; a restore would put everything back in
   one place.  To avoid running out of disk space, you can place the
   WAL files or individual databases in other locations while creating
-   them.  See the <application>initdb</> documentation and <xref
-   linkend="manage-ag-alternate-locs"> for more information.
+   them.  See the <command>initdb</> documentation and <xref
+   linkend="manage-ag-alternate-locs"> for more information about that.
  </para>

  <tip>

--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.146 2003/03/21 21:54:29 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.147 2003/03/24 14:32:50 petere Exp $
 PostgreSQL documentation
 -->

@@ -5900,7 +5900,7 @@ SELECT TIMESTAMP 'now';
 	<entry><literal>255.255.255.0</literal></entry>
       </row>
       <row>
-	<entry><function>hostmask</function>(<type>inet</type>)</entry>
+	<entry><literal><function>hostmask</function>(<type>inet</type>)</literal></entry>
 	<entry><type>inet</type></entry>
 	<entry>construct hostmask for network</entry>
 	<entry><literal>hostmask('192.168.23.20/30')</literal></entry>
@@ -6477,7 +6477,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..

   <indexterm zone="functions-misc">
    <primary>configuration</primary>
-    <secondary>run time</secondary>
+    <secondary>server</secondary>
   </indexterm>

   <para>

--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -54,7 +54,7 @@
    <term><filename>interfaces\libpq\Release\libpqdll.lib</filename></term>
    <listitem>
     <para>
-      Import library to link your program to <filename>libpq.dll</filename>
+      Import library to link your programs to <filename>libpq.dll</filename>
     </para>
    </listitem>
   </varlistentry>
@@ -98,7 +98,7 @@
 </para>

 <para>
-  To use the libraries, you must add the
+  To use the library, you must add the
  <filename>libpqdll.lib</filename> file to your project.  (In Visual
  C++, just right-click on the project and choose to add it.)
 </para>

--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.8 2003/03/20 18:53:18 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.9 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,12 +18,12 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>clusterdb</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <arg>--table | -t <replaceable>table</replaceable> </arg>
   <arg><replaceable>dbname</replaceable></arg>
   <sbr>
   <command>clusterdb</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <group><arg>--all</arg><arg>-a</arg></group>
  </cmdsynopsis>
 </refsynopsisdiv>
@@ -114,7 +114,7 @@ PostgreSQL documentation
      <term><option>--table <replaceable class="parameter">table</replaceable></></term>
      <listitem>
       <para>
-	Clusters <replaceable class="parameter">table</replaceable> only.
+	Cluster <replaceable class="parameter">table</replaceable> only.
       </para>
      </listitem>
     </varlistentry>
@@ -134,7 +134,7 @@ PostgreSQL documentation
       <para>
 	Specifies the host name of the machine on which the 
 	server
-	is running.  If host begins with a slash, it is used 
+	is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -145,7 +145,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
+	Specifies the TCP port or local Unix domain socket file 
 	extension on which the server
 	is listening for connections.
       </para>
@@ -219,7 +219,7 @@ PostgreSQL documentation

    <listitem>
     <para>
-      Default connection parameters.
+      Default connection parameters
     </para>
    </listitem>
   </varlistentry>

--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.31 2003/03/18 22:19:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.32 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,7 +18,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>createdb</command>
-   <arg rep="repeat"><replaceable>options</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   <arg><replaceable>dbname</replaceable></arg>
   <arg><replaceable>description</replaceable></arg>
  </cmdsynopsis>
@@ -47,7 +47,7 @@ PostgreSQL documentation
   endterm="SQL-CREATEDATABASE-title">.  Thus, there is nothing
   special about creating databases via this or other methods.  This
   means that a database server must be running at the targeted
-   port. Also, any default settings and environment variables used by
+   host. Also, any default settings and environment variables used by
   the <application>libpq</application> front-end library will apply.
  </para>
 </refsect1>
@@ -65,7 +65,7 @@ PostgreSQL documentation
      <listitem>
       <para>
 	Specifies the name of the database to be created.  The name must be
-	unique among all <productname>PostgreSQL</productname> databases in this installation.
+	unique among all <productname>PostgreSQL</productname> databases in this cluster.
        The default is to create a database with the same name as the
        current system user.
       </para>
@@ -98,7 +98,7 @@ PostgreSQL documentation
      <term><option>--echo</></term>
      <listitem>
       <para>
-        Echo the queries that <application>createdb</application> generates
+        Echo the commands that <application>createdb</application> generates
 	and sends to the server.
       </para>
      </listitem>
@@ -166,7 +166,7 @@ PostgreSQL documentation
      <listitem>
       <para>
 	Specifies the host name of the machine on which the 
-	server is running.  If host begins with a slash, it is used 
+	server is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -177,7 +177,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or the local Unix domain socket file 
+	Specifies the TCP port or the local Unix domain socket file 
 	extension on which the server is listening for connections.
       </para>
      </listitem>
@@ -296,7 +296,7 @@ PostgreSQL documentation
    To create the database <literal>demo</literal> using the
    server on host <literal>eden</>, port 5000, using the
    <literal>LATIN1</literal> encoding scheme with a look at the
-    underlying query:
+    underlying command:
 <screen>
 <prompt>$ </prompt><userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
 <computeroutput>CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'</computeroutput>

--- a/doc/src/sgml/ref/createlang.sgml
+++ b/doc/src/sgml/ref/createlang.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.30 2003/03/18 22:19:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.31 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,12 +18,12 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>createlang</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <arg choice="plain"><replaceable>langname</replaceable></arg>
   <arg><replaceable>dbname</replaceable></arg>
   <sbr>
   <command>createlang</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <group choice="plain"><arg>--list</arg><arg>-l</arg></group>
   <arg choice="plain"><replaceable>dbname</replaceable></arg>
  </cmdsynopsis>
@@ -85,7 +85,7 @@ PostgreSQL documentation
      <term><option>--echo</></term>
      <listitem>
       <para>
-        Displays SQL commands as they are executed.
+        Display SQL commands as they are executed.
       </para>
      </listitem>
     </varlistentry>
@@ -95,8 +95,7 @@ PostgreSQL documentation
      <term><option>--list</></term>
      <listitem>
       <para>
-        Shows a list of already installed languages in the target database
-        (which must be specified).
+        Show a list of already installed languages in the target database.
       </para>
      </listitem>
     </varlistentry>
@@ -127,7 +126,7 @@ PostgreSQL documentation
       <para>
 	Specifies the host name of the machine on which the 
 	server
-	is running.  If host begins with a slash, it is used 
+	is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -138,7 +137,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
+	Specifies the TCP port or local Unix domain socket file 
 	extension on which the server
 	is listening for connections.
       </para>
@@ -182,7 +181,7 @@ PostgreSQL documentation

    <listitem>
     <para>
-      Default connection parameters.
+      Default connection parameters
     </para>
    </listitem>
   </varlistentry>
@@ -215,7 +214,7 @@ PostgreSQL documentation
  <title>Examples</title>

   <para>
-    To install <literal>pltcl</literal> into the database
+    To install the language <literal>pltcl</literal> into the database
    <literal>template1</literal>:
 <screen>
 <prompt>$ </prompt><userinput>createlang pltcl template1</userinput>

--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.31 2003/03/18 22:19:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.32 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,7 +18,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>createuser</command>
-   <arg rep="repeat"><replaceable>options</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   <arg><replaceable>username</replaceable></arg>
  </cmdsynopsis>
 </refsynopsisdiv>
@@ -78,7 +78,7 @@ PostgreSQL documentation
      <listitem>
       <para>
 	The new user is allowed to create other users.
-	(Note: Actually, this makes the new user a <firstterm>superuser</>.
+	(Note: Actually, this makes the new user a <emphasis>superuser</>.
 	The option is poorly named.)
       </para>
      </listitem>
@@ -120,7 +120,7 @@ PostgreSQL documentation
      <term><option>--echo</></term>
      <listitem>
       <para>
-        Echo the queries that <application>createuser</application> generates
+        Echo the commands that <application>createuser</application> generates
 	and sends to the server.
       </para>
      </listitem>
@@ -138,8 +138,8 @@ PostgreSQL documentation
     </varlistentry>

     <varlistentry>
-      <term><option>-i <replaceable class="parameter">uid</replaceable></></term>
-      <term><option>--sysid <replaceable class="parameter">uid</replaceable></></term>
+      <term><option>-i <replaceable class="parameter">number</replaceable></></term>
+      <term><option>--sysid <replaceable class="parameter">number</replaceable></></term>
      <listitem>
       <para>
       Allows you to pick a non-default user ID for the new user. This is not
@@ -200,7 +200,7 @@ PostgreSQL documentation
       <para>
 	Specifies the host name of the machine on which the 
 	server
-	is running.  If host begins with a slash, it is used 
+	is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -211,7 +211,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
+	Specifies the TCP port or local Unix domain socket file 
 	extension on which the server
 	is listening for connections.
       </para>
@@ -311,7 +311,7 @@ PostgreSQL documentation
   <para>
    To create the same user <literal>joe</literal> using the
    server on host <literal>eden</>, port 5000, avoiding the prompts and
-    taking a look at the underlying query:
+    taking a look at the underlying command:
 <screen>
 <prompt>$ </prompt><userinput>createuser -p 5000 -h eden -D -A -e joe</userinput>
 <computeroutput>CREATE USER "joe" NOCREATEDB NOCREATEUSER</computeroutput>

--- a/doc/src/sgml/ref/current_date.sgml
+++ b/doc/src/sgml/ref/current_date.sgml
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/current_date.sgml,v 1.5 2002/04/21 19:02:39 thomas Exp $
-Postgres documentation
-->
-
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/current_date.sgml,v 1.5 2002/04/21 19:02:39 thomas Exp $
-Postgres documentation
-->
-
-<REFENTRY ID="SQL-CURRENT-DATE">
- <REFMETA>
-  <REFENTRYTITLE>CURRENT_DATE</REFENTRYTITLE>
-  <REFMISCINFO>SQL - Functions</REFMISCINFO>
- </REFMETA>
- <REFNAMEDIV>
-  <REFNAME>
-   CURRENT_DATE
-  </REFNAME>
-  <REFPURPOSE>
-Returns the current date
-  </REFPURPOSE>
- <REFSYNOPSISDIV>
-  <REFSYNOPSISDIVINFO>
-   <DATE>1998-04-15</DATE>
-  </REFSYNOPSISDIVINFO>
-  <SYNOPSIS>
-   CURRENT_DATE
-  </SYNOPSIS>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-DATE-1">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Inputs
-   </TITLE>
-   <PARA>
-None.
-  </REFSECT2>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-DATE-2">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Outputs
-   </TITLE>
-   <PARA>
-       <VARIABLELIST>
-	<VARLISTENTRY>
-	 <TERM>
-<replaceable>date</replaceable>
-
-	 </TERM>
-	 <LISTITEM>
-	  <PARA>
-	  Returns "<replaceable class="parameter">today</replaceable>".
-   </VARIABLELIST>
-  </REFSECT2>
- </REFSYNOPSISDIV>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-DATE-1">
-  <REFSECT1INFO>
-   <DATE>1998-04-15</DATE>
-  </REFSECT1INFO>
-  <TITLE>
-   Description
-  </TITLE>
-  <PARA>
-   The niladic CURRENT_DATE function has a data type of
-   DATE and returns the date at the time that it is run.
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-DATE-3">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Notes
-   </TITLE>
-   <PARA>
-    Refer to SET DATESTYLE for further information about date format.
-   </PARA>
-  </REFSECT2>
-  
- <REFSECT1 ID="R1-SQL-CURRENT-DATE-2">
-  <TITLE>
-   Usage
-  </TITLE>
-  <PARA>
-   Insert the date of insertion into a row:
-  </PARA>
-  <ProgramListing>
-   INSERT INTO films
-         VALUES ('TM999','Ben Hur',105,CURRENT_DATE,'Action',NULL);
-  </ProgramListing>
-  
-  <PARA>
-   Display CURRENT-DATE:
-  </PARA>
-  <ProgramListing>
-   SELECT CURRENT_DATE AS today;
-
-   today
-   ------------
-   1998-03-31
-
-  </ProgramListing>
- </REFSECT1>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-DATE-3">
-  <TITLE>
-   Compatibility
-  </TITLE>
-  <PARA>
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-DATE-4">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    SQL92
-   </TITLE>
-   <PARA>
-    Full compatibility.
-   </PARA>
-  </refsect2>
- </refsect1>
-</REFENTRY>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../reference.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:"/usr/lib/sgml/catalog"
-sgml-local-ecat-files:nil
-End:
-->
--- a/doc/src/sgml/ref/current_time.sgml
+++ b/doc/src/sgml/ref/current_time.sgml
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/current_time.sgml,v 1.6 2002/04/21 19:02:39 thomas Exp $
-PostgreSQL documentation
-->
-
-<REFENTRY ID="SQL-CURRENT-TIME">
- <REFMETA>
-  <REFENTRYTITLE>CURRENT_TIME</REFENTRYTITLE>
-  <REFMISCINFO>SQL - Functions</REFMISCINFO>
- </REFMETA>
- <REFNAMEDIV>
-  <REFNAME>
-   CURRENT_TIME
-  </REFNAME>
-  <REFPURPOSE>
-Returns the current local time
-  </REFPURPOSE>
- <REFSYNOPSISDIV>
-  <REFSYNOPSISDIVINFO>
-   <DATE>1998-04-15</DATE>
-  </REFSYNOPSISDIVINFO>
-  <SYNOPSIS>
-   CURRENT_TIME 
-  </SYNOPSIS>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIME-1">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Inputs
-   </TITLE>
-   <PARA>
-None.
-   
-  </REFSECT2>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIME-2">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Outputs
-   </TITLE>
-   <PARA>
-       <VARIABLELIST>
-	<VARLISTENTRY>
-	 <TERM>
-	  <replaceable>time</replaceable>
-
-	 <LISTITEM>
-	  <PARA>
-	  <ReturnValue>Returns "<replaceable class="parameter">now</replaceable>"</ReturnValue>
-
-   </VARIABLELIST>
-  </REFSECT2>
- </REFSYNOPSISDIV>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-TIME-1">
-  <REFSECT1INFO>
-   <DATE>1998-04-15</DATE>
-  </REFSECT1INFO>
-  <TITLE>
-   Description
-  </TITLE>
-  <PARA>
-   The niladic CURRENT_TIME function has a data type of
-   TIME and returns the local time when it is run.
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIME-3">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Notes
-   </TITLE>
-   <PARA> Refer to the SET TIME ZONE statement for a further description
-    of local time.
-   </PARA>
-  </REFSECT2>
-  
- <REFSECT1 ID="R1-SQL-CURRENT-TIME-2">
-  <TITLE>
-   Usage
-  </TITLE>
-  <PARA>Display CURRENT_TIME:
-  </PARA>
-  <ProgramListing>
-   SELECT CURRENT_TIME AS now;
-
-   now
-   -----------
-   17:41:31+02
-
-  </ProgramListing>
- </REFSECT1>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-TIME-3">
-  <TITLE>
-   Compatibility
-  </TITLE>
-  <PARA>
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIME-4">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    SQL92
-   </TITLE>
-   <PARA>
-    SQL92 specifies some additional capabilities for CURRENT_TIME:
-   </PARA>
-   <VARIABLELIST>
-    <VARLISTENTRY>
-     <TERM>
-     </TERM>
-     <LISTITEM>
-      <PARA>
-       <VARIABLELIST>
-	<VARLISTENTRY>
-	 <TERM>
-	  <ReturnValue>
-	   CURRENT_TIME [ (<replaceable class="parameter">scale</replaceable>) ]</ReturnValue>
-	 </TERM>
-	 <LISTITEM>
-	  <PARA>
-	   The optional scale for CURRENT_TIME, if specified, is an
-	   unsigned integer representing the number of digits in the
-	   optional seconds fraction of the time value represented
-	   by the function.
-	  </PARA>
-	 </LISTITEM>
-	</VARLISTENTRY>
-       </VARIABLELIST>
-     </LISTITEM>
-    </VARLISTENTRY>
-   </VARIABLELIST>
-</REFENTRY>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../reference.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:"/usr/lib/sgml/catalog"
-sgml-local-ecat-files:nil
-End:
-->
--- a/doc/src/sgml/ref/current_timestamp.sgml
+++ b/doc/src/sgml/ref/current_timestamp.sgml
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/current_timestamp.sgml,v 1.6 2002/04/21 19:02:39 thomas Exp $
-PostgreSQL documentation
-->
-
-<REFENTRY ID="SQL-CURRENT-TIMESTAMP">
- <REFMETA>
-  <REFENTRYTITLE>CURRENT_TIMESTAMP</REFENTRYTITLE>
-  <REFMISCINFO>SQL - Functions</REFMISCINFO>
- </REFMETA>
- <REFNAMEDIV>
-  <REFNAME>
-   CURRENT_TIMESTAMP
-  </REFNAME>
-  <REFPURPOSE>
-   Returns the current date and time
-  </REFPURPOSE>
-  
-  
- <REFSYNOPSISDIV>
-  <REFSYNOPSISDIVINFO>
-   <DATE>1998-04-15</DATE>
-  </REFSYNOPSISDIVINFO>
-  <synopsis>
-  CURRENT_TIMESTAMP 
- </SYNOPSIS>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIMESTAMP-1">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Inputs
-   </TITLE>
-   <PARA>
-None.
-
-  </REFSECT2>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIMESTAMP-2">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Outputs
-   </TITLE>
-   <PARA>
-       <VARIABLELIST>
-	<VARLISTENTRY>
-	 <TERM>
-<replaceable>timestamp</replaceable>
-
-	 <LISTITEM>
-	  <PARA>
-	  Returns "<replaceable class="parameter">today</replaceable>" and "<replaceable class="parameter">now</replaceable>".
-
-   </VARIABLELIST>
-  </REFSECT2>
- </REFSYNOPSISDIV>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-TIMESTAMP-1">
-  <REFSECT1INFO>
-   <DATE>1998-04-15</DATE>
-  </REFSECT1INFO>
-  <TITLE>
-   Description
-  </TITLE>
-  <PARA>
-   The niladic CURRENT_TIMESTAMP function has a data type of
-   TIMESTAMP and returns the date and local time at which it is run.
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIMESTAMP-3">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Notes
-   </TITLE>
-   <PARA>
-    Refer to the SET TIME ZONE statement for a further description
-    of local time.
-   </PARA>
-   
-   
-  </REFSECT2>
-  
- <REFSECT1 ID="R1-SQL-CURRENT-TIMESTAMP-2">
-  <TITLE>
-   Usage
-  </TITLE>
-  <PARA>
-   Display CURRENT_TIMESTAMP:
-  </PARA>
-  <ProgramListing>
-   SELECT CURRENT_TIMESTAMP AS date_and_time;
-
-   date_and_time
-   ----------------------
-   1998-03-31 07:41:21-08
-  </ProgramListing>
- </REFSECT1>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-TIMESTAMP-3">
-  <TITLE>
-   Compatibility
-  </TITLE>
-  <PARA>
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-TIMESTAMP-4">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    SQL92
-   </TITLE>
-   <PARA>
-   SQL92 specifies some additional capabilities for CURRENT_TIMESTAMP:
-   </PARA>
-   
-   <VARIABLELIST>
-    <VARLISTENTRY>
-     <TERM>
-     </TERM>
-     <LISTITEM>
-      <PARA>
-       <VARIABLELIST>
-	<VARLISTENTRY>
-	 <TERM>
-	  <ReturnValue>CURRENT_TIMESTAMP [ (<replaceable class="parameter">scale</replaceable>) ]</ReturnValue>
-	 </TERM>
-	 <LISTITEM>
-	  <PARA>
-	   The optional scale for CURRENT_TIMESTAMP, if specified, is an
-	   unsigned integer representing the number of digits in the
-	   optional seconds fraction of the time value represented
-	   by the function.
-	  </PARA>
-	 </LISTITEM>
-	</VARLISTENTRY>
-       </VARIABLELIST>
-      </para>
-     </LISTITEM>
-    </VARLISTENTRY>
-   </VARIABLELIST>
-  </refsect2>
- </refsect1>
-</REFENTRY>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../reference.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:"/usr/lib/sgml/catalog"
-sgml-local-ecat-files:nil
-End:
-->
--- a/doc/src/sgml/ref/current_user.sgml
+++ b/doc/src/sgml/ref/current_user.sgml
-<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/current_user.sgml,v 1.7 2002/08/13 20:40:43 momjian Exp $
-PostgreSQL documentation
-->
-
-<REFENTRY ID="SQL-CURRENT-USER">
- <REFMETA>
-  <REFENTRYTITLE>CURRENT_USER</REFENTRYTITLE>
-  <REFMISCINFO>SQL - Functions</REFMISCINFO>
- </REFMETA>
- <REFNAMEDIV>
-  <REFNAME>
-   CURRENT_USER
-  </REFNAME>
-  <REFPURPOSE>
-   Returns the current user name
-  </REFPURPOSE>
- <REFSYNOPSISDIV>
-  <REFSYNOPSISDIVINFO>
-   <DATE>1998-04-15</DATE>
-  </REFSYNOPSISDIVINFO>
-  <SYNOPSIS>
-   CURRENT_USER 
-  </SYNOPSIS>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-USER-1">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Inputs
-   </TITLE>
-   <PARA>
-
-None.
-  </REFSECT2>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-USER-2">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Outputs
-   </TITLE>
-   <PARA>
-
-       <VARIABLELIST>
-	<VARLISTENTRY>
-	 <TERM>
-	  <replaceable>username</replaceable>
-	 </TERM>
-	 <LISTITEM>
-	  <PARA>
-The name of the current user.
-
-   </VARIABLELIST>
-  </REFSECT2>
- </REFSYNOPSISDIV>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-USER-1">
-  <REFSECT1INFO>
-   <DATE>1998-04-15</DATE>
-  </REFSECT1INFO>
-  <TITLE>
-   Description
-  </TITLE>
-  <PARA>
-   The niladic CURRENT_USER function returns a string of type "name"
-   whose value represents a user name identification.
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-USER-3">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    Notes
-   </TITLE>
-   <PARA>
-    Data type "name" is a non-standard 63-character type for storing
-    system identifiers.
-   </PARA>
-  </REFSECT2>
-  
- <REFSECT1 ID="R1-SQL-CURRENT-USER-2">
-  <TITLE>
-   Usage
-  </TITLE>
-  <PARA>
-   Display CURRENT_USER
-  </PARA>
-  <ProgramListing>
-   SELECT CURRENT_USER AS who_am_i;
-
-   who_am_i
-   ------------
-   jose
-  </ProgramListing>
- </REFSECT1>
- 
- <REFSECT1 ID="R1-SQL-CURRENT-USER-3">
-  <TITLE>
-   Compatibility
-  </TITLE>
-  <PARA>
-  </PARA>
-  
-  <REFSECT2 ID="R2-SQL-CURRENT-USER-4">
-   <REFSECT2INFO>
-    <DATE>1998-04-15</DATE>
-   </REFSECT2INFO>
-   <TITLE>
-    SQL92
-   </TITLE>
-   <PARA>
-   SQL92 specifies some additional niladic USER functions:
-   </PARA>
-   <variablelist>
-    <varlistentry>
-     <term>CURRENT_USER / USER</term>
-     <listitem>
-      <para>  
-       USER is a synonym for CURRENT_USER. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>SESSION_USER</term>
-     <listitem>
-      <para>
-       The SESSION_USER function returns the SQL-session user name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>SYSTEM_USER</term>
-     <listitem>
-      <para>
-       The SYSTEM_USER function returns the database's initial default user.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-   <para>
-    A niladic USER function returns a SQL_TEXT character string whose
-    value represents a user name.
-   </para>
-  </refsect2>
- </refsect1>
-</REFENTRY>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:"../reference.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:"/usr/lib/sgml/catalog"
-sgml-local-ecat-files:nil
-End:
-->
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.20 2003/03/18 22:19:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.21 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,7 +18,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>dropdb</command>
-   <arg rep="repeat"><replaceable>options</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   <arg choice="plain"><replaceable>dbname</replaceable></arg>
  </cmdsynopsis>
 </refsynopsisdiv>
@@ -57,9 +57,7 @@ PostgreSQL documentation
      <term><replaceable class="parameter">dbname</replaceable></term>
      <listitem>
       <para>
-	Specifies the name of the database to be removed.  The database
-	must be one of the existing <productname>PostgreSQL</productname> databases
-	in this installation.
+	Specifies the name of the database to be removed.
       </para>
      </listitem>
     </varlistentry>
@@ -69,7 +67,7 @@ PostgreSQL documentation
      <term><option>--echo</></term>
      <listitem>
       <para>
-        Echo the queries that <application>dropdb</application> generates
+        Echo the commands that <application>dropdb</application> generates
 	and sends to the server.
       </para>
      </listitem>
@@ -109,7 +107,7 @@ PostgreSQL documentation
       <para>
 	Specifies the host name of the machine on which the 
 	server
-	is running.  If host begins with a slash, it is used 
+	is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -120,7 +118,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
+	Specifies the TCP port or local Unix domain socket file 
 	extension on which the server
 	is listening for connections.
       </para>
@@ -212,7 +210,7 @@ PostgreSQL documentation
   <para>
    To destroy the database <literal>demo</literal> using the
    server on host <literal>eden</literal>, port 5000, with verification and a peek
-    at the underlying query:
+    at the underlying command:
 <screen>
 <prompt>$ </prompt><userinput>dropdb -p 5000 -h eden -i -e demo</userinput>
 <computeroutput>Database "demo" will be permanently deleted.

--- a/doc/src/sgml/ref/droplang.sgml
+++ b/doc/src/sgml/ref/droplang.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.22 2003/03/18 22:19:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.23 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,12 +18,12 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>droplang</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <arg choice="plain"><replaceable>langname</replaceable></arg>
   <arg><replaceable>dbname</replaceable></arg>
   <sbr>
   <command>droplang</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <group choice="plain"><arg>--list</arg><arg>-l</arg></group>
   <arg choice="plain"><replaceable>dbname</replaceable></arg>
  </cmdsynopsis>
@@ -85,7 +85,7 @@ PostgreSQL documentation
      <term><option>--echo</></term>
      <listitem>
       <para>
-        Displays SQL commands as they are executed.
+        Display SQL commands as they are executed.
       </para>
      </listitem>
     </varlistentry>
@@ -95,8 +95,7 @@ PostgreSQL documentation
      <term><option>--list</></term>
      <listitem>
       <para>
-        Shows a list of already installed languages in the target database
-        (which must be specified).
+        Show a list of already installed languages in the target database.
       </para>
      </listitem>
     </varlistentry>
@@ -171,7 +170,7 @@ PostgreSQL documentation

    <listitem>
     <para>
-      Default connection parameters.
+      Default connection parameters
     </para>
    </listitem>
   </varlistentry>
@@ -204,7 +203,7 @@ PostgreSQL documentation
  <title>Examples</title>

   <para>
-    To remove <literal>pltcl</literal>:
+    To remove the language <literal>pltcl</literal>:
 <screen>
 <prompt>$ </prompt><userinput>droplang pltcl dbname</userinput>
 </screen>

--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.23 2003/03/18 22:19:46 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.24 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,7 +18,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>dropuser</command>
-   <arg rep="repeat"><replaceable>options</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   <arg><replaceable>username</replaceable></arg>
  </cmdsynopsis>
 </refsynopsisdiv>
@@ -31,8 +31,8 @@ PostgreSQL documentation
   <application>dropuser</application> removes an existing
   <productname>PostgreSQL</productname> user
   <emphasis>and</emphasis> the databases which that user owned.
-   Only users with <literal>usesuper</literal> set in
-   the <literal>pg_shadow</literal> table can destroy 
+   Only superusers (users with <literal>usesuper</literal> set in
+   the <literal>pg_shadow</literal> table) can destroy 
   <productname>PostgreSQL</productname> users.
  </para>

@@ -61,7 +61,6 @@ PostgreSQL documentation
      <listitem>
       <para>
 	Specifies the name of the <productname>PostgreSQL</productname> user to be removed. 
-	This name must exist in the <productname>PostgreSQL</productname> installation.
 	You will be prompted for a name if none is specified on the command line.
       </para>
      </listitem>
@@ -72,7 +71,7 @@ PostgreSQL documentation
      <term><option>--echo</></term>
      <listitem>
       <para>
-        Echo the queries that <application>dropuser</application> generates
+        Echo the commands that <application>dropuser</application> generates
 	and sends to the server.
       </para>
      </listitem>
@@ -112,7 +111,7 @@ PostgreSQL documentation
       <para>
 	Specifies the host name of the machine on which the 
 	server
-	is running.  If host begins with a slash, it is used 
+	is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -123,7 +122,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
+	Specifies the TCP port or local Unix domain socket file 
 	extension on which the server
 	is listening for connections.
       </para>
@@ -219,9 +218,9 @@ PostgreSQL documentation
   </para>

   <para>
-    To remove user <literal>joe</literal> using the postmaster on host
+    To remove user <literal>joe</literal> using the server on host
    <literal>eden</literal>, port 5000, with verification and a peek at the underlying
-    query:
+    command:
 <screen>
 <prompt>$ </prompt><userinput>dropuser -p 5000 -h eden -i -e joe</userinput>
 <computeroutput>User "joe" and any owned databases will be permanently deleted.

--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.24 2003/01/19 00:13:29 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/ecpg-ref.sgml,v 1.25 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -66,7 +66,7 @@ PostgreSQL documentation
     <term><option>-c</option></term>
     <listitem>
      <para>
-       Automatically generate C code from SQL code.  Currently, this
+       Automatically generate certain C code from SQL code.  Currently, this
       works for <literal>EXEC SQL TYPE</literal>.
      </para>
     </listitem>
@@ -101,7 +101,7 @@ PostgreSQL documentation
     <term><option>-o <replaceable>filename</replaceable></option></term>
     <listitem>
      <para>
-       Specifies that <application>ecpg</application> should write all
+       Specifies that <command>ecpg</command> should write all
       its output to the given <replaceable>filename</replaceable>.
      </para>
     </listitem>
@@ -111,9 +111,9 @@ PostgreSQL documentation
     <term><option>-t</option></term>
     <listitem>
      <para>
-       Turn on autocommit of transactions. In this mode, each query is
+       Turn on autocommit of transactions. In this mode, each SQL command is
       automatically committed unless it is inside an explicit
-       transaction block. In the default mode, queries are committed
+       transaction block. In the default mode, commands are committed
       only when <command>EXEC SQL COMMIT</command> is issued.
      </para>
     </listitem>
@@ -130,7 +130,7 @@ PostgreSQL documentation
    </varlistentry>

    <varlistentry>
-     <term><option>---help</option></term>
+     <term><option>--help</option></term>
     <listitem>
      <para>
       Show a brief summary of the command usage, then exit.
@@ -165,7 +165,7 @@ PostgreSQL documentation
  <para>
   Programs using C code with embedded SQL have to be linked against
   the <filename>libecpg</filename> library, for example using the
-   flags <literal>-L/usr/local/pgsql/lib -lecpg</literal>.
+   linker options <literal>-L/usr/local/pgsql/lib -lecpg</literal>.
  </para>

  <para>

--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.24 2003/01/19 00:13:29 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/initdb.sgml,v 1.25 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,7 +18,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>initdb</command>
-   <arg rep="repeat">options</arg>
+   <arg rep="repeat"><replaceable>option</></arg>
   <group choice="plain">
    <arg>--pgdata </arg>
    <arg>-D </arg>
@@ -33,17 +33,17 @@ PostgreSQL documentation
  </title>
  <para>
   <command>initdb</command> creates a new
-   <productname>PostgreSQL</productname> database cluster (or database
-   system).  A database cluster is a collection of databases that are
-   managed by a single server instance.
+   <productname>PostgreSQL</productname> database cluster.  A database
+   cluster is a collection of databases that are managed by a single
+   server instance.
  </para>

  <para>
-   Creating a database system consists of creating the directories in which
+   Creating a database cluster consists of creating the directories in which
   the database data will live, generating the shared catalog tables 
   (tables that belong to the whole cluster rather than to any particular
   database), and creating the <literal>template1</literal>
-   database.  When you create a new database, everything in the
+   database.  When you later create a new database, everything in the
   <literal>template1</literal> database is copied.
   It contains catalog tables filled in for things like the
   built-in types.
@@ -99,7 +99,7 @@ PostgreSQL documentation
      <term><option>--pgdata=<replaceable class="parameter">directory</replaceable></option></term>
      <listitem>
       <para>
-        This option specifies the directory where the database system
+        This option specifies the directory where the database cluster
        should be stored. This is the only information required by
        <command>initdb</command>, but you can avoid writing it by
        setting the <envar>PGDATA</envar> environment variable, which
@@ -117,9 +117,7 @@ PostgreSQL documentation
       <para>
        Selects the encoding of the template database. This will also
        be the default encoding of any database you create later, unless you
-        override it there. To use the encoding feature, you must
-        have enabled it at build time, at which time you also select the default
-        for this option.
+        override it there.  The default is <literal>SQL_ASCII</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -205,7 +203,7 @@ PostgreSQL documentation
      <listitem>
       <para>
        Specifies where <command>initdb</command> should find
-        its input files to initialize the database system.  This is
+        its input files to initialize the database cluster.  This is
        normally not necessary.  You will be told if you need to
        specify their location explicitly.
       </para>
@@ -219,7 +217,7 @@ PostgreSQL documentation
       <para>
 	By default, when <command>initdb</command>
 	determines that an error prevented it from completely creating the database
-	system, it removes any files it may have created before discovering
+	cluster, it removes any files it may have created before discovering
 	that it can't finish the job. This option inhibits tidying-up and is
 	thus useful for debugging.
       </para>
@@ -239,7 +237,7 @@ PostgreSQL documentation

    <listitem>
     <para>
-      Specifies the directory where the database system is to be
+      Specifies the directory where the database cluster is to be
      stored; may be overridden using the <option>-D</option> option.
     </para>
    </listitem>

--- a/doc/src/sgml/ref/initlocation.sgml
+++ b/doc/src/sgml/ref/initlocation.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/initlocation.sgml,v 1.18 2003/01/19 00:13:29 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/initlocation.sgml,v 1.19 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -47,9 +47,9 @@ PostgreSQL documentation
 <screen>
 <prompt>$ </prompt><userinput>export PGDATA2=/opt/postgres/data</userinput>
 </screen>
-    Stop and start postmaster so it sees the <envar>PGDATA2</envar>
+    Stop and start <command>postmaster</> so it sees the <envar>PGDATA2</envar>
    environment variable.  The system must be configured so the
-    postmaster sees <envar>PGDATA2</envar> every time it starts.  Finally:
+    <command>postmaster</> sees <envar>PGDATA2</envar> every time it starts.  Finally:
 <screen>
 <prompt>$</prompt> <userinput>initlocation PGDATA2</userinput>
 <prompt>$</prompt> <userinput>createdb -D PGDATA2 testdb</userinput>

--- a/doc/src/sgml/ref/ipcclean.sgml
+++ b/doc/src/sgml/ref/ipcclean.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/ipcclean.sgml,v 1.7 2002/04/21 19:02:39 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/ipcclean.sgml,v 1.8 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -36,12 +36,10 @@ PostgreSQL documentation
  <para>
   Only the database administrator should execute this program as it
   can cause bizarre behavior (i.e., crashes) if run during multiuser
-   execution.  If this command is executed while a
-   <application>postmaster</application> is running, the shared memory
-   and semaphores allocated by the
-   <application>postmaster</application> will be deleted.  This will
-   result in a general failure of the backend servers started by that
-   <application>postmaster</application>.
+   execution.  If this command is executed while a server is running,
+   the shared memory and semaphores allocated by that server will be
+   deleted, which would have rather severe consequences for that
+   server.
  </para>
 </refsect1>

@@ -51,14 +49,14 @@ PostgreSQL documentation
  <para>
   This script is a hack, but in the many years since it was written,
   no one has come up with an equally effective and portable solution.
-   Since the <application>postmaster</application> can now clean up by
+   Since the <command>postmaster</command> can now clean up by
   itself, it is unlikely that <command>ipcclean</command> will be
   improved upon in the future.
  </para>

  <para>
   The script makes assumption about the format of output of the
-   <application>ipcs</application>
+   <command>ipcs</command>
   utility which may not be true across different operating systems.
   Therefore, it may not work on your particular OS.
  </para>

--- a/doc/src/sgml/ref/pg_config-ref.sgml
+++ b/doc/src/sgml/ref/pg_config-ref.sgml
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.13 2003/01/19 00:13:29 momjian Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.14 2003/03/24 14:32:51 petere Exp $ -->

 <refentry id="app-pgconfig">
 <refmeta>
@@ -50,7 +50,7 @@
     <listitem>
      <para>
       Print the location of user executables. Use this, for example, to find
-       the <application>psql</> program. This is normally also the location
+       the <command>psql</> program. This is normally also the location
       where the <filename>pg_config</> program resides.       
      </para>
     </listitem>
@@ -130,10 +130,10 @@
  <title>Notes</title>

  <para>
-   The option <option>--includedir-server</option> is new in
+   The option <option>--includedir-server</option> was new in
   <productname>PostgreSQL</> 7.2.  In prior releases, the server include files were
   installed in the same location as the client headers, which could
-   be queried with the <option>--includedir</option>.  To make your
+   be queried with the option <option>--includedir</option>.  To make your
   package handle both cases, try the newer option first and test the
   exit status to see whether it succeeded.
  </para>

--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.4 2002/08/17 05:07:18 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.5 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -12,7 +12,7 @@ PostgreSQL documentation

 <refnamediv>
  <refname>pg_controldata</refname>
-  <refpurpose>display server-wide control information</refpurpose>
+  <refpurpose>display control information of a <productname>PostgreSQL</productname> database cluster</refpurpose>
 </refnamediv>

 <refsynopsisdiv>
@@ -25,16 +25,16 @@ PostgreSQL documentation
 <refsect1 id="R1-APP-PGCONTROLDATA-1">
  <title>Description</title>
  <para>
-   <command>pg_controldata</command> returns information initialized during
-   <application>initdb</>, such as the catalog version and server locale.
+   <command>pg_controldata</command> prints information initialized during
+   <command>initdb</>, such as the catalog version and server locale.
   It also shows information about write-ahead logging and checkpoint 
-   processing.  This information is server-wide, and not specific to any one
+   processing.  This information is cluster-wide, and not specific to any one
   database.
  </para>

  <para>
-   This utility may only be run by the user who installed the server because
-   it requires read access to the <literal>datadir</>.
+   This utility may only be run by the user who initialized the cluster because
+   it requires read access to the data directory.
   You can specify the data directory on the command line, or use 
   the environment variable <envar>PGDATA</>.
  </para>

--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.58 2003/03/18 17:05:01 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.59 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -21,7 +21,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>pg_dump</command>
-   <arg rep="repeat"><replaceable>options</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   <arg><replaceable>dbname</replaceable></arg>
  </cmdsynopsis>
 </refsynopsisdiv>
@@ -54,14 +54,6 @@ PostgreSQL documentation
   architectures.
  </para>

-  <para>
-   <application>pg_dump</application> will save the information necessary to
-   re-generate all user-defined types, functions, tables, indexes,
-   aggregates, and operators.  In addition, all the data is copied out
-   in text format so that it can be readily copied in again, as well
-   as imported into tools for editing.
-  </para>
-
  <para>
   When used with one of the archive file formats and combined with
   <application>pg_restore</application>, <application>pg_dump</application> provides a
@@ -73,14 +65,14 @@ PostgreSQL documentation
   The most flexible output file format is the <quote>custom</quote>
   format (<option>-Fc</option>). It allows for selection and
   reordering of all archived items, and is compressed by default. The
-   <filename>tar</filename> format (<option>-Ft</option>) is not
+   <application>tar</application> format (<option>-Ft</option>) is not
   compressed and it is not possible to reorder data when loading, but
   it is otherwise quite flexible; moreover, it can be manipulated with
-   other tools such as <filename>tar</filename>.
+   other tools such as <command>tar</command>.
  </para>

  <para>
-   While running <command>pg_dump</command>, one should examine the
+   While running <application>pg_dump</application>, one should examine the
   output for any warnings (printed on standard error), especially in
   light of the limitations listed below.
  </para>
@@ -198,7 +190,7 @@ PostgreSQL documentation
 	<replaceable>table</replaceable>
 	(<replaceable>column</replaceable>, ...) VALUES
 	...</literal>).  This will make restoration very slow,
-	but it is necessary if you desire to rearrange column ordering.
+	but it is necessary if you desire to rearrange the column ordering.
       </para>
      </listitem>
     </varlistentry>
@@ -224,7 +216,7 @@ PostgreSQL documentation

       <variablelist>
        <varlistentry>
-         <term>p</term>
+         <term><literal>p</></term>
         <listitem>
          <para>
           Output a plain-text <acronym>SQL</acronym> script file (default)
@@ -233,10 +225,10 @@ PostgreSQL documentation
        </varlistentry>

        <varlistentry>
-         <term>t</term>
+         <term><literal>t</></term>
         <listitem>
          <para>
-         Output a <filename>tar</filename> archive suitable for input into 
+         Output a <command>tar</command> archive suitable for input into 
         <application>pg_restore</application>. Using this archive format 
         allows reordering and/or exclusion of schema elements 
         at the time the database is restored. It is also possible to limit 
@@ -246,7 +238,7 @@ PostgreSQL documentation
        </varlistentry>

        <varlistentry>
-         <term>c</term>
+         <term><literal>c</></term>
         <listitem>
          <para>
         Output a custom archive suitable for input into 
@@ -514,8 +506,9 @@ PostgreSQL documentation
      <term><option>--compress=<replaceable class="parameter">0..9</replaceable></option></term>
      <listitem>
       <para>
-	Specify the compression level to use in archive formats that support 
-      compression (currently only the custom archive format supports compression).
+	Specify the compression level to use in archive formats that
+	support compression.  (Currently only the custom archive
+	format supports compression.)
       </para>
      </listitem>
     </varlistentry>
@@ -531,9 +524,11 @@ PostgreSQL documentation
      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
      <listitem>
       <para>
-	Specifies the host name of the machine on which the server is
-	running.  If the host name begins with a slash, it is used as the
-	directory for the Unix domain socket.
+        Specifies the host name of the machine on which the server is
+        running.  If the value begins with a slash, it is used as the
+        directory for the Unix domain socket. The default is taken
+        from the <envar>PGHOST</envar> environment variable, if set,
+        else a Unix domain socket connection is attempted.
       </para>
      </listitem>
     </varlistentry>
@@ -543,11 +538,10 @@ PostgreSQL documentation
      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
-	extension on which the server
-	is listening for connections.  The port number defaults to 5432,
-	or the value of the <envar>PGPORT</envar>
-	environment variable (if set).
+	Specifies the TCP port or local Unix domain socket file
+	extension on which the server is listening for connections.
+	Defaults to the <envar>PGPORT</envar> environment variable, if
+	set, or a compiled-in default.
       </para>
      </listitem>
     </varlistentry>
@@ -596,42 +590,13 @@ PostgreSQL documentation
 <refsect1 id="app-pgdump-diagnostics">
  <title>Diagnostics</title>

-  <msgset>
-   <msgentry>
-    <msg>
-     <msgmain>
-      <msgtext>
-<screen>
-Connection to database 'template1' failed.
-connectDBStart() -- connect() failed: No such file or directory
-        Is the postmaster running locally
-        and accepting connections on Unix socket '/tmp/.s.PGSQL.5432'?
-</screen>
-      </msgtext>
-     </msgmain> 
-    </msg>
-
-    <msgexplan>
-       <para>
-	<application>pg_dump</application> could not connect to the
-	PostgreSQL server on the specified host and port.  If you see this
-	message, ensure that the server is running on the proper host and
-	that you have specified the proper port.
-       </para>
-    </msgexplan>
-   </msgentry>
-
-  </msgset>
-
-   <note>
-    <para>
-     <application>pg_dump</application> internally executes
-     <command>SELECT</command> statements. If you have problems running
-     <application>pg_dump</application>,
-     make sure you are able to select information from the database using, for
-     example, <xref linkend="app-psql">.
-    </para>
-   </note>
+  <para>
+   <application>pg_dump</application> internally executes
+   <command>SELECT</command> statements. If you have problems running
+   <application>pg_dump</application>, make sure you are able to
+   select information from the database using, for example, <xref
+   linkend="app-psql">.
+  </para>
 </refsect1>


@@ -639,11 +604,11 @@ connectDBStart() -- connect() failed: No such file or directory
  <title>Notes</title>

  <para>
-   If your installation has any local additions to the template1 database,
+   If your database cluster has any local additions to the <literal>template1</> database,
   be careful to restore the output of <application>pg_dump</application> into a
   truly empty database; otherwise you are likely to get errors due to
   duplicate definitions of the added objects.  To make an empty database
-   without any local additions, copy from template0 not template1,
+   without any local additions, copy from <literal>template0</> not <literal>template1</>,
   for example:
 <programlisting>
 CREATE DATABASE foo WITH TEMPLATE template0;
@@ -657,17 +622,20 @@ CREATE DATABASE foo WITH TEMPLATE template0;
    <listitem>
     <para>
      When dumping a single table or as plain text, <application>pg_dump</application> 
-      does not handle large objects. Large objects must be dumped in their
-      entirety using one of the binary archive formats.
+      does not handle large objects. Large objects must be dumped with the
+      entire database using one of the non-text archive formats.
     </para>
    </listitem>

    <listitem>
     <para>
-      When doing a data-only dump, <application>pg_dump</application> emits queries
-      to disable triggers on user tables before inserting the data and queries to
-      re-enable them after the data has been inserted.  If the restore is stopped
-      in the middle, the system catalogs may be left in the wrong state.
+      When a data-only dump is chosen and the option
+      <option>--disable-triggers</> is used,
+      <application>pg_dump</application> emits commands to disable
+      triggers on user tables before inserting the data and commands
+      to re-enable them after the data has been inserted.  If the
+      restore is stopped in the middle, the system catalogs may be
+      left in the wrong state.
     </para>
    </listitem>

@@ -732,9 +700,9 @@ CREATE DATABASE foo WITH TEMPLATE template0;

  <para>
   The <application>pg_dump</application> utility first appeared in
-   <application>Postgres95</application> release <literal>0.02</literal>.  The
+   <application>Postgres95</application> release 0.02.  The
   non-plain-text output formats were introduced in
-   <application>PostgreSQL</application> release <literal>7.1</literal>.
+   <application>PostgreSQL</application> release 7.1.
  </para>
 </refsect1>


--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.37 2003/03/18 00:02:11 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dumpall.sgml,v 1.38 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,7 +18,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>pg_dumpall</command>
-   <arg rep="repeat"><replaceable>options</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
  </cmdsynopsis>
 </refsynopsisdiv>

@@ -63,8 +63,8 @@ PostgreSQL documentation
  </para>

  <para>
-  <application>pg_dumpall</application> might need to connect several
-  times to the <productname>PostgreSQL</productname> server, asking for
+  <application>pg_dumpall</application> needs to connect several
+  times to the <productname>PostgreSQL</productname> server and might be asking for
  a password each time. It is convenient to have a
  <filename>$HOME/.pgpass</> file in such cases.
  </para>
@@ -96,7 +96,7 @@ PostgreSQL documentation
       <para>
 	Dump data as <command>INSERT</command> commands (rather
 	than <command>COPY</command>). This will make restoration very
-	slow, but it makes the output more portable to other RDBMS
+	slow, but it makes the output more portable to other SQL database
 	packages.
       </para>
      </listitem>
@@ -184,10 +184,10 @@ PostgreSQL documentation
      <listitem>
       <para>
 	Specifies the host name of the machine on which the database
-	server is running.  If host begins with a slash, it is used as
-	the directory for the Unix domain socket.  The default is
-	taken from the <envar>PGHOST</envar> environment variable, if
-	set, else a Unix domain socket connection is attempted.
+	server is running.  If the value begins with a slash, it is
+	used as the directory for the Unix domain socket.  The default
+	is taken from the <envar>PGHOST</envar> environment variable,
+	if set, else a Unix domain socket connection is attempted.
       </para>
      </listitem>
     </varlistentry>
@@ -196,9 +196,10 @@ PostgreSQL documentation
      <term>-p <replaceable>port</replaceable></term>
      <listitem>
       <para>
-        The port number on which the server is listening.  Defaults to
-        the <envar>PGPORT</envar> environment variable, if set, or a
-        compiled-in default.
+	Specifies the TCP port or local Unix domain socket file
+	extension on which the server is listening for connections.
+	Defaults to the <envar>PGPORT</envar> environment variable, if
+	set, or a compiled-in default.
       </para>
      </listitem>
     </varlistentry>
@@ -237,7 +238,7 @@ PostgreSQL documentation

    <listitem>
     <para>
-      Default connection parameters.
+      Default connection parameters
     </para>
    </listitem>
   </varlistentry>
@@ -254,18 +255,10 @@ PostgreSQL documentation
   messages will refer to <application>pg_dump</application>.
  </para>

-  <para>
-   <application>pg_dumpall</application> will need to connect several
-   times to the <productname>PostgreSQL</productname> server.  If password
-   authentication is configured, it will ask for a password each time. In
-   that case it would be convenient to set up a <filename>.pgpass</> 
-   password file.
-  </para>
-
  <para>
   Once restored, it is wise to run <command>ANALYZE</> on each
   database so the optimizer has useful statistics. You
-   can also run <command>vacuumdb -a -z</> to <command>ANALYZE</> all
+   can also run <command>vacuumdb -a -z</> to analyze all
   databases.
  </para>


--- a/doc/src/sgml/ref/pg_resetxlog.sgml
+++ b/doc/src/sgml/ref/pg_resetxlog.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.6 2002/10/02 21:30:13 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_resetxlog.sgml,v 1.7 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -12,7 +12,7 @@ PostgreSQL documentation

 <refnamediv>
  <refname>pg_resetxlog</refname>
-  <refpurpose>reset write-ahead log and pg_control contents</refpurpose>
+  <refpurpose>reset the write-ahead log and other control information of a <productname>PostgreSQL</productname> database cluster</refpurpose>
 </refnamediv>

 <refsynopsisdiv>
@@ -30,25 +30,24 @@ PostgreSQL documentation
 <refsect1 id="R1-APP-PGRESETXLOG-1">
  <title>Description</title>
  <para>
-   <command>pg_resetxlog</command> clears the write-ahead log and
-   optionally resets some fields in the <filename>pg_control</> file.  This
-   function is sometimes 
-   needed if these files have become corrupted.
-   It should be used only as a last resort,
-   when the server will not start due to such corruption.
+   <command>pg_resetxlog</command> clears the write-ahead log (WAL) and
+   optionally resets some other control information (stored in the
+   <filename>pg_control</> file).  This function is sometimes needed
+   if these files have become corrupted.  It should be used only as a
+   last resort, when the server will not start due to such corruption.
  </para>

  <para>
   After running this command, it should be possible to start the server,
   but bear in mind that the database may contain inconsistent data due to
   partially-committed transactions.  You should immediately dump your data,
-   run <application>initdb</>, and reload.  After reload, check for
+   run <command>initdb</>, and reload.  After reload, check for
   inconsistencies and repair as needed.
  </para>

  <para>
   This utility can only be run by the user who installed the server, because
-   it requires read/write access to the <literal>datadir</>.
+   it requires read/write access to the data directory.
   For safety reasons, you must specify the data directory on the command line.
   <command>pg_resetxlog</command> does not use the environment variable
   <envar>PGDATA</>.
@@ -64,12 +63,12 @@ PostgreSQL documentation
   The first three of these can be set using the switches discussed below.
   <command>pg_resetxlog</command>'s own environment is the source for its
   guess at the locale fields; take care that <envar>LANG</> and so forth
-   match the environment that <application>initdb</> was run in.
+   match the environment that <command>initdb</> was run in.
   If you are not able to determine correct values for all these fields,
   <literal>-f</> can still be used, but
   the recovered database must be treated with even more suspicion than
-   usual --- an immediate dump and reload is imperative.  <emphasis>Do not</>
-   execute any data-modifying operations in the database before you dump,
+   usual: an immediate dump and reload is imperative.  <emphasis>Do not</>
+   execute any data-modifying operations in the database before you dump;
   as any such action is likely to make the corruption worse.
  </para>

@@ -79,8 +78,8 @@ PostgreSQL documentation
   be set manually.  These are only needed when
   <command>pg_resetxlog</command> is unable to determine appropriate values
   by reading <filename>pg_control</>.  A safe value for the
-   next transaction ID may be determined by looking for the largest
-   file name in <envar>$PGDATA</><filename>/pg_clog</>, adding one,
+   next transaction ID may be determined by looking for the numerically largest
+   file name in the directory <filename>pg_clog</> under the data directory, adding one,
   and then multiplying by 1048576.  Note that the file names are in
   hexadecimal.  It is usually easiest to specify the switch value in
   hexadecimal too. For example, if <filename>0011</> is the largest entry
@@ -88,7 +87,7 @@ PostgreSQL documentation
   zeroes provide the proper multiplier).
   The WAL starting address should be
   larger than any file number currently existing in
-   <envar>$PGDATA</><filename>/pg_xlog</>.  These also are in hex, and
+   the directory <filename>pg_xlog</> under the data directory.  The addresses are also in hexadecimal and
   have two parts.   For example, if <filename>000000FF0000003A</> is the
   largest entry in <filename>pg_xlog</>, <literal>-l 0xFF,0x3B</> will work.
   There is no comparably easy way to determine a next OID that's beyond
@@ -109,14 +108,14 @@ PostgreSQL documentation
  <title>Notes</title>

  <para>
-   This command must not be used when the <application>postmaster</> is 
+   This command must not be used when the server is 
   running.  <command>pg_resetxlog</command> will refuse to start up if
-   it finds a postmaster lock file in the <literal>datadir</>.  If the
-   <application>postmaster</> crashed then a lock file may have been left
+   it finds a server lock file in the data directory.  If the
+   server crashed then a lock file may have been left
   behind; in that case you can remove the lock file to allow
   <command>pg_resetxlog</command> to run.  But before you do
   so, make doubly certain that there
-   is no postmaster nor any backend server process still alive.
+   is no <command>postmaster</command> nor any backend server process still alive.
  </para>
 </refsect1>


--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
--- a/doc/src/sgml/ref/pgtclsh.sgml
+++ b/doc/src/sgml/ref/pgtclsh.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgtclsh.sgml,v 1.6 2003/01/19 00:13:31 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgtclsh.sgml,v 1.7 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -20,7 +20,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>pgtclsh</command>
-   <arg><replaceable>filename</replaceable> <arg rep="repeat"><replaceable>arguments</replaceable></arg></arg>
+   <arg><replaceable>filename</replaceable> <arg rep="repeat"><replaceable>argument</replaceable></arg></arg>
  </cmdsynopsis>
 </refsynopsisdiv>


--- a/doc/src/sgml/ref/pgtksh.sgml
+++ b/doc/src/sgml/ref/pgtksh.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgtksh.sgml,v 1.6 2003/01/19 00:13:31 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgtksh.sgml,v 1.7 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -20,7 +20,7 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>pgtksh</command>
-   <arg><replaceable>filename</replaceable> <arg rep="repeat"><replaceable>arguments</replaceable></arg></arg>
+   <arg><replaceable>filename</replaceable> <arg rep="repeat"><replaceable>argument</replaceable></arg></arg>
  </cmdsynopsis>
 </refsynopsisdiv>


--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.27 2002/10/11 23:03:48 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.28 2003/03/24 14:32:51 petere Exp $
 PostgreSQL documentation
 -->

@@ -18,12 +18,12 @@ PostgreSQL documentation
 <refsynopsisdiv>
  <cmdsynopsis>
   <command>vacuumdb</command>
-   <arg rep="repeat"><replaceable>connection-options</replaceable></arg>
+   <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
   <group><arg>--full</arg><arg>-f</arg></group>
   <group><arg>--verbose</arg><arg>-v</arg></group>
   <group><arg>--analyze</arg><arg>-z</arg></group>
-   <arg>--table | -t '<replaceable>table</replaceable>
-    <arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>'
+   <arg>--table | -t <replaceable>table</replaceable>
+    <arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>
   </arg>
   <arg><replaceable>dbname</replaceable></arg>
   <sbr>
@@ -78,6 +78,16 @@ PostgreSQL documentation
    <application>vacuumdb</application> accepts the following command-line arguments:
    
    <variablelist>
+     <varlistentry>
+      <term><option>-a</option></term>
+      <term><option>--all</option></term>
+      <listitem>
+       <para>
+	Vacuum all databases.
+       </para>
+      </listitem>
+     </varlistentry>
+
     <varlistentry>
      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></option></term>
      <term><option><optional>--dbname</> <replaceable class="parameter">dbname</replaceable></option></term>
@@ -93,17 +103,6 @@ PostgreSQL documentation
      </listitem>
     </varlistentry>

-     <varlistentry>
-      <term><option>-a</option></term>
-      <term><option>--all</option></term>
-      <listitem>
-       <para>
-	Vacuum all databases.
-       </para>
-      </listitem>
-     </varlistentry>
-
-
     <varlistentry>
      <term><option>-e</></term>
      <term><option>--echo</></term>
@@ -146,8 +145,8 @@ PostgreSQL documentation
       </para>
       <tip>
        <para>
-         If you specify columns to vacuum, you probably have to escape the parentheses
-         from the shell.
+         If you specify columns, you probably have to escape the parentheses
+         from the shell.  (See examples below.)
        </para>
       </tip>
      </listitem>
@@ -187,7 +186,7 @@ PostgreSQL documentation
       <para>
 	Specifies the host name of the machine on which the 
 	server
-	is running.  If host begins with a slash, it is used 
+	is running.  If the value begins with a slash, it is used 
 	as the directory for the Unix domain socket.
       </para>
      </listitem>
@@ -198,7 +197,7 @@ PostgreSQL documentation
      <term><option>--port <replaceable class="parameter">port</replaceable></></term>
      <listitem>
       <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
+	Specifies the TCP port or local Unix domain socket file 
 	extension on which the server
 	is listening for connections.
       </para>
@@ -272,7 +271,7 @@ PostgreSQL documentation

    <listitem>
     <para>
-      Default connection parameters.
+      Default connection parameters
     </para>
    </listitem>
   </varlistentry>

--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml