diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index fb238bc01004..e6b3045ed0ce 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,161 +1,164 @@
 .\" Copyright (c) 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.
 .\"
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
 .\" $FreeBSD$
 .\"
-.Dd November 13, 2020
+.Dd September 14, 2022
 .Dt UNAME 1
 .Os
 .Sh NAME
 .Nm uname
 .Nd display information about the system
 .Sh SYNOPSIS
 .Nm
 .Op Fl aiKmnoprsUv
 .Sh DESCRIPTION
 The
 .Nm
 command writes the name of the operating system implementation to
 standard output.
 When options are specified, strings representing one or more system
 characteristics are written to standard output.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
 Behave as though the options
 .Fl m , n , r , s ,
 and
 .Fl v
 were specified.
 .It Fl i
 Write the kernel ident to standard output.
 .It Fl K
 Write the
 .Fx
 version of the kernel.
 .It Fl m
 Write the type of the current hardware platform to standard output.
 .Po Xr make 1
 uses it to set the
 .Va MACHINE
 variable.
 .Pc
 .It Fl n
 Write the name of the system to standard output.
 .It Fl o
 This is a synonym for the
 .Fl s
 option, for compatibility with other systems.
 .It Fl p
 Write the type of the machine processor architecture to standard output.
 .Po Xr make 1
 uses it to set the
 .Va MACHINE_ARCH
 variable.
 .Pc
 .It Fl r
-Write the current release level of the operating system
+Write the current release level of the kernel
 to standard output.
+.Xr freebsd-version 1
+can be used to print the release level of the userland.
 .It Fl s
 Write the name of the operating system implementation to standard output.
 .It Fl U
 Write the
 .Fx
 version of the user environment.
 .It Fl v
 Write the version level of this release of the operating system
 to standard output.
 .El
 .Pp
 If the
 .Fl a
 flag is specified, or multiple flags are specified, all
 output is written on a single line, separated by spaces.
 .Pp
 The
 .Fl K
 and
 .Fl U
 flags are intended to be used for fine grain differentiation of incremental
 .Fx
 development and user visible changes.
 .Sh ENVIRONMENT
 An environment variable composed of the string
 .Ev UNAME_
 followed by any flag to the
 .Nm
 utility (except for
 .Fl a )
 will allow the corresponding data to be set to the contents
 of the environment variable.
 See
 .Xr uname 3
 for more information.
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 The hardware platform
 .Pq Fl m
 can be different from the machine's processor architecture
 .Pq Fl p ,
 e.g., on 64-bit PowerPC,
 .Fl m
 would return
 .Va powerpc
 and
 .Fl p
 would return
 .Va powerpc64 .
 .Sh SEE ALSO
+.Xr freebsd-version 1 ,
 .Xr feature_present 3 ,
 .Xr getosreldate 3 ,
 .Xr sysctl 3 ,
 .Xr uname 3 ,
 .Xr sysctl 8
 .Sh STANDARDS
 The
 .Nm
 command is expected to conform to the
 .St -p1003.2
 specification.
 .Sh HISTORY
 The
 .Nm
 command appeared in PWB UNIX 1.0, however
 .Bx 4.4
 was the first Berkeley release with the
 .Nm
 command.
 .Pp
 The
 .Fl K
 and
 .Fl U
 extension flags appeared in
 .Fx 10.0 .
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index 6d7fc792c6f1..3b56d64660a2 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -1,262 +1,264 @@
 .\"-
 .\" Copyright 2006, 2007 Colin Percival
 .\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted providing 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 22, 2022
