merge

5 files changed, 64 insertions, 53 deletions

diff --git a/sys/man/1/jpg b/sys/man/1/jpg
index 9ec0153fc..e242fa6e8 100644
--- a/sys/man/1/jpg
+++ b/sys/man/1/jpg
@@ -1,6 +1,6 @@
 .TH JPG 1
 .SH NAME
-jpg, gif, png, ppm, bmp, v210, yuv, ico, tga, tojpg, togeordi, togif, toppm, topng, toico \- view and convert pictures
+jpg, gif, png, tif, ppm, bmp, v210, yuv, ico, tga, tojpg, togeordi, togif, toppm, topng, toico \- view and convert pictures
 .SH SYNOPSIS
 .B jpg
 [
@@ -23,6 +23,13 @@ jpg, gif, png, ppm, bmp, v210, yuv, ico, tga, tojpg, togeordi, togif, toppm, top
 .I file ...
 ]
 .br
+.B tif
+[
+.B -39cdektv
+] [
+.I file ...
+]
+.br
 .B ppm
 [
 .B -39cdektv
@@ -137,6 +144,7 @@ These programs read, display, and write image files in public formats.
 .IR Jpg ,
 .IR gif ,
 .IR png ,
+.IR tif ,
 .IR ppm ,
 .IR bmp ,
 .IR tga ,
@@ -156,8 +164,14 @@ read Plan 9 images files, convert them to JPEG, GIF, PPM, or PNG, and write them
 The default behavior of
 .IR jpg ,
 .IR gif ,
+.IR png ,
+.IR tif ,
+.IR ppm ,
+.IR bmp ,
+.IR tga ,
+.IR v210 ,
 and
-.IR ppm
+.IR yuv
 is to display the
 .IR file ,
 or standard input if no file is named.
@@ -227,11 +241,12 @@ The input is a motion JPEG file, with multiple images representing frames of the
 .PP
 The
 .IR tojpg ,
-.IR togif
-and
+.IR togif ,
 .IR toppm
-programs go the other way: they convert from Plan 9 images to JPEG, GIF and PPM,
-and have no display capability.
+and
+.IR topng
+programs go the other way: they convert from Plan 9 images to JPEG, GIF,
+PPM and PNG and have no display capability.
 They all accept an option
 .B -c
 to set the comment field of the resulting file.
@@ -323,6 +338,8 @@ space in the image.  The icon file is written to standard output.
 .br
 .B http://www.w3.org/TR/2003/REC-PNG-20031110
 .br
+.B http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf
+.br
 .B http://netpbm.sourceforge.net/doc/ppm.html
 .br
 .B http://en.wikipedia.org/wiki/Windows_bitmap
diff --git a/sys/man/1/sysinfo b/sys/man/1/sysinfo
index 1ecef1d74..01f96517f 100644
--- a/sys/man/1/sysinfo
+++ b/sys/man/1/sysinfo
@@ -4,7 +4,10 @@ sysinfo, sysupdate \- report information about, update the system
 .SH SYNOPSIS
 .B sysinfo
 [
-.B -m
+.B -e e-mail
+]
+[
+.B -p
 ]
 .br
 .B sysupdate
@@ -19,11 +22,20 @@ the running system, concatenating the output to
 stdout.
 .PP
 The
-.B -m
-flag causes the output to be piped to a mail command,
-whose recipient is
-.B hardware@9front.org.
-This flag is useful for reporting new installs to the
+.B -p
+flag causes the output to be posted at a website
+archive,
+.B http://sysinfo.9front.org,
+which in turn forwards the message to a
+mailing list,
+.B 9front-sysinfo@9front.org.
+A URL pointing to the archived output is returned.
+The
+.B -e
+flag causes a reply-to e-mail address to be included
+in the message (the e-mail address is not divulged
+to the mailing list).
+These flags are useful for reporting new installs to the
 development team.
 .PP
 .I Sysupdate
diff --git a/sys/man/1/vnc b/sys/man/1/vnc
index 49cbe0eb5..fbf1f5373 100644
--- a/sys/man/1/vnc
+++ b/sys/man/1/vnc
@@ -194,41 +194,6 @@ start TLS on the connection.
 .B -v
 print verbose output to standard error.
 .PD
-.PP
-The VNC protocol represents keyboard input as
-key up/down events.
-Plan 9 does not expose the state of the
-Ctl and Shift keys except as it can be inferred
-from receipt of control or shifted characters.
-It does not expose the state of the Alt key at all,
-since the Alt key is used to compose Unicode characters
-(see
-.IR keyboard (6)).
-.I Vncv
-correctly handles the sending of control and shifted
-characters.
-To support systems that use key sequences like Alt-X
-(or worse, Alt-mouse-click), typing the Plan 9 compose
-sequences
-.B Alt
-.B Z
-.B A
-(for Alt), 
-.B Alt
-.B Z
-.B C
-(for Ctrl),
-and
-.B Alt
-.B Z
-.B S
-(for Shift)
-will send a ``key down'' message for
-the given key.
-A corresponding ``key up'' message
-will be sent after the next key is pressed,
-or when the sequence is retyped,
-whichever happens first.
 .SH SOURCE
 .B /sys/src/cmd/vnc
 .SH "SEE ALSO
diff --git a/sys/man/8/hjfs b/sys/man/8/hjfs
index e7f84740c..49573fbb4 100644
--- a/sys/man/8/hjfs
+++ b/sys/man/8/hjfs
@@ -27,6 +27,8 @@ hjfs \- file server maintenance
 .I name
 .RI [ options ]
 .PP
+.B users
+.PP
 .B sync
 .PP
 .B debug-chdeind
@@ -113,10 +115,6 @@ owned by user and group
 The options are
 .TF =leaderxx
 .TP
-.B ?
-Print the entry for
-.IR name .
-.TP
 .B :
 Add a group: add the name to
 .B /adm/users
@@ -157,6 +155,12 @@ command the file server overwrites
 .B /adm/users
 to reflect the internal state of the user table.
 .PP
+.I Users
+reads the contents of file 
+.B /adm/users
+to initialize the file server's internal representation of the
+users structure.
+.PP
 .I Sync
 writes dirty blocks in memory to the magnetic disk cache.
 .PP
diff --git a/sys/man/8/plan9.ini b/sys/man/8/plan9.ini
index 61115f7fd..bbd6f317a 100644
--- a/sys/man/8/plan9.ini
+++ b/sys/man/8/plan9.ini
@@ -392,18 +392,28 @@ or
 .B /boot.
 To select the access point, the
 .B essid=
-parameter can be specified at boot or set during runtime
+and
+.B bssid=
+parameters can be specified at boot or set during runtime
 like:
 .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:
 .EX
 	cat /net/ether1/ifstats
 .EE
-Ad-hoc mode or encryption is currently not supported.
+Ad-hoc mode or WEP encryption is currently not supported.
+To enable WPA/WPA2 encryption, see
+.IR wpa (8)
+for details.
 .SS DISKS, TAPES
 (S)ATA controllers are autodetected.
 .SS \fL*nodma=\fP
@@ -720,6 +730,9 @@ processors.
 Prints a summary of the multiprocessor APIC interrupt configuration.
 .SS \fL*nomsi=\fP
 Disables message signaled interrupts.
+.SS \fL*notsc=\fP
+Disables the use of the per processor timestamp counter registers
+as high resolution clock.
 .SS \fL*pcimaxbno=value\fP
 This puts a limit on the maximum bus number probed
 on a PCI bus (default 7).