From d83981c24be76b64205158b59b6c05cf118187c3 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 4 May 2025 22:08:20 -0400
Subject: [PATCH] doc PG 18 relnotes:  move and clarify constraint items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported-by: Álvaro Herrera

Discussion: https://postgr.es/m/202505041135.cpo7zgdcya2u@alvherre.pgsql
---
 doc/src/sgml/release-18.sgml | 103 +++++++++++++++++------------------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/doc/src/sgml/release-18.sgml b/doc/src/sgml/release-18.sgml
index bd2b2ed6315..764c929823f 100644
--- a/doc/src/sgml/release-18.sgml
+++ b/doc/src/sgml/release-18.sgml
@@ -1530,23 +1530,6 @@ This is specified by WITHOUT OVERLAPS on the last column.
 </para>
 </listitem>
 
-
-<!--
-Author: Peter Eisentraut <peter@eisentraut.org>
-2024-11-15 [9321d2fdf] Fix collation handling for foreign keys
--->
-
-<listitem>
-<para>
-Require primary/foreign key relationships to use either deterministic collations or the the same nondeterministic collations (Peter Eisentraut)
-<ulink url="&commit_baseurl;9321d2fdf">&sect;</ulink>
-</para>
-
-<para>
-The restore of a pg_dump, also used by pg_upgrade, will fail if these requirements are not met;  schema changes must be made for these upgrade methods to succeed.
-</para>
-</listitem>
-
 <!--
 Author: Peter Eisentraut <peter@eisentraut.org>
 2025-01-11 [ca87c415e] Add support for NOT ENFORCED in CHECK constraints
@@ -1566,6 +1549,38 @@ This also adds column pg_constraint.conenforced.
 </para>
 </listitem>
 
+<!--
+Author: Peter Eisentraut <peter@eisentraut.org>
+2024-11-15 [9321d2fdf] Fix collation handling for foreign keys
+-->
+
+<listitem>
+<para>
+Require primary/foreign key relationships to use either deterministic collations or the the same nondeterministic collations (Peter Eisentraut)
+<ulink url="&commit_baseurl;9321d2fdf">&sect;</ulink>
+</para>
+
+<para>
+The restore of a pg_dump, also used by pg_upgrade, will fail if these requirements are not met;  schema changes must be made for these upgrade methods to succeed.
+</para>
+</listitem>
+
+<!--
+Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
+2024-11-08 [14e87ffa5] Add pg_constraint rows for not-null constraints
+-->
+
+<listitem>
+<para>
+Store column NOT NULL specifications in pg_constraint (Álvaro Herrera, Bernd Helmle)
+<ulink url="&commit_baseurl;14e87ffa5">&sect;</ulink>
+</para>
+
+<para>
+This allows names to be specified for NOT NULL constraint.  This also adds NOT NULL constraints to foreign tables and NOT NULL inheritance control to local tables.
+</para>
+</listitem>
+
 <!--
 Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
 2025-04-07 [a379061a2] Allow NOT NULL constraints to be added as NOT VALID
@@ -1578,6 +1593,25 @@ Allow ALTER TABLE to set the NOT VALID attribute of NOT NULL constraints (Rushab
 </para>
 </listitem>
 
+<!--
+Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
+2025-03-05 [f4e53e10b] Add ALTER TABLE ... ALTER CONSTRAINT ... SET [NO] INHERI
+Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
+2025-03-27 [4a02af8b1] Simplify syntax for ALTER TABLE ALTER CONSTRAINT NO INHE
+-->
+
+<listitem>
+<para>
+Allow modification of the inheritability of NOT NULL constraints (Suraj Kharage, Álvaro Herrera)
+<ulink url="&commit_baseurl;f4e53e10b">&sect;</ulink>
+<ulink url="&commit_baseurl;4a02af8b1">&sect;</ulink>
+</para>
+
+<para>
+The syntax is ALTER TABLE ... ALTER CONSTRAINT ... [NO] INHERIT.
+</para>
+</listitem>
+
 <!--
 Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
 2025-01-23 [b663b9436] Allow NOT VALID foreign key constraints on partitioned t
@@ -1604,41 +1638,6 @@ Allow dropping of constraints ONLY on partitioned tables (Álvaro Herrera)
 <para>
 This was previously erroneously prohibited.
 </para>
-</listitem>
-
-<!--
-Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
-2025-03-05 [f4e53e10b] Add ALTER TABLE ... ALTER CONSTRAINT ... SET [NO] INHERI
-Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
-2025-03-27 [4a02af8b1] Simplify syntax for ALTER TABLE ALTER CONSTRAINT NO INHE
--->
-
-<listitem>
-<para>
-Allow modification of the inheritability of constraints (Suraj Kharage, Álvaro Herrera)
-<ulink url="&commit_baseurl;f4e53e10b">&sect;</ulink>
-<ulink url="&commit_baseurl;4a02af8b1">&sect;</ulink>
-</para>
-
-<para>
-The syntax is ALTER TABLE ... ALTER CONSTRAINT ... [NO] INHERIT.
-</para>
-</listitem>
-
-<!--
-Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
-2024-11-08 [14e87ffa5] Add pg_constraint rows for not-null constraints
--->
-
-<listitem>
-<para>
-Store column NOT NULL specifications in pg_constraint (Álvaro Herrera, Bernd Helmle)
-<ulink url="&commit_baseurl;14e87ffa5">&sect;</ulink>
-</para>
-
-<para>
-This allows names to be specified for NOT NULL constraint.  This also adds NOT NULL constraints to foreign tables and NOT NULL inheritance control to local tables.
-</para>
 </listitem>
 
       </itemizedlist>