+.Dd September 10, 2022
 .Dt FREEBSD-UPDATE 8
 .Os
 .Sh NAME
 .Nm freebsd-update
 .Nd fetch and install binary updates to FreeBSD
 .Sh SYNOPSIS
 .Nm
 .Op Fl F
 .Op Fl b Ar basedir
 .Op Fl -currently-running Ar release
 .Op Fl d Ar workdir
 .Op Fl f Ar conffile
 .Op Fl j Ar jail
 .Op Fl k Ar KEY
 .Op Fl -not-running-from-cron
 .Op Fl r Ar newrelease
 .Op Fl s Ar server
 .Op Fl t Ar address
 .Ar command ...
 .Sh DESCRIPTION
 The
 .Nm
 tool is used to fetch, install, and rollback binary
 updates to the
 .Fx
 base system.
 .Sh BINARY UPDATES AVAILABILITY
 Binary updates are not available for every single
 .Fx
 version and architecture.
 .Pp
 In general, binary updates are available for ALPHA, BETA, RC, and RELEASE
 versions of
 .Fx ,
 e.g.:
 .Bl -item -offset indent -compact
 .It
 .Fx 13.1-ALPHA3
 .It
 .Fx 13.1-BETA2
 .It
 .Fx 13.1-RC1
 .It
 .Fx 13.1-RELEASE
 .El
 They are not available for branches such as PRERELEASE, STABLE, and CURRENT,
 e.g.:
 .Bl -item -offset indent -compact
 .It
 .Fx 13.0-PRERELEASE
 .It
 .Fx 13.1-STABLE
 .It
 .Fx 14.0-CURRENT
 .El
 .Pp
 In particular, the
 .Fx
 Security Team only builds updates for releases shipped in binary form
 by the
 .Fx
 Release Engineering Team.
 .Sh OPTIONS
 The following options are supported:
 .Bl -tag -width "-r newrelease"
 .It Fl b Ar basedir
 Operate on a system mounted at
 .Ar basedir .
 (default:
 .Pa / ,
 or as given in the configuration file.)
 .It Fl d Ar workdir
 Store working files in
 .Ar workdir .
 (default:
 .Pa /var/db/freebsd-update/ ,
 or as given in the configuration file.)
 .It Fl f Ar conffile
 Read configuration options from
 .Ar conffile .
 (default:
 .Pa /etc/freebsd-update.conf )
 .It Fl F
 Force
 .Nm Cm fetch
 to proceed in the case of an unfinished upgrade.
 .It Fl j Ar jail
 Operate on the given jail specified by
 .Va jid
 or
 .Va name .
 (The version of the installed userland is detected and the
 .Fl -currently-running
 option is no more required.)
 .It Fl k Ar KEY
 Trust an RSA key with SHA256 of
 .Ar KEY .
 (default: read value from configuration file.)
 .It Fl r Ar newrelease
 Specify the new release (e.g., 11.2-RELEASE) to which
 .Nm
 should upgrade
 .Pq Cm upgrade No command only .
 .It Fl s Ar server
 Fetch files from the specified server or server pool.
 (default: read value from configuration file.)
 .It Fl t Ar address
 Mail output of
 .Cm cron
 command, if any, to
 .Ar address .
 (default: root, or as given in the configuration file.)
 .It Fl -not-running-from-cron
 Force
 .Nm Cm fetch
 to proceed when there is no controlling
 .Xr tty 4 .
 This is for use by automated scripts and orchestration tools.
 Please do not run
 .Nm Cm fetch
 from
 .Xr crontab 5
 or similar using this flag, see:
 .Nm Cm cron
 .It Fl -currently-running Ar release
 Do not detect the currently-running release; instead, assume that the
 system is running the specified
 .Ar release .
 This is most likely to be useful when upgrading jails.
 .El
 .Sh COMMANDS
 The
 .Cm command
 can be any one of the following:
 .Bl -tag -width "rollback"
 .It Cm fetch
 Based on the currently installed world and the configuration
 options set, fetch all available binary updates.
 .It Cm cron
 Sleep a random amount of time between 1 and 3600 seconds,
 then download updates as if the
 .Cm fetch
 command was used.
 If updates are downloaded, an email will be sent
 (to root or a different address if specified via the
 .Fl t
 option or in the configuration file).
 As the name suggests, this command is designed for running
 from
 .Xr cron 8 ;
 the random delay serves to minimize the probability that
 a large number of machines will simultaneously attempt to
 fetch updates.
 .It Cm upgrade
 Fetch files necessary for upgrading to a new release.
 Before using this command, make sure that you read the
 announcement and release notes for the new release in
 case there are any special steps needed for upgrading.
 Note that this command may require up to 500 MB of space in
 .Ar workdir
 depending on which components of the
 .Fx
 base system are installed.
 .It Cm updatesready
 Check if there are fetched updates ready to install.
 Returns exit code 2 if there are no updates to install.
 .It Cm install
 Install the most recently fetched updates or upgrade.
 Returns exit code 2 if there are no updates to install
 and the
 .Cm fetch
 command wasn't passed as an earlier argument in the same
 invocation.
 .It Cm rollback
 Uninstall the most recently installed updates.
 .It Cm IDS
 Compare the system against a "known good" index of the
 installed release.
 .It Cm showconfig
 Show configuration options after parsing conffile and command
 line options.
 .El
 .Sh TIPS
 .Bl -bullet
 .It
 If your clock is set to local time, adding the line
 .Pp
 .Dl 0 3 * * * root /usr/sbin/freebsd-update cron
 .Pp
 to
 .Pa /etc/crontab
 will check for updates every night.
 If your clock is set to UTC, please pick a random time
 other than 3AM, to avoid overly imposing an uneven load
 on the server(s) hosting the updates.
 .It
 In spite of its name,
 .Nm
 IDS should not be relied upon as an "Intrusion Detection
 System", since if the system has been tampered with
 it cannot be trusted to operate correctly.
 If you intend to use this command for intrusion-detection
 purposes, make sure you boot from a secure disk (e.g., a CD).
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width "PAGER"
 .It Ev PAGER
 The pager program used to present various reports during the execution.
 .Po
 Default:
 .Dq Pa /usr/bin/less .
 .Pc
 .Pp
 .Ev PAGER
 can be set to
 .Dq cat
 when a non-interactive pager is desired.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/freebsd-update.conf"
 .It Pa /etc/freebsd-update.conf
 Default location of the
 .Nm
 configuration file.
 .It Pa /var/db/freebsd-update/
 Default location where
 .Nm
 stores temporary files and downloaded updates.
 .El
 .Sh SEE ALSO
+.Xr freebsd-version 1 ,
+.Xr uname 1 ,
 .Xr freebsd-update.conf 5 ,
 .Xr nextboot 8
 .Sh AUTHORS
 .An Colin Percival Aq Mt cperciva@FreeBSD.org