Merge branch 'release_2_4' into issue_66

Author: gsmolk

doc/pgprobackup.xml

@@ -4310,7 +4310,7 @@ pg_probackup archive-get -B <replaceable>backup_dir</replaceable> --instance <re
         <option>--recovery-target-lsn</option> or
         <option>--recovery-target-xid</option> options. The default
         depends on the
-        <ulink url="https://postgrespro.com/docs/postgresql/current/recovery-target-settings.html#RECOVERY-TARGET-INCLUSIVE">recovery_target_inclusive</ulink>
+        <ulink url="https://postgrespro.com/docs/postgresql/current/runtime-config-wal#GUC-RECOVERY-TARGET-INCLUSIVE">recovery_target_inclusive</ulink>
         parameter.
       </para>
       </listitem>

tests/replica.py

@@ -726,7 +726,7 @@ def test_replica_stop_lsn_null_offset_next_record(self):
             log_content)
 
         self.assertIn(
-            'LOG: current.stop_lsn: 0/4000028',
+            'LOG: stop_lsn: 0/4000028',
             log_content)
 
         # Clean after yourself