Merge remote-tracking branch 'origin/stable/10' into devel

22 files changed, 253 insertions, 50 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 01f3bf1..cba63e4 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -208,6 +208,7 @@ MAN=	aac.4 \
 	ipw.4 \
 	ipwfw.4 \
 	isci.4 \
+	ismt.4 \
 	isp.4 \
 	ispfw.4 \
 	iwi.4 \
diff --git a/share/man/man4/blackhole.4 b/share/man/man4/blackhole.4
index 668f92d..f662ec3 100644
--- a/share/man/man4/blackhole.4
+++ b/share/man/man4/blackhole.4
@@ -12,25 +12,35 @@
 .\"
 .\"
 .\" $FreeBSD$
-.Dd January 1, 2007
+.Dd September 6, 2015
 .Dt BLACKHOLE 4
 .Os
 .Sh NAME
 .Nm blackhole
 .Nd a
 .Xr sysctl 8
-MIB for manipulating behaviour in respect of refused TCP or UDP connection
+MIB for manipulating behaviour in respect of refused SCTP, TCP, or UDP connection
 attempts
 .Sh SYNOPSIS
-.Cd sysctl net.inet.tcp.blackhole[=[0 | 1 | 2]]
-.Cd sysctl net.inet.udp.blackhole[=[0 | 1]]
+.Cd sysctl net.inet.sctp.blackhole Ns Op = Ns Brq "0 | 1 | 2"
+.Cd sysctl net.inet.tcp.blackhole Ns Op = Ns Brq "0 | 1 | 2"
+.Cd sysctl net.inet.udp.blackhole Ns Op = Ns Brq "0 | 1"
 .Sh DESCRIPTION
 The
 .Nm
 .Xr sysctl 8
 MIB is used to control system behaviour when connection requests
-are received on TCP or UDP ports where there is no socket listening.
+are received on SCTP, TCP, or UDP ports where there is no socket listening.
 .Pp
+The blackhole behaviour is useful to slow down an attacker who is port-scanning
+a system in an attempt to detect vulnerable services.
+It might also slow down an attempted denial of service attack.
+.Ss SCTP
+Setting the SCTP blackhole MIB to a numeric value of one
+will prevent sending an ABORT packet in response to an incoming INIT.
+A MIB value of two will do the same, but will also prevent sending an ABORT packet
+when unexpected packets are received.
+.Ss TCP
 Normal behaviour, when a TCP SYN segment is received on a port where
 there is no socket accepting connections, is for the system to return
 a RST segment, and drop the connection.
@@ -44,20 +54,15 @@ as a blackhole.
 By setting the MIB value to two, any segment arriving
 on a closed port is dropped without returning a RST.
 This provides some degree of protection against stealth port scans.
-.Pp
-In the UDP instance, enabling blackhole behaviour turns off the sending
+.Ss UDP
+Enabling blackhole behaviour turns off the sending
 of an ICMP port unreachable message in response to a UDP datagram which
 arrives on a port where there is no socket listening.
 It must be noted that this behaviour will prevent remote systems from running
 .Xr traceroute 8
 to a system.
-.Pp
-The blackhole behaviour is useful to slow down anyone who is port scanning
-a system, attempting to detect vulnerable services on a system.
-It could potentially also slow down someone who is attempting a denial
-of service attack.
 .Sh WARNING
-The TCP and UDP blackhole features should not be regarded as a replacement
+The SCTP, TCP, and UDP blackhole features should not be regarded as a replacement
 for firewall solutions.
 Better security would consist of the
 .Nm
@@ -68,6 +73,7 @@ This mechanism is not a substitute for securing a system.
 It should be used together with other security mechanisms.
 .Sh SEE ALSO
 .Xr ip 4 ,
+.Xr sctp 4 ,
 .Xr tcp 4 ,
 .Xr udp 4 ,
 .Xr ipf 8 ,
@@ -80,5 +86,10 @@ The TCP and UDP
 MIBs
 first appeared in
 .Fx 4.0 .
