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

makes a few editorial changes to the documentation.

Neil Conway

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 55ad984318b54c7dd8aa72a10fb941f3af5b9766..e6ceefc5cbdc2a35e64d407b33a3fe25ade7d2db 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/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
-when configuring <productname>PostgreSQL</productname>).
+sets the default client encoding.
 </para>
 </listitem>
 </itemizedlist>

diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index d5667fbf2a9ebeb1742b9be05e2922a53a971470..1b8f9ba331a68446068cc28ef6106ccf36a5fe8e 100644 (file)
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/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>

diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index c893a47e7d6b6926abcbaa553b804575e1e7d5fa..86114a1a079d78cb72c0f199846990975a477187 100644 (file)
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/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,
-   if your server was compiled with multibyte encoding support.  When not
-   specified, it defaults to the encoding used by the selected template
-   database.
+   The optional encoding parameter allows selection of the database
+   encoding.  When not specified, it defaults to the encoding used by
+   the selected template database.
   </para>
 
   <para>

diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml
index cf26b08f4107835ec8ece2f4755bc9ff3c610859..507d9d1d19c1074162179f2cb49eb88b322407f1 100644 (file)
--- a/doc/src/sgml/ref/createlang.sgml
+++ b/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>

diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index 2db51f8fa5d769943054cf83f72533ca4cfe32a6..4825d27b141b7fa6b10193df131b32840d085795 100644 (file)
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/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>

diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index 677b4773b43d11abb8bc99fcc6b8fb3fcc5f4015..181d967cbb902b5a5848747379a1b2792d62d737 100644 (file)
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/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.
-        Without an argument, this command shows the current encoding.
+        Sets the client encoding.  Without an argument, this command
+        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.
-        Append a <quote>+</quote> to the command name to see any
-        descriptions for the databases as well. If your
-        <productname>PostgreSQL</productname> installation was compiled
-        with multibyte encoding support, the encoding scheme of each
-        database is shown as well.
+        List the names, owners, and encodings of all the databases in
+        the server.  Append a <quote>+</quote> to the command name to
+        see any descriptions for the databases as well.
         </para>
         </listitem>
       </varlistentry>

diff --git a/src/bin/scripts/clusterdb b/src/bin/scripts/clusterdb
index ca6510b190611cb53b1398d2991601862999765c..4b9b7c845e99ad8b3f087cbc7cb8ecaf5560fd9c 100644 (file)
--- a/src/bin/scripts/clusterdb
+++ b/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,10 +118,9 @@ 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 "  --help                    show this help, then exit"
        echo
        echo "Connection options:"
        echo "  -h, --host=HOSTNAME       database server host"

diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser
index f3983cfcba342475a62f50eda7e9f262629338d4..025993c12523020860ac03efa0621af06b6b57cf 100644 (file)
--- a/src/bin/scripts/createuser
+++ b/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.
 #
@@ -153,8 +153,8 @@ if [ "$usage" ]; then
        echo "  -N, --unencrypted         do no encrypt stored password"
        echo "  -i, --sysid=SYSID         select sysid for new user"     
        echo "  -e, --echo                show the query being sent to the backend"
-        echo "  -q, --quiet               don't write any messages"
-       echo " --help                     show this help, then exit"
+       echo "  -q, --quiet               don't write any messages"
+       echo "  --help                    show this help, then exit"
        echo
        echo "Connection options:"
        echo "  -h, --host=HOSTNAME       database server host"