7 files changed, 42 insertions, 17 deletions
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 52935363023a..e0052e781dc0 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -268,8 +268,10 @@ fi
 if [ -z "$firmware" ]; then
 	case ${platform} in
 	amd64)
-		firmware="${efi_firmware}"
-		firmware_pkg="edk2-bhyve"
+		if [ ${efi_mode} -ne 0 ]; then
+			firmware="${efi_firmware}"
+			firmware_pkg="edk2-bhyve"
+		fi
 		;;
 	arm64)
 		firmware="${uboot_firmware}"
diff --git a/share/man/man4/linprocfs.4 b/share/man/man4/linprocfs.4
index 53940d7c02b0..dcd1c642b409 100644
--- a/share/man/man4/linprocfs.4
+++ b/share/man/man4/linprocfs.4
@@ -9,7 +9,7 @@
 .Nd Linux process file system
 .Sh SYNOPSIS
 .Bd -literal
-linproc		/compat/linux/proc	linprocfs	rw 0 0
+linprocfs		/compat/linux/proc	linprocfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The Linux process file system, or
@@ -138,7 +138,7 @@ To mount a
 file system on
 .Pa /compat/linux/proc :
 .Pp
-.Dl "mount -t linprocfs linproc /compat/linux/proc"
+.Dl "mount -t linprocfs linprocfs /compat/linux/proc"
 .Sh SEE ALSO
 .Xr mount 2 ,
 .Xr unmount 2 ,
diff --git a/share/man/man4/linsysfs.4 b/share/man/man4/linsysfs.4
index 12729a814085..045e1af89173 100644
--- a/share/man/man4/linsysfs.4
+++ b/share/man/man4/linsysfs.4
@@ -9,7 +9,7 @@
 .Nd Linux kernel objects file system
 .Sh SYNOPSIS
 .Bd -literal
-linsys		/compat/linux/sys	linsysfs	rw 0 0
+linsysfs		/compat/linux/sys	linsysfs	rw 0 0
 .Ed
 .Sh DESCRIPTION
 The
@@ -66,7 +66,7 @@ The PCI device hierarchy node.
 .Sh EXAMPLES
 The most common usage follows:
 .Pp
-.Dl "mount -t linsysfs linsys /compat/linux/sys"
+.Dl "mount -t linsysfs linsysfs /compat/linux/sys"
 .Pp
 where
 .Pa /compat/linux/sys
diff --git a/share/man/man4/nvd.4 b/share/man/man4/nvd.4
index d5145939e409..1861fabc91d0 100644
--- a/share/man/man4/nvd.4
+++ b/share/man/man4/nvd.4
@@ -31,7 +31,7 @@
 .\"
 .\" Author: Jim Harris <jimharris@FreeBSD.org>
 .\"
-.Dd May 18, 2019
+.Dd October 2, 2025
 .Dt NVD 4
 .Os
 .Sh NAME
@@ -72,6 +72,10 @@ Note that device nodes from the
 driver are not
 .Xr GEOM 4
 disks and cannot be partitioned.
+.Sh HARDWARE
+The
+.Nm
+driver supports NVMe storage devices using NVMe namespaces.
 .Sh CONFIGURATION
 The
 .Nm
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 05f80374926f..2493a34721bc 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -1,3 +1,6 @@
+.\"
+.\" SPDX-License-Identifier: BSD-2-Clause
+.\"
 .\" Copyright (c) 2002 Murray Stokely <murray@FreeBSD.org>
 .\" All rights reserved.
 .\"
@@ -22,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 11, 2025
+.Dd October 13, 2025
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -136,6 +139,8 @@ configuration file supports the following variables:
 .Bl -tag -width Ev
 .It Va CHROOTDIR
 The directory within which the release will be built.
+Defaults to
+.Pa /scratch .
 .It Va CHROOT_MAKEENV
 Additional
 .Xr make 1
@@ -636,6 +641,7 @@ Typically, one only needs to set
 .El
 .Sh FILES
 .Bl -tag -compact -width Pa
+.It Pa /scratch
 .It Pa /usr/doc/Makefile
 .It Pa /usr/doc/share/mk/doc.project.mk
 .It Pa /usr/ports/Mk/bsd.port.mk
@@ -688,16 +694,10 @@ the Raspberry Pi, exist in the directory corresponding to the
 .Va TARGET
 .Xr make 1
 variable.
-For example, to build an image for the Raspberry Pi:
-.Bd -literal -offset indent
-cd /usr/src/release
-sh release.sh -c arm/RPI-B.conf
-.Ed
-.Pp
-To build an image for the Raspberry Pi 3:
+For example, to build an image for 64-bit Raspberry Pis:
 .Bd -literal -offset indent
 cd /usr/src/release
-sh release.sh -c arm64/RPI3.conf
+sh release.sh -c arm64/RPI.conf
 .Ed
 .Pp
 After running these commands, all prepared release files are available in the
diff --git a/share/man/man9/VOP_OPENCLOSE.9 b/share/man/man9/VOP_OPENCLOSE.9
index 9a4f7069962d..672f9faa92f5 100644
--- a/share/man/man9/VOP_OPENCLOSE.9
+++ b/share/man/man9/VOP_OPENCLOSE.9
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 2, 2009
+.Dd October 17, 2025
 .Dt VOP_OPEN 9
 .Os
 .Sh NAME
@@ -78,6 +78,17 @@ The access mode is a set of flags, including
 .Dv FWRITE ,
 .Dv O_NONBLOCK ,
 .Dv O_APPEND .
+.Pp
+The thread
+.Fa td
+passed to
+.Fn VOP_CLOSE
+may be
+.Ql NULL
+if the last reference to the open file is released from a kernel context, e.g.,
+the destruction of a socket buffer containing the file reference in a
+.Dv SCM_RIGHTS
+message.
 .Sh LOCKS
 .Fn VOP_OPEN
 expects
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 0a3594e05d94..1591a3e0905e 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -97,6 +97,14 @@ manlinksinstall: .PHONY
 
 all-man:
 
+# Take groups from both MANGROUPS and MANGROUPS.yes, to allow syntax like
+# MANGROUPS.${MK_FOO}=FOO.  Sort and uniq the list of groups in case of
+# duplicates.
+.if defined(MANGROUPS) || defined(MANGROUPS.yes)
+MANGROUPS:=${MANGROUPS} ${MANGROUPS.yes}
+MANGROUPS:=${MANGROUPS:O:u}
+.endif
+
 .for __group in ${MANGROUPS}
 
 realmaninstall: realmaninstall-${__group}