Okay, that should put us back in sync. These two patches (src & doc) are

against the sources from one hour ago and contain all the portable and
up
to date stuff.

A few other CVS "householding" things you might want to take care of:

* Remove the src/bin/cleardbdir directory

* Remove the file src/bin/psql/sql_help.h from the repository, as it is
a derived file and is build by the release_prep.

Peter Eisentraut

Author: bmomjian

doc/src/sgml/install.sgml

@@ -808,15 +808,15 @@ $ nohup postmaster -i > pgserver.log 2>&1 &
 <para>
 Create a database by typing
 <ProgramListing>
-$ createdb
+$ createdb test
 </ProgramListing>
 </para>
 </step>
 <Step Performance="required">
 <para>
 Connect to the new database:
 <ProgramListing>
-$ psql
+$ psql test
 </ProgramListing>
 </para>
 </step>
@@ -840,7 +840,7 @@ postgres=> \q
 <para>
 Remove the test database (unless you will want to use it later for other tests):
 <ProgramListing>
-$ destroydb
+$ dropdb test
 </ProgramListing>
 </para>
 </step>
@@ -1028,7 +1028,7 @@ For example,
      After running the regression tests, type
 
 <ProgramListing>
-$ destroydb regression
+$ dropdb regression
 $ cd /usr/src/pgsql/postgresql-6.5.3/src/test/regress
 $ gmake clean
 </ProgramListing>
@@ -1241,7 +1241,7 @@ Create the database foo:
 
 <ProgramListing>
 template1=> create database foo;
