From fb771f9086aab3018b652e1d8e5207208311bb23 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 28 Jun 2013 18:01:46 -0400 Subject: [PATCH] pg_upgrade: trim down --help and doc option descriptions Previous code had old/new prefixes on option values, e.g. --old-datadir=OLDDATADIR. Remove them, for simplicity; now: --old-datadir=DATADIR. Also update docs to do the same. --- contrib/pg_upgrade/option.c | 20 ++++++++++---------- doc/src/sgml/pgupgrade.sgml | 28 ++++++++++++++-------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index a586b4e57a..c71db32ed1 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -229,17 +229,17 @@ usage(void) pg_upgrade [OPTION]...\n\ \n\ Options:\n\ - -b, --old-bindir=OLDBINDIR old cluster executable directory\n\ - -B, --new-bindir=NEWBINDIR new cluster executable directory\n\ + -b, --old-bindir=BINDIR old cluster executable directory\n\ + -B, --new-bindir=BINDIR new cluster executable directory\n\ -c, --check check clusters only, don't change any data\n\ - -d, --old-datadir=OLDDATADIR old cluster data directory\n\ - -D, --new-datadir=NEWDATADIR new cluster data directory\n\ + -d, --old-datadir=DATADIR old cluster data directory\n\ + -D, --new-datadir=DATADIR new cluster data directory\n\ -j, --jobs number of simultaneous processes or threads to use\n\ -k, --link link instead of copying files to new cluster\n\ -o, --old-options=OPTIONS old cluster options to pass to the server\n\ -O, --new-options=OPTIONS new cluster options to pass to the server\n\ - -p, --old-port=OLDPORT old cluster port number (default %d)\n\ - -P, --new-port=NEWPORT new cluster port number (default %d)\n\ + -p, --old-port=PORT old cluster port number (default %d)\n\ + -P, --new-port=PORT new cluster port number (default %d)\n\ -r, --retain retain SQL and log files after success\n\ -U, --username=NAME cluster superuser (default \"%s\")\n\ -v, --verbose enable verbose internal logging\n\ @@ -252,10 +252,10 @@ Before running pg_upgrade you must:\n\ shutdown the postmaster servicing the new cluster\n\ \n\ When you run pg_upgrade, you must provide the following information:\n\ - the data directory for the old cluster (-d OLDDATADIR)\n\ - the data directory for the new cluster (-D NEWDATADIR)\n\ - the \"bin\" directory for the old version (-b OLDBINDIR)\n\ - the \"bin\" directory for the new version (-B NEWBINDIR)\n\ + the data directory for the old cluster (-d DATADIR)\n\ + the data directory for the new cluster (-D DATADIR)\n\ + the \"bin\" directory for the old version (-b BINDIR)\n\ + the \"bin\" directory for the new version (-B BINDIR)\n\ \n\ For example:\n\ pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n\ diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index a896565641..d1677d45e9 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -79,15 +79,15 @@ - old_bindir - old_bindir + bindir + bindir the old cluster executable directory; environment variable PGBINOLD - new_bindir - new_bindir + bindir + bindir the new cluster executable directory; environment variable PGBINNEW @@ -99,15 +99,15 @@ - old_datadir - old_datadir + datadir + datadir the old cluster data directory; environment variable PGDATAOLD - new_datadir - new_datadir + datadir + datadir the new cluster data directory; environment variable PGDATANEW @@ -140,15 +140,15 @@ - old_port_number - old_portnum + port + port the old cluster port number; environment variable PGPORTOLD - new_port_number - new_portnum + port + port the new cluster port number; environment variable PGPORTNEW @@ -161,8 +161,8 @@ - user_name - user_name + username + username cluster's super user name; environment variable PGUSER -- 2.40.0