diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 803b3221503d..fdbde436186e 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,387 +1,384 @@
 .\" Copyright (c) 1983, 1987, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
 .\" $FreeBSD$
 .\"
 .Dd October 21, 2022
 .Dt NEWFS 8
 .Os
 .Sh NAME
 .Nm newfs
 .Nd construct a new UFS1/UFS2 file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl EJNUjlnt
 .Op Fl L Ar volname
 .Op Fl O Ar filesystem-type
 .Op Fl S Ar sector-size
 .Op Fl T Ar disktype
 .Op Fl a Ar maxcontig
 .Op Fl b Ar block-size
 .Op Fl c Ar blocks-per-cylinder-group
 .Op Fl d Ar max-extent-size
 .Op Fl e Ar maxbpg
 .Op Fl f Ar frag-size
 .Op Fl g Ar avgfilesize
 .Op Fl h Ar avgfpdir
 .Op Fl i Ar bytes
 .Op Fl k Ar held-for-metadata-blocks
 .Op Fl m Ar free-space
 .Op Fl o Ar optimization
 .Op Fl p Ar partition
 .Op Fl r Ar reserved
 .Op Fl s Ar size
 .Ar special
 .Sh DESCRIPTION
 The
 .Nm
 utility is used to initialize and clear file systems before first use.
 The
 .Nm
 utility builds a file system on the specified special file.
 (We often refer to the
 .Dq special file
 as the
 .Dq disk ,
 although the special file need not be a physical disk.
 In fact, it need not even be special.)
 Typically the defaults are reasonable, however
 .Nm
 has numerous options to allow the defaults to be selectively overridden.
 .Pp
 The following options define the general layout policies:
 .Bl -tag -width indent
 .It Fl E
 Erase the content of the disk before making the filesystem.
 The reserved area in front of the superblock (for bootcode) will not be erased.
 Erasing is only relevant to flash-memory or thinly provisioned devices.
 Erasing may take a long time.
 If the device does not support BIO_DELETE, the command will fail.
 .It Fl J
 Enable journaling on the new file system via gjournal.
 See
 .Xr gjournal 8
 for details.
 .It Fl L Ar volname
 Add a volume label to the new file system.
 Legal characters are alphanumerics, dashes, and underscores.
 .It Fl N
 Cause the file system parameters to be printed out
 without really creating the file system.
 .It Fl O Ar filesystem-type
 Use 1 to specify that a UFS1 format file system be built;
 use 2 to specify that a UFS2 format file system be built.
 The default format is UFS2.
 .It Fl T Ar disktype
 For backward compatibility.
 .It Fl U
 Enable soft updates on the new file system.
 .It Fl a Ar maxcontig
 Specify the maximum number of contiguous blocks that will be
 laid out before forcing a rotational delay.
 The default value is 16.
 See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl b Ar block-size
 The block size of the file system, in bytes.
 It must be a power of 2.
 .\" If changing the default block size and it causes the default
 .\" fragment size to change, be sure to update the location of
 .\" the first backup superblock on the fsck_ffs.8 manual page.
 The
 default size is 32768 bytes, and the smallest allowable size is 4096 bytes.
 The optimal block:fragment ratio is 8:1.
 Other ratios are possible, but are not recommended,
 and may produce poor results.
 .It Fl c Ar blocks-per-cylinder-group
 The number of blocks per cylinder group in a file system.
 The default is to compute the maximum allowed by the other parameters.
 This value is
 dependent on a number of other parameters, in particular the block size
 and the number of bytes per inode.
 .It Fl d Ar max-extent-size
 The file system may choose to store large files using extents.
 This parameter specifies the largest extent size that may be used.
 The default value is the file system blocksize.
 It is presently limited to a maximum value of 16 times the
 file system blocksize and a minimum value of the file system blocksize.
 .It Fl e Ar maxbpg
 Indicate the maximum number of blocks any single file can
 allocate out of a cylinder group before it is forced to begin
 allocating blocks from another cylinder group.
 The default is about one quarter of the total blocks in a cylinder group.
 See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl f Ar frag-size
 The fragment size of the file system in bytes.
 It must be a power of two
 ranging in value between
 .Ar blocksize Ns /8
 and
 .Ar blocksize .
 .\" If changing the default fragment size or it changes because of a
 .\" change to the default block size, be sure to update the location
 .\" of the first backup superblock on the fsck_ffs.8 manual page.
 The default is 4096 bytes.
 .It Fl g Ar avgfilesize
 The expected average file size for the file system.
 .It Fl h Ar avgfpdir
 The expected average number of files per directory on the file system.
 .It Fl i Ar bytes
 Specify the density of inodes in the file system.
 The default is to create an inode for every
 .Pq 2 * Ar frag-size
 bytes of data space.
 If fewer inodes are desired, a larger number should be used;
 to create more inodes a smaller number should be given.
 One inode is required for each distinct file, so this value effectively
 specifies the average file size on the file system.
 .It Fl j
 Enable soft updates journaling on the new file system.
 This flag is implemented by running the
 .Xr tunefs 8
 utility found in the user's
 .Dv $PATH .
 .Pp
 Enabling journaling reduces the time spent by
 .Xr fsck_ffs 8
 cleaning up a filesystem after a crash to a few seconds from minutes to hours.
 Without journaling, the time to recover after a crash is a function
 of the number of files in the filesystem and the size of the filesystem.
 With journaling, the time to recover after a crash is a function of the
 amount of activity in the filesystem in the minute before the crash.
 Journaled recovery time is usually only a few seconds and never
 exceeds a minute.
 .Pp
 The drawback to using journaling is that the writes to its log adds
 an extra write load to the media containing the filesystem.
 Thus a write-intensive workload will have reduced throughput on a
 filesystem running with journaling.
 .Pp
 Like all journaling filesystems, the journal recovery will only fix
 issues known to the journal.
 Specifically if a media error occurs,
 the journal will not know about it and hence will not fix it.
 Thus when using journaling, it is still necessary to run a full fsck
 every few months or after a filesystem panic to check for and fix
 any errors brought on by media failure.
 A full fsck can be done by running a background fsck on a live
 filesystem or by running with the
 .Fl f
 flag on an unmounted filesystem.
 When running
 .Xr fsck_ffs 8
 in background on a live filesystem the filesystem performance
 will be about half of normal during the time that the background
 .Xr fsck_ffs 8
 is running.
 Running a full fsck on a UFS filesystem is the equivalent of
 running a scrub on a ZFS filesystem.
