Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/man/man7/sysctl.7,v
rcsdiff: /ftp/cvs/cvsroot/src/share/man/man7/sysctl.7,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.12
retrieving revision 1.66
diff -u -p -r1.12 -r1.66
--- src/share/man/man7/sysctl.7	2007/06/20 15:29:18	1.12
+++ src/share/man/man7/sysctl.7	2011/09/24 00:08:05	1.66
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysctl.7,v 1.12 2007/06/20 15:29:18 christos Exp $
+.\"	$NetBSD: sysctl.7,v 1.66 2011/09/24 00:08:05 christos Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
 .\"
-.Dd June 19, 2007
+.Dd September 9, 2011
 .Dt SYSCTL 7
 .Os
 .Sh NAME
@@ -68,29 +68,31 @@ sysctl variable relative to the upper le
 See the
 .Xr sysctl 3
 manual page for programming examples.
-.Sh Top level names
-The top level names are defined with a CTL_ prefix in
-.Aq Pa sys/sysctl.h ,
+.Ss Top level names
+The top level names are defined with a
+.Va CTL_
+prefix in
+.In sys/sysctl.h ,
 and are as follows.
 The next and subsequent levels down are found in the include files
 listed here, and described in separate sections below.
-.Bl -column securityXX CTLXSECURITYXX "Next level namesXX"
-.It Sy Name	Constant	Next level names	Description
-.It kern	CTL\_KERN	sys/sysctl.h	High kernel limits
-.It vm	CTL\_VM	uvm/uvm_param.h	Virtual memory
-.It vfs	CTL\_VFS	sys/mount.h	Filesystem
-.It net	CTL\_NET	sys/socket.h	Networking
-.It debug	CTL\_DEBUG	sys/sysctl.h	Debugging
-.It hw	CTL\_HW	sys/sysctl.h	Generic CPU, I/O
-.It machdep	CTL\_MACHDEP	sys/sysctl.h	Machine dependent
-.It user	CTL\_USER	sys/sysctl.h	User-level
-.It ddb	CTL\_DDB	sys/sysctl.h	In-kernel debugger
-.It proc	CTL\_PROC	sys/sysctl.h	Per-process
-.It vendor	CTL\_VENDOR	?	Vendor specific
-.It emul	CTL\_EMUL	sys/sysctl.h	Emulation settings
-.It security	CTL\_SECURITY	sys/sysctl.h	Security settings
+.Bl -column "security" ".Dv CTL_SECURITY" ".In uvm/uvm_param.h" "High kernel limits"
+.It Sy Name  Ta Sy Constant     Ta Sy Next level names Ta Sy Description
+.It kern     Ta Dv CTL_KERN     Ta In sys/sysctl.h     Ta High kernel limits
+.It vm       Ta Dv CTL_VM       Ta In uvm/uvm_param.h  Ta Virtual memory
+.It vfs      Ta Dv CTL_VFS      Ta In sys/mount.h      Ta Filesystem
+.It net      Ta Dv CTL_NET      Ta In sys/socket.h     Ta Networking
+.It debug    Ta Dv CTL_DEBUG    Ta In sys/sysctl.h     Ta Debugging
+.It hw       Ta Dv CTL_HW       Ta In sys/sysctl.h     Ta Generic CPU, I/O
+.It machdep  Ta Dv CTL_MACHDEP  Ta In sys/sysctl.h     Ta Machine dependent
+.It user     Ta Dv CTL_USER     Ta In sys/sysctl.h     Ta User-level
+.It ddb      Ta Dv CTL_DDB      Ta In sys/sysctl.h     Ta In-kernel debugger
+.It proc     Ta Dv CTL_PROC     Ta In sys/sysctl.h     Ta Per-process
+.It vendor   Ta Dv CTL_VENDOR   Ta ?                   Ta Vendor specific
+.It emul     Ta Dv CTL_EMUL     Ta In sys/sysctl.h     Ta Emulation settings
+.It security Ta Dv CTL_SECURITY Ta In sys/sysctl.h     Ta Security settings
 .El
-.Sh The debug.* subtree
+.Ss The debug.* subtree
 The debugging variables vary from system to system.
 A debugging variable may be added or deleted without need to recompile
 .Nm
@@ -100,7 +102,7 @@ Each time it runs,
 gets the list of debugging variables from the kernel and
 displays their current values.
 The system defines twenty
-.Va ( struct ctldebug )
+.Vt ( struct ctldebug )
 variables named
 .Dv debug0
 through
@@ -110,8 +112,9 @@ individually initialized at the location
 The loader prevents multiple use of the same variable by issuing errors
 if a variable is initialized in more than one place.
 For example, to export the variable
-.Dv dospecialcheck
+.Va dospecialcheck
 as a debugging variable, the following declaration would be used:
+.Pp
 .Bd -literal -offset indent -compact
 int dospecialcheck = 1;
 struct ctldebug debug5 = { "dospecialcheck", \*[Am]dospecialcheck };
@@ -127,32 +130,64 @@ See
 .\" and
 .\" .Xr sysctl 9
 for more information.
-.Sh The vfs.* subtree
+.Ss The vfs.* subtree
 A distinguished second level name,
 .Li vfs.generic ( VFS_GENERIC ) ,
-is used to get general information about all filesystems.
-One of its third level identifiers is
-.Li vfs.generic.maxtypenum ( VFS_MAXTYPENUM )
-that gives the highest valid filesystem type number.
-Its other third level identifier is
-.Li vfs.generic.conf ( VFS_CONF )
-that returns configuration information about the filesystem
-type given as a fourth level identifier.
-The remaining second level identifiers are the
-filesystem type number returned by a
+is used to get general information about all file systems.
+It has the following third level identifiers:
+.Bl -tag -width "123456"
+.It Li vfs.generic.maxtypenum ( VFS_MAXTYPENUM )
+The highest valid file system type number.
+.It Li vfs.generic.conf ( VFS_CONF )
+Returns configuration information about the file system type given as a fourth
+level identifier.
+.It Li vfs.generic.usermount ( VFS_USERMOUNT )
+Determines if non superuser mounts are allowed, default to no
+.Dv 0 .
+.It Li vfs.generic.magiclinks ( VFS_MAGICLINKS )
+Controls if expansion of variables is going to be performed on pathnames
+or not.
+Defaults to no variable expansion,
+.Dv 0 .
+Variables are of the form
+.Li @name
+and the variables supported are described in
+.Xr symlink 7
+under
+.Dq "MAGIC SYMLINKS" .
+.El
+.Pp
+A second level name for controlling the
+.Xr wapbl 4
+(Write Ahead Physical Block Logging file system journalling)
+capabilities with the following third level identifiers:
+.Bl -tag -width "123456"
+.It Li vfs.wapbl.flush_disk_cache
+Controls whether to attempt to flush the disk cache on each commit.
+It defaults to 1 and it should always be on to ensure data integrity in
+case of a crash.
+For slow disks, turning it off can improve performance.
+.It Li vfs.wapbl.verbose_commit
+For each transaction log commit, print the number of bytes written
+and the time it took to commit as seconds.nanoseconds.
+.El
+.Pp
+The remaining second level identifiers are the file system names, identified
+by the type number returned by a
 .Xr statvfs 2
 call or from
 .Li vfs.generic.conf .
-The third level identifiers available for each filesystem
+.Pp
+The third level identifiers available for each file system
 are given in the header file that defines the mount
-argument structure for that filesystem.
-.Sh The hw.* subtree
+argument structure for that file system.
+.Ss The hw.* subtree
 The string and integer information available for the
 .Li hw
 level is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-.Bl -column "Second level nameXXXXXX" "struct disk_sysctlXXX" -offset indent
+.Bl -column "hw.machine_arch" "integer" "Changeable" -offset indent
 .It Sy Second level name	Type	Changeable
 .It hw.alignbytes	integer	no
 .It hw.byteorder	integer	no
@@ -176,10 +211,10 @@ Alignment constraint for all possible da
 This shows the value
 .Dv ALIGNBYTES
 in
-.Pa /usr/include/machine/param.h ,
+.In machine/param.h ,
 at the kernel compilation time.
 .It Li hw.byteorder ( HW_BYTEORDER )
-The byteorder (4,321, or 1,234).
+The byteorder (4321, or 1234).
 .It Li hw.cnmagic ( HW_CNMAGIC )
 The console magic key sequence.
 .It Li hw.disknames ( HW_DISKNAMES )
@@ -191,15 +226,15 @@ collected on them.
 Return statistical information on the NFS mounts, disk and tape
 devices on the system.
 An array of
-.Va struct io_sysctl
+.Vt struct io_sysctl
 structures is returned,
 whose size depends on the current number of such objects in the system.
 The third level name is the size of the
-.Va struct io_sysctl .
+.Vt struct io_sysctl .
 The type of object can be determined by examining the
 .Va type
 element of
-.Va struct io_sysctl .
+.Vt struct io_sysctl .
 Which can be
 .Dv IOSTAT_DISK
 (disk drive),
@@ -215,7 +250,6 @@ The machine CPU class.
 The machine model.
 .It Li hw.ncpu ( HW_NCPU )
 The number of CPUs.
