postgres.git / summary / log / commit / refs

commit    dd312101efc1b0836c00230951a135edecbdb0e5
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Thu Jan 07 11:50:56 2021 +0000

    doc: Remove reference to recovery params for divergence lookup in pg_rewind
    
    The documentation of pg_rewind mentioned the use of restore_command and
    primary_conninfo as options available at startup to fetch missing WAL
    segments that could be used to find the point of divergence for the
    rewind.  This is confusing because when finding the point of divergence
    the target cluster is offline, so this option is not available.
    
    Issue introduced by 878bd9a, so backpatch down to 9.6.  The
    documentation of 13 and HEAD was already right as this sentence has been
    changed by a7e8ece when introducing -c/--restore-target-wal.
    
    Reported-by: Amine Tengilimoglu
    Discussion: https://postgr.es/m/CADTdw-w_0MP=iQrfizeU4QU5fcZb+w8P_oPeLL+WznWf0kbn3w@mail.gmail.com
    Backpatch-through: 9.6


 doc/src/sgml/ref/pg_rewind.sgml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index f231646ee9b..096ae655564 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -68,11 +68,10 @@ PostgreSQL documentation
    shut down soon after the divergence, this is not a problem, but if the
    target cluster ran for a long time after the divergence, the old WAL
    files might no longer be present. In that case, they can be manually
-   copied from the WAL archive to the <filename>pg_xlog</> directory, or
-   fetched on startup by configuring <filename>recovery.conf</>.  The use of
-   <application>pg_rewind</> is not limited to failover, e.g.,  a standby
-   server can be promoted, run some write transactions, and then rewound
-   to become a standby again.
+   copied from the WAL archive to the <filename>pg_xlog</> directory.
+   The use of <application>pg_rewind</> is not limited to
+   failover, e.g., a standby server can be promoted, run some write
+   transactions, and then rewound to become a standby again.
   </para>
 
   <para>


[parent: 0307b98d8f5f]