diff --git a/bin/df/df.1 b/bin/df/df.1
index ceb1bb45bab..2de72e4e3bb 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 29, 2023
+.Dd July 16, 2025
 .Dt DF 1
 .Os
 .Sh NAME
@@ -65,7 +65,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl a
 Show all mount points, including those that were mounted with the
@@ -264,7 +264,7 @@ each file or directory name or disk label
 .Xr getmntinfo 3 ,
 .Xr libxo 3 ,
 .Xr localeconv 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
 .Xr pstat 8 ,
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 1c964157f53..54200445365 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -33,7 +33,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 06, 2025
+.Dd July 16, 2025
 .Dt PS 1
 .Os
 .Sh NAME
@@ -194,7 +194,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 The default is the traditional text style output.
 .It Fl A
@@ -925,7 +925,7 @@ Display information on all system processes:
 .Xr kvm 3 ,
 .Xr libxo 3 ,
 .Xr strftime 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr mac 4 ,
 .Xr procfs 4 ,
 .Xr pstat 8 ,
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index b584d71ea56..7bfc21ea41d 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 30, 2025
+.Dd July 16, 2025
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -80,7 +80,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl a
 All the file systems described in
@@ -573,7 +573,7 @@ support for a particular file system might be provided either on a static
 .Xr acl 3 ,
 .Xr getmntinfo 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr cd9660 4 ,
 .Xr devfs 4 ,
 .Xr ext2fs 4 ,
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 53d2360719d..1fb79c51f98 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 4, 2022
+.Dd July 16, 2025
 .Dt SAVECORE 8
 .Os
 .Sh NAME
@@ -69,7 +69,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl C
 Check to see if a dump exists,
@@ -193,7 +193,7 @@ is meant to be called near the end of the initialization file
 .Xr zstd 1 ,
 .Xr getbootfile 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr mem 4 ,
 .Xr textdump 4 ,
 .Xr tar 5 ,
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 37f7d7837b1..1b6d800b028 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 29, 2024
+.Dd July 16, 2025
 .Dt DU 1
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl A
 Display the apparent size instead of the disk usage.
@@ -225,7 +225,7 @@ Also display a grand total at the end:
 .Xr chflags 2 ,
 .Xr fts 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr symlink 7 ,
 .Xr quot 8
 .Sh STANDARDS
diff --git a/usr.bin/iscsictl/iscsictl.8 b/usr.bin/iscsictl/iscsictl.8
index 74394063a00..88c79c29784 100644
--- a/usr.bin/iscsictl/iscsictl.8
+++ b/usr.bin/iscsictl/iscsictl.8
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 27, 2018
+.Dd July 16, 2025
 .Dt ISCSICTL 8
 .Os
 .Sh NAME
@@ -88,7 +88,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl A
 Add session.
@@ -190,7 +190,7 @@ Disconnect all iSCSI sessions:
 .Dl Nm Fl Ra
 .Sh SEE ALSO
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr iscsi 4 ,
 .Xr iscsi.conf 5 ,
 .Xr iscsid 8
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index f3ccc6e772a..b026ed6a792 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 9, 2021
+.Dd July 16, 2025
 .Dt LAST 1
 .Os
 .Sh NAME
@@ -75,7 +75,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl d Ar date
 Specify the snapshot date and time.
@@ -223,7 +223,7 @@ alice  ttyv0    Mon Dec  7 19:18 - 22:27  (03:09)
 .Xr lastcomm 1 ,
 .Xr getutxent 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr ac 8 ,
 .Xr lastlogin 8
 .Sh HISTORY
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index cf6a907c6aa..1931c38a1fa 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 30, 2025
+.Dd July 16, 2025
 .Dt NETSTAT 1
 .Os
 .Sh NAME
@@ -166,7 +166,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl 4
 Show IPv4 only.
@@ -954,7 +954,7 @@ Show IPv4 listening sockets:
 .Xr ps 1 ,
 .Xr sockstat 1 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr bpf 4 ,
 .Xr inet 4 ,
 .Xr route 4 ,
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 7d641b50f1a..a4a00586f21 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 28, 2023
+.Dd July 16, 2025
 .Dt NFSSTAT 1
 .Os
 .Sh NAME
@@ -123,7 +123,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1
index 1e05e235e61..b810abf66da 100644
--- a/usr.bin/procstat/procstat.1
+++ b/usr.bin/procstat/procstat.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 7, 2022
+.Dd July 16, 2025
 .Dt PROCSTAT 1
 .Os
 .Sh NAME