+.Pp
+The SCTP 
+.Nm 
+MIB first appeared in
+.Fx 9.1 .
 .Sh AUTHORS
 .An Geoffrey M. Rehmet
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index 0fabedd..464994a 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -214,8 +214,7 @@ None.
 .Xr ada 4 ,
 .Xr cam 4 ,
 .Xr geom 4 ,
-.Xr bsdlabel 8 ,
-.Xr fdisk 8
+.Xr gpart 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/geom_fox.4 b/share/man/man4/geom_fox.4
index 8010d24..d6d2112 100644
--- a/share/man/man4/geom_fox.4
+++ b/share/man/man4/geom_fox.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 2, 2005
+.Dd September 12, 2015
 .Dt GEOM_FOX 4
 .Os
 .Sh NAME
@@ -46,6 +46,13 @@ module at boot time, place the following line in
 geom_fox_load="YES"
 .Ed
 .Sh DESCRIPTION
+.Bf -symbolic
+This driver is obsolete.
+Users are advised to use
+.Xr gmultipath 8
+instead.
+.Ef
+.Pp
 The intent of the
 .Nm
 framework is to provide basic multipathing support to access direct
diff --git a/share/man/man4/ismt.4 b/share/man/man4/ismt.4
new file mode 100644
index 0000000..15baf4b
--- /dev/null
+++ b/share/man/man4/ismt.4
@@ -0,0 +1,59 @@
+.\"
+.\" Copyright (c) 2014 Intel Corporation
+.\" 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,
+.\"    without modification.
+.\" 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 Intel Corporation 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
+.\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+.\" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+.\" HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+.\"
+.\" ismt driver man page.
+.\"
+.\" Author: Jim Harris <jimharris@FreeBSD.org>
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 9, 2014
+.Dt ISMT 4
+.Os
+.Sh NAME
+.Nm ismt
+.Nd Intel SMBus Message Transport (SMBus 2.0) driver
+.Sh SYNOPSIS
+.Cd device pci
+.Cd device smbus
+.Cd device smb
+.Cd device ismt
+.Sh DESCRIPTION
+This driver provides access to the SMBus 2.0 controller device contained
+in the Intel Atom S1200 and C2000 CPUs.
+.Sh SEE ALSO
+.Xr smb 4 ,
+.Xr smbus 4
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+.An Jim Harris Aq jimharris@FreeBSD.org
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 49b0069..29549e0 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -81,8 +81,7 @@ disk found in the
 man page.
 Other tools will also create these images, such as NanoBSD.
 .Sh SEE ALSO
-.Xr disklabel 8 ,
-.Xr fdisk 8 ,
+.Xr gpart 8 ,
 .Xr loader 8 ,
 .Xr mdconfig 8 ,
 .Xr mdmfs 8 ,
diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4
index 6840c21..7e910b1 100644
--- a/share/man/man4/mps.4
+++ b/share/man/man4/mps.4
@@ -34,7 +34,7 @@
 .\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#6 $
 .\" $FreeBSD$
 .\"
-.Dd January 3, 2013
+.Dd December 9, 2015
 .Dt MPS 4
 .Os
 .Sh NAME
@@ -129,6 +129,8 @@ driver instance, set the following tunable value in
 dev.mps.X.disable_msix=1
 .Ed
 .Pp
+where X is the adapter number.
+.Pp
 To set the maximum number of DMA chains allocated for all adapters,
 set the following variable in
 .Xr loader.conf 5 :
@@ -166,6 +168,39 @@ The maximum number of active I/O command seen since boot is shown in the
 dev.mps.X.io_cmds_highwater
 .Xr sysctl 8
 variable.
+.Pp
+The adapter can issue the
+.Sy StartStopUnit
+SCSI command to SATA direct-access devices during shutdown, to allow the
+device to quiesce before being powered down.
+To control this feature for all adapters, set the
+.Bd -literal -offset indent
+hw.mps.enable_ssu
+.Ed
+.Pp
+tunable value in
+.Xr loader.conf 5
+to one of the following values:
+.Bl -tag -width 6n -offset indent
+.It 0
+Do not send SSU to either HDDs or SSDs.
+.It 1
+Send SSU to SSDs, but not to HDDs; this is the default value.
+.It 2
+Send SSU to HDDs, but not to SSDs.
+.It 3
+Send SSU to both HDDs and SSDs.
+.El
+.Pp
+To control the feature for a specific adapter, set the following tunable
+value in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+dev.mps.X.enable_ssu
+.Ed
+.Pp
+where X is the adapter number.
+The same set of values are valid as for all adapters.
 .Sh DEBUGGING
 To enable debugging prints from the
 .Nm
