Tuning for docbook2man.

6 files changed, 18 insertions, 45 deletions

diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 4466c30548f..f0f6d803fa3 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.17 2001/02/18 17:53:54 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.18 2001/03/17 16:27:31 petere Exp $
 Postgres documentation
 -->
 
@@ -23,7 +23,7 @@ Postgres documentation
   <cmdsynopsis>
    <command>createdb</command>
    <arg rep="repeat"><replaceable>options</replaceable></arg>
-   <arg choice="plain"><replaceable>dbname</replaceable></arg>
+   <arg><replaceable>dbname</replaceable></arg>
    <arg><replaceable>description</replaceable></arg>
   </cmdsynopsis>
 
@@ -41,7 +41,7 @@ Postgres documentation
 	Specifies the hostname of the machine on which the 
 	<application>postmaster</application>
 	is running.  If host begins with a slash, it is used 
-	as the directory for the Unix-domain socket.
+	as the directory for the Unix domain socket.
        </para>
       </listitem>
      </varlistentry>
@@ -50,8 +50,8 @@ Postgres documentation
       <term>-p, --port <replaceable class="parameter">port</replaceable></term>
       <listitem>
        <para>
-	Specifies the Internet TCP/IP port or local Unix domain socket file 
-	extension on which the <application>postmaster</application>
+	Specifies the Internet TCP/IP port or the local Unix domain socket file 
+	extension on which the <command>postmaster</command>
 	is listening for connections.
        </para>
       </listitem>
@@ -153,7 +153,7 @@ Postgres documentation
     The options <literal>-D</literal>, <literal>-T</literal>, and
     <literal>-E</literal> are converted into options for the underlying
     SQL command <xref linkend="SQL-CREATEDATABASE"
-    endterm="SQL-CREATEDATABASE-title">, which see for more information
+    endterm="SQL-CREATEDATABASE-title">; see there for more information
     about them.
    </para>
   </refsect2>
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 1fa64e38365..ddcf5db63f8 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.30 2001/03/06 18:55:57 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.31 2001/03/17 16:27:31 petere Exp $
 Postgres documentation
 -->
 
@@ -35,7 +35,6 @@ Postgres documentation
    <arg>-f <replaceable>file</replaceable></arg> 
    <arg>-F <replaceable>format</replaceable></arg>
    <arg>-i</arg>
-   <sbr>
    <group> <arg>-n</arg> <arg>-N</arg> </group>
    <arg>-o</arg>
    <arg>-O</arg>
@@ -45,11 +44,9 @@ Postgres documentation
    <arg>-v</arg>
    <arg>-x</arg>
    <arg>-Z <replaceable>0...9</replaceable></arg>
-   <sbr>
    <arg>-h <replaceable>host</replaceable></arg>
    <arg>-p <replaceable>port</replaceable></arg>
    <arg>-u</arg>
-   <sbr>
    <arg choice="plain"><replaceable>dbname</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index dbd6ceb8504..246154a8df2 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.9 2001/03/06 18:55:57 petere Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_restore.sgml,v 1.10 2001/03/17 16:27:31 petere Exp $ -->
 
 <refentry id="APP-PGRESTORE">
  <docinfo>
@@ -32,7 +32,6 @@
    <arg> -f <replaceable class="parameter">archive-file</replaceable> </arg>
    <arg> -F <replaceable class="parameter">format</replaceable> </arg>
    <arg> -i  <replaceable class="parameter">index</replaceable> </arg>
-   <sbr>
    <arg> -l </arg>
    <arg> -L <replaceable class="parameter">contents-file</replaceable> </arg>
    <group> <arg> -N </arg> <arg> -o </arg> <arg> -r </arg> </group>
@@ -45,11 +44,9 @@
    <arg> -T  <replaceable class="parameter">trigger</replaceable> </arg>
    <arg> -v </arg>
    <arg> -x </arg>
-   <sbr>
    <arg> -h  <replaceable class="parameter">host</replaceable> </arg>
    <arg> -p  <replaceable class="parameter">port</replaceable> </arg>
    <arg> -u </arg>
-   <sbr>
    <arg> <replaceable class="parameter">archive-file</replaceable> </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
diff --git a/doc/src/sgml/ref/pgaccess-ref.sgml b/doc/src/sgml/ref/pgaccess-ref.sgml
index 64acad88245..beda85f37a9 100644
--- a/doc/src/sgml/ref/pgaccess-ref.sgml
+++ b/doc/src/sgml/ref/pgaccess-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgaccess-ref.sgml,v 1.8 2001/02/07 20:46:55 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/Attic/pgaccess-ref.sgml,v 1.9 2001/03/17 16:27:31 petere Exp $
 Postgres documentation
 -->
 
@@ -379,31 +379,6 @@ select * from invoices where year=[parameter "Year of selection"]
  </refsect1>
 
  <refsect1>
-  <title>Diagnostics</title>
-
-  <para>
-   If pgaccess fails to start up, with an error message roughly like this:
-<screen>
-<computeroutput>
-Error in startup script: couldn't load file "libpgtcl.so": libpgtcl.so: cannot open shared object file: No such file or directory
-    while executing
-"load ${libpgtclpath}[info sharedlibextension]"
-    (procedure "main" line 8)
-    invoked from within
-"main $argc $argv"
-    (file "/usr/local/pgsql/share/pgaccess/main.tcl" line 249)
-</computeroutput>
-</screen>
-   then you need to configure your runtime linker to find the
-   <filename>libpgtcl.so</filename> and <filename>libpq.so</filename>
-   libraries, most likely by setting
-   the <envar>LD_LIBRARY_PATH</envar> environment variable.  Consult
-   the <productname>PostgreSQL</productname> installation instructions
-   for more information.
-  </para>
- </refsect1>
-
- <refsect1>
   <title>Notes</title>
 
   <para>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index 6240e34d63e..83236297bf9 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.16 2000/12/25 23:15:26 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/postgres-ref.sgml,v 1.17 2001/03/17 16:27:31 petere Exp $
 Postgres documentation
 -->
 
@@ -78,7 +78,12 @@ Postgres documentation
   <para>
    The <filename>postgres</filename> executable is the actual
    <productname>PostgreSQL</productname> server process that processes
-   queries.  The second form above is how
+   queries.  It is normally not called directly; instead a <xref
+   linkend="app-postmaster"> multi-user server is started.
+  </para>
+
+  <para>
+   The second form above is how
    <application>postgres</application> is invoked by the <xref
    linkend="app-postmaster"> (only
    conceptually, since both <filename>postmaster</filename> and
@@ -255,7 +260,7 @@ Postgres documentation
     <variablelist>
 
      <varlistentry>
-      <term>-f [ s | i | m | n | h ]</term>
+      <term>-f { s | i | m | n | h }</term>
       <listitem>
        <para>
 	Forbids the use of particular scan and join methods:
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index c3634ba186b..1efa7fce93b 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.15 2000/12/25 23:15:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.16 2001/03/17 16:27:31 petere Exp $
 Postgres documentation
 -->
 
@@ -26,7 +26,6 @@ Postgres documentation
    <arg><arg>-d</arg> <replaceable>dbname</replaceable></arg>
    <group><arg>--analyze</arg><arg>-z</arg></group>
    <group><arg>--verbose</arg><arg>-v</arg></group>
-   <sbr>
    <arg>--table '<replaceable>table</replaceable>
     <arg>( <replaceable class="parameter">column</replaceable> [,...] )</arg>'
    </arg>