@@ -136,7 +136,7 @@ flag is specified the output is generated via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .Pp
 The following commands are available for
@@ -870,7 +870,7 @@ procstat: procstat_getprocs()
 .Xr libprocstat 3 ,
 .Xr libxo 3 ,
 .Xr signal 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr ddb 4 ,
 .Xr divert 4 ,
 .Xr icmp 4 ,
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index de4176c9361..80facb05cc3 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 21, 2021
+.Dd July 16, 2025
 .Dt VMSTAT 8
 .Os
 .Sh NAME
@@ -71,7 +71,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl a
 When used with
@@ -371,7 +371,7 @@ statistics every second.
 .Xr systat 1 ,
 .Xr libmemstat 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr gstat 8 ,
 .Xr iostat 8 ,
 .Xr pstat 8 ,
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index a92edc6f005..159eb3370c8 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 24, 2020
+.Dd July 16, 2025
 .Dt W 1
 .Os
 .Sh NAME
@@ -61,7 +61,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl d
 dumps out the entire process list on a per controlling
@@ -145,7 +145,7 @@ flags are no longer supported.
 .Xr uptime 1 ,
 .Xr who 1 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3
+.Xr xo_options 7
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 482145c8f01..65640879495 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd April 11, 2020
+.Dd July 16, 2025
 .Dt WC 1
 .Os
 .Sh NAME
@@ -70,7 +70,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl L
 Write the length of the line containing the most bytes (default) or characters
@@ -196,7 +196,7 @@ utility.
 .Sh SEE ALSO
 .Xr iswspace 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3
+.Xr xo_options 7
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index d31b2b482ba..0a171c9e36b 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 13, 2020
+.Dd July 16, 2025
 .Dt ARP 8
 .Os
 .Sh NAME
@@ -80,7 +80,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl a
 The program displays or, if it is used with the
@@ -183,7 +183,7 @@ character will mark the rest of the line as a comment.
 .Sh SEE ALSO
 .Xr inet 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr arp 4 ,
 .Xr ifconfig 8 ,
 .Xr ndp 8
diff --git a/usr.sbin/efitable/efitable.8 b/usr.sbin/efitable/efitable.8
index d1f4cedcdea..bb8a9cc3d0e 100644
--- a/usr.sbin/efitable/efitable.8
+++ b/usr.sbin/efitable/efitable.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 10, 2021
+.Dd July 16, 2025
 .Dt EFITABLE 8
 .Os
 .Sh NAME
@@ -45,7 +45,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl t Ar name Fl -table Ar name
 Specify the name of the table to print.
diff --git a/usr.sbin/lastlogin/lastlogin.8 b/usr.sbin/lastlogin/lastlogin.8
index 3b2d47fdaf7..9fd5c88d02c 100644
--- a/usr.sbin/lastlogin/lastlogin.8
+++ b/usr.sbin/lastlogin/lastlogin.8
@@ -73,7 +73,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 for details on command line arguments.
 .It Fl f Ar file
 Open last login database
@@ -93,7 +93,7 @@ last login database
 .Xr last 1 ,
 .Xr getutxent 3 ,
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr ac 8
 .Sh AUTHORS
 .An -nosplit
diff --git a/usr.sbin/sesutil/sesutil.8 b/usr.sbin/sesutil/sesutil.8
index 664dcab593e..d4960b3ec6b 100644
--- a/usr.sbin/sesutil/sesutil.8
+++ b/usr.sbin/sesutil/sesutil.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 5, 2022
+.Dd July 16, 2025
 .Dt SESUTIL 8
 .Os
 .Sh NAME
@@ -129,7 +129,7 @@ Generate output via
 .Xr libxo 3
 in a selection of different human and machine readable formats.
 See
-.Xr xo_parse_args 3
+.Xr xo_options 7
 .El
 .Sh EXAMPLES
 Turn off all locate LEDs:
@@ -146,7 +146,7 @@ Turn on the fault LED for a drive bay not associated with a device:
 .Dl Nm Cm fault -u /dev/ses2 7 on
 .Sh SEE ALSO
 .Xr libxo 3 ,
-.Xr xo_parse_args 3 ,
+.Xr xo_options 7 ,
 .Xr ses 4
 .Sh HISTORY
 The