@@ -218,7 +253,7 @@ This man page was written by
 This driver has a couple of known shortcomings:
 .Bl -bullet -compact
 .It
-No userland utility available (e.g.
+No userland utility available (e.g.,
 .Xr mptutil 8 ) .
 .It
 The driver probes devices sequentially.
diff --git a/share/man/man4/nvme.4 b/share/man/man4/nvme.4
index 8a22d68..a23430d 100644
--- a/share/man/man4/nvme.4
+++ b/share/man/man4/nvme.4
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2012-2014 Intel Corporation
+.\" Copyright (c) 2012-2016 Intel Corporation
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 18, 2014
+.Dd January 7, 2016
 .Dt NVME 4
 .Os
 .Sh NAME
@@ -90,7 +90,10 @@ not 0, and this driver follows that convention.
 By default,
 .Nm
 will create an I/O queue pair for each CPU, provided enough MSI-X vectors
-can be allocated.
+and NVMe queue pairs can be allocated.  If not enough vectors or queue
+pairs are available, nvme(4) will use a smaller number of queue pairs and
+assign multiple CPUs per queue pair.
+.Pp
 To force a single I/O queue pair shared by all CPUs, set the following
 tunable value in
 .Xr loader.conf 5 :
@@ -98,6 +101,13 @@ tunable value in
 hw.nvme.per_cpu_io_queues=0
 .Ed
 .Pp
+To assign more than one CPU per I/O queue pair, thereby reducing the number
+of MSI-X vectors consumed by the device, set the following tunable value in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+hw.nvme.min_cpus_per_ioq=X
+.Ed
+.Pp
 To force legacy interrupts for all
 .Nm
 driver instances, set the following tunable value in
@@ -110,6 +120,8 @@ Note that use of INTx implies disabling of per-CPU I/O queue pairs.
 .Sh SYSCTL VARIABLES
 The following controller-level sysctls are currently implemented:
 .Bl -tag -width indent
+.It Va dev.nvme.0.num_cpus_per_ioq
+(R) Number of CPUs associated with each I/O queue pair.
 .It Va dev.nvme.0.int_coal_time
 (R/W) Interrupt coalescing timer period in microseconds.
 Set to 0 to disable.
diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4
index a6b1b79..113fd3d 100644
--- a/share/man/man4/rights.4
+++ b/share/man/man4/rights.4
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 23, 2013
+.Dd January 23, 2015
 .Dt RIGHTS 4
 .Os
 .Sh NAME
@@ -273,9 +273,13 @@ with the
 flag.
 .It Dv CAP_FUTIMES
 Permit
-.Xr futimes 2
+.Xr futimens 2
 and
+.Xr futimes 2 ,
+and permit
 .Xr futimesat 2
+and
+.Xr utimensat 2
 if the
 .Dv CAP_LOOKUP
 right is also present.
diff --git a/share/man/man4/vpo.4 b/share/man/man4/vpo.4
index 722a18f..925dadf 100644
--- a/share/man/man4/vpo.4
+++ b/share/man/man4/vpo.4
@@ -64,7 +64,7 @@ When mounting a DOS file system or
 formatting a
 .Fx
 file system, check the slice of the disk with the
-.Xr fdisk 8
+.Xr gpart 8
 utility.
 .Pp
 In order to unixify a ZIP disk, put the following in /etc/disktab:
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 25d25fc..832fa03 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 11, 2014
+.Dd October 9, 2015
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -4524,6 +4524,82 @@ This variables contains the
 .Xr rctl.conf 5
 ruleset to load for
 .Xr rctl 8 .
+.It Va autofs_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+start the
+.Xr automount 8
+utility and the
+.Xr automountd 8
+and
+.Xr autounmountd 8
+daemons at boot time.
+.It Va automount_flags
+.Pq Vt str
+If
+.Va autofs_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to the
+.Xr automount 8
+program.
+By default no flags are passed.
+.It Va automountd_flags
+.Pq Vt str
+If
+.Va autofs_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to the
+.Xr automountd 8
+daemon.
+By default no flags are passed.
+.It Va autounmountd_flags
+.Pq Vt str
+If
+.Va autofs_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to the
+.Xr autounmountd 8
+daemon.
+By default no flags are passed.
+.It Va ctld_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+start the
+.Xr ctld 8
+daemon at boot time.
+.It Va iscsid_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+start the
+.Xr iscsid 8
+daemon at boot time.
+.It Va iscsictl_enable
+.Pq Vt bool
+If set to
+.Dq Li YES ,
+start the
+.Xr iscsictl 8
+utility at boot time.
+.It Va iscsictl_flags
+.Pq Vt str
+If
+.Va iscsictl_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to the
+.Xr iscsictl 8
+program.
+The default is
+.Dq Li -Aa ,
+which configures sessions based on the
+.Pa /etc/iscsi.conf
+configuration file.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 5e228dd9..c04b01a 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -753,10 +753,10 @@ over services you export from your box (web services, email).
 .Xr ports 7 ,
 .Xr boot 8 ,
 .Xr bsdinstall 8 ,
-.Xr bsdlabel 8 ,
 .Xr ccdconfig 8 ,
 .Xr config 8 ,
 .Xr fsck 8 ,
+.Xr gpart 8 ,
 .Xr gjournal 8 ,
 .Xr gstripe 8 ,
 .Xr gvinum 8 ,
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index e117fe4..b94d9bb 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -425,7 +425,7 @@ third form, replacing
 .Ar NN
 with the actual start of the partition
 (which you can determine using
-.Xr fdisk 8 ) .
+.Xr gpart 8 ) .
 Note that after saving the image to the slice, it will not yet be
 recognised.
 You have to use the
