diff --git a/doc/src/sgml/appendix-obsolete-pgreceivexlog.sgml b/doc/src/sgml/appendix-obsolete-pgreceivexlog.sgml
new file mode 100644
index 00000000000..f74d0ae832e
--- /dev/null
+++ b/doc/src/sgml/appendix-obsolete-pgreceivexlog.sgml
@@ -0,0 +1,24 @@
+
+
+
+
+ <command>pg_receivexlog</command> renamed to <command>pg_receivewal</command>
+
+
+ pg_receivexlog
+ pg_receivewal
+
+
+
+ PostgreSQL 9.6 and below provided a command named
+ pg_receivexlog
+ pg_receivexlog
+ to fetch write-ahead-log (WAL) files. This command was renamed to pg_receivewal, see
+ for documentation of pg_receivewal and see
+ the release notes for PostgreSQL 10 for details
+ on this change.
+
+
+
diff --git a/doc/src/sgml/appendix-obsolete-pgresetxlog.sgml b/doc/src/sgml/appendix-obsolete-pgresetxlog.sgml
new file mode 100644
index 00000000000..7d999301f15
--- /dev/null
+++ b/doc/src/sgml/appendix-obsolete-pgresetxlog.sgml
@@ -0,0 +1,24 @@
+
+
+
+
+ <command>pg_resetxlog</command> renamed to <command>pg_resetwal</command>
+
+
+ pg_resetxlog
+ pg_resetwal
+
+
+
+ PostgreSQL 9.6 and below provided a command named
+ pg_resetxlog
+ pg_resetxlog
+ to reset the write-ahead-log (WAL) files. This command was renamed to pg_resetwal, see
+ for documentation of pg_resetwal and see
+ the release notes for PostgreSQL 10 for details
+ on this change.
+
+
+
diff --git a/doc/src/sgml/appendix-obsolete-pgxlogdump.sgml b/doc/src/sgml/appendix-obsolete-pgxlogdump.sgml
new file mode 100644
index 00000000000..4173fee0414
--- /dev/null
+++ b/doc/src/sgml/appendix-obsolete-pgxlogdump.sgml
@@ -0,0 +1,24 @@
+
+
+
+
+ <command>pg_xlogdump</command> renamed to <command>pg_waldump</command>
+
+
+ pg_xlogdump
+ pg_waldump
+
+
+
+ PostgreSQL 9.6 and below provided a command named
+ pg_xlogdump
+ pg_xlogdump
+ to read write-ahead-log (WAL) files. This command was renamed to pg_waldump, see
+ for documentation of pg_waldump and see
+ the release notes for PostgreSQL 10 for details
+ on this change.
+
+
+
diff --git a/doc/src/sgml/appendix-obsolete-recovery-config.sgml b/doc/src/sgml/appendix-obsolete-recovery-config.sgml
new file mode 100644
index 00000000000..77c4289531b
--- /dev/null
+++ b/doc/src/sgml/appendix-obsolete-recovery-config.sgml
@@ -0,0 +1,58 @@
+
+
+
+
+ <filename>recovery.conf</filename> file merged into <filename>postgresql.conf</filename>
+
+
+ recovery.conf
+
+
+
+ PostgreSQL 11 and below used a configuration file named
+ recovery.conf
+ recovery.conf
+ to manage replicas and standbys. Support for this file was removed in PostgreSQL 12. See
+ the release notes for PostgreSQL 12 for details
+ on this change.
+
+
+
+ On PostgreSQL 12 and above,
+ archive recovery, streaming replication, and PITR
+ are configured using
+ normal server configuration parameters.
+ These are set in postgresql.conf or via
+ ALTER SYSTEM
+ like any other parameter.
+
+
+
+ The server will not start if a recovery.conf exists.
+
+
+
+ The
+ trigger_file
+
+ trigger_file
+ promote_trigger_file
+
+ setting has been renamed to
+ .
+
+
+
+ The
+ standby_mode
+
+ standby_mode
+ standby.signal
+
+ setting has been removed. A standby.signal file in the data directory
+ is used instead. See for details.
+
+
+
diff --git a/doc/src/sgml/appendix-obsolete.sgml b/doc/src/sgml/appendix-obsolete.sgml
new file mode 100644
index 00000000000..ffd7d40263e
--- /dev/null
+++ b/doc/src/sgml/appendix-obsolete.sgml
@@ -0,0 +1,41 @@
+
+
+
+ Obsolete or Renamed Features
+
+
+ Functionality is sometimes removed from PostgreSQL, feature, setting
+ and file names sometimes change, or documentation moves to different
+ places. This section directs users coming from old versions of the
+ documentation or from external links to the appropriate new location
+ for the information they need.
+
+
+
+
+ &obsolete-recovery-config;
+ &obsolete-pgxlogdump;
+ &obsolete-pgresetxlog;
+ &obsolete-pgreceivexlog;
+
+
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index dd2778611f8..28fd0670f76 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -4196,8 +4196,9 @@ ANY num_sync ( standby server
+ that is to receive replication data. Their values on the master server
are irrelevant.
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index 68179f71cdb..6c8b12376ed 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -182,3 +182,10 @@
+
+
+
+
+
+
+
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 2e7fa4a92e5..37c44396f85 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -615,9 +615,17 @@ protocol to make nodes agree on a serializable transactional order.
-
+ Standby Server Operation
+
+ A server enters standby mode if a
+
+ standby.signal
+ standby.signal
+ file exists in the data directory when the server is started.
+
+
In standby mode, the server continuously applies WAL received from the
master server. The standby server can read WAL from a WAL archive
@@ -691,7 +699,8 @@ protocol to make nodes agree on a serializable transactional order.
To set up the standby server, restore the base backup taken from primary
server (see ). Create a file
- standby.signal in the standby's cluster data
+ standby.signalstandby.signal
+ in the standby's cluster data
directory. Set to a simple command to copy files from
the WAL archive. If you plan to have multiple standby servers for high
availability purposes, make sure that recovery_target_timeline is set to
@@ -2114,7 +2123,8 @@ if (!triggered)
If hot_standby is on in postgresql.conf
- (the default value) and there is a standby.signal
+ (the default value) and there is a
+ standby.signalstandby.signalfor hot standby
file present, the server will run in Hot Standby mode.
However, it may take some time for Hot Standby connections to be allowed,
because the server will not accept connections until it has completed
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index c41ce9499be..763941e1e17 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -288,6 +288,7 @@ break is not needed in a wider output rendering.
&acronyms;
&glossary;
&color;
+ &obsolete;
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 03f31b2879d..ac442b81a5d 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -199,7 +199,10 @@ PostgreSQL documentation
- Creates a standby.signal file and appends
+ Creates a
+ standby.signal
+ standby.signalpg_basebackup --write-recovery-conf
+ file and appends
connection settings to the postgresql.auto.conf
file in the target directory (or within the base archive file when
using tar format). This eases setting up a standby server using the