Sync layout list with pckbd.

1 files changed, 69 insertions, 77 deletions

diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index bacf443a084..b8226c2d341 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ukbd.4,v 1.7 2005/05/08 17:04:31 jmc Exp $
+.\" $OpenBSD: ukbd.4,v 1.8 2005/05/09 05:11:14 miod Exp $
 .\" $NetBSD: ukbd.4,v 1.10 2001/12/29 15:12:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 6, 2005
+.Dd May 8, 2005
 .Dt UKBD 4
 .Os
 .Sh NAME
@@ -97,14 +97,14 @@ The built-in mappings are at this time:
 (
 .Dq be
 ) Belgium French.
-.\" .It KB_BR
-.\" (
-.\" .Dq br
-.\" ) Brazilian.
-.\" .It KB_CF
-.\" (
-.\" .Dq cf
-.\" ) Canadian French.
+.It KB_BR
+(
+.Dq br
+) Brazilian.
+.It KB_CF
+(
+.Dq cf
+) Canadian French.
 .It KB_DE
 (
 .Dq de
@@ -123,10 +123,10 @@ The built-in mappings are at this time:
 (
 .Dq fr
 ) French.
-.\" .It KB_HU
-.\" (
-.\" .Dq hu
-.\" ) Hungarian.
+.It KB_HU
+(
+.Dq hu
+) Hungarian.
 .It KB_IT
 (
 .Dq it
@@ -135,34 +135,34 @@ The built-in mappings are at this time:
 (
 .Dq jp
 ) Japanese.
-.\" .It KB_LA
-.\" (
-.\" .Dq la
-.\" ) Latinamerican.
-.\" .It KB_LT
-.\" (
-.\" .Dq \&lt
-.\" ) Lithuanian in
-.\" .Dq ISO 8859-13 .
+.It KB_LA
+(
+.Dq la
+) Latinamerican.
+.It KB_LT
+(
+.Dq \&lt
+) Lithuanian in
+.Dq ISO 8859-13 .
 .It KB_NO
 (
 .Dq no
 ) Norwegian with
 .Dq dead accents .
-.\" .It KB_PL
-.\" (
-.\" .Dq pl
-.\" ) Polish in
-.\" .Dq ISO 8859-2 .
+.It KB_PL
+(
+.Dq pl
+) Polish in
+.Dq ISO 8859-2 .
 .It KB_PT
 (
 .Dq pt
 ) Portuguese.
-.\" .It KB_RU
-.\" (
-.\" .Dq ru
-.\" ) Russian in
-.\" .Dq KOI8 .
+.It KB_RU
+(
+.Dq ru
+) Russian in
+.Dq KOI8 .
 .It KB_SF
 (
 .Dq sf
@@ -173,27 +173,27 @@ The built-in mappings are at this time:
 .Dq sg
 ) Swiss German with
 .Dq dead accents .
-.\" .It KB_SI
-.\" (
-.\" .Dq si
-.\" ) Slovenian.
+.It KB_SI
+(
+.Dq si
+) Slovenian.
 .It KB_SV
 (
 .Dq sv
 ) Swedish with
 .Dq dead accents .
-.\" .It KB_TR
-.\" (
-.\" .Dq tr
-.\" ) Turkish in
-.\" .Dq ISO 8859-9
-.\" with
-.\" .Dq dead accents .
-.\" .It KB_UA
-.\" (
-.\" .Dq ua
-.\" ) Ukrainian in
-.\" .Dq KOI8 .
+.It KB_TR
+(
+.Dq tr
+) Turkish in
+.Dq ISO 8859-9
+with
+.Dq dead accents .
+.It KB_UA
+(
+.Dq ua
+) Ukrainian in
+.Dq KOI8 .
 .It KB_UK
 (
 .Dq uk
@@ -202,49 +202,41 @@ The built-in mappings are at this time:
 (
 .Dq us
 ) English / US keyboard mapping (default).
-.\" .It KB_US | KB_DVORAK
-.\" (
-.\" .Dq us.dvorak
-.\" ) English / US keyboard with
-.\" .Dq Dvorak
-.\" layout.
+.It KB_US | KB_DVORAK
+(
+.Dq us.dvorak
+) English / US keyboard with
+.Dq Dvorak
+layout.
 .El
 .Pp
-.\" The KB_DE, KB_DK, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR
-The KB_DE, KB_DK, KB_NO, KB_SF, KB_SG and KB_SV
-mappings can be used in
+The KB_DE, KB_DK, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR mappings can be used in
 the KB_NODEAD (
 .Dq .nodead
 ) variant.
 This switches off the
 .Dq dead accents .
 .Pp
-.\" The KB_BE, KB_FR, KB_JP, KB_US and KB_US | KB_DVORAK
-The KB_FR, KB_JP and KB_US
-mappings can be modified
+The KB_BE, KB_FR, KB_JP, KB_US and KB_US | KB_DVORAK mappings can be modified
 to swap the left Control and the Caps Lock keys by the
 KB_SWAPCTRLCAPS variant bit or the
 .Dq .swapctrlcaps
 suffix.
-.\" .Pp
-.\" The KB_METAESC (
-.\" .Dq .metaesc
-.\" ) option can be applied to any layout.
-.\" If set, keys pressed together
-.\" with the ALT modifier are prefixed by an ESC character.
-.\" (Standard behaviour is to add 128 to the ASCII value.)
+.Pp
+The KB_METAESC (
+.Dq .metaesc
+) option can be applied to any layout.
+If set, keys pressed together
+with the ALT modifier are prefixed by an ESC character.
+(Standard behaviour is to add 128 to the ASCII value.)
 .Sh EXAMPLES
 To set a German keyboard layout without
-.\" .Dq dead accents
-.\" and sending an ESC character before the key symbol if the ALT
-.\" key is pressed simultaneously,
-.Dq dead accents ,
-use
-.\" .Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
-.Ic wsconsctl -w keyboard.encoding=de.nodead .
+.Dq dead accents
+and sending an ESC character before the key symbol if the ALT
+key is pressed simultaneously, use
+.Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
 To set it at kernel build time, add
-.\" .Em option UKBD_LAYOUT="(KB_DE|KB_NODEAD|KB_METAESC)"
-.Em option UKBD_LAYOUT="(KB_DE|KB_NODEAD)"
+.Em option UKBD_LAYOUT="(KB_DE|KB_NODEAD|KB_METAESC)"
 to the kernel configuration file.
 .Sh SEE ALSO
 .Xr usbhidctl 1 ,