diff --git a/share/vt/keymaps/gr.101.acc.kbd b/share/vt/keymaps/gr.101.acc.kbd
index 89a931f..7e8e661 100644
--- a/share/vt/keymaps/gr.101.acc.kbd
+++ b/share/vt/keymaps/gr.101.acc.kbd
@@ -18,7 +18,7 @@
   009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  012   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
   013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -90,7 +90,7 @@
   081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
-  084   ns     ns     ns     ns     ns     ns     ns     ns      O
+  084   us     us     us     us     us     us     us     us      O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
   086   '\'    '|'    nop    nop    '\'    '|'    nop    nop     O
   087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
@@ -148,7 +148,7 @@
   137   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   138   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   139   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  140   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  140   '-'    '_'    us     us     '-'    '_'    us     us      O
   141   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   142   bs     bs     del    del    bs     bs     del    del     O
   143   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -220,7 +220,7 @@
   209   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   210   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   211   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
-  212   ns     ns     ns     ns     ns     ns     ns     ns      O
+  212   us     us     us     us     us     us     us     us      O
   213   nop    nop    nop    nop    nop    nop    nop    nop     O
   214   '\'    '|'    nop    nop    '\'    '|'    nop    nop     O
   215   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
diff --git a/share/vt/keymaps/gr.elot.acc.kbd b/share/vt/keymaps/gr.elot.acc.kbd
index 1a758a7..061717f 100644
--- a/share/vt/keymaps/gr.elot.acc.kbd
+++ b/share/vt/keymaps/gr.elot.acc.kbd
@@ -18,7 +18,7 @@
   009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  012   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
   013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -90,7 +90,7 @@
   081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
-  084   ns     ns     ns     ns     ns     ns     ns     ns      O
+  084   us     us     us     us     us     us     us     us      O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
   086   '\'    '|'    nop    nop    '\'    '|'    nop    nop     O
   087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