-.ne 1i
 .It Li hw.pagesize ( HW_PAGESIZE )
 The software page size.
 .It Li hw.physmem ( HW_PHYSMEM )
@@ -227,45 +261,50 @@ The bytes of non-kernel memory as a 32-b
 .It Li hw.usermem64 ( HW_USERMEM64 )
 The bytes of non-kernel memory as a 64-bit integer.
 .El
-.Sh The kern.* subtree
+.Ss The kern.* subtree
+This subtree includes data generally related to the kernel.
 The string and integer information available for the
 .Li kern
 level is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-The types of data currently available are process information,
-system vnodes, the open file entries, routing table entries,
-virtual memory statistics, load average history, and clock rate
-information.
-.Bl -column "kern.posix_reader_writer_locks" "struct clockrateXXX" -offset indent
+.Bl -column "kern.posix_reader_writer_locks" \
+"struct kinfo_drivers" "not applicable"
 .It Sy Second level name	Type	Changeable
+.It kern.aio_listio_max	integer	yes
+.It kern.aio_max	integer	yes
+.It kern.arandom	integer	no
 .It kern.argmax	integer	no
-.It kern.autonicetime	integer	yes
-.It kern.autoniceval	integer	yes
+.It kern.boothowto	integer	no
 .It kern.boottime	struct timeval	no
-.It kern.bufq	node	not applicable
+.\".It kern.bufq	node	not applicable
 .It kern.ccpu	integer	no
 .It kern.clockrate	struct clockinfo	no
 .It kern.consdev	integer	no
-.It kern.cp\_id	struct	no
-.It kern.cp\_time	uint64_t[\|]	no
+.It kern.coredump	node	not applicable
+.It kern.cp_id	struct	no
+.It kern.cp_time	uint64_t[\|]	no
+.It kern.cryptodevallowsoft	integer	yes
 .It kern.defcorename	string	yes
+.It kern.detachall	integer	yes
 .It kern.domainname	string	yes
 .It kern.drivers	struct kinfo_drivers	no
+.It kern.dump_on_panic	integer	yes
 .It kern.file	struct file	no
 .It kern.forkfsleep	integer	yes
 .It kern.fscale	integer	no
 .It kern.fsync	integer	no
-.It kern.hardclock\_ticks	integer	no
+.It kern.hardclock_ticks	integer	no
 .It kern.hostid	integer	yes
 .It kern.hostname	string	yes
-.It kern.iov\_max	integer	no
-.It kern.job\_control	integer	no
+.It kern.iov_max	integer	no
+.It kern.ipc	node	not applicable
+.It kern.job_control	integer	no
 .It kern.labeloffset	integer	no
 .It kern.labelsector	integer	no
-.It kern.login\_name\_max	integer	no
+.It kern.login_name_max	integer	no
 .It kern.logsigexit	integer	yes
-.It kern.mapped\_files	integer	no
+.It kern.mapped_files	integer	no
 .It kern.maxfiles	integer	yes
 .It kern.maxpartitions	integer	no
 .It kern.maxphys	integer	no
@@ -274,81 +313,163 @@ information.
 .It kern.maxvnodes	integer	yes
 .It kern.mbuf	node	not applicable
 .It kern.memlock	integer	no
-.It kern.memlock\_range	integer	no
-.It kern.memory\_protection	integer	no
-.It kern.monotonic\_clock	integer	no
+.It kern.memlock_range	integer	no
+.It kern.memory_protection	integer	no
+.It kern.module	node	not applicable
+.It kern.monotonic_clock	integer	no
+.It kern.mqueue	node	not applicable
 .It kern.msgbuf	integer	no
 .It kern.msgbufsize	integer	no
 .It kern.ngroups	integer	no
+.\".It kern.no_sa_support	integer	yes
 .It kern.ntptime	struct ntptimeval	no
 .It kern.osrelease	string	no
-.It kern.osrev	integer	no
+.It kern.osrevision	integer	no
 .It kern.ostype	string	no
+.\".It kern.panic_now	integer	yes
 .It kern.pipe	node	not applicable
-.It kern.posix1	integer	no
-.It kern.posix\_barriers	integer	no
-.It kern.posix\_reader\_writer\_locks	integer	no
-.It kern.posix\_semaphores	integer	no
-.It kern.posix\_spin\_locks	integer	no
-.It kern.posix\_threads	integer	no
-.It kern.posix\_timers	integer	no
+.\" .It kern.posix	node	not applicable
+.It kern.posix1version	integer	no
+.It kern.posix_aio	integer	no
+.It kern.posix_barriers	integer	no
+.It kern.posix_reader_writer_locks	integer	no
+.\".It kern.posix_sched	integer	yes
+.It kern.posix_semaphores	integer	no
+.It kern.posix_spin_locks	integer	no
+.It kern.posix_threads	integer	no
+.It kern.posix_timers	integer	no
 .It kern.proc	struct kinfo_proc	no
 .It kern.proc2	struct kinfo_proc2	no
-.It kern.proc\_args	string	no
-.It kern.prof	node	not applicable
+.It kern.proc_args	string	no
+.It kern.profiling	node	not applicable
+.\".It kern.pset	node	not applicable
 .It kern.rawpartition	integer	no
-.It kern.root\_device	string	no
-.It kern.root\_partition	integer	no
-.It kern.rtc\_offset	integer	yes
-.It kern.saved\_ids	integer	no
+.It kern.root_device	string	no
+.It kern.root_partition	integer	no
+.It kern.rtc_offset	integer	yes
+.It kern.saved_ids	integer	no
+.It kern.sbmax	integer	yes
+.\".It kern.sched	node	not applicable
 .It kern.securelevel	integer	raise only
-.It kern.synchronized\_io	integer	no
-.It kern.ipc	node	not applicable
+.It kern.somaxkva	integer	yes
+.It kern.synchronized_io	integer	no
+.It kern.timecounter	node	not applicable
 .It kern.timex	struct	no
 .It kern.tkstat	node	not applicable
+.It kern.tty	node	not applicable
 .It kern.urandom	integer	no
+.It kern.usercrypto	integer	yes
+.It kern.userasymcrypto	integer	yes
+.It kern.veriexec	node	not applicable
 .It kern.version	string	no
 .It kern.vnode	struct vnode	no
 .El
-.ne 1i
-.Pp
 .Bl -tag -width "123456"
+.It Li kern.aio_listio_max
+The maximum number of asynchronous
+.Tn I/O
+operations in a single list I/O call.
+Like with all variables related to
+.Xr aio 3 ,
+the variable may be created and removed dynamically
+upon loading or unloading the corresponding kernel module.
+.It Li kern.aio_max
+The maximum number of asynchronous I/O operations.
+.It Li kern.arandom
+This variable picks a random number each time it is queried.
+The used random number generator
+.Pf ( Tn RNG )
+is based on
+.Xr arc4random 3 .
 .It Li kern.argmax ( KERN_ARGMAX )
 The maximum bytes of argument to
 .Xr execve 2 .
-.It Li kern.autonicetime ( KERN_AUTONICETIME )
-The number of seconds of CPU-time a non-root process may accumulate before
-having its priority lowered from the default to the value of KERN_AUTONICEVAL.
-If set to 0, automatic lowering of priority is not performed, and if set to \-1
-all non-root processes are immediately lowered.
-.It Li kern.autoniceval ( KERN_AUTONICEVAL )
-The priority assigned for automatically niced processes.
+.It Li kern.boothowto
+Flags passed from the boot loader; see
+.Xr reboot 2
+for the meanings of the flags.
 .It Li kern.boottime ( KERN_BOOTTIME )
 A
-.Va struct timeval
+.Vt struct timeval
 structure is returned.
 This structure contains the time that the system was booted.
+.\" .It Li kern.bufq
+.\" XXX: Undocumented.
 .It Li kern.ccpu ( KERN_CCPU )
 The scheduler exponential decay value.
 .It Li kern.clockrate ( KERN_CLOCKRATE )
 A
-.Va struct clockinfo
+.Vt struct clockinfo
 structure is returned.
 This structure contains the clock, statistics clock and profiling clock
 frequencies, the number of micro-seconds per hz tick, and the clock
 skew rate.
+Refer to
+.Xr hz 9
+for additional details.
 .It Li kern.consdev ( KERN_CONSDEV )
 Console device.
+.It Li kern.coredump
+Settings related to set-id processes coredumps.
+By default, set-id processes do not dump core in situations where
+other processes would.
+The settings in this node allows an administrator to change this
+behavior.
+.Pp
+The third level name is
+.Dv kern.coredump.setid
+and fourth level variables are described below.
+.Bl -column "kern.coredump.setid.group" "integer" "Changeable" -offset indent
+.It Sy Fourth level name	Type	Changeable
+.It kern.coredump.setid.dump	integer	yes
+.It kern.coredump.setid.group	integer	yes
+.It kern.coredump.setid.mode	integer	yes
+.It kern.coredump.setid.owner	integer	yes
+.It kern.coredump.setid.path	string	yes
+.El
+.Bl -tag -width "123456"
+.It Li kern.coredump.setid.dump
+If non-zero, set-id processes will dump core.
+.It Li kern.coredump.setid.group
+The group-id for the set-id processes' coredump.
+.It Li kern.coredump.setid.mode
+The mode for the set-id processes' coredump.
+See
+.Xr chmod 1 .
+.It Li kern.coredump.setid.owner
+The user-id that will be used as the owner of the set-id processes'
+coredump.
+.It Li kern.coredump.setid.path
+The path to which set-id processes' coredumps will be saved to.
+Same syntax as kern.defcorename.
+.El
 .It Li kern.cp_id ( KERN_CP_ID )
 Mapping of CPU number to CPU id.
 .It Li kern.cp_time ( KERN_CP_TIME )
