merge

[plan9front.git] / sys / man / 8 / plan9.ini

diff --git a/sys/man/8/plan9.ini b/sys/man/8/plan9.ini
index a684860c94dee98921141cac6be9c547880a2a22..765aad04b4c74bf427ca20f38be2f9679374cfd3 100644 (file)
--- a/sys/man/8/plan9.ini
+++ b/sys/man/8/plan9.ini
@@ -420,9 +420,6 @@ file and can be read out like:
        cat /net/ether1/ifstats
 .EE
 Ad-hoc mode or WEP encryption is currently not supported.
-To enable WPA/WPA2 encryption, see
-.IR wpa (8)
-for details.
 .TP
 .B rt2860
 Ralink Technology PCI/PCI-Express wireless adapters require
@@ -443,6 +440,14 @@ to be present on attach in
 or
 .B /boot. 
 See iwl section above for configuration details.
+.SS \fLwpapsk\fI=password\fP
+WPA/WPA2 encryption
+is detected automatically and a prompt for the
+.I password
+will appear when using the WIFI interface for netbooting.
+To avoid the prompt, the
+.I password
+can be specified with the boot parameter above.
 .SS \fLnora6=
 Disable automatic IPv6 configuration from incoming router advertisements.
 .SS DISKS, TAPES
@@ -566,10 +571,22 @@ are automatically detected and need no configuration lines.
 The line
 .B serial=type=com
 can be used to specify settings for a PCMCIA modem.
+.SS \fLkbmap=\fIvalue\fP
+This specifies the keyboard map to use.
+.I Value
+can be a map file found in
+.B /sys/lib/kbmap
+on the ramdisk.
+.PP
+For example:
+.TP
+.B kbmap=colemak
 .SS \fLmouseport=\fIvalue\fP
 This specifies where the mouse is attached.
 .I Value
-can be
+can be a map file found in
+.B /sys/lib/kbmap
+on the ramdisk.
 .TP
 .B ps2
 the PS2 mouse/keyboard port.  The BIOS setup procedure