@@ -148,7 +148,7 @@
   137   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   138   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   139   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  140   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  140   '-'    '_'    us     us     '-'    '_'    us     us      O
   141   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   142   bs     bs     del    del    bs     bs     del    del     O
   143   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -220,7 +220,7 @@
   209   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   210   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   211   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
-  212   ns     ns     ns     ns     ns     ns     ns     ns      O
+  212   us     us     us     us     us     us     us     us      O
   213   nop    nop    nop    nop    nop    nop    nop    nop     O
   214   '\'    '|'    nop    nop    '\'    '|'    nop    nop     O
   215   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
diff --git a/share/vt/keymaps/hu.101.kbd b/share/vt/keymaps/hu.101.kbd
index 3101b36..07be2b1 100644
--- a/share/vt/keymaps/hu.101.kbd
+++ b/share/vt/keymaps/hu.101.kbd
@@ -46,7 +46,7 @@
   009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   011   '0'    ')'    nop    nop    0xf6   0xd6   nop    nop     O
-  012   '-'    '_'    ns     ns     0xfc   0xdc   ns     ns      C
+  012   '-'    '_'    us     us     0xfc   0xdc   us     us      C
   013   '='    '+'    nop    nop    0xf3   0xd3   nop    nop     C
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -175,7 +175,7 @@
   137   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   138   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   139   0xf6   0xd6   nop    nop    '0'    ')'    nop    nop     O
-  140   0xfc   0xdc   ns     ns     '-'    '_'    ns     ns      C
+  140   0xfc   0xdc   us     us     '-'    '_'    us     us      C
   141   0xf3   0xd3   nop    nop    '='    '+'    nop    nop     C
   142   bs     bs     del    del    bs     bs     del    del     O
   143   ht     btab   nop    nop    ht     btab   nop    nop     O
diff --git a/share/vt/keymaps/hu.102.kbd b/share/vt/keymaps/hu.102.kbd
index 532cbd8..244db9e 100644
--- a/share/vt/keymaps/hu.102.kbd
+++ b/share/vt/keymaps/hu.102.kbd
@@ -60,7 +60,7 @@
   050   'm'    'M'    cr     cr     '<'    nop    cr     cr      C
   051   ','    '?'    nop    nop    ';'    nop    nop    nop     O
   052   '.'    ':'    nop    nop    '>'    nop    nop    nop     O
-  053   '-'    '_'    ns     ns     '*'    nop    nop    nop     O
+  053   '-'    '_'    us     us     '*'    nop    nop    nop     O
   054   rshift rshift rshift rshift rshift rshift rshift rshift  O
   055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
   056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
diff --git a/share/vt/keymaps/lt.kbd b/share/vt/keymaps/lt.kbd
index 0f7ac09..ac8b17b 100644
--- a/share/vt/keymaps/lt.kbd
+++ b/share/vt/keymaps/lt.kbd
@@ -15,7 +15,7 @@
   009   '8'    '*'    nop    nop    0x016b 0x0172 nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  012   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
   013   '='    '+'    nop    nop    0x017e 0x017d nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -87,7 +87,7 @@
   081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   083   del    '.'    ','    ','    del    ','    boot   boot    N
-  084   ns     ns     ns     ns     ns     ns     ns     ns      O
+  084   us     us     us     us     us     us     us     us      O
   085   nop    nop    nop    nop    nop    nop    nop    nop     O
   086   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
   087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
@@ -143,7 +143,7 @@
   137   0x016b 0x016a nop    nop    '8'    '*'    nop    nop     C
   138   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   139   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  140   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  140   '-'    '_'    us     us     '-'    '_'    us     us      O
   141   0x017e 0x017d nop    nop    '='    '+'    nop    nop     C
   142   bs     bs     del    del    bs     bs     del    del     O
   143   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -215,7 +215,7 @@
   209   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
   210   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
   211   del    ','    '.'    '.'    del    '.'    boot   boot    N
-  212   ns     ns     ns     ns     ns     ns     ns     ns      O
+  212   us     us     us     us     us     us     us     us      O
   213   nop    nop    nop    nop    nop    nop    nop    nop     O
   214   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
   215   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