-Returns an array of CPUSTATES uint64_ts.
+Returns an array of
+.Dv CPUSTATES
+.Vt uint64_t Ns s.
 This array contains the
 number of clock ticks spent in different CPU states.
 On multi-processor systems, the sum across all CPUs is returned unless
 appropriate space is given for one data set for each CPU.
 Data for a specific CPU can also be obtained by adding the number of the
 CPU at the end of the MIB, enlarging it by one.
+.It Li kern.cryptodevallowsoft
+This variable controls userland access to hardware versus software transforms
+in the
+.Xr crypto 4
+system.
+The available values are as follows:
+.Bl -tag -width XX0 -offset indent
+.It Dv \*[Lt] 0
+Always force userlevel requests to use software transforms.
+.It Dv = 0
+If present, use hardware and grant userlevel requests for
+non-accelerated transforms (handling the latter in software).
+.It Dv \*[Gt] 0
+Allow user requests only for transforms which are hardware-accelerated.
+.El
 .It Li kern.defcorename ( KERN_DEFCORENAME )
 Default template for the name of core dump files (see also
 .Li proc.pid.corename
@@ -358,19 +479,19 @@ and
 .Xr core 5
 for format of this template).
 The default value is
-.Nm %n.core
+.Pa %n.core
 and can be changed with the kernel configuration option
 .Cd options DEFCORENAME
 (see
 .Xr options 4
 ).
+.It Li kern.detachall
+Detach all devices at shutdown.
 .It Li kern.domainname ( KERN_DOMAINNAME )
 Get or set the YP domain name.
-.It Li kern.dump_on_panic ( KERN_DUMP_ON_PANIC )
-Perform a crash dump on system panic.
 .It Li kern.drivers ( KERN_DRIVERS )
 Return an array of
-.Va struct kinfo_drivers
+.Vt struct kinfo_drivers
 that contains the name and major device numbers of all the device drivers
 in the current kernel.
 The
@@ -379,12 +500,15 @@ field is always a NUL terminated string.
 The
 .Va d_bmajor
 field will be set to \-1 if the driver doesn't have a block device.
+.It Li kern.dump_on_panic ( KERN_DUMP_ON_PANIC )
+Perform a crash dump on system
+.Xr panic 9 .
 .It Li kern.file ( KERN_FILE )
 Return the entire file table.
 The returned data consists of a single
-.Va struct filelist
+.Vt struct filelist
 followed by an array of
-.Va struct file ,
+.Vt struct file ,
 whose size depends on the current number of such objects in the system.
 .It Li kern.forkfsleep ( KERN_FORKFSLEEP )
 If
@@ -400,20 +524,28 @@ Maximum is 20 seconds.
 .It Li kern.fscale ( KERN_FSCALE )
 The kernel fixed-point scale factor.
 .It Li kern.fsync ( KERN_FSYNC )
-Return 1 if the POSIX 1003.1b File Synchronization Option is available
+Return 1 if the
+.St -p1003.1b-93
+File Synchronization Option is available
 on this system,
-otherwise 0.
+otherwise\ 0.
 .It Li kern.hardclock_ticks ( KERN_HARDCLOCK_TICKS )
 Returns the number of
 .Xr hardclock 9
 ticks.
 .It Li kern.hostid ( KERN_HOSTID )
-Get or set the host id.
+Get or set the host identifier.
+This is aimed to replace the legacy
+.Xr gethostid 3
+and
+.Xr sethostid 3
+system calls.
 .It Li kern.hostname ( KERN_HOSTNAME )
-Get or set the hostname.
+Get or set the
+.Xr hostname 1 .
 .It Li kern.iov_max ( KERN_IOV_MAX )
 Return the maximum number of
-.Va iovec
+.Vt iovec
 structures that a process has available for use with
 .Xr preadv 2 ,
 .Xr pwritev 2 ,
@@ -422,10 +554,98 @@ structures that a process has available 
 .Xr sendmsg 2
 and
 .Xr writev 2 .
+.It Li kern.ipc ( KERN_SYSVIPC )
+Return information about the SysV IPC parameters.
+The third level names for the ipc variables are detailed below.
+.Bl -column "kern.ipc.shm_use_phys" "integer" "Changeable" -offset indent
+.It Sy Third level name	Type	Changeable
+.It kern.ipc.sysvmsg	integer	no
+.It kern.ipc.sysvsem	integer	no
+.It kern.ipc.sysvshm	integer	no
+.It kern.ipc.sysvipc_info	struct	no
+.It kern.ipc.shmmax	integer	yes
+.It kern.ipc.shmmni	integer	yes
+.It kern.ipc.shmseg	integer	yes
+.It kern.ipc.shmmaxpgs	integer	yes
+.It kern.ipc.shm_use_phys	integer	yes
+.It kern.ipc.msgmni	integer	yes
+.It kern.ipc.msgseg	integer	yes
+.It kern.ipc.semmni	integer	yes
+.It kern.ipc.semmns	integer	yes
+.It kern.ipc.semmnu	integer	yes
+.El
+.Bl -tag -width "123456"
+.It Li kern.ipc.sysvmsg ( KERN_SYSVIPC_MSG )
+Returns 1 if System V style message queue functionality is available
+on this system,
+otherwise\ 0.
+.It Li kern.ipc.sysvsem ( KERN_SYSVIPC_SEM )
+Returns 1 if System V style semaphore functionality is available
+on this system,
+otherwise\ 0.
+.It Li kern.ipc.sysvshm ( KERN_SYSVIPC_SHM )
+Returns 1 if System V style share memory functionality is available
+on this system,
+otherwise\ 0.
+.It Li kern.ipc.sysvipc_info ( KERN_SYSVIPC_INFO )
+Return System V style IPC configuration and run-time information.
+The fourth level name selects the System V style IPC facility.
+.Bl -column "KERN_SYSVIPC_MSG_INFO" "struct shm_sysctl_info" -offset indent
+.It Sy Fourth level name	Type
+.It KERN_SYSVIPC_MSG_INFO	struct msg_sysctl_info
+.It KERN_SYSVIPC_SEM_INFO	struct sem_sysctl_info
+.It KERN_SYSVIPC_SHM_INFO	struct shm_sysctl_info
+.El
+.Pp
+.Bl -tag -width "123456"
+.It Li KERN_SYSVIPC_MSG_INFO
+Return information on the System V style message facility.
+The
+.Sy msg_sysctl_info
+structure is defined in
+.In sys/msg.h .
+.It Li KERN_SYSVIPC_SEM_INFO
+Return information on the System V style semaphore facility.
+The
+.Sy sem_sysctl_info
+structure is defined in
+.In sys/sem.h .
+.It Li KERN_SYSVIPC_SHM_INFO
+Return information on the System V style shared memory facility.
+The
+.Sy shm_sysctl_info
+structure is defined in
+.In sys/shm.h .
+.El
+.It Li kern.ipc.shmmax ( KERN_SYSVIPC_SHMMAX )
+Max shared memory segment size in bytes.
+.It Li kern.ipc.shmmni ( KERN_SYSVIPC_SHMMNI )
+Max number of shared memory identifiers.
+.It Li kern.ipc.shmseg ( KERN_SYSVIPC_SHMSEG )
+Max shared memory segments per process.
+.It Li kern.ipc.shmmaxpgs ( KERN_SYSVIPC_SHMMAXPGS )
+Max amount of shared memory in pages.
+.It Li kern.ipc.shm_use_phys ( KERN_SYSVIPC_SHMUSEPHYS )
+Locking of shared memory in physical memory.
+If 0, memory can be swapped
+out, otherwise it will be locked in physical memory.
+.It Li kern.ipc.msgmni
+Max number of message queue identifiers.
+.It Li kern.ipc.msgseg
+Max number of number of message segments.
+.It Li kern.ipc.semmni
+Max number of number of semaphore identifiers.
+.It Li kern.ipc.semmns
+Max number of number of semaphores in system.
+.It Li kern.ipc.semmnu
+Max number of undo structures in system.
+.El
 .It Li kern.job_control ( KERN_JOB_CONTROL )
-Return 1 if job control is available on this system, otherwise 0.
+Return 1 if job control is available on this system, otherwise\ 0.
 .It Li kern.labeloffset ( KERN_LABELOFFSET )
-The offset within the sector specified by KERN_LABELSECTOR of the
+The offset within the sector specified by
+.Dv KERN_LABELSECTOR
+of the
 .Xr disklabel 5 .
 .It Li kern.labelsector ( KERN_LABELSECTOR )
 The sector number containing the
