doc: PG 16 relnotes, misc merged items and bootstrap detail

Reported-by: Andres Freund, jian he

Discussion: https://postgr.es/m/20230521171341.jjxykfsefsek4kzj@awork3.anarazel.de, 20230521171341.jjxykfsefsek4kzj@awork3.anarazel.de

doc/src/sgml/release-16.sgml

@@ -313,7 +313,7 @@ Author: Andres Freund <andres@anarazel.de>
 
 <listitem>
 <para>
-Allow more efficient addition of multiple heap and index pages (Andres Freund)
+Allow more efficient addition of heap and index pages (Andres Freund)
 </para>
 </listitem>
 
@@ -912,6 +912,10 @@ Author: Robert Haas <rhaas@postgresql.org>
 <para>
 Prevent removal of superuser privileges for the bootstrap user (Robert Haas)
 </para>
+
+<para>
+Restoring such users could lead to errors.
+</para>
 </listitem>
 
 <!--
@@ -1285,26 +1289,24 @@ ADD THIS?
 <!--
 Author: Andres Freund <andres@anarazel.de>
 2023-04-08 [0fdab27ad] Allow logical decoding on standbys
--->
-
-<listitem>
-<para>
-Allow logical decoding on standbys (Bertrand Drouvot, Andres Freund, Amit Khandekar)
-</para>
-</listitem>
-
-<!--
+Author: Andres Freund <andres@anarazel.de>
+2023-04-07 [be87200ef] Support invalidating replication slots due to horizon an
+Author: Andres Freund <andres@anarazel.de>
+2023-04-08 [26669757b] Handle logical slot conflicts on standby
 Author: Andres Freund <andres@anarazel.de>
 2023-04-08 [0fdab27ad] Allow logical decoding on standbys
 -->
 
 <listitem>
 <para>
-Add function pg_log_standby_snapshot() to force creation of a WAL snapshot (Bertrand Drouvot)
+Allow logical decoding on standbys (Bertrand Drouvot, Andres Freund, Amit Khandekar, Bertrand Drouvot)
 </para>
+</listitem>
 
+<listitem>
 <para>
-WAL snapshots are required for logical slot creation so this function speeds their creation on standbys.
+New function pg_log_standby_snapshot() forces creation of WAL snapshots.
+Snapshots are required for logical slot creation so this function speeds their creation on standbys.
 </para>
 </listitem>
 
@@ -1426,23 +1428,6 @@ Have wal_retrieve_retry_interval operate on a per-subscription basis (Nathan Bos
 <para>
 Previously the retry time was applied globally.  This also adds wait events LogicalRepLauncherDSA and LogicalRepLauncherHash.
 </para>
-</listitem>
-
-<!--
-Author: Andres Freund <andres@anarazel.de>
-2023-04-07 [be87200ef] Support invalidating replication slots due to horizon an
-Author: Andres Freund <andres@anarazel.de>
-2023-04-08 [26669757b] Handle logical slot conflicts on standby
--->
-
-<listitem>
-<para>
-Allow invalidation of replication slots due to row removal, wal_level, and conflicts (Bertrand Drouvot, Andres Freund, Amit Khandekar)
-</para>
-
-<para>
-Invalidated slots are indicated in the pg_replication_slots.conflicting column.
-</para>
 </listitem>
 
     </itemizedlist>