diff --git a/share/vt/keymaps/pt.acc.kbd b/share/vt/keymaps/pt.acc.kbd
index 02ee9b5..8b6ee3b 100644
--- a/share/vt/keymaps/pt.acc.kbd
+++ b/share/vt/keymaps/pt.acc.kbd
@@ -17,7 +17,7 @@
   009   '8'    '('    nop    nop    '['    '*'    nop    nop     O
   010   '9'    ')'    nop    nop    ']'    '('    nop    nop     O
   011   '0'    '='    nop    nop    '}'    ')'    nop    nop     O
-  012   '''    '?'    ns     ns     '-'    '_'    ns     ns      O
+  012   '''    '?'    us     us     '-'    '_'    us     us      O
   013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
diff --git a/share/vt/keymaps/pt.kbd b/share/vt/keymaps/pt.kbd
index 46f781e..addd275 100644
--- a/share/vt/keymaps/pt.kbd
+++ b/share/vt/keymaps/pt.kbd
@@ -17,7 +17,7 @@
   009   '8'    '('    nop    nop    '['    '*'    nop    nop     O
   010   '9'    ')'    nop    nop    ']'    '('    nop    nop     O
   011   '0'    '='    nop    nop    '}'    ')'    nop    nop     O
-  012   '''    '?'    ns     ns     '-'    '_'    ns     ns      O
+  012   '''    '?'    us     us     '-'    '_'    us     us      O
   013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
diff --git a/share/vt/keymaps/ua.kbd b/share/vt/keymaps/ua.kbd
index d031f1d..3c20b8e 100644
--- a/share/vt/keymaps/ua.kbd
+++ b/share/vt/keymaps/ua.kbd
@@ -15,7 +15,7 @@
   009   '8'    '*'    nop    nop    '8'    ';'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '?'    nop    nop     O
   011   '0'    ')'    nop    nop    '0'    '%'    nop    nop     O
-  012   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
   013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   014   bs     bs     del    del    bs     bs     del    del     O
   015   ht     btab   nop    nop    btab   btab   nop    nop     O
@@ -144,7 +144,7 @@
   137   '8'    ';'    nop    nop    '8'    '*'    nop    nop     O
   138   '9'    '?'    nop    nop    '9'    '('    nop    nop     O
   139   '0'    '%'    nop    nop    '0'    ')'    nop    nop     O
-  140   '-'    '_'    ns     ns     '-'    '_'    ns     ns      O
+  140   '-'    '_'    us     us     '-'    '_'    us     us      O
   141   '='    '+'    nop    nop    '='    '+'    nop    nop     O
   142   bs     bs     del    del    bs     bs     del    del     O
   143   ht     btab   nop    nop    btab   btab   nop    nop     O
diff --git a/share/vt/keymaps/ua.shift.alt.kbd b/share/vt/keymaps/ua.shift.alt.kbd
index cef2c27..3159e9a 100644
--- a/share/vt/keymaps/ua.shift.alt.kbd
+++ b/share/vt/keymaps/ua.shift.alt.kbd
@@ -27,7 +27,7 @@
   009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  012   '-'    '_'    ns     ns     0x0456 0x0406 0xf7   0xf7    O
+  012   '-'    '_'    us     us     0x0456 0x0406 0xf7   0xf7    O
   013   '='    '+'    nop    nop    0x0454 0x0404 nop    nop     O
   014   bs     bs     del    del    bs     bs     0x042a 0x042a  O
   015   ht     btab   nop    nop    ht     btab   nop    nop     O
@@ -155,7 +155,7 @@
   137   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
   138   '9'    '('    nop    nop    '9'    '('    nop    nop     O
   139   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
-  140   0x0456 0x0406 ns     ns     '-'    '_'    0xf7   0xf7    O
+  140   0x0456 0x0406 us     us     '-'    '_'    0xf7   0xf7    O
   141   0x0454 0x0404 nop    nop    '='    '+'    nop    nop     O
   142   bs     bs     del    del    bs     bs     0x042a 0x042a  O
   143   ht     btab   nop    nop    ht     btab   nop    nop     O