@@ -440,9 +660,10 @@ all process exits due to signals which c
 .Xr core 5
 file, and whether the coredump was created.
 .It Li kern.mapped_files ( KERN_MAPPED_FILES )
-Returns 1 if the POSIX 1003.1b Memory Mapped Files Option is available
-on this system,
-otherwise 0.
+Returns 1 if the
+.St -p1003.1b-93
+Memory Mapped Files Option is available on this system,
+otherwise\ 0.
 .It Li kern.maxfiles ( KERN_MAXFILES )
 The maximum number of open files that may be open in the system.
 .It Li kern.maxpartitions ( KERN_MAXPARTITIONS )
@@ -468,7 +689,7 @@ structures in the networking code, see
 The third level names for the mbuf variables are detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-.Bl -column "kern.mbuf.nmbclusters" "struct integerXXX" -offset indent
+.Bl -column "kern.mbuf.nmbclusters" "integer" "Changeable" -offset indent
 .It Sy Third level name	Type	Changeable
 .\" XXX Changeable? really?
 .It kern.mbuf.mblowat	integer	yes
@@ -494,21 +715,75 @@ The variable can only be increased, and 
 direct-mapped pool pages.
 .El
 .It Li kern.memlock ( KERN_MEMLOCK )
-Returns 1 if the POSIX 1003.1b Process Memory Locking Option is available
-on this system,
-otherwise 0.
+Returns 1 if the
+.St -p1003.1b-93
+Process Memory Locking Option is available on this system,
+otherwise\ 0.
 .It Li kern.memlock_range ( KERN_MEMLOCK_RANGE )
-Returns 1 if the POSIX 1003.1b Range Memory Locking Option is available
-on this system,
-otherwise 0.
+Returns 1 if the
+.St -p1003.1b-93
+Range Memory Locking Option is available on this system,
+otherwise\ 0.
 .It Li kern.memory_protection ( KERN_MEMORY_PROTECTION )
-Returns 1 if the POSIX 1003.1b Memory Protection Option is available
-on this system,
-otherwise 0.
+Returns 1 if the
+.St -p1003.1b-93
+Memory Protection Option is available on this system,
+otherwise\ 0.
+.It Li kern.module
+Settings related to kernel modules.
+The third level names for the settings are described below.
+.Bl -column "kern.module.autoload" "integer" "Changeable" -offset indent
+.It Sy Third level name	Type	Changeable
+.It kern.module.autoload	integer	yes
+.It kern.module.verbose	integer	yes
+.El
+.Pp
+The variables are as follows:
+.Bl -tag -width "123456"
+.It Li kern.module.autoload
+A boolean that controls whether kernel modules are loaded automatically.
+See
+.Xr module 7
+for additional details.
+.It Li kern.module.verbose
+A boolean that enables or disables verbose
+debug messages related to kernel modules.
+.El
 .It Li kern.monotonic_clock ( KERN_MONOTONIC_CLOCK )
-Returns the standard version the implementation of the POSIX 1003.1b
+Returns the standard version the implementation of the
+.St -p1003.1b-93
 Monotonic Clock Option conforms to,
-otherwise 0.
+otherwise\ 0.
+.It Li kern.mqueue
+Settings related to
+.Tn POSIX
+message queues; see
+.Xr mqueue 3 .
+This node is created dynamically when
+the corresponding kernel module is loaded.
+The third level names for the settings are described below.
+.Bl -column "kern.mqueue.mq_max_msgsize" "integer" "Changeable" -offset indent
+.It Sy Third level name	Type	Changeable
+.It kern.mqueue.mq_open_max	integer	yes
+.It kern.mqueue.mq_prio_max	integer	yes
+.It kern.mqueue.mq_max_msgsize	integer	yes
+.It kern.mqueue.mq_def_maxmsg	integer	yes
+.It kern.mqueue.mq_max_maxmsg	integer	yes
+.El
+.Pp
+The variables are:
+.Bl -tag -width "123456"
+.It Li kern.mqueue.mq_open_max
+The maximum number of message queue descriptors any single process can open.
+.It Li kern.mqueue.mq_prio_max
+The maximum priority of a message.
+.It Li kern.mqueue.mq_max_msgsize
+The maximum size of a message in a message queue.
+.It Li kern.mqueue.mq_def_maxmsg
+The default maximum message count.
+.It Li kern.mqueue.mq_max_maxmsg
+The maximum number of messages in a message queue.
+.El
 .It Li kern.msgbuf ( KERN_MSGBUF )
 The kernel message buffer, rotated so that the head of the circular kernel
 message buffer is at the start of the returned data.
@@ -517,9 +792,11 @@ The returned data may contain NUL bytes.
 The maximum number of characters that the kernel message buffer can hold.
 .It Li kern.ngroups ( KERN_NGROUPS )
 The maximum number of supplemental groups.
+.\" .It Li kern.no_sa_support
+.\" XXX: Undocumented.
 .It Li kern.ntptime ( KERN_NTPTIME )
 A
-.Va struct ntptimeval
+.Vt struct ntptimeval
 structure is returned.
 This structure contains data used by the
 .Xr ntpd 8
@@ -530,12 +807,14 @@ The system release string.
 The system revision string.
 .It Li kern.ostype ( KERN_OSTYPE )
 The system type string.
+.\".It Li kern.panic_now
+.\" XXX: Undocumented.
 .It Li kern.pipe ( KERN_PIPE )
 Pipe settings.
 The third level names for the  integer pipe settings is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-.Bl -column "kern.pipe.maxbigpipesXXX" "integerXXX" -offset indent
+.Bl -column "kern.pipe.maxbigpipes" "integer" "Changeable" -offset indent
 .It Sy Third level name	Type	Changeable
 .It kern.pipe.kvasiz	integer	yes
 .It kern.pipe.maxbigpipes	integer	yes
@@ -549,84 +828,99 @@ The variables are as follows:
 .It Li kern.pipe.kvasiz ( KERN_PIPE_KVASIZ )
 Amount of kernel memory consumed by pipe buffers.
 .It Li kern.pipe.maxbigpipes ( KERN_PIPE_MAXBIGPIPES )
-Maximum number of "big" pipes.
+Maximum number of
+.Dq big
+pipes.
 .It Li kern.pipe.maxkvasz ( KERN_PIPE_MAXKVASZ )
 Maximum amount of kernel memory to be used for pipes.
 .It Li kern.pipe.limitkva ( KERN_PIPE_LIMITKVA )
 Limit for direct transfers via page loan.
 .It Li kern.pipe.nbigpipes ( KERN_PIPE_NBIGPIPES )
-Number of "big" pipes.
+Number of
+.Dq big
+pipes.
 .El
+.\" XXX: Undocumented .It Li kern.posix ( ? )
+.\"	 This is a node in which the only variable is semmax.
 .It Li kern.posix1version ( KERN_POSIX1 )
-The version of ISO/IEC 9945 (POSIX 1003.1) with which the system
-attempts to comply.
+The version of ISO/IEC 9945
+.Pq St -p1003.1
+with which the system attempts to comply.
+.It Li kern.posix_aio
+The version of
+.St -p1003.1
+and its Asynchronous I/O option to which the system attempts to conform.
 .It Li kern.posix_barriers ( KERN_POSIX_BARRIERS )
 The version of
 .St -p1003.1
 and its
 Barriers
 option to which the system attempts to conform,
-otherwise 0.
+otherwise\ 0.
 .It Li kern.posix_reader_writer_locks ( KERN_POSIX_READER_WRITER_LOCKS )
 The version of
 .St -p1003.1
 and its
 Read-Write Locks
 option to which the system attempts to conform,
-otherwise 0.
+otherwise\ 0.
+.\".It Li kern.posix_sched
+.\" XXX: Undocumented.
 .It Li kern.posix_semaphores ( KERN_POSIX_SEMAPHORES )
 The version of
 .St -p1003.1
 and its
 Semaphores
 option to which the system attempts to conform,
-otherwise 0.
+otherwise\ 0.
 .It Li kern.posix_spin_locks ( KERN_POSIX_SPIN_LOCKS )
 The version of
 .St -p1003.1
 and its
 Spin Locks
 option to which the system attempts to conform,
-otherwise 0.
+otherwise\ 0.
 .It Li kern.posix_threads ( KERN_POSIX_THREADS )
 The version of
 .St -p1003.1
 and its
 Threads
 option to which the system attempts to conform,
-otherwise 0.
+otherwise\ 0.
 .It Li kern.posix_timers ( KERN_POSIX_TIMERS )
 The version of
 .St -p1003.1
 and its
 Timers
 option to which the system attempts to conform,
-otherwise 0.
+otherwise\ 0.
 .It Li kern.proc ( KERN_PROC )
 Return the entire process table, or a subset of it.
 An array of
-.Va struct kinfo_proc
+.Vt struct kinfo_proc
 structures is returned,
 whose size depends on the current number of such objects in the system.
 The third and fourth level numeric names are as follows:
-.Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
+.Bl -column "KERN_PROC_SESSION" "Fourth level is:" -offset indent
 .It Sy Third level name	Fourth level is:
