From fc3e21282fae2b5b44c59e56e1fc4958915bd817 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 9 Aug 2023 20:48:31 -0400
Subject: [PATCH] doc: PG 16 relnotes, move createuser and SCM items

Reported-by: Noah Misch

Discussion: https://postgr.es/m/20230805230847.GA1370050@rfd.leadboat.com

Backpatch-through: 16 only
---
 doc/src/sgml/release-16.sgml | 66 ++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/doc/src/sgml/release-16.sgml b/doc/src/sgml/release-16.sgml
index 4b50bc67ce5..cbffde80ad6 100644
--- a/doc/src/sgml/release-16.sgml
+++ b/doc/src/sgml/release-16.sgml
@@ -160,21 +160,6 @@ Remove pg_walinspect functions pg_get_wal_records_info_till_end_of_wal() and pg_
 </para>
 </listitem>
 
-<!--
-Author: Michael Paquier <michael@paquier.xyz>
-2023-03-17 [98ae2c84a] libpq: Remove code for SCM credential authentication
--->
-
-<listitem>
-<para>
-Remove libpq support for SCM credential authentication (Michael Paquier)
-</para>
-
-<para>
-Backend support for this authentication method was removed in PostgreSQL 9.1.
-</para>
-</listitem>
-
 <!--
 Author: David Rowley <drowley@postgresql.org>
 2023-02-15 [5352ca22e] Rename force_parallel_mode to debug_parallel_query
@@ -262,24 +247,6 @@ permission.  For example, they can now change the CREATEDB, REPLICATION, and BYP
 </para>
 </listitem>
 
-<!--
-Author: Nathan Bossart <nathan@postgresql.org>
-2023-05-21 [2dcd1578c] Rename some createuser options.
-Author: Nathan Bossart <nathan@postgresql.org>
-2023-05-23 [381d19b3e] Document deprecated createuser option.
--->
-
-<listitem>
-<para>
-Deprecate createuser option --role (Nathan Bossart)
-</para>
-
-<para>
-This option could be easily confused with new createuser role membership options, so option --member-of has been added with the same functionality.
-The --role option can still be used.
-</para>
-</listitem>
-
 <!--
 Author: Peter Eisentraut <peter@eisentraut.org>
 2023-01-26 [37e267335] Don't install postmaster symlink anymore
@@ -2414,6 +2381,24 @@ Specifically, the new options control the valid-until date, bypassing of row-lev
 </para>
 </listitem>
 
+<!--
+Author: Nathan Bossart <nathan@postgresql.org>
+2023-05-21 [2dcd1578c] Rename some createuser options.
+Author: Nathan Bossart <nathan@postgresql.org>
+2023-05-23 [381d19b3e] Document deprecated createuser option.
+-->
+
+<listitem>
+<para>
+Deprecate createuser option --role (Nathan Bossart)
+</para>
+
+<para>
+This option could be easily confused with new createuser role membership options, so option --member-of has been added with the same functionality.
+The --role option can still be used.
+</para>
+</listitem>
+
 <!--
 Author: Andrew Dunstan <andrew@dunslane.net>
 2022-07-31 [7781f4e3e] Add - -schema and - -exclude-schema options to vacuumdb.
@@ -2744,6 +2729,21 @@ Remove support for M68K, M88K, M32R, and SuperH CPU architectures (Thomas Munro)
 </para>
 </listitem>
 
+<!--
+Author: Michael Paquier <michael@paquier.xyz>
+2023-03-17 [98ae2c84a] libpq: Remove code for SCM credential authentication
+-->
+
+<listitem>
+<para>
+Remove libpq support for SCM credential authentication (Michael Paquier)
+</para>
+
+<para>
+Backend support for this authentication method was removed in PostgreSQL 9.1.
+</para>
+</listitem>
+
 <!--
 Author: Andres Freund <andres@anarazel.de>
 2022-09-21 [e6927270c] meson: Add initial version of meson based build system