diff --git a/HISTORY b/HISTORY
index e1a5eecc86..ba079e1b98 100644
--- a/HISTORY
+++ b/HISTORY
@@ -159,7 +159,6 @@ Allow postmaster to listen on a specific IP address (David J. MacKenzie)
Allow socket path name to be specified in hostname by using leading slash
(David J. MacKenzie)
Allow CREATE DATABASE to specify template database (Tom)
-New pg_dump --globals-only option (Peter E)
New utility to convert MySQL schema dumps to SQL92 and PostgreSQL (Thomas)
New /contrib/rserv replication toolkit (Vadim)
New file format for COPY BINARY (Tom)
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 2e270b6dc6..35f786aaa5 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -1,5 +1,5 @@
@@ -25,7 +25,7 @@ Postgres documentation
-c--clean
-h host
-p port
- --globals-only
+ -g--globals-only
@@ -71,6 +71,16 @@ Postgres documentation
pg_dumpall accepts the following
command line arguments:
+
+
+ -c, --clean
+
+
+ Clean (drop) database before creating schema.
+
+
+
+
-h host
@@ -97,7 +107,7 @@ Postgres documentation
- --globals-only
+ -g, --globals-only
Only dump global objects (users and groups), no databases.
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 8bb07cfb78..18b66a53d0 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
@@ -235,7 +235,6 @@ Allow postmaster to listen on a specific IP address (David J. MacKenzie)
Allow socket path name to be specified in hostname by using leading slash
(David J. MacKenzie)
Allow CREATE DATABASE to specify template database (Tom)
-New pg_dump --globals-only option (Peter E)
New utility to convert MySQL schema dumps to SQL92 and PostgreSQL (Thomas)
New /contrib/rserv replication toolkit (Vadim)
New file format for COPY BINARY (Tom)
diff --git a/src/bin/pg_dump/pg_dumpall.sh b/src/bin/pg_dump/pg_dumpall.sh
index a3b80fe251..708e165bfe 100644
--- a/src/bin/pg_dump/pg_dumpall.sh
+++ b/src/bin/pg_dump/pg_dumpall.sh
@@ -6,7 +6,7 @@
# and "pg_group" tables, which belong to the whole installation rather
# than any one individual database.
#
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.10 2001/01/25 17:28:15 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.11 2001/02/09 17:16:57 momjian Exp $
CMDNAME=`basename $0`
@@ -75,7 +75,8 @@ cleanschema=
globals_only=
#
-# Scan options. We're interested in the -h (host), -p (port), and -c (clean) options.
+# Scan options. We're interested in the -h (host), -p (port),
+# -c (clean), and -g (global) options.
# The rest we pass to pg_dump, which may or may not be useful.
#
while [ $# -gt 0 ] ; do
@@ -110,7 +111,7 @@ while [ $# -gt 0 ] ; do
cleanschema=yes
pgdumpextraopts="$pgdumpextraopts -c"
;;
- --globals-only)
+ -g|--globals-only)
globals_only=yes
;;
*)
@@ -125,13 +126,13 @@ if [ "$usage" ] ; then
echo "$CMDNAME extracts a PostgreSQL database cluster into an SQL script file."
echo
echo "Usage:"
- echo " $CMDNAME [ -c ] [ -h HOSTNAME ] [ -p PORT ] [ --globals-only ]"
+ echo " $CMDNAME [ -c ] [ -h HOSTNAME ] [ -p PORT ] [ -g ]"
echo
echo "Options:"
echo " -c, --clean Clean (drop) schema prior to create"
echo " -h, --host=HOSTNAME Server host name"
echo " -p, --port=PORT Server port number"
- echo " --globals-only Only dump global objects, no databases"
+ echo " -g, --globals-only Only dump global objects, no databases"
echo "Any extra options will be passed to pg_dump."
echo
echo "Report bugs to ."