-.It KERN\_PROC\_ALL	None
-.It KERN\_PROC\_GID	A group ID
-.It KERN\_PROC\_PID	A process ID
-.It KERN\_PROC\_PGRP	A process group
-.It KERN\_PROC\_RGID	A real group ID
-.It KERN\_PROC\_RUID	A real user ID
-.It KERN\_PROC\_SESSION	A session ID
-.It KERN\_PROC\_TTY	A tty device
-.It KERN\_PROC\_UID	A user ID
+.It KERN_PROC_ALL	None
+.It KERN_PROC_GID	A group ID
+.It KERN_PROC_PID	A process ID
+.It KERN_PROC_PGRP	A process group
+.It KERN_PROC_RGID	A real group ID
+.It KERN_PROC_RUID	A real user ID
+.It KERN_PROC_SESSION	A session ID
+.It KERN_PROC_TTY	A tty device
+.It KERN_PROC_UID	A user ID
 .El
 .It Li kern.proc2 ( KERN_PROC2 )
-As for KERN_PROC, but an array of
-.Va struct kinfo_proc2
+As for
+.Dv KERN_PROC ,
+but an array of
+.Vt struct kinfo_proc2
 structures are returned.
 The fifth level name is the size of the
-.Va struct kinfo_proc2
+.Vt struct kinfo_proc2
 and the sixth level name is the number of structures to return.
 .It Li kern.proc_args ( KERN_PROC_ARGS )
 Return the argv or environment strings (or the number thereof)
@@ -634,23 +928,24 @@ of a process.
 Multiple strings are returned separated by NUL characters.
 The third level name is the process ID.
 The fourth level name is as follows:
-.Bl -column "Third level nameXXXXXX" -offset indent
-.It KERN\_PROC\_ARGV	The argv strings
-.It KERN\_PROC\_ENV	The environ strings
-.It KERN\_PROC\_NARGV	The number of argv strings
-.It KERN\_PROC\_NENV	The number of environ strings
+.Bl -column "KERN_PROG_NARGV" "The number of environ strings" -offset indent
+.It KERN_PROC_ARGV	The argv strings
+.It KERN_PROC_ENV	The environ strings
+.It KERN_PROC_NARGV	The number of argv strings
+.It KERN_PROC_NENV	The number of environ strings
 .El
 .It Li kern.profiling ( KERN_PROF )
 Return profiling information about the kernel.
 If the kernel is not compiled for profiling,
-attempts to retrieve any of the KERN_PROF values will
-fail with
+attempts to retrieve any of the
+.Dv KERN_PROF
+values will fail with
 .Er EOPNOTSUPP .
 The third level names for the string and integer profiling information
 is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-.Bl -column "kern.profiling.gmonparam" "struct gmonparam" -offset indent
+.Bl -column "kern.profiling.gmonparam" "struct gmonparam" "Changeable" -offset indent
 .It Sy Third level name	Type	Changeable
 .It kern.profiling.count	u_short[\|]	yes
 .It kern.profiling.froms	u_short[\|]	yes
@@ -669,13 +964,19 @@ Array indexed by program counter of call
 Structure giving the sizes of the above arrays.
 .It Li kern.profiling.state ( GPROF_STATE )
 Profiling state.
-If set to GMON_PROF_ON, starts profiling.
-If set to GMON_PROF_OFF, stops profiling.
+If set to
+.Dv GMON_PROF_ON ,
+starts profiling.
+If set to
+.Dv GMON_PROF_OFF ,
+stops profiling.
 .It Li kern.profiling.tos ( GPROF_TOS )
 Array of
-.Va struct tostruct
+.Vt struct tostruct
 describing destination of calls and their counts.
 .El
+.\" .It Li kern.pset
+.\" XXX: Undocumented.
 .It Li kern.rawpartition ( KERN_RAWPARTITION )
 The raw partition of a disk (a == 0).
 .It Li kern.root_device ( KERN_ROOT_DEVICE )
@@ -691,86 +992,35 @@ Returns 1 if saved set-group and saved s
 Maximum socket buffer size.
 .\" XXX units?
 .It Li kern.securelevel ( KERN_SECURELVL )
-The system security level.
-This level may be raised by processes with appropriate privilege.
-It may only be lowered by process 1.
+See
+.Xr secmodel_securelevel 9 .
+.\" .It Li kern.sched
+.\" XXX: Undocumented.
 .It Li kern.somaxkva ( KERN_SOMAXKVA )
 Maximum amount of kernel memory to be used for socket buffers.
 .\" XXX units?
 .It Li kern.synchronized_io ( KERN_SYNCHRONIZED_IO )
-Returns 1 if the POSIX 1003.1b Synchronized I/O Option is available
-on this system,
-otherwise 0.
-.It Li kern.ipc ( KERN_SYSVIPC )
-Return information about the SysV IPC parameters.
-The third level names for the ipc variables are detailed below.
-.Bl -column "KERN_SYSVIPC_MSGXXX" "integerXXX" "noXXX" -offset indent
-.It Sy Third level name	Type		Changeable
-.It kern.ipc.sysvmsg	integer		no
-.It kern.ipc.sysvsem	integer		no
-.It kern.ipc.sysvshm	integer		no
-.It kern.ipc.sysvipc_info	struct		no
-.It kern.ipc.shmmax	integer		no
-.It kern.ipc.shmmni	integer		yes
-.It kern.ipc.shmseg	integer		yes
-.It kern.ipc.shmmaxpgs	integer		yes
-.It kern.ipc.shm_use_phys	integer		yes
-.El
-.Bl -tag -width "123456"
-.It Li kern.ipc.sysvmsg ( KERN_SYSVIPC_MSG )
-Returns 1 if System V style message queue functionality is available
-on this system,
-otherwise 0.
-.It Li kern.ipc.sysvsem ( KERN_SYSVIPC_SEM )
-Returns 1 if System V style semaphore functionality is available
-on this system,
-otherwise 0.
-.It Li kern.ipc.sysvshm ( KERN_SYSVIPC_SHM )
-Returns 1 if System V style share memory functionality is available
-on this system,
-otherwise 0.
-.It Li kern.ipc.sysvipc_info ( KERN_SYSVIPC_INFO )
-Return System V style IPC configuration and run-time information.
-The fourth level name selects the System V style IPC facility.
-.Bl -column "KERN_SYSVIPC_MSG_INFOXXX" "struct shm_sysctl_infoXXX" -offset indent
-.It Sy Fourth level name	Type
-.It KERN\_SYSVIPC\_MSG\_INFO	struct msg_sysctl_info
-.It KERN\_SYSVIPC\_SEM\_INFO	struct sem_sysctl_info
-.It KERN\_SYSVIPC\_SHM\_INFO	struct shm_sysctl_info
+Returns 1 if the
+.St -p1003.1b-93
+Synchronized I/O Option is available on this system,
+otherwise\ 0.
+.It Li kern.timecounter ( dynamic )
+Display and control the timecounter source of the system.
+.Bl -column "kern.timecounter.timestepwarnings" "integer" "Changeable" -offset indent
+.It Sy Third level name	Type	Changeable
+.It kern.timecounter.choice	string	no
+.It kern.timecounter.hardware	string	yes
+.It kern.timecounter.timestepwarnings	integer	yes
 .El
 .Pp
+The variables are as follows:
 .Bl -tag -width "123456"
-.It Li KERN_SYSVIPC_MSG_INFO
-Return information on the System V style message facility.
-The
-.Sy msg_sysctl_info
-structure is defined in
-.Aq Pa sys/msg.h .
-.It Li KERN_SYSVIPC_SEM_INFO
-Return information on the System V style semaphore facility.
-The
-.Sy sem_sysctl_info
-structure is defined in
-.Aq Pa sys/sem.h .
-.It Li KERN_SYSVIPC_SHM_INFO
-Return information on the System V style shared memory facility.
-The
-.Sy shm_sysctl_info
-structure is defined in
-.Aq Pa sys/shm.h .
-.El
-.It Li kern.ipc.shmmax ( KERN_SYSVIPC_SHMMAX )
-Max shared memory segment size in bytes.
-.It Li kern.ipc.shmmni ( KERN_SYSVIPC_SHMMNI )
-Max number of shared memory identifiers.
-.It Li kern.ipc.shmseg ( KERN_SYSVIPC_SHMSEG )
-Max shared memory segments per process.
-.It Li kern.ipc.shmmaxpgs ( KERN_SYSVIPC_SHMMAXPGS )
-Max amount of shared memory in pages.
-.It Li kern.ipc.shm_use_phys ( KERN_SYSVIPC_SHMUSEPHYS )
-Locking of shared memory in physical memory.
-If 0, memory can be swapped
-out, otherwise it will be locked in physical memory.
+.It Li kern.timecounter.choice ( dynamic )
+The list of available timecounters with their quality and frequency.
+.It Li kern.timecounter.hardware ( dynamic )
+The currently selected timecounter source.
+.It Li kern.timecounter.timestepwarnings ( dynamic )
+If non-zero display a message each time the time is stepped.
 .El
 .It Li kern.timex ( KERN_TIMEX )
 Not available.
