@@ -11,38 +11,40 @@ version.
1111.LP
1212\fB pg_upgrade \fP must be run in two stages. In phase one you must run
1313\fB pg_upgrade \fP with your old database installation in place. In phase two,
14- \fB pg_upgrade \fP must be run on a freshly\fB initdb \fP 'edcurrent install.
15- In both phases, the same\fB pg_upgrade \fP scriptmatching the newly installed
16- version must be used.
14+ \fB pg_upgrade \fP must be run on a freshly\fB initdb \fP 'edserver.
15+ In both phases, the samenewly installed \fB pg_upgrade \fP scriptmust be
16+ used.
1717.SH Upgrading PostgreSQL with pg_upgrade
1818.LP
19- 1) Back up your existing data directory, preferably by making a complete
20- dump with\fB pg_dumpall. \fP
19+ 1) Back up your existing data directory, preferably using\fB pg_dumpall. \fP
2120.LP
22212) Copy the program\fI pgsql/contrib/pg_upgrade/pg_upgrade \fP from the current
2322PostgreSQL distribution somewhere into your path.
2423.LP
25- 3)Change your working directory to the pgsql main directory, and type:
24+ 3)Run phase one of \fB pg_upgrade: \fP
2625.LP
2726.B $ pg_upgrade -1
2827.sp
2928to collect information about the old database needed for the upgrade.
30- You may use\fI -D \fP to specify the data directory, or use PGDATA.
29+ You may use\fI -D \fP to specify the data directory. By default it uses
30+ the environment variable\fI PGDATA. \fP
3131.LP
32324) Do:
3333.LP
34+ .B $ cd pgsql/src
35+ .br
3436.B $ make install
3537.sp
36- to install thenew binaries.
38+ to install thePostgreSQL binaries for the new release .
3739.LP
38405) Do:
3941.LP
4042.B $ cd pgsql/contrib/pg_resetxlog
4143.br
4244.B $ make install
4345.sp
44- to install the\fI pg_resetxlog \fP utility which is neededby
45- \fB pg_upgrade \fP .
46+ to install the\fI pg_resetxlog \fP utility, which is neededduring phase
47+ 2 of \fB pg_upgrade \fP .
4648.LP
47496) Run initdb to create a new template1 database containing the system
4850tables for the new release. Make sure you use settings similar to those
@@ -52,17 +54,18 @@ used in your previous version.
5254to the server until the upgrade is complete. You may wish to start the
5355postmaster without -i or alter pg_hba.conf temporarily.)
5456.LP
55- 8)Change your working directory to the pgsql main directory again, and type:
57+ 8)Run phase two of \fB pg_upgrade: \fP
5658.LP
5759.B $ pg_upgrade -2
5860.sp
5961The program will do some checking to make sure everything is properly
60- configured, and will then recreate allthe databases and tables you had ,
62+ configured, and will then recreate allyour databases and tables,
6163but with no data. It will then physically move the data files
6264containing non-system tables and indexes into the proper
6365subdirectories.
6466.LP
65- 9) Restore your old\fI pg_hba.conf \fP if needed to allow user logins.
67+ 9) Restore your old\fI postmaster \fP flags or\fI pg_hba.conf \fP if
68+ needed to allow user logins.
6669.sp
6770.LP
687110) Carefully examine the contents of the upgraded databases. If you