Reorder mergemaster entries to be adjacent. Reorder FFS-related

entries to be adjacent.

No new text.

2 files changed, 18 insertions, 22 deletions

diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 846bf2e..9d025a9 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -121,6 +121,11 @@ updated to make this change as seamless as possible.
 A filesystem snapshot capability has been added to FFS.  Details can
 be found in /usr/src/sys/ufs/ffs/README.snapshot.
 
+Softupdates for FFS have received some bug fixes and enhancements.
+
+A bug in FFS that could cause superblock corruption on very large
+filesystems has been corrected. [MERGED]
+
 The ng_mppc(4) and ng_bridge(4) node types have been added to the
 netgraph subsystem.  The ng_ether(4) node is now dynamically loadable.
 Miscellaneous bug fixes and enhancements have also been made. [MERGED]
@@ -204,8 +209,6 @@ Privacy (WEP) encryption, settable via ancontrol(8). [MERGED]
 A new netgraph node type ng_one2many(4) for multiplexing and
 demultiplexing packets over multiple links has been added.  [MERGED]
 
-Softupdates for FFS have received some bug fixes and enhancements.
-
 The DEC3000-series support has been removed from the mfsroot floppy image
 so that it fits on a 1.44Mbyte floppy again. As DEC3000 is currently
 only usable diskless this should not cause any problems.
@@ -275,9 +278,6 @@ to a SCSI card driven by 'isp' has been fixed. [MERGED]
 Condition variables have now been implemented in the FreeBSD kernel.
 See condvar(9) for more details.
 
-A bug in FFS that could cause superblock corruption on very large
-filesystems has been corrected. [MERGED]
-
 The "make buildkernel" target now gets the name of the
 configuration(s) to build from the KERNCONF variable, not KERNEL.  It
 is no longer required, in some cases, for a "buildworld" to precede a
@@ -640,6 +640,10 @@ reflects the percentage of network mbufs used. [MERGED]
 mergemaster(8) has gained some new features, has been cleaned up
 somewhat, and is now more cross-platform friendly.
 
+mergemaster(8) now sources an /etc/mergemaster.rc file and also
+prompts the user to run recommended commands (such as "newaliases") as
+needed. [MERGED]
+
 The compiler chain now uses the FSF-supplied C/C++ runtime
 initialization code.  This change brings about better compatibility
 with code generated from the various egcs and gcc ports, as well as
@@ -687,10 +691,6 @@ A number of cleanups and enhancements have been applied to the PCI
 subsystem.  /usr/share/misc/pci_vendors now contains a vendor/device
 database, which can be used by pciconf(8).
 
-growfs(8), a utility for growing FFS filesystems, has been added.
-ffsinfo(8), a utility for dump all the meta-information of an existing
-filesystem, has also been added.
-
 indent(1) has gained some new formatting options. [MERGED]
 
 sysinstall now uses some more intuitive defaults thanks to some new
@@ -904,10 +904,6 @@ functioning of "pkg_add -r". [MERGED]
 
 "lprm -" now works for remote printer queues. [MERGED]
 
-mergemaster(8) now sources an /etc/mergemaster.rc file and also
-prompts the user to run recommended commands (such as "newaliases") as
-needed. [MERGED]
-
 ftpd(8) now supports a -r flag for read-only mode and a -E flag to
 disable EPSV.  It also has some fixes to reduce information leakage
 and the ability to specify compile-time port ranges. [MERGED]
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index d9ff4b4..8e442e9 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -139,6 +139,11 @@ updated to make this change as seamless as possible.
 A filesystem snapshot capability has been added to FFS.  Details can
 be found in /usr/src/sys/ufs/ffs/README.snapshot.
 
+Softupdates for FFS have received some bug fixes and enhancements.
+
+A bug in FFS that could cause superblock corruption on very large
+filesystems has been corrected. [MERGED]
+
 Support for the Adaptec FSA family of PCI-SCSI RAID controllers has
 been added, in the form of the aac(4) driver. [MERGED]
 
@@ -276,8 +281,6 @@ some Sony laptops, has been added.
 A new netgraph node type ng_one2many(4) for multiplexing and
 demultiplexing packets over multiple links has been added.  [MERGED]
 
-Softupdates for FFS have received some bug fixes and enhancements.
-
 A number of cleanups and enhancements have been applied to the PCI
 subsystem.  /usr/share/misc/pci_vendors now contains a vendor/device
 database, which can be used by pciconf(8).
@@ -358,9 +361,6 @@ the cpu options in the kernel configuration file to only include I386_CPU.
 Condition variables have now been implemented in the FreeBSD kernel.
 See condvar(9) for more details.
 
-A bug in FFS that could cause superblock corruption on very large
-filesystems has been corrected. [MERGED]
-
 The "make buildkernel" target now gets the name of the
 configuration(s) to build from the KERNCONF variable, not KERNEL.  It
 is no longer required, in some cases, for a "buildworld" to precede a
@@ -733,6 +733,10 @@ reflects the percentage of network mbufs used. [MERGED]
 mergemaster(8) has gained some new features, has been cleaned up
 somewhat, and is now more cross-platform friendly.
 
+mergemaster(8) now sources an /etc/mergemaster.rc file and also
+prompts the user to run recommended commands (such as "newaliases") as
+needed. [MERGED]
+
 The compiler chain now uses the FSF-supplied C/C++ runtime
 initialization code.  This change brings about better compatibility
 with code generated from the various egcs and gcc ports, as well as
@@ -992,10 +996,6 @@ functioning of "pkg_add -r". [MERGED]
 
 "lprm -" now works for remote printer queues. [MERGED]
 
-mergemaster(8) now sources an /etc/mergemaster.rc file and also
-prompts the user to run recommended commands (such as "newaliases") as
-needed. [MERGED]
-
 ftpd(8) now supports a -r flag for read-only mode and a -E flag to
 disable EPSV.  It also has some fixes to reduce information leakage
 and the ability to specify compile-time port ranges. [MERGED]