@@ -780,7 +1030,7 @@ on ttys.
 The third level names for the tty statistic variables are detailed below.
 The changeable column shows whether a process
 with appropriate privilege may change the value.
-.Bl -column "KERNXTKSTATXRAWCCXXX" "struct integerXXX" -offset indent
+.Bl -column "kern.tkstat.cancc" "quad" "Changeable" -offset indent
 .It Sy Third level name	Type	Changeable
 .It kern.tkstat.cancc	quad	no
 .It kern.tkstat.nin	quad	no
@@ -799,10 +1049,49 @@ The total number of output characters.
 .It Li kern.tkstat.rawcc ( KERN_TKSTAT_RAWCC )
 The number of raw input characters.
 .El
+.It Li kern.tty
+The third level names for the tty setup variables are detailed below.
+The changeable column shows whether a process
+with appropriate privilege may change the value.
+.Bl -column "kern.tty.qsize" "int" "Changeable" -offset indent
+.It Sy Third level name	Type	Changeable
+.It kern.tty.qsize	int	yes
+.El
+.Pp
+The variables are as follows:
+.Bl -tag -width "123456"
+.It Li kern.tty.qsize
+Control/display the size of the default input and output queues selected
+during tty creation.
+Is converted to a power of two and its range is between
+.Dv 1024
+and
+.Dv 65536 .
+.El
 .It Li kern.urandom ( KERN_URND )
 Random integer value.
+.It Li kern.usercrypto
+When enabled, allows userland to
+.Xr open 2
+the
+.Pa /dev/crypto
+special device, used by the
+.Xr crypto 4
+system.
+.It Li kern.userasymcrypto
+Enables or disables the use of software asymmetric crypto support in the
+.Xr crypto 4
+system.
 .It Li kern.veriexec
-Tunings for Verixec.
+Runtime information for
+.Xr veriexec 8 .
+.Bl -column "kern.veriexec.algorithms" "integer" "Changeable" -offset indent
+.It Sy Third level name	Type	Changeable
+.It kern.veriexec.algorithms	string	no
+.It kern.veriexec.count	node	not applicable
+.It kern.veriexec.strict	integer	yes
+.It kern.veriexec.verbose	integer	yes
+.El
 .Bl -tag -width "123456"
 .It Li kern.veriexec.algorithms
 Returns a string with the supported algorithms in Veriexec.
@@ -812,11 +1101,11 @@ Each mount will be under its own
 .No tableN
 node.
 Under each node there will be three variables, indicating the mount
-point, the file-system type, and the number of entries.
+point, the file system type, and the number of entries.
 .It Li kern.veriexec.strict
 Controls the strict level of Veriexec.
 See
-.Xr security 8
+.Xr security 7
 for more information on each level's implications.
 .It Li kern.veriexec.verbose
 Controls the verbosity level of Veriexec.
@@ -837,42 +1126,20 @@ the system.
 The returned data consists of an array whose size depends on the
 current number of such objects in the system.
 Each element of the array contains the kernel address of a vnode
-.Va struct vnode *
+.Vt struct vnode *
 followed by the vnode itself
-.Va struct vnode .
-.It Li kern.coredump.setid
-Settings related to set-id processes coredumps.
-By default, set-id processes do not dump core in situations where
-other processes would.
-The settings in this node allows an administrator to change this
-behavior.
-.Pp
-.Bl -tag -width "123456"
-.It Li kern.coredump.setid.dump
-If non-zero, set-id processes will dump core.
-.It Li kern.coredump.setid.group
-The group-id for the set-id processes' coredump.
-.It Li kern.coredump.setid.mode
-The mode for the set-id processes' coredump.
-See
-.Xr chmod 1 .
-.It Li kern.coredump.setid.owner
-The user-id that will be used as the owner of the set-id processes'
-coredump.
-.It Li kern.coredump.setid.path
-The path to which set-id processes' coredumps will be saved to.
-Same syntax as kern.defcorename.
+.Vt struct vnode .
+.\" XXX: Undocumented: kern.lwp: no children?
 .El
-.\" XXX kern.lwp
-.El
-.Sh The machdep.* subtree
+.Ss The machdep.* subtree
 The set of variables defined is architecture dependent.
 Most architectures define at least the following variables.
-.Bl -column "CONSOLE_DEVICEXXX" "integerXXX" -offset indent
+.Bl -column "machdep.booted_kernel" "Type" "Changeable" -offset indent
 .It Sy Second level name	Type	Changeable
-.It Li CPU_CONSDEV	dev_t	no
+.It Li machdep.booted_kernel	string	no
 .El
-.Sh The net.* subtree
+.\" XXX: Document the above.
+.Ss The net.* subtree
 The string and integer information available for the
 .Li net
 level is detailed below.
@@ -880,7 +1147,7 @@ The changeable column shows whether a pr
 privilege may change the value.
 The second and third levels are typically the protocol family and
 protocol number, though this is not always the case.
-.Bl -column "Second level nameX" "IPsec key management valuesX" -offset indent
+.Bl -column "Second level name" "IPsec key management values" "Changeable" -offset indent
 .It Sy Second level name	Type	Changeable
 .It net.route	routing messages	no
 .It net.inet	IPv4 values	yes
@@ -897,15 +1164,15 @@ The data is returned as a sequence of ro
 for the header file, format and meaning).
 The length of each message is contained in the message header.
 .Pp
-The third level name is a protocol number, which is currently always 0.
+The third level name is a protocol number, which is currently always\ 0.
 The fourth level name is an address family, which may be set to 0 to
 select all address families.
 The fifth and sixth level names are as follows:
-.Bl -column "Fifth level nameXXXXXX" "Sixth level is:XXX" -offset indent
+.Bl -column "Fifth level name" "Sixth level is:" -offset indent
 .It Sy Fifth level name	Sixth level is:
-.It NET\_RT\_FLAGS	rtflags
-.It NET\_RT\_DUMP	None
-.It NET\_RT\_IFLIST	None
+.It NET_RT_FLAGS	rtflags
+.It NET_RT_DUMP	None
+.It NET_RT_IFLIST	None
 .El
 .It Li net.inet ( PF_INET )
 Get or set various global information about the IPv4
@@ -913,10 +1180,13 @@ Get or set various global information ab
 The third level name is the protocol.
 The fourth level name is the variable name.
 The currently defined protocols and names are:
-.Bl -column "Protocol name" "sack.globalmaxholes" "integer" -offset 4n
+.Bl -column "Protocol name" "sack.globalmaxholes" "integer" "Changeable" -offset 4n
 .It Sy Protocol name	Variable name	Type	Changeable
 .It arp	down	integer	yes
 .It arp	keep	integer	yes
+.It arp	log_movements	integer	yes
+.It arp	log_permanent_modify	integer	yes
+.It arp	log_wrong_iface	integer	yes
 .It arp	prune	integer	yes
 .It arp	refresh	integer	yes
 .It carp	allow	integer	yes
@@ -927,6 +1197,7 @@ The currently defined protocols and name
 .It icmp	maskrepl	integer	yes
 .It icmp	rediraccept	integer	yes
 .It icmp	redirtimeout	integer	yes
+.It icmp	bmcastecho	integer	yes
 .It ip	allowsrcrt	integer	yes
 .It ip	anonportmax	integer	yes
 .It ip	anonportmin	integer	yes
@@ -973,6 +1244,7 @@ The currently defined protocols and name
 .It tcp	log_refused	integer	yes
 .It tcp	rstppslimit	integer	yes
 .It tcp	ident	struct	no
+.It tcp	drop	struct	no
 .It tcp	sack.enable	integer	yes
 .It tcp	sack.globalholes	integer	no
 .It tcp	sack.globalmaxholes	integer	yes
@@ -1135,6 +1407,9 @@ ICMP redirect.
 This defaults to 600 seconds.
 .It Li icmp.returndatabytes
 Number of bytes to return in an ICMP error message.
+.It Li icmp.bmcastecho
+If set to 1, enables responding to ICMP echo or timestamp request to the
+broadcast address.
 .It Li tcp.ack_on_push
 If set to 1, TCP is to immediately transmit an ACK upon reception of
 a packet with PUSH set.
@@ -1209,6 +1484,11 @@ per second.
 TCP RST packet that exceeded the value are subject to rate limitation
 and will not go out from the node.
 Negative value disables rate limitation.
+.It Li tcp.ident
+Return the user ID of a connected socket pair.
+(RFC1413 Identification Protocol lookups.)
+.It Li tcp.drop
+Drop a TCP socket pair connection.
 .It Li tcp.sack.enable
 If set to 1, enables RFC 2018 Selective ACKnowledgement.
 .It Li tcp.sack.globalholes
@@ -1271,7 +1551,7 @@ Get or set various global information ab
 The third level name is the protocol.
 The fourth level name is the variable name.
 The currently defined protocols and names are:
-.Bl -column "Protocol name" "Variable nameXX" "integer" "yes" -offset indent
+.Bl -column "Protocol name" "do_loopback_cksum" "integer" "Changeable" -offset indent
 .It Sy Protocol name	Variable name	Type	Changeable
 .It icmp6	errppslimit	integer	yes
 .It icmp6	mtudisc_hiwat	integer	yes
