This patch fixes an error in the usage message for 'clusterdb', and

makes a few editorial changes to the documentation.


Neil Conway

doc/src/sgml/libpq.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.107 2003/01/30 19:49:54 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/libpq.sgml,v 1.108 2003/02/13 05:37:43 momjian Exp $
 -->
 
  <chapter id="libpq">
@@ -2137,8 +2137,7 @@ sets the default time zone.
 <listitem>
 <para>
 <envar>PGCLIENTENCODING</envar>
-sets the default client encoding (if multibyte support was selected
+sets the default client encoding.
-when configuring <productname>PostgreSQL</productname>).
 </para>
 </listitem>
 </itemizedlist>

doc/src/sgml/ref/clusterdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.5 2002/10/11 23:03:48 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.6 2003/02/13 05:37:43 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -164,7 +164,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/ref/create_database.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.31 2003/01/19 00:13:29 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_database.sgml,v 1.32 2003/02/13 05:37:43 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -224,10 +224,9 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
   </para>
 
   <para>
-   The optional encoding parameter allows selection of the database encoding,
+   The optional encoding parameter allows selection of the database
-   if your server was compiled with multibyte encoding support.  When not
+   encoding.  When not specified, it defaults to the encoding used by
-   specified, it defaults to the encoding used by the selected template
+   the selected template database.
-   database.
   </para>
 
   <para>

doc/src/sgml/ref/createlang.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.28 2002/10/11 23:03:48 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.29 2003/02/13 05:37:43 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -150,7 +150,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as
+        User name to connect as.
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/ref/createuser.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.29 2002/10/11 23:03:48 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.30 2003/02/13 05:37:43 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -227,7 +227,7 @@ PostgreSQL documentation
       <term><option>--username <replaceable class="parameter">username</replaceable></></term>
       <listitem>
        <para>
-        User name to connect as (not the user name to create)
+        User name to connect as (not the user name to create).
        </para>
       </listitem>
      </varlistentry>

doc/src/sgml/ref/psql-ref.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.84 2003/01/07 20:56:06 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.85 2003/02/13 05:37:43 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -1063,8 +1063,8 @@ Tue Oct 26 21:40:57 CEST 1999
 
         <listitem>
         <para>
-        Sets the client encoding, if you are using multibyte encodings.
+        Sets the client encoding.  Without an argument, this command
-        Without an argument, this command shows the current encoding.
+        shows the current encoding.
         </para>
 	<note>
 	<para>
@@ -1169,12 +1169,9 @@ Tue Oct 26 21:40:57 CEST 1999
         <term><literal>\l</literal> (or <literal>\list</literal>)</term>
         <listitem>
         <para>
-        List all the databases in the server as well as their owners.
+        List the names, owners, and encodings of all the databases in
-        Append a <quote>+</quote> to the command name to see any
+        the server.  Append a <quote>+</quote> to the command name to
-        descriptions for the databases as well. If your
+        see any descriptions for the databases as well.
-        <productname>PostgreSQL</productname> installation was compiled
-        with multibyte encoding support, the encoding scheme of each
-        database is shown as well.
         </para>
         </listitem>
       </varlistentry>

src/bin/scripts/clusterdb

@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/clusterdb,v 1.8 2002/10/21 20:32:33 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/clusterdb,v 1.9 2003/02/13 05:37:44 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -118,9 +118,8 @@ if [ "$usage" ]; then
 	echo "  -a, --all                 cluster all databases"
 	echo "  -d, --dbname=DBNAME       database to cluster"
 	echo "  -t, --table='TABLE'       cluster specific table only"
-	echo "  -e, --echo                show the command being sent to the backend"
+	echo "  -e, --echo                show the commands sent to the backend"
 	echo "  -q, --quiet               don't write any output"
-	echo "  -v, --verbose             write a lot of output"
 	echo "  --help                    show this help, then exit"
 	echo
 	echo "Connection options:"

src/bin/scripts/createuser

@@ -9,7 +9,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.29 2002/10/18 22:05:36 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.30 2003/02/13 05:37:44 momjian Exp $
 #
 # Note - this should NOT be setuid.
 #