v2-0001-Head-amit.1.patch.txt

diff --git a/doc/src/sgml/system-views.sgml b/doc/src/sgml/system-views.sgml
index 141c140331d..bff0d143ac5 100644
--- a/doc/src/sgml/system-views.sgml
+++ b/doc/src/sgml/system-views.sgml
@@ -2566,7 +2566,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       </para>
       <para>
        The address (<literal>LSN</literal>) from which the decoding of prepared
-       transactions is enabled. Always <literal>NULL</literal> for physical
+       transactions is enabled. <literal>NULL</literal> for physical
        slots.
       </para></entry>
      </row>
diff --git a/src/test/recovery/t/040_standby_failover_slots_sync.pl b/src/test/recovery/t/040_standby_failover_slots_sync.pl
index 67cc6374565..19273a49914 100644
--- a/src/test/recovery/t/040_standby_failover_slots_sync.pl
+++ b/src/test/recovery/t/040_standby_failover_slots_sync.pl
@@ -896,9 +896,9 @@ is($result, 't',
 # Promote the standby1 to primary. Confirm that:
 # a) the slot 'lsub1_slot' and 'snap_test_slot' are retained on the new primary
 # b) logical replication for regress_mysub1 is resumed successfully after failover
-# c) changes from the transaction 'test_twophase_slotsync', which was prepared
-#    on the old primary, can be consumed from the synced slot 'snap_test_slot'
-#    once committed on the new primary.
+# c) changes from the transaction prepared 'test_twophase_slotsync' can be
+#    consumed from the synced slot 'snap_test_slot' once committed on the new
+#    primary.
 # d) changes can be consumed from the synced slot 'snap_test_slot'
 ##################################################
 $primary->wait_for_replay_catchup($standby1);