@@ -1365,7 +1645,7 @@ The number of IPv6 extension headers per
 If set to 0, the node will accept as many extension headers as possible.
 .It Li ip6.hashsize
 The size of IPv6 Fast Forward hash table.
-This value must be a power of 2 (64, 256...).
+This value must be a power of 2 (64, 256, ...).
 A larger hash table size results in fewer collisions.
 Also see
 .Li ip6.maxflows .
@@ -1537,7 +1817,7 @@ For variables net.*.ipsec6, please refer
 Get or set various global information about the IPsec key management.
 The third level name is the variable name.
 The currently defined variable and names are:
-.Bl -column "blockacq_lifetime" "integer" "yes" -offset indent
+.Bl -column "blockacq_lifetime" "integer" "Changeable" -offset indent
 .It Sy Variable name	Type	Changeable
 .It debug	integer	yes
 .It spi_try	integer	yes
@@ -1550,12 +1830,13 @@ The currently defined variable and names
 .It esp_auth	integer	yes
 .It ah_keymin	integer	yes
 .El
+.Pp
 The variables are as follows:
 .Bl -tag -width "123456"
 .It Li debug
 Turn on debugging message from within the kernel.
 The value is a bitmap, as defined in
-.Pa /usr/include/netkey/key_debug.h .
+.In netkey/key_debug.h .
 .It Li spi_try
 The number of times the kernel will try to obtain an unique SPI
 when it generates it from random number generator.
@@ -1586,7 +1867,7 @@ The value is used when the kernel create
 on ACQUIRE PF_KEY message.
 .El
 .El
-.Sh The proc.* subtree
+.Ss The proc.* subtree
 The string and integer information available for the
 .Li proc
 level is detailed below.
@@ -1600,7 +1881,7 @@ When a set-user-ID or set-group-ID binar
 value of PROC_PID_CORENAME is reset to the system default value.
 The second level name is either the magic value PROC_CURPROC, which
 points to the current process, or the PID of the target process.
-.Bl -column "USER_COLL_WEIGHTS_MAXXXX" "integerXXX" "yes" -offset indent
+.Bl -column "proc.pid.corename" "string" "not applicable" -offset indent
 .It Sy Third level name	Type	Changeable
 .It proc.pid.corename	string	yes
 .It proc.pid.rlimit	node	not applicable
@@ -1609,15 +1890,17 @@ points to the current process, or the PI
 .It proc.pid.stopexit	int	yes
 .El
 .Bl -tag -width "123456"
-.Pp
 .It Li proc.pid.corename ( PROC_PID_CORENAME )
 The template used for the core dump file name (see
 .Xr core 5
 for details).
 The base name must either be
-.Nm core
-or end with the suffix ``.core'' (the super-user may set arbitrary names).
-By default it points to KERN_DEFCORENAME.
+.Pa core
+or end with the suffix
+.Pa .core
+(the super-user may set arbitrary names).
+By default it points to
+.Dv KERN_DEFCORENAME .
 .It Li proc.pid.rlimit ( PROC_PID_LIMIT )
 Return resources limits, as defined for the
 .Xr getrlimit 2
@@ -1625,7 +1908,7 @@ and
 .Xr setrlimit 2
 system calls.
 The fourth level name is one of:
-.Bl -tag -width PROC_PID_LIMIT_MEMLOCKAA
+.Bl -tag -width "123456"
 .It Li proc.pid.rlimit.cputime ( PROC_PID_LIMIT_CPU )
 The maximum amount of CPU time (in seconds) to be used by each process.
 .It Li proc.pid.rlimit.filesize ( PROC_PID_LIMIT_FSIZE )
@@ -1658,11 +1941,19 @@ function.
 The maximum number of simultaneous processes for this user id.
 .It Li proc.pid.rlimit.descriptors ( PROC_PID_LIMIT_NOFILE )
 The maximum number of open files for this process.
-.\" XXX proc.pid.rlimit.sbsize
+.It Li proc.pid.rlimit.sbsize ( PROC_PID_LIMIT_SBSIZE )
+The maximum size (in bytes) of the socket buffers
+set by the
+.Xr setsockopt 2
+.Dv SO_RCVBUF
+and
+.Dv SO_SNDBUF
+options.
 .El
 .Pp
 The fifth level name is one of
-.Li soft ( PROC_PID_LIMIT_TYPE_SOFT ) or
+.Li soft ( PROC_PID_LIMIT_TYPE_SOFT )
+or
 .Li hard ( PROC_PID_LIMIT_TYPE_HARD ) ,
 to select respectively the soft or hard limit.
 Both are of type integer.
@@ -1712,13 +2003,13 @@ before it disappears.
 .Pp
 This value is also inherited by the process's children.
 .El
-.Sh The user.* subtree ( CTL_USER )
+.Ss The user.* subtree ( CTL_USER )
 The string and integer information available for the
 .Li user
 level is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-.Bl -column "USER_COLL_WEIGHTS_MAXXXX" "integerXXX" -offset indent
+.Bl -column "user.coll_weights_max" "integer" "Changeable" -offset indent
 .It Sy Second level name	Type	Changeable
 .It user.atexit_max	integer	no
 .It user.bc_base_max	integer	no
@@ -1744,7 +2035,6 @@ privilege may change the value.
 .It user.tzname_max	integer	no
 .El
 .Bl -tag -width "123456"
-.Pp
 .It Li user.atexit_max ( USER_ATEXIT_MAX )
 The maximum number of functions that may be registered with
 .Xr atexit 3 .
@@ -1781,33 +2071,36 @@ The maximum length in bytes of a text-pr
 line.
 .It Li user.posix2_char_term ( USER_POSIX2_CHAR_TERM )
 Return 1 if the system supports at least one terminal type capable of
-all operations described in POSIX 1003.2, otherwise 0.
+all operations described in
+.St -p1003.2 ,
+otherwise\ 0.
 .It Li user.posix2_c_bind ( USER_POSIX2_C_BIND )
 Return 1 if the system's C-language development facilities support the
-C-Language Bindings Option, otherwise 0.
+C-Language Bindings Option, otherwise\ 0.
 .It Li user.posix2_c_dev ( USER_POSIX2_C_DEV )
 Return 1 if the system supports the C-Language Development Utilities Option,
-otherwise 0.
+otherwise\ 0.
 .It Li user.posix2_fort_dev ( USER_POSIX2_FORT_DEV )
 Return 1 if the system supports the FORTRAN Development Utilities Option,
-otherwise 0.
+otherwise\ 0.
 .It Li user.posix2_fort_run ( USER_POSIX2_FORT_RUN )
 Return 1 if the system supports the FORTRAN Runtime Utilities Option,
-otherwise 0.
+otherwise\ 0.
 .It Li user.posix2_localedef ( USER_POSIX2_LOCALEDEF )
-Return 1 if the system supports the creation of locales, otherwise 0.
+Return 1 if the system supports the creation of locales, otherwise\ 0.
 .It Li user.posix2_sw_dev ( USER_POSIX2_SW_DEV )
 Return 1 if the system supports the Software Development Utilities Option,
-otherwise 0.
+otherwise\ 0.
 .It Li user.posix2_upe ( USER_POSIX2_UPE )
 Return 1 if the system supports the User Portability Utilities Option,
-otherwise 0.
+otherwise\ 0.
 .It Li user.posix2_version ( USER_POSIX2_VERSION )
-The version of POSIX 1003.2 with which the system attempts to comply.
+The version of
+.St -p1003.2
+with which the system attempts to comply.
 .It Li user.re_dup_max ( USER_RE_DUP_MAX )
 The maximum number of repeated occurrences of a regular expression
 permitted when using interval notation.
-.ne 1i
 .It Li user.stream_max ( USER_STREAM_MAX )
 The minimum maximum number of streams that a process may have open
 at any one time.
@@ -1815,13 +2108,13 @@ at any one time.
 The minimum maximum number of types supported for the name of a
 timezone.
 .El
-.Sh The vm.* subtree ( CTL_VM )
+.Ss The vm.* subtree ( CTL_VM )
 The string and integer information available for the
 .Li vm
 level is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
-.Bl -column "Second level nameXXXXXX" "struct uvmexp_sysctlXXX" -offset indent
+.Bl -column "Second level name" "struct uvmexp_sysctl" "Changeable" -offset indent
 .It Sy Second level name	Type	Changeable
 .It vm.anonmax	int	yes
 .It vm.anonmin	int	yes
@@ -1875,75 +2168,105 @@ cached file data.
 .It Li vm.loadavg ( VM_LOADAVG )
 Return the load average history.
 The returned data consists of a
-.Va struct loadavg .
+.Vt struct loadavg .
 .It Li vm.maxslp ( VM_MAXSLP )
 The value of the maxslp kernel global variable.
 .It Li vm.vmmeter ( VM_METER )
 Return system wide virtual memory statistics.
 The returned data consists of a
-.Va struct vmtotal .
+.Vt struct vmtotal .
+.It vm.user_va0_disable
+A flag which controls whether user processes can map virtual address\ 0.
 .It Li vm.uspace ( VM_USPACE )
 The number of bytes allocated for each kernel stack.
 .It Li vm.uvmexp ( VM_UVMEXP )
 Return system wide virtual memory statistics.
 The returned data consists of a
