diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-05-16 10:46:52 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-05-16 10:48:40 -0400 |
| commit | 6c19bd96bc5139fabace94c5a0a5624fd9d8e986 (patch) | |
| tree | a7cf4bf9d1462848d010218ccf7ce57554089f45 /doc/src | |
| parent | 78b66cff72d6f337a685355f7ccede1c518681b5 (diff) | |
| download | postgresql-6c19bd96bc5139fabace94c5a0a5624fd9d8e986.tar.gz postgresql-6c19bd96bc5139fabace94c5a0a5624fd9d8e986.zip | |
Allow pg_upgrade to honor libpq environment variables. Add 'local'
checks for PGHOST and PGHOSTADDR.
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/pgupgrade.sgml | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 1713bf02729..8bd5f74178e 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -58,14 +58,16 @@ <varlistentry> <term><option>-b</option> <replaceable>old_bindir</></term> - <term><option>--old-bindir=</option><replaceable>OLDBINDIR</></term> - <listitem><para>specify the old cluster executable directory</para></listitem> + <term><option>--old-bindir=</option><replaceable>old_bindir</></term> + <listitem><para>the old cluster executable directory; + environment variable <envar>OLDBINDIR</></para></listitem> </varlistentry> <varlistentry> <term><option>-B</option> <replaceable>new_bindir</></term> - <term><option>--new-bindir=</option><replaceable>NEWBINDIR</></term> - <listitem><para>specify the new cluster executable directory</para></listitem> + <term><option>--new-bindir=</option><replaceable>new_bindir</></term> + <listitem><para>the new cluster executable directory; + environment variable <envar>NEWBINDIR</></para></listitem> </varlistentry> <varlistentry> @@ -76,14 +78,16 @@ <varlistentry> <term><option>-d</option> <replaceable>old_datadir</></term> - <term><option>--old-datadir=</option><replaceable>OLDDATADIR</></term> - <listitem><para>specify the old cluster data directory</para></listitem> + <term><option>--old-datadir=</option><replaceable>old_datadir</></term> + <listitem><para>the old cluster data directory; environment + variable <envar>OLDDATADIR</></para></listitem> </varlistentry> <varlistentry> <term><option>-D</option> <replaceable>new_datadir</></term> - <term><option>--new-datadir=</option><replaceable>NEWDATADIR</></term> - <listitem><para>specify the new cluster data directory</para></listitem> + <term><option>--new-datadir=</option><replaceable>new_datadir</></term> + <listitem><para>the new cluster data directory; environment + variable <envar>NEWDATADIR</></para></listitem> </varlistentry> <varlistentry> @@ -94,7 +98,7 @@ <varlistentry> <term><option>-G</option> <replaceable>debug_filename</></term> - <term><option>--debugfile=</option><replaceable>DEBUGFILENAME</></term> + <term><option>--debugfile=</option><replaceable>debug_filename</></term> <listitem><para>output debugging activity to file</para></listitem> </varlistentry> @@ -106,26 +110,29 @@ <varlistentry> <term><option>-l</option> <replaceable>log_filename</></term> - <term><option>--logfile=</option><replaceable>LOGFILENAME</></term> + <term><option>--logfile=</option><replaceable>log_filename</></term> <listitem><para>log session activity to file</para></listitem> </varlistentry> <varlistentry> - <term><option>-p</option> <replaceable>old_portnum</></term> - <term><option>--old-port=</option><replaceable>portnum</></term> - <listitem><para>specify the old cluster port number</para></listitem> + <term><option>-p</option> <replaceable>old_port_number</></term> + <term><option>--old-port=</option><replaceable>old_portnum</></term> + <listitem><para>the old cluster port number; environment + variable <envar>PGPORT</></para></listitem> </varlistentry> <varlistentry> - <term><option>-P</option> <replaceable>new_portnum</></term> - <term><option>--new-port=</option><replaceable>portnum</></term> - <listitem><para>specify the new cluster port number</para></listitem> + <term><option>-P</option> <replaceable>new_port_number</></term> + <term><option>--new-port=</option><replaceable>new_portnum</></term> + <listitem><para>the new cluster port number; environment + variable <envar>PGPORT</></para></listitem> </varlistentry> <varlistentry> - <term><option>-u</option> <replaceable>username</></term> - <term><option>--user=</option><replaceable>username</></term> - <listitem><para>clusters superuser</para></listitem> + <term><option>-u</option> <replaceable>user_name</></term> + <term><option>--user=</option><replaceable>user_name</></term> + <listitem><para>cluster's super user name; environment + variable <envar>PGUSER</></para></listitem> </varlistentry> <varlistentry> |