From 0064031f99d1bafda9d3d6d88284dc4e058c5293 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 13 Feb 2003 05:37:44 +0000 Subject: [PATCH] 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 | 5 ++--- doc/src/sgml/ref/clusterdb.sgml | 4 ++-- doc/src/sgml/ref/create_database.sgml | 9 ++++----- doc/src/sgml/ref/createlang.sgml | 4 ++-- doc/src/sgml/ref/createuser.sgml | 4 ++-- doc/src/sgml/ref/psql-ref.sgml | 15 ++++++--------- src/bin/scripts/clusterdb | 7 +++---- src/bin/scripts/createuser | 6 +++--- 8 files changed, 24 insertions(+), 30 deletions(-) diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 55ad984318..e6ceefc5cb 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,5 +1,5 @@ @@ -2137,8 +2137,7 @@ sets the default time zone. PGCLIENTENCODING -sets the default client encoding (if multibyte support was selected -when configuring PostgreSQL). +sets the default client encoding. diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml index d5667fbf2a..1b8f9ba331 100644 --- a/doc/src/sgml/ref/clusterdb.sgml +++ b/doc/src/sgml/ref/clusterdb.sgml @@ -1,5 +1,5 @@ @@ -164,7 +164,7 @@ PostgreSQL documentation - User name to connect as + User name to connect as. diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index c893a47e7d..86114a1a07 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -1,5 +1,5 @@ @@ -224,10 +224,9 @@ CREATE DATABASE name - 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. diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml index cf26b08f41..507d9d1d19 100644 --- a/doc/src/sgml/ref/createlang.sgml +++ b/doc/src/sgml/ref/createlang.sgml @@ -1,5 +1,5 @@ @@ -150,7 +150,7 @@ PostgreSQL documentation - User name to connect as + User name to connect as. diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml index 2db51f8fa5..4825d27b14 100644 --- a/doc/src/sgml/ref/createuser.sgml +++ b/doc/src/sgml/ref/createuser.sgml @@ -1,5 +1,5 @@ @@ -227,7 +227,7 @@ PostgreSQL documentation - User name to connect as (not the user name to create) + User name to connect as (not the user name to create). diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 677b4773b4..181d967cbb 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -1063,8 +1063,8 @@ Tue Oct 26 21:40:57 CEST 1999 - 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. @@ -1169,12 +1169,9 @@ Tue Oct 26 21:40:57 CEST 1999 \l (or \list) - List all the databases in the server as well as their owners. - Append a + to the command name to see any - descriptions for the databases as well. If your - PostgreSQL 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 + to the command name to + see any descriptions for the databases as well. diff --git a/src/bin/scripts/clusterdb b/src/bin/scripts/clusterdb index ca6510b190..4b9b7c845e 100644 --- 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 f3983cfcba..025993c125 100644 --- 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"