-.Va struct uvmexp .
+.Vt struct uvmexp .
 .It Li vm.uvmexp2 ( VM_UVMEXP2 )
 Return system wide virtual memory statistics.
 The returned data consists of a
-.Va struct uvmexp_sysctl .
+.Vt struct uvmexp_sysctl .
 .\" XXX vm.idlezero
 .El
-.Sh The ddb.* subtree ( CTL_DDB )
-The integer information available for the
+.Ss The ddb.* subtree ( CTL_DDB )
+The information available for the
 .Li ddb
 level is detailed below.
 The changeable column shows whether a process with appropriate
 privilege may change the value.
 .\" XXX sort
-.Bl -column "ddb.fromconsoleXXX" "integerXXX" -offset indent
+.Bl -column "Second level name" "integer" "Changeable" -offset indent
 .It Sy Second level name	Type	Changeable
 .It ddb.radix	integer	yes
 .It ddb.maxoff	integer	yes
+.It ddb.maxwidth	integer	yes
 .It ddb.lines	integer	yes
 .It ddb.tabstops	integer	yes
 .It ddb.onpanic	integer	yes
 .It ddb.fromconsole	integer	yes
+.It ddb.tee_msgbuf	integer	yes
+.It ddb.commandonenter	string	yes
 .El
 .Pp
 .Bl -tag -width "123456"
-.It Li ddb.radix ( DBCTL_RADIX )
+.It Li ddb.radix ( DDBCTL_RADIX )
 The input and output radix.
-.It Li ddb.maxoff ( DBCTL_MAXOFF )
+.It Li ddb.maxoff ( DDBCTL_MAXOFF )
 The maximum symbol offset.
-.It Li ddb.lines ( DBCTL_LINES )
+.It Li ddb.maxwidth ( DDBCTL_MAXWIDTH )
+The maximum output line width.
+.It Li ddb.lines ( DDBCTL_LINES )
 Number of display lines.
-.It Li ddb.tabstops ( DBCTL_TABSTOPS )
+.It Li ddb.tabstops ( DDBCTL_TABSTOPS )
 Tab width.
-.It Li ddb.onpanic ( DBCTL_ONPANIC )
-If non-zero, DDB will be entered when the kernel panics.
-.It Li ddb.fromconsole ( DBCTL_FROMCONSOLE )
+.It Li ddb.onpanic ( DDBCTL_ONPANIC )
+If greater than zero, DDB will be entered if the kernel panics.
+A value of 1 causes the system to enter DDB on panic, while a value of 2
+causes the kernel to attempt to print out a stack trace before entering DDB.
+A value of 0 causes the kernel to attempt to print a stack trace, then
+reboot, while a value of \-1 means neither a stack trace will be printed
+nor DDB entered.
+.It Li ddb.fromconsole ( DDBCTL_FROMCONSOLE )
 If not zero, DDB may be entered by sending a break on a serial
 console or by a special key sequence on a graphics console.
-.\" XXX tee_msgbuf maxwidth commandonenter
+.It Li ddb.tee_msgbuf
+If not zero, DDB will output also to the kernel message buffer.
+.It Li ddb.commandonenter
+If not empty, a command to be executed on each enter to the
+.Tn DDB .
+.\"
+.\" XXX: (a) ddb.commandonenter is missing in ddb(4);
+.\"	 (b) No DDBCTL definitions for tee_msgbuf and commandonenter.
 .El
 .Pp
-These MIB nodes are also available as variables from within the DDB.
+Some of these
+.Tn MIB
+nodes are also available as variables from within the debugger.
 See
 .Xr ddb 4
 for more details.
-.Sh The security.* subtree ( CTL_SECURITY )
+.Ss The security.* subtree ( CTL_SECURITY )
 The
 .Li security
 level contains various security-related settings for
 the system.
+The available second level names are:
+.Bl -column "Second level name" "integer" "Changeable" -offset indent
+.It Sy Second level name	Type	Changeable
+.It Li security.curtain	integer	yes
+.It Li security.models	node	not applicable
+.It Li security.pax	node	not applicable
+.El
+.Pp
 Available settings are detailed below.
 .Pp
 .Bl -tag -width "123456"
 .It Li security.curtain
-If non-zero, will filter return objects according to the user-id
+If non-zero, will filter return objects according to the user
+.Tn ID
 requesting information about them, preventing from users any
-access to objects they don't own.
+access to objects they do not own.
 .Pp
 At the moment, it affects
 .Xr ps 1 ,
@@ -1958,7 +2281,7 @@ PCBs), and
 .It Li security.models
 .Nx
 supports pluggable security models.
-Every security model used, whether if loaded as an LKM or built with the system,
+Every security model used, whether if loaded as a module or built with the system,
 is required to add an entry to this node with at least one element,
 .Dq name ,
 indicating the name of the security model.
@@ -1973,10 +2296,48 @@ Settings for PaX -- exploit mitigation f
 For more information on any of the PaX features, please see
 .Xr paxctl 8
 and
-.Xr security 8 .
+.Xr security 7 .
+The available third and fourth level names are:
+.Bl -column "security.pax.segvguard.suspend_timeout" "integer" "Changeable" \
+-offset 2n
+.It Sy Third and fourth level names Ta Sy Type Ta Sy Changeable
+.It Li security.pax.aslr.enabled	integer	yes
+.\".It Li security.pax.aslr.exec_len	integer	yes
+.It Li security.pax.aslr.global	integer	yes
+.\".It Li security.pax.aslr.mmap_len	integer	yes
+.\".It Li security.pax.aslr.stack_len	integer	yes
+.It Li security.pax.mprotect.enabled	integer	yes
+.It Li security.pax.mprotect.global	integer	yes
+.It Li security.pax.segvguard.enabled	integer	yes
+.It Li security.pax.segvguard.expiry_timeout	integer	yes
+.It Li security.pax.segvguard.global	integer	yes
+.It Li security.pax.segvguard.max_crashes	integer	yes
+.It Li security.pax.segvguard.suspend_timeout	integer	yes
+.El
 .Pp
 .Bl -tag -width "123456"
-.It Li security.pax.mprotect.enable
+.It Li security.pax.aslr.enabled
+Enable PaX ASLR (Address Space Layout Randomization).
+.Pp
+The value of this
+knob must be non-zero for PaX ASLR to be enabled, even if a program is set to
+explicit enable.
+.\".It Li security.pax.aslr.exec_len
+.\" XXX: Undocumented.
+.It Li security.pax.aslr.global
+Specifies the default global policy for programs without an
+explicit enable/disable flag.
+.Pp
+When non-zero, all programs will get PaX ASLR, except those exempted with
+.Xr paxctl 8  .
+Otherwise, all programs will not get PaX ASLR, except those specifically
+marked as such with
+.Xr paxctl 8 .
+.\".It Li security.pax.aslr.mmap_len
+.\" XXX: Undocumented.
+.\" .It Li security.pax.aslr.stack_len
+.\" XXX: Undocumented.
+.It Li security.pax.mprotect.enabled
 Enable PaX MPROTECT restrictions.
 .Pp
 These are
@@ -1995,7 +2356,7 @@ except those exempted with
 Otherwise, all programs will not get the PaX MPROTECT restrictions,
 except those specifically marked as such with
 .Xr paxctl 8 .
-.It Li security.pax.segvguard.enable
+.It Li security.pax.segvguard.enabled
 Enable PaX Segvguard.
 .Pp
 PaX Segvguard can detect and prevent certain exploitation attempts, where
@@ -2007,6 +2368,9 @@ The
 .Nx
 interface and implementation of the Segvguard is still experimental, and may
 change in future releases.
+.It Li security.pax.segvguard.expiry_timeout
+If the max number was not reached within this timeout (in seconds), the entry
+will expire.
 .It Li security.pax.segvguard.global
 Specifies the default global policy for programs without an
 explicit enable/disable flag.
@@ -2017,17 +2381,14 @@ except those exempted with
 Otherwise, no program will get the PaX Segvguard restrictions,
 except those specifically marked as such with
 .Xr paxctl 8 .
-.It Li security.pax.segvguard.expiry_timeout
-If the max number was not reached within this timeout (in seconds), the entry
-will expire.
+.It Li security.pax.segvguard.max_crashes
+The maximum number of segfaults a program can receive before suspension.
 .It Li security.pax.segvguard.suspend_timeout
 Number of seconds to suspend a user from running a faulting program when the
 limit was exceeded.
-.It Li security.pax.segvguard.max_crashes
-Max number of segfaults a program can receive before suspension.
 .El
 .El
-.Sh The vendor.* subtree ( CTL_VENDOR )
+.Ss The vendor.* subtree ( CTL_VENDOR )
 The
 .Li vendor
 toplevel name is reserved to be used by vendors who wish to
@@ -2038,7 +2399,7 @@ Intended use is to store values under
 .Xr sysctl 3 ,
 .Xr ipsec 4 ,
 .Xr tcp 4 ,
-.Xr security 8 ,
+.Xr security 7 ,
 .Xr sysctl 8
 .Sh HISTORY
 The