Index: stable/12/share/man/man4/smbios.4
===================================================================
--- stable/12/share/man/man4/smbios.4	(revision 367200)
+++ stable/12/share/man/man4/smbios.4	(revision 367201)
@@ -1,65 +1,65 @@
 .\" Copyright (c) 2020 Gordon Bergling
 .\"
 .\" 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
 .\" $FreeBSD$
 .\"
 .Dd April 22, 2020
 .Dt SMBIOS 4
 .Os
 .Sh NAME
 .Nm smbios
 .Nd "System Management BIOS"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "device smbios"
 .Ed
 .Pp
 Alternatively, to load the driver as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 smbios_load="YES"
 .Ed
 .Sh DESCRIPTION
 The System Management BIOS (SMBIOS) describes hardware components.
 .Sh SEE ALSO
 .Xr efi 8
 .Rs
 .%T System Management BIOS (SMBIOS) Reference Specification
 .%N DMTF DSP0134
 .Re
 .Sh HISTORY
 The
 .Nm
 device driver first appeared in
 .Fx 4.8 .
 .Sh AUTHORS
 The
 .Nm
 device driver was written by
 .An Matthew N. Dodd Aq Mt winter@jurai.net .
 This manual page was written by
-.An Gordon Bergling Aq Mt gbergling@gmail.com .
+.An Gordon Bergling Aq Mt gbe@FreeBSD.org .
Index: stable/12/share/man/man5/smbfs.5
===================================================================
--- stable/12/share/man/man5/smbfs.5	(revision 367200)
+++ stable/12/share/man/man5/smbfs.5	(revision 367201)
@@ -1,79 +1,79 @@
 .\" Copyright (c) 2020 Gordon Bergling
 .\"
 .\" 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
 .\" $FreeBSD$
 .\"
 .Dd April 8, 2020
 .Dt SMBFS 5
 .Os
 .Sh NAME
 .Nm smbfs
 .Nd "SMB FS"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "option NETSMB"
 .Ed
 .Pp
 Alternatively, to load the driver as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 smbfs_load="YES"
 .Ed
 .Sh DESCRIPTION
 The SMB driver is an implementation of the CIFS (Common Internet Filesystem)
 network protocol.
 .Sh SEE ALSO
 .Xr smbutil 1 ,
 .Xr mount_smbfs 8
 .Sh STANDARDS
 .Rs
 .%U https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/
 .%T Common Internet File System (CIFS) Protocol
 .%R MS-CIFS
 .%D December 2018
 .Re
 .Pp
 .Rs
 .%U https://tools.ietf.org/html/draft-heizer-cifs-v1-spec-00
 .%T Common Internet File System Protocol (CIFS/1.0)
 .%D June 13, 1996
 .%A I. Heizer
 .%A P. Leach
 .%A D. Perry
 .Re
 .Sh HISTORY
 The
 .Nm
 device driver first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
 The
 .Nm
 device driver was written by
 .An Boris Popov Aq Mt bp@FreeBSD.org .
 The manual page was contributed by
-.An Gordon Bergling Aq Mt gbergling@gmail.com .
+.An Gordon Bergling Aq Mt gbe@FreeBSD.org .
Index: stable/12/share/man/man5/unionfs.5
===================================================================
--- stable/12/share/man/man5/unionfs.5	(revision 367200)
+++ stable/12/share/man/man5/unionfs.5	(revision 367201)
@@ -1,87 +1,87 @@
 .\" Copyright (c) 2020 Gordon Bergling
 .\"
 .\" 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
 .\" $FreeBSD$
 .\"
 .Dd April 27, 2020
 .Dt UNIONFS 5
 .Os
 .Sh NAME
 .Nm unionfs
 .Nd "UNION FS"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "option UNIONFS"
 .Ed
 .Pp
 Alternatively, to load the driver as a
 module at boot time, place the following line in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
 unionfs_load="YES"
 .Ed
 .Sh DESCRIPTION
 The UNIONFS driver is an implementation of a stackable unification filesystem.
 .Sh SEE ALSO
 .Xr mount_unionfs 8
 .Sh STANDARDS
 .Rs
 .%T Union mounts in 4.4BSD-Lite
 .%A J. S. Pendry
 .%A M. K. McKusick
 .%R Proceedings of the USENIX Technical Conference on UNIX and Advanced Computing Systems
 .%D December 1995
 .Re
 .Pp
 .Rs
 .%T Jails: Confining the omnipotent root
 .%A P. H. Kamp
 .%A R. N. M. Watson
 .%R Proceedings of the Second International System Administration and Networking Conference (SANE2000)
 .%D May 2000
 .Re
 .Sh HISTORY
 The
 .Nm
 device driver first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
 The
 .Nm
 device driver was written by Jan-Simon Pendry for
 .Bx 4.4
 and
 .An Masanori OZAWA Aq Mt ozawa@ongs.co.jp
 reimplemented the handling of the locking for
 .Fx 7.0 .
 The manual page was written by
-.An Gordon Bergling Aq Mt gbergling@gmail.com .
+.An Gordon Bergling Aq Mt gbe@FreeBSD.org .
 .Sh BUGS
 Please see the
 .Xr mount_unionfs 8
 manual page for a list of bugs regarding the
 .Nm
 filesystem.
Index: stable/12
===================================================================
--- stable/12	(revision 367200)
+++ stable/12	(revision 367201)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r367091