From fbd635df5d0937fb3d8c7b8a83f8284f1700a52b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 16 Nov 2024 04:04:40 +0000
Subject: [PATCH] nixos/doc/rl-2505: add more comments about ordering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This looks a little ridiculous right now, but my experience is that
it’s common to find the beginning or end of a section and add more
things there without seeing the comments. We should probably move
to a one file per release note system, but in the meantime this is
a low‐cost way to help reduce merge conflicts.
---
 .../doc/manual/release-notes/rl-2505.section.md  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 86f705ec6724..29af283010c9 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -1,24 +1,36 @@
 # Release 25.05 (“Warbler”, 2025.05/??) {#sec-release-25.05}
 
-<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
-
 ## Highlights {#sec-release-25.05-highlights}
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 - Create the first release note entry in this section!
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 ## New Modules {#sec-release-25.05-new-modules}
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 - Create the first release note entry in this section!
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 ## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 - `kanata` was updated to v1.7.0, which introduces several breaking changes.
   See the release notes of
   [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
   for more information.
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 ## Other Notable Changes {#sec-release-25.05-notable-changes}
 
+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+
 - Create the first release note entry in this section!
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->