aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2013-06-28 18:01:46 -0400
committerBruce Momjian <bruce@momjian.us>2013-06-28 18:01:49 -0400
commitfb771f9086aab3018b652e1d8e5207208311bb23 (patch)
treed7fbeb2cae4c2002f66a1d8cb92172500254683f /doc/src
parent82233ce7ea42d6ba519aaec63008aff49da6c7af (diff)
downloadpostgresql-fb771f9086aab3018b652e1d8e5207208311bb23.tar.gz
postgresql-fb771f9086aab3018b652e1d8e5207208311bb23.zip
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.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/pgupgrade.sgml28
1 files changed, 14 insertions, 14 deletions
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index a8965656419..d1677d45e9f 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -79,15 +79,15 @@
<variablelist>
<varlistentry>
- <term><option>-b</option> <replaceable>old_bindir</></term>
- <term><option>--old-bindir=</option><replaceable>old_bindir</></term>
+ <term><option>-b</option> <replaceable>bindir</></term>
+ <term><option>--old-bindir=</option><replaceable>bindir</></term>
<listitem><para>the old cluster executable directory;
environment variable <envar>PGBINOLD</></para></listitem>
</varlistentry>
<varlistentry>
- <term><option>-B</option> <replaceable>new_bindir</></term>
- <term><option>--new-bindir=</option><replaceable>new_bindir</></term>
+ <term><option>-B</option> <replaceable>bindir</></term>
+ <term><option>--new-bindir=</option><replaceable>bindir</></term>
<listitem><para>the new cluster executable directory;
environment variable <envar>PGBINNEW</></para></listitem>
</varlistentry>
@@ -99,15 +99,15 @@
</varlistentry>
<varlistentry>
- <term><option>-d</option> <replaceable>old_datadir</></term>
- <term><option>--old-datadir=</option><replaceable>old_datadir</></term>
+ <term><option>-d</option> <replaceable>datadir</></term>
+ <term><option>--old-datadir=</option><replaceable>datadir</></term>
<listitem><para>the old cluster data directory; environment
variable <envar>PGDATAOLD</></para></listitem>
</varlistentry>
<varlistentry>
- <term><option>-D</option> <replaceable>new_datadir</></term>
- <term><option>--new-datadir=</option><replaceable>new_datadir</></term>
+ <term><option>-D</option> <replaceable>datadir</></term>
+ <term><option>--new-datadir=</option><replaceable>datadir</></term>
<listitem><para>the new cluster data directory; environment
variable <envar>PGDATANEW</></para></listitem>
</varlistentry>
@@ -140,15 +140,15 @@
</varlistentry>
<varlistentry>
- <term><option>-p</option> <replaceable>old_port_number</></term>
- <term><option>--old-port=</option><replaceable>old_portnum</></term>
+ <term><option>-p</option> <replaceable>port</></term>
+ <term><option>--old-port=</option><replaceable>port</></term>
<listitem><para>the old cluster port number; environment
variable <envar>PGPORTOLD</></para></listitem>
</varlistentry>
<varlistentry>
- <term><option>-P</option> <replaceable>new_port_number</></term>
- <term><option>--new-port=</option><replaceable>new_portnum</></term>
+ <term><option>-P</option> <replaceable>port</></term>
+ <term><option>--new-port=</option><replaceable>port</></term>
<listitem><para>the new cluster port number; environment
variable <envar>PGPORTNEW</></para></listitem>
</varlistentry>
@@ -161,8 +161,8 @@
</varlistentry>
<varlistentry>
- <term><option>-U</option> <replaceable>user_name</></term>
- <term><option>--username=</option><replaceable>user_name</></term>
+ <term><option>-U</option> <replaceable>username</></term>
+ <term><option>--username=</option><replaceable>username</></term>
<listitem><para>cluster's super user name; environment
variable <envar>PGUSER</></para></listitem>
</varlistentry>