-.Pp
-Presently it is not possible
-to run background fsck on filesystems enabled for journaling.
 .It Fl k Ar held-for-metadata-blocks
 Set the amount of space to be held for metadata blocks in each cylinder group.
 When set, the file system preference routines will try to save
 the specified amount of space immediately following the inode blocks
 in each cylinder group for use by metadata blocks.
 Clustering the metadata blocks speeds up random file access
 and decreases the running time of
 .Xr fsck 8 .
 By default
 .Nm
 sets it to half of the space reserved to minfree.
 .It Fl l
 Enable multilabel MAC on the new file system.
 .It Fl m Ar free-space
 The percentage of space reserved from normal users; the minimum free
 space threshold.
 The default value used is
 defined by
 .Dv MINFREE
 from
 .In ufs/ffs/fs.h ,
 currently 8%.
 See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl n
 Do not create a
 .Pa .snap
 directory on the new file system.
 The resulting file system will not support snapshot generation, so
 .Xr dump 8
 in live mode and background
 .Xr fsck 8
 will not function properly.
 The traditional
 .Xr fsck 8
 and offline
 .Xr dump 8
 will work on the file system.
 This option is intended primarily for memory or vnode-backed file systems that
 do not require
 .Xr dump 8
 or
 .Xr fsck 8
 support.
 .It Fl o Ar optimization
 .Cm ( space
 or
 .Cm time ) .
 The file system can either be instructed to try to minimize the time spent
 allocating blocks, or to try to minimize the space fragmentation on the disk.
 If the value of minfree (see above) is less than 8%,
 the default is to optimize for
 .Cm space ;
 if the value of minfree is greater than or equal to 8%,
 the default is to optimize for
 .Cm time .
 See
 .Xr tunefs 8
 for more details on how to set this option.
 .It Fl p Ar partition
 The partition name (a..h) you want to use in case the underlying image
 is a file, so you do not have access to individual partitions through the
 filesystem.
 Can also be used with a device, e.g.,
 .Nm
 .Fl p Ar f
 .Ar /dev/da1s3
 is equivalent to
 .Nm
 .Ar /dev/da1s3f .
 .It Fl r Ar reserved
 The size, in sectors, of reserved space
 at the end of the partition specified in
 .Ar special .
 This space will not be occupied by the file system;
 it can be used by other consumers such as
 .Xr geom 4 .
 Defaults to 0.
 .It Fl s Ar size
 The size of the file system in sectors.
 This value defaults to the size of the
 raw partition specified in
 .Ar special
 less the
 .Ar reserved
 space at its end (see
 .Fl r ) .
 A
 .Ar size
 of 0 can also be used to choose the default value.
 A valid
 .Ar size
 value cannot be larger than the default one,
 which means that the file system cannot extend into the reserved space.
 .It Fl t
 Turn on the TRIM enable flag.
 If enabled, and if the underlying device supports the BIO_DELETE
 command, the file system will send a delete request to the underlying
 device for each freed block.
 The trim enable flag is typically set for flash-memory devices to
 reduce write amplification which reduces wear on write-limited
 flash-memory and often improves long-term performance.
 Thinly provisioned storage also benefits by returning unused blocks to
 the global pool.
 .El
 .Pp
 The following options override the standard sizes for the disk geometry.
 Their default values are taken from the disk label.
 Changing these defaults is useful only when using
 .Nm
 to build a file system whose raw image will eventually be used on a
 different type of disk than the one on which it is initially created
 (for example on a write-once disk).
 Note that changing any of these values from their defaults will make
 it impossible for
 .Xr fsck 8
 to find the alternate superblocks if the standard superblock is lost.
 .Bl -tag -width indent
 .It Fl S Ar sector-size
 The size of a sector in bytes (almost never anything but 512).
 .El
 .Sh NOTES ON THE NAMING
 .Dq newfs
 is a common name prefix for utilities creating filesystems, with the suffix
 indicating the type of the filesystem, for instance
 .Xr newfs_msdos 8 .
 The
 .Nm
 utility is a special case which predates that convention.
 .Sh EXAMPLES
 .Dl newfs /dev/ada3s1a
 .Pp
 Creates a new ufs file system on
 .Pa ada3s1a .
 The
 .Nm
 utility will use a block size of 32768 bytes, a fragment size of 4096 bytes
 and the largest possible number of blocks per cylinders group.
 These values tend to produce better performance for most applications
 than the historical defaults
 (8192 byte block size and 1024 byte fragment size).
 This large fragment size may lead to much wasted space
 on file systems that contain many small files.
 .Sh SEE ALSO
 .Xr fdformat 1 ,
 .Xr geom 4 ,
 .Xr disktab 5 ,
 .Xr fs 5 ,
 .Xr camcontrol 8 ,
 .Xr dump 8 ,
 .Xr dumpfs 8 ,
 .Xr fsck 8 ,
 .Xr gjournal 8 ,
 .Xr gpart 8 ,
 .Xr growfs 8 ,
 .Xr gvinum 8 ,
 .Xr makefs 8 ,
 .Xr mount 8 ,
 .Xr newfs_msdos 8 ,
 .Xr tunefs 8
 .Rs
 .%A M. McKusick
 .%A W. Joy
 .%A S. Leffler
 .%A R. Fabry
 .%T A Fast File System for UNIX
 .%J ACM Transactions on Computer Systems 2
 .%V 3
 .%P pp 181-197
 .%D August 1984
 .%O (reprinted in the BSD System Manager's Manual)
 .Re
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Bx 4.2 .
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 0264c3e5f772..95adac48b8b2 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -1,253 +1,250 @@
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
 .Dd August 16, 2022
 .Dt TUNEFS 8
 .Os
 .Sh NAME
 .Nm tunefs
 .Nd tune up an existing UFS file system
 .Sh SYNOPSIS
 .Nm
 .Op Fl A
 .Op Fl a Cm enable | disable
 .Op Fl e Ar maxbpg
 .Op Fl f Ar avgfilesize
 .Op Fl j Cm enable | disable
 .Op Fl J Cm enable | disable
 .Op Fl k Ar held-for-metadata-blocks
 .Op Fl L Ar volname
 .Op Fl l Cm enable | disable
 .Op Fl m Ar minfree
 .Op Fl N Cm enable | disable
 .Op Fl n Cm enable | disable
 .Op Fl o Cm space | time
 .Op Fl p
 .Op Fl s Ar avgfpdir
 .Op Fl S Ar size
 .Op Fl t Cm enable | disable
 .Ar special | filesystem
 .Sh DESCRIPTION
 The
 .Nm
 utility is designed to change the dynamic parameters of a UFS file system
 which affect the layout policies.
 The
 .Nm
 utility cannot be run on an active file system.
 To change an active file system,
 it must be downgraded to read-only or unmounted.
 .Pp
 The parameters which are to be changed are indicated by the flags
 given below:
 .Bl -tag -width indent
 .It Fl A
 The file system has several backups of the super-block.
 Specifying
 this option will cause all backups to be modified as well as the
 primary super-block.
 This is potentially dangerous - use with caution.
 .It Fl a Cm enable | disable
 Turn on/off the administrative POSIX.1e ACL enable flag.
 .It Fl e Ar maxbpg
 Indicate the maximum number of blocks any single file can
 allocate out of a cylinder group before it is forced to begin
 allocating blocks from another cylinder group.
 Typically this value is set to about one quarter of the total blocks
 in a cylinder group.
 The intent is to prevent any single file from using up all the
 blocks in a single cylinder group,
 thus degrading access times for all files subsequently allocated
 in that cylinder group.
 The effect of this limit is to cause big files to do long seeks
 more frequently than if they were allowed to allocate all the blocks
 in a cylinder group before seeking elsewhere.
 For file systems with exclusively large files,
 this parameter should be set higher.
 .It Fl f Ar avgfilesize
 Specify the expected average file size.
 .It Fl j Cm enable | disable
 Turn on/off soft updates journaling.
 .Pp
 Enabling journaling reduces the time spent by
 .Xr fsck_ffs 8
 cleaning up a filesystem after a crash to a few seconds from minutes to hours.
 Without journaling, the time to recover after a crash is a function
 of the number of files in the filesystem and the size of the filesystem.
 With journaling, the time to recover after a crash is a function of the
 amount of activity in the filesystem in the minute before the crash.
 Journaled recovery time is usually only a few seconds and never
 exceeds a minute.
 .Pp
 The drawback to using journaling is that the writes to its log adds
 an extra write load to the media containing the filesystem.
 Thus a write-intensive workload will have reduced throughput on a
 filesystem running with journaling.
 .Pp
 Like all journaling filesystems, the journal recovery will only fix
 issues known to the journal.
 Specifically if a media error occurs,
 the journal will not know about it and hence will not fix it.
 Thus when using journaling, it is still necessary to run a full fsck
 every few months or after a filesystem panic to check for and fix
 any errors brought on by media failure.
 A full fsck can be done by running a background fsck on a live
 filesystem or by running with the
 .Fl f
 flag on an unmounted filesystem.
 When running
 .Xr fsck_ffs 8
 in background on a live filesystem the filesystem performance
 will be about half of normal during the time that the background
 .Xr fsck_ffs 8
 is running.
 Running a full fsck on a UFS filesystem is the equivalent of
 running a scrub on a ZFS filesystem.
-.Pp
-Presently it is not possible
-to run background fsck on filesystems enabled for journaling.
 .It Fl J Cm enable | disable
 Turn on/off gjournal flag.
 .It Fl k Ar held-for-metadata-blocks
 Set the amount of space to be held for metadata blocks.
 When set, the file system preference routines will try to save
 the specified amount of space immediately following the inode blocks
 in each cylinder group for use by metadata blocks.
 Clustering the metadata blocks speeds up random file access
 and decreases the running time of
 .Xr fsck 8 .
 While this option can be set at any time,
 it is most effective if set before any data is loaded into the file system.
 By default
 .Xr newfs 8
 sets it to half of the space reserved to minfree.
 .It Fl L Ar volname
 Add/modify an optional file system volume label.
 Legal characters are alphanumerics, dashes, and underscores.
 .It Fl l Cm enable | disable
 Turn on/off MAC multilabel flag.
 .It Fl m Ar minfree
 Specify the percentage of space held back
 from normal users; the minimum free space threshold.
 The default value used is 8%.
 Note that lowering the threshold can adversely affect performance:
 .Bl -bullet
 .It
 Settings of 5% and less force space optimization to
 always be used which will greatly increase the overhead for file
 writes.
 .It
 The file system's ability to avoid fragmentation will be reduced
 when the total free space, including the reserve, drops below 15%.
 As free space approaches zero, throughput can degrade by up to a
 factor of three over the performance obtained at a 10% threshold.
 .El
 .Pp
 If the value is raised above the current usage level,
 users will be unable to allocate files until enough files have
 been deleted to get under the higher threshold.
 .It Fl N Cm enable | disable
 Turn on/off the administrative NFSv4 ACL enable flag.
 .It Fl n Cm enable | disable
 Turn on/off soft updates.
 .It Fl o Cm space | time
 The file system can either try to minimize the time spent
 allocating blocks, or it can attempt to minimize the space
 fragmentation on the disk.
 Optimization for space has much
 higher overhead for file writes.
 The kernel normally changes the preference automatically as
 the percent fragmentation changes on the file system.
 .It Fl p
 Show a summary of what the current tunable settings
 are on the selected file system.
 More detailed information can be
 obtained from the
 .Xr dumpfs 8
 utility.
 .It Fl s Ar avgfpdir
 Specify the expected number of files per directory.
 .It Fl S Ar size
 Specify the softdep journal size in bytes.
 The minimum is 4M.
 .It Fl t Cm enable | disable
 Turn on/off the TRIM enable flag.
 If enabled, and if the underlying device supports the BIO_DELETE
 command, the file system will send a delete request to the underlying
 device for each freed block.
 The trim enable flag is typically set when the underlying device
 uses flash-memory as the device can use the delete command to
 pre-zero or at least avoid copying blocks that have been deleted.
 .Pp
 Note that this does not trim blocks that are already free.
 See the
 .Xr fsck_ffs 8
 .Fl E
 flag.
 .El
 .Pp
 At least one of these flags is required.
 .Sh FILES
 .Bl -tag -width ".Pa /etc/fstab"
 .It Pa /etc/fstab
 read this to determine the device file for a
 specified mount point.
 .El
 .Sh SEE ALSO
 .Xr fs 5 ,
 .Xr dumpfs 8 ,
 .Xr gjournal 8 ,
 .Xr growfs 8 ,
 .Xr newfs 8
 .Rs
 .%A M. McKusick
 .%A W. Joy
 .%A S. Leffler
 .%A R. Fabry
 .%T "A Fast File System for UNIX"
 .%J "ACM Transactions on Computer Systems 2"
 .%N 3
 .%P pp 181-197
 .%D August 1984
 .%O "(reprinted in the BSD System Manager's Manual, SMM:5)"
 .Re
 .Sh HISTORY
 The
 .Nm
 utility appeared in
 .Bx 4.2 .
 .Sh BUGS
 This utility does not work on active file systems.
 To change the root file system, the system must be rebooted
 after the file system is tuned.
 .\" Take this out and a Unix Daemon will dog your steps from now until
 .\" the time_t's wrap around.
 .Pp
 You can tune a file system, but you cannot tune a fish.