Merge remote-tracking branch 'upstream/master'

6 files changed, 9 insertions, 24 deletions

diff --git a/man/man3/INDEX b/man/man3/INDEX
index 9664f800..6654ea7c 100644
--- a/man/man3/INDEX
+++ b/man/man3/INDEX
@@ -301,7 +301,6 @@ asctime ctime.3
 ctime ctime.3
 gmtime ctime.3
 localtime ctime.3
-timezone ctime.3
 tm2sec ctime.3
 
 block_cipher des.3
@@ -1238,6 +1237,7 @@ threadsetgrp thread.3
 threadsetname thread.3
 threadsetstate thread.3
 threadspawn thread.3
+threadspawnd thread.3
 threadspawnl thread.3
 threadunpin thread.3
 threadwaitchan thread.3
@@ -1255,7 +1255,6 @@ vtblockput venti-cache.3
 vtblockwrite venti-cache.3
 vtcachealloc venti-cache.3
 vtcacheallocblock venti-cache.3
-vtcacheblocksize venti-cache.3
 vtcachefree venti-cache.3
 vtcacheglobal venti-cache.3
 vtcachelocal venti-cache.3
diff --git a/man/man3/ctime.3 b/man/man3/ctime.3
index 65ab1d41..5491d39f 100644
--- a/man/man3/ctime.3
+++ b/man/man3/ctime.3
@@ -1,6 +1,6 @@
 .TH CTIME 3
 .SH NAME
-ctime, localtime, gmtime, asctime, tm2sec, timezone \- convert date and time
+ctime, localtime, gmtime, asctime, tm2sec \- convert date and time
 .SH SYNOPSIS
 .B #include <u.h>
 .br
@@ -81,9 +81,9 @@ if
 is not
 .BR GMT .
 .SH SOURCE
-.B \*9/src/lib9/date.c
-.br
 .B \*9/src/lib9/ctime.c
+.br
+.B \*9/src/lib9/tm2sec.c
 .SH "SEE ALSO"
 .IR date (1),
 .IR time (3)
diff --git a/man/man3/getsnarf.3 b/man/man3/getsnarf.3
index 6c236e76..938aae3f 100644
--- a/man/man3/getsnarf.3
+++ b/man/man3/getsnarf.3
@@ -34,18 +34,6 @@ and
 .I putsnarf
 will convert as necessary.
 .SH SOURCE
-.B \*9/src/libdraw/x11-itrans.c
+.B \*9/src/libdraw/snarf.c
 .SH SEE ALSO
 .IR snarfer (1)
-.SH BUGS
-On OS X, there are two snarf buffers: the Carbon snarf buffer
-used by native OS X applications, and the X11 snarf buffer,
-used by X11 applications.
-Whenever new text is written to the Carbon snarf buffer, the OS X X11
-implementation automatically copies that text to the X11 snarf buffer.
-The reverse is not done automatically, arguably a bug in the X11 server.
-To work around this,
-.I putsnarf
-writes to both the Carbon snarf buffer and the X11 snarf buffer.
-To work around this bug in remote or non-Plan 9 X11 clients, run
-.IR snarfer (1).
diff --git a/man/man3/mux.3 b/man/man3/mux.3
index caaf55ff..0c429fba 100644
--- a/man/man3/mux.3
+++ b/man/man3/mux.3
@@ -146,7 +146,7 @@ that need to remain active.
 .I Libmux
 also provides a non-blocking interface, useful for programs forced
 to use a
-.IR select (2)-based
+.IR select (3)-based
 main loop.
 .I Muxrpcstart
 runs the first half of
diff --git a/man/man3/needstack.3 b/man/man3/needstack.3
index cf13809d..071b8916 100644
--- a/man/man3/needstack.3
+++ b/man/man3/needstack.3
@@ -50,9 +50,9 @@ like
 The X Window library implementation of
 .I XLookupString
 allocates some very large buffers on the stack, so
-.B \*9/src/libdraw/x11-itrans.c
+.B \*9/src/cmd/devdraw/x11-itrans.c
 calls
-.B needstack(20*1024)
+.B needstack(64*1024)
 before making calls to
 .IR XLookupString .
 If a thread (in this case, the keyboard-reading thread used
diff --git a/man/man3/wctl.3 b/man/man3/wctl.3
index 9addaeb2..25c90234 100644
--- a/man/man3/wctl.3
+++ b/man/man3/wctl.3
@@ -34,6 +34,4 @@ requests that the program's window title be set to
 requests that the program's window be moved
 above all other windows and given the input focus.
 .SH SOURCE
-.B \*9/src/libdraw/x11-init.c
-.br
-.B \*9/src/libdraw/x11-wsys.c
+.B \*9/src/libdraw/wsys.c