aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/pgupgrade.sgml29
1 files changed, 13 insertions, 16 deletions
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 1373069243c..4f263fe6720 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -182,7 +182,7 @@
<para>
If you are using a version-specific installation directory, e.g.
- <filename>/opt/PostgreSQL/8.4</>, you do not need to move the old cluster. The
+ <filename>/opt/PostgreSQL/9.1</>, you do not need to move the old cluster. The
one-click installers all use version-specific installation directories.
</para>
@@ -254,7 +254,8 @@ gmake prefix=/usr/local/pgsql.new install
<para>
Install any custom shared object files (or DLLs) used by the old cluster
- into the new cluster, e.g. <filename>pgcrypto.so</filename>, whether they are from <filename>contrib</filename>
+ into the new cluster, e.g. <filename>pgcrypto.so</filename>,
+ whether they are from <filename>contrib</filename>
or some other source. Do not install the schema definitions, e.g.
<filename>pgcrypto.sql</>, because these will be upgraded from the old cluster.
</para>
@@ -454,18 +455,14 @@ psql --username postgres --file script.sql postgres
<listitem>
<para>
- If you
- ran <command>pg_upgrade</command> <emphasis>without</> <option>--link</>
- or did not start the new server, the old cluster was not
- modified except that an <literal>.old</> suffix was appended
- to <filename>$PGDATA/global/pg_control</> and perhaps
- tablespace directories. To reuse the old cluster, remove
- the <filename>.old</> suffix
- from <filename>$PGDATA/global/pg_control</>. and, if upgrading
- to 8.4 or earlier, remove the tablespace directories created
- by the upgrade and remove the <filename>.old</> suffix from
- the tablespace directory names; then you can restart the old
- cluster.
+ If you ran <command>pg_upgrade</command> <emphasis>without</>
+ <option>--link</> or did not start the new server, the
+ old cluster was not modified except that, if linking
+ started, a <literal>.old</> suffix was appended to
+ <filename>$PGDATA/global/pg_control</>. To reuse the old
+ cluster, possibly remove the <filename>.old</> suffix from
+ <filename>$PGDATA/global/pg_control</>; you can then restart the
+ old cluster.
</para>
</listitem>
</itemizedlist>
@@ -582,9 +579,9 @@ psql --username postgres --file script.sql postgres
</para>
<para>
- If you want to use link mode and you don't want your old cluster
+ If you want to use link mode and you do not want your old cluster
to be modified when the new cluster is started, make a copy of the
- old cluster and upgrade that with link mode. To make a valid copy
+ old cluster and upgrade that in link mode. To make a valid copy
of the old cluster, use <command>rsync</> to create a dirty
copy of the old cluster while the server is running, then shut down
the old server and run <command>rsync</> again to update the copy with any