Skip to content

Commit 4b9904a

Browse files
bmomjianbmomjian
committed
Update pg_upgrade docs to show options in alphabetical order, and
improve 8.3 doc limitations paragraph.
1 parent 00be754 commit 4b9904a

File tree

1 file changed

+32
-29
lines changed

1 file changed

+32
-29
lines changed

‎doc/src/sgml/pgupgrade.sgml

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgupgrade.sgml,v 1.9 2010/05/19 20:47:18 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgupgrade.sgml,v 1.10 2010/05/24 17:43:39 momjian Exp $ -->
22

33
<sect1 id="pgupgrade">
44
<title>pg_upgrade</title>
@@ -35,18 +35,6 @@
3535

3636
<variablelist>
3737

38-
<varlistentry>
39-
<term><option>-d</option> <replaceable>OLDDATADIR</></term>
40-
<term><option>--old-datadir</option> <replaceable>OLDDATADIR</></term>
41-
<listitem><para>specify the old cluster data directory</para></listitem>
42-
</varlistentry>
43-
44-
<varlistentry>
45-
<term><option>-D</option> <replaceable>NEWDATADIR</></term>
46-
<term><option>--new-datadir</option> <replaceable>NEWDATADIR</></term>
47-
<listitem><para>specify the new cluster data directory</para></listitem>
48-
</varlistentry>
49-
5038
<varlistentry>
5139
<term><option>-b</option> <replaceable>OLDBINDIR</></term>
5240
<term><option>--old-bindir</option> <replaceable>OLDBINDIR</></term>
@@ -60,31 +48,25 @@
6048
</varlistentry>
6149

6250
<varlistentry>
63-
<term><option>-p</option> <replaceable>portnum</></term>
64-
<term><option>--old-port</option> <replaceable>portnum</></term>
65-
<listitem><para>specify the old cluster port number</para></listitem>
66-
</varlistentry>
67-
68-
<varlistentry>
69-
<term><option>-P</option> <replaceable>portnum</></term>
70-
<term><option>--new-port</option> <replaceable>portnum</></term>
71-
<listitem><para>specify the new cluster port number</para></listitem>
51+
<term><option>-c</option></term>
52+
<term><option>--check</option></term>
53+
<listitem><para>check clusters only, don't change any data</para></listitem>
7254
</varlistentry>
7355

7456
<varlistentry>
75-
<term><option>-u</option> <replaceable>username</></term>
76-
<term><option>--user</option> <replaceable>username</></term>
77-
<listitem><para>clusters superuser</para></listitem>
57+
<term><option>-d</option> <replaceable>OLDDATADIR</></term>
58+
<term><option>--old-datadir</option> <replaceable>OLDDATADIR</></term>
59+
<listitem><para>specify the old cluster data directory</para></listitem>
7860
</varlistentry>
7961

8062
<varlistentry>
81-
<term><option>-c</option></term>
82-
<term><option>--check</option></term>
83-
<listitem><para>check clusters only, don't change any data</para></listitem>
63+
<term><option>-D</option> <replaceable>NEWDATADIR</></term>
64+
<term><option>--new-datadir</option> <replaceable>NEWDATADIR</></term>
65+
<listitem><para>specify the new cluster data directory</para></listitem>
8466
</varlistentry>
8567

8668
<varlistentry>
87-
<term><option>-d</option></term>
69+
<term><option>-g</option></term>
8870
<term><option>--debug</option></term>
8971
<listitem><para>enable debugging</para></listitem>
9072
</varlistentry>
@@ -107,6 +89,24 @@
10789
<listitem><para>log session activity to file</para></listitem>
10890
</varlistentry>
10991

92+
<varlistentry>
93+
<term><option>-p</option> <replaceable>portnum</></term>
94+
<term><option>--old-port</option> <replaceable>portnum</></term>
95+
<listitem><para>specify the old cluster port number</para></listitem>
96+
</varlistentry>
97+
98+
<varlistentry>
99+
<term><option>-P</option> <replaceable>portnum</></term>
100+
<term><option>--new-port</option> <replaceable>portnum</></term>
101+
<listitem><para>specify the new cluster port number</para></listitem>
102+
</varlistentry>
103+
104+
<varlistentry>
105+
<term><option>-u</option> <replaceable>username</></term>
106+
<term><option>--user</option> <replaceable>username</></term>
107+
<listitem><para>clusters superuser</para></listitem>
108+
</varlistentry>
109+
110110
<varlistentry>
111111
<term><option>-v</option></term>
112112
<term><option>--verbose</option></term>
@@ -120,6 +120,7 @@
120120
</varlistentry>
121121

122122
<varlistentry>
123+
<term><option>-?</option></term>
123124
<term><option>-h</option></term>
124125
<term><option>--help</option></term>
125126
<listitem><para>show help, then exit</para></listitem>
@@ -441,6 +442,8 @@ psql --username postgres --file script.sql postgres
441442

442443

443444
<para>
445+
Upgrading from PostgreSQL 8.3 has additional restrictions not present
446+
when upgrading from later PostgreSQL releases. For example,
444447
pg_upgrade will not work for a migration from 8.3 if a user column
445448
is defined as:
446449
<itemizedlist>

0 commit comments

Comments
 (0)