-CREATEDB
+CREATE DATABASE
 </ProgramListing>
 
 (Get in the habit of including those SQL semicolons.  Psql won't execute

doc/src/sgml/manage-ag.sgml

@@ -143,7 +143,7 @@ You are currently connected to the database: <replaceable>dbname</replaceable>
     mydb,  you can destroy it using the following Unix command:
 
     <programlisting>
-% destroydb <replaceable class="parameter">dbname</replaceable>
+% dropdb <replaceable class="parameter">dbname</replaceable>
     </programlisting>
 
     This action physically removes all of  the  Unix  files

doc/src/sgml/manage.sgml

@@ -283,7 +283,7 @@ TBD
      If you are the database administrator for the  database
      <Database>mydb</Database>,  you can destroy it using the following Unix command:
 <ProgramListing>
-% destroydb mydb
+% dropdb mydb
 </ProgramListing>
      This action physically removes all of  the  Unix  files
      associated  with  the database and cannot be undone, so

doc/src/sgml/ref/createdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.7 1999/12/04 04:53:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createdb.sgml,v 1.8 1999/12/07 22:41:41 momjian Exp $
 Postgres documentation
 -->
 
@@ -96,7 +96,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
      </varlistentry>
 
      <varlistentry>
-      <term>-D, --dbpath <replaceable class="parameter">datadir</replaceable></term>
+      <term>-D, --location <replaceable class="parameter">datadir</replaceable></term>
       <listitem>
        <para>
 	Specifies the alternate database location for this database installation.
@@ -120,7 +120,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
       <listitem>
        <para>
 	Specifies the name of the database to be created.  The name must be
-	unique among all <productname>Postgres</productname> databases in this installation.
+	unique among all <productname>PostgreSQL</productname> databases in this installation.
        </para>
       </listitem>
      </varlistentry>
@@ -167,7 +167,7 @@ createdb [ <replaceable class="parameter">options</replaceable> ] <replaceable c
      </varlistentry>
 
      <varlistentry>
-      <term><computeroutput>createdb: Comment creation failed.</computeroutput></term>
+      <term><computeroutput>createdb: Comment creation failed. (Database was created.)</computeroutput></term>
       <listitem>
        <para>
        The comment/description for the database could not be created.
@@ -235,11 +235,11 @@ CREATE DATABASE
   <para>
    To create the database <literal>demo</literal>
    using the postmaster on host eden, port 5000, using the <literal>LATIN1</literal>
-   encoding scheme and look at the underlying query:
+   encoding scheme with a look at the underlying query:
 
    <programlisting>
 $ <userinput>createdb -p 5000 -h eden -E LATIN1 -e demo</userinput>
-QUERY: CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'
+CREATE DATABASE "demo" WITH ENCODING = 'LATIN1'
 CREATE DATABASE
    </programlisting>
   </para>

doc/src/sgml/ref/createuser.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.6 1999/12/04 04:53:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
 Postgres documentation
 -->
 
@@ -125,6 +125,16 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term>-i, --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
+       necessary, but some people like it.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><replaceable class="parameter">username</replaceable></term>
       <listitem>
@@ -142,11 +152,9 @@ createuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceab
 
     <para>
     The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>,
-    are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. If you
-    need the <application>psql</application> options <literal>-U</literal> and
-    <literal>-W</literal> as well, you can uncomment the
-    respective lines in the source. They are disabled by default because of the potential
-    conceptual confusion between existing and new users.
+    are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. The
+    <application>psql</application> options <literal>-U</literal> and <literal>-W</literal>
+    are available as well, but their use can be confusing in this context.
    </para>
   </refsect2>
 
@@ -243,7 +251,7 @@ CREATE USER
 
    <programlisting>
 $ <userinput>createuser -p 5000 -h eden -D -A -e joe</userinput>
-QUERY: CREATE USER "joe" NOCREATEDB NOCREATEUSER
+CREATE USER "joe" NOCREATEDB NOCREATEUSER
 CREATE USER
    </programlisting>
   </para>

doc/src/sgml/ref/drop_user.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.8 1999/12/04 04:53:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_user.sgml,v 1.9 1999/12/07 22:41:41 momjian Exp $
 Postgres documentation
 -->
 
@@ -94,9 +94,7 @@ ERROR: removeUser: user "<replaceable class="parameter">name</replaceable>" does
    user from the database,
    along with any databases owned by the user. It
    does not remove tables, views, or triggers owned by the
-   named user in databases not owned by the user. This statement
-   can be used in place of the <application>dropuser</application>
-   script, regardless of how the user was created.
+   named user in databases not owned by the user.
   </para>
 
   <refsect2 id="R2-SQL-DROPUSER-3">

doc/src/sgml/ref/dropdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.1 1999/12/04 04:53:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropdb.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
 Postgres documentation
 -->
 
@@ -207,7 +207,7 @@ DROP DATABASE
 $ <userinput>dropdb -p 5000 -h eden -i -e demo</userinput>
 Database "demo" will be permanently deleted.
 Are you sure? (y/n) <userinput>y</userinput>
-QUERY: DROP DATABASE "demo"
+DROP DATABASE "demo"
 DROP DATABASE
    </programlisting>
   </para>

doc/src/sgml/ref/dropuser.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.1 1999/12/04 04:53:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.2 1999/12/07 22:41:41 momjian Exp $
 Postgres documentation
 -->
 
@@ -101,11 +101,9 @@ dropuser [ <replaceable class="parameter">options</replaceable> ] [ <replaceable
 
     <para>
     The options <literal>-h</literal>, <literal>-p</literal>, and <literal>-e</literal>,
-    are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. If you
-    need the <application>psql</application> options <literal>-U</literal> and
-    <literal>-W</literal> as well, you can uncomment the
-    respective lines in the source. They are disabled by default because of the potential
-    conceptual confusion between existing and new users.
+    are passed on literally to <xref linkend="APP-PSQL" endterm="APP-PSQL-title">. The
+    <application>psql</application> options <literal>-U</literal> and <literal>-W</literal>
+    are available as well, but they can be confusing in this context.
    </para>
   </refsect2>
 
@@ -201,7 +199,7 @@ DROP USER
 $ <userinput>dropuser -p 5000 -h eden -i -e joe</userinput>
 User "joe" and any owned databases will be permanently deleted.
 Are you sure? (y/n) <userinput>y</userinput>
-QUERY: DROP USER "joe"
+DROP USER "joe"
 DROP USER
    </programlisting>
   </para>

doc/src/sgml/ref/vacuum.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.6 1999/11/28 02:17:04 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuum.sgml,v 1.7 1999/12/07 22:41:41 momjian Exp $
 Postgres documentation
 -->
 
@@ -24,7 +24,7 @@ Postgres documentation
   </refsynopsisdivinfo>
   <synopsis>
 VACUUM [ VERBOSE ] [ ANALYZE ] [ <replaceable class="PARAMETER">table</replaceable> ]
-VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">ER">t</replaceable>BLE> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
+VACUUM [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table</replaceable> [ (<replaceable class="PARAMETER">column</replaceable> [, ...] ) ] ]
   </synopsis>
 
   <refsect2 id="R2-SQL-VACUUM-1">