merge

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

diff --git a/sys/man/8/plan9.ini b/sys/man/8/plan9.ini
index 4798417fb5038116a7b84c0cc0d78b8c6cdbe0d7..765aad04b4c74bf427ca20f38be2f9679374cfd3 100644 (file)
--- a/sys/man/8/plan9.ini
+++ b/sys/man/8/plan9.ini
@@ -404,20 +404,15 @@ to be present on attach in
 .B /lib/firmware
 or
 .B /boot.
-To select the access point, the
+To limit the selected APs the options
 .B essid=
 and
 .B bssid=
-parameters can be specified at boot or set during runtime
-like:
+may be set at boot or in the ether interface clone file 
+using a space as the separator between option and value, e.g.
 .EX
        echo essid left-armpit >/net/ether1/clone
 .EE
-If both
-.B essid=
-and
-.B bssid=
-are specified, both must match.
 Scan results appear in the
 .B ifstats
 file and can be read out like:
@@ -425,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
@@ -448,6 +440,16 @@ 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
 (S)ATA controllers are autodetected.
 .SS \fL*nodma=\fP
@@ -504,7 +506,7 @@ to use as a root device for bootstrapping.
 .SS \fLramdisk\fIX\fL=\fIsize sectorsize\fP
 .SS \fLramdisk\fIX\fL=\fIaddress size sectorsize\fP
 This reserves physical memory as a ramdisk that will appear as
-.IR sd(3)
+.IR sd (3)
 device \fLsdZ\fIX\fR.
 When the
 .I address
@@ -569,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
@@ -694,10 +708,24 @@ See
 for more.
 .SS \fLnobootprompt=\fIvalue\fP
 Suppress the
-.L "root from"
+.L bootargs
 prompt and use
 .I value
 as the answer instead.
+.SS \fLrootdir=\fB/root/\fIdir\fP
+.SS \fLrootspec=\fIspec\fP
+Changes the mount arguments for the root file server
+that was specified by
+.I bootargs
+above.
+By changing
+.I dir
+in
+.BR $rootdir ,
+a different sub-directory on the root file server
+can be used as the system root. see
+.IR boot (8)
+for details.
 .SS \fLuser=\fIvalue\fP
 Suppress the
 .L "user"
@@ -870,6 +898,18 @@ The main feature of the interface is the ability to watch
 battery life (see
 .IR stats (8)).
 It is not on by default because it causes problems on some laptops.
+.SS USB
+.SS \fL*nousbprobe=\fP
+Disable USB host controller detection.
+.SS \fL*nousbohci=\fP
+.SS \fL*nousbuhci=\fP
+.SS \fL*nousbehci=\fP
+.SS \fL*nousbxhci=\fP
+Disable specific USB host controller types.
+.SS \fLnousbrc=\fP
+Disable
+.IR nusbrc (8)
+startup at boot time.
 .SS \fLnousbhname=\fP
 When defined,
 .IR nusbrc (8)