diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2015-03-10 22:33:25 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2015-04-14 19:26:38 -0400 |
| commit | 9fa8b0ee90c44c0f97d16bf65e94322988c94864 (patch) | |
| tree | 61e414865d8552490ce7d735675cda7c65211655 /doc/src | |
| parent | 30982be4e5019684e1772dd9170aaa53f5a8e894 (diff) | |
| download | postgresql-9fa8b0ee90c44c0f97d16bf65e94322988c94864.tar.gz postgresql-9fa8b0ee90c44c0f97d16bf65e94322988c94864.zip | |
Move pg_upgrade from contrib/ to src/bin/
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/contrib.sgml | 1 | ||||
| -rw-r--r-- | doc/src/sgml/filelist.sgml | 1 | ||||
| -rw-r--r-- | doc/src/sgml/ref/allfiles.sgml | 1 | ||||
| -rw-r--r-- | doc/src/sgml/ref/pgupgrade.sgml (renamed from doc/src/sgml/pgupgrade.sgml) | 14 | ||||
| -rw-r--r-- | doc/src/sgml/reference.sgml | 1 |
5 files changed, 5 insertions, 13 deletions
diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml index 57730955bfa..adc21843db2 100644 --- a/doc/src/sgml/contrib.sgml +++ b/doc/src/sgml/contrib.sgml @@ -204,7 +204,6 @@ pages. &pgstandby; &pgtestfsync; &pgtesttiming; - &pgupgrade; &pgxlogdump; </sect1> </appendix> diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml index ab935a6664f..2d7514c3ea1 100644 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@ -136,7 +136,6 @@ <!ENTITY pgtestfsync SYSTEM "pgtestfsync.sgml"> <!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml"> <!ENTITY pgtrgm SYSTEM "pgtrgm.sgml"> -<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml"> <!ENTITY pgxlogdump SYSTEM "pg_xlogdump.sgml"> <!ENTITY postgres-fdw SYSTEM "postgres-fdw.sgml"> <!ENTITY seg SYSTEM "seg.sgml"> diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 9ae6aecb1a1..211a3c42bd5 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -193,6 +193,7 @@ Complete list of usable sgml source files in this directory. <!ENTITY pgResetxlog SYSTEM "pg_resetxlog.sgml"> <!ENTITY pgRestore SYSTEM "pg_restore.sgml"> <!ENTITY pgRewind SYSTEM "pg_rewind.sgml"> +<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml"> <!ENTITY postgres SYSTEM "postgres-ref.sgml"> <!ENTITY postmaster SYSTEM "postmaster.sgml"> <!ENTITY psqlRef SYSTEM "psql-ref.sgml"> diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index 45bceff9bea..ce5e3082b5d 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -1,4 +1,4 @@ -<!-- doc/src/sgml/pgupgrade.sgml --> +<!-- doc/src/sgml/ref/pgupgrade.sgml --> <refentry id="pgupgrade"> <indexterm zone="pgupgrade"> @@ -240,7 +240,8 @@ mv /usr/local/pgsql /usr/local/pgsql.old <title>Install the new PostgreSQL binaries</title> <para> - Install the new server's binaries and support files. + Install the new server's binaries and support + files. <application>pg_upgrade</> is included in a default installation. </para> <para> @@ -253,15 +254,6 @@ make prefix=/usr/local/pgsql.new install </step> <step> - <title>Install pg_upgrade</title> - - <para> - Install the <application>pg_upgrade</> binary in the new PostgreSQL - installation. - </para> - </step> - - <step> <title>Initialize the new PostgreSQL cluster</title> <para> diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index c1765ef1c5e..fb18d94ea09 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -263,6 +263,7 @@ &pgCtl; &pgResetxlog; &pgRewind; + &pgupgrade; &postgres; &postmaster; |