diff --git a/man/man1/0intro.1 b/man/man1/0intro.1
index 610e791..6e86bb4 100644
--- a/man/man1/0intro.1
+++ b/man/man1/0intro.1
@@ -30,7 +30,7 @@
 environment variable 
 to contain the name of the root of the tree.
 See
-.IR install (8)
+.IR install (1)
 for details about installation.
 .PP
 Many of the familiar Unix commands,
@@ -127,6 +127,15 @@
 .IR 9p (1)
 client can be used in shell scripts or by hand to carry out
 simple interactions with servers.
+.SS External databases
+Some programs rely on large databases that would be
+cumbersome to include in every release.
+Scripts are provided that download these databases separately.
+These databases can be downloaded separately.  
+See
+.B $PLAN9/dict/README
+and
+.BR $PLAN9/sky/README .
 .SS Programming
 The shell scripts
 .I 9c
@@ -187,15 +196,6 @@
 cannot)
 and dump data structures,
 but that it is the extent to which they have been developed and exercised.
-.SS External databases
-Some programs rely on large databases that would be
-cumbersome to include in every release.
-Scripts are provided that download these databases separately.
-These databases can be downloaded separately.  
-See
-.B $PLAN9/dict/README
-and
-.BR $PLAN9/sky/README .
 .SS Porting programs
 The vast majority of the familiar Plan 9 programs 
 have been ported, including the Unicode-aware
@@ -244,8 +244,8 @@
 .IR getcallerpc (3),
 but these are usually simple and are not on the critical
 path for getting the system up and running.
-.SS SEE ALSO
-The system's documentation is these manual pages.
+.SH SEE ALSO
+The rest of this manual describes Plan 9 from User Space.
 Many of the man pages have been brought from Plan 9,
 but they have been updated, and others have been written from scratch.
 .PP
@@ -276,19 +276,24 @@
 The manual sections follow the Unix numbering conventions,
 not the Plan 9 ones.
 .PP
-Section (1) describes general publicly accessible commands.
+.HR ../man1 "Section (1)
+describes general publicly accessible commands.
 .PP
-Section (3) describes C library functions.
+.HR ../man3 "Section (3)
+describes C library functions.
 .PP
-Section (4) describes user-level file servers.
+.HR ../man4 "Section (4)
+describes user-level file servers.
 .PP
-Section (7) describes file formats and protocols.
+.HR ../man7 "Section (7)
+describes file formats and protocols.
 (On Unix, section (5) is technically for file formats but
 seems now to be used for describing specific files.)
+.\" .PP
+.\" Section (8) describes commands used for system administration.
 .PP
-Section (8) describes commands used for system administration.
-.PP
-Section (9p) describes the Plan 9 file protocol 9P.
+.HR ../man9 "Section (9p)
+describes the Plan 9 file protocol 9P.
 .SH DIAGNOSTICS
 In Plan 9, a program's exit status is an arbitrary text string,
 while on Unix it is an integer.
diff --git a/man/man1/9.1 b/man/man1/9.1
index d590f3b..24ce022 100644
--- a/man/man1/9.1
+++ b/man/man1/9.1
@@ -2,17 +2,60 @@
 .SH NAME
 9 \- run Plan 9 commands
 .SH SYNOPSIS
-.B .
-.B 9
-.PP
 .B 9
 .I cmd
 [
 .I args
 \&...
 ]
+.PP
+.B .
+.B 9
 .SH DESCRIPTION
-XXX
+Because Plan 9 supplies commands with the same name as but different
+behavior than many basic Unix system commands
+(e.g.,
+.BR grep ,
+.BR sed ,
+.BR mkdir ,
+.BR rm ),
+it is not recommended to run with the Plan 9 bin directory
+ahead of the system directories.
+.PP
+.I 9
+is a shell script that sets up a Plan 9 environment and runs
+.I cmd .
+It sets
+.B $PLAN9
+and adds
+.B $PLAN9/bin
+to the beginning of
+.B $PATH
+before running
+.IR cmd .
+.PP
+If run with no arguments,
+.B 9
+does not do anything.  This is so that it can be invoked from
+.IR sh -style
+shells using
+.B .
+.B 9
+in order to make the current shell start running in the Plan 9 environment.
+.SH EXAMPLES
+Search for greek in the password file:
+.IP
+.EX
+$ 9 grep '[α-ζ]' /etc/passwd
+.EE
+.PP
+Start an
+.IR rc (1)
+with the Plan 9 commands in the path before the system commands.
+.IP
+.EX
+9 rc
+.EE
 .SH SOURCE
 .B \*9/bin/9
 .SH SEE ALSO
diff --git a/man/man1/INDEX b/man/man1/INDEX
index fcd708c..629dc65 100644
--- a/man/man1/INDEX
+++ b/man/man1/INDEX
@@ -169,6 +169,7 @@
 tr2post tr2post.1
 nroff troff.1
 troff troff.1
+troff2html troff2html.1
 tweak tweak.1
 uniq uniq.1
 units units.1
diff --git a/man/man1/mk.1 b/man/man1/mk.1
index caa2d17..6ef1249 100644
--- a/man/man1/mk.1
+++ b/man/man1/mk.1
@@ -1,6 +1,6 @@
 .TH MK 1
 .SH NAME
-mk, membername \- maintain (make) related files
+mk \- maintain (make) related files
 .SH SYNOPSIS
 .B mk
 [
@@ -13,10 +13,6 @@
 [
 .I target ...
 ]
-.PP
-.B membername
-.IR lib ( object )
-\&...
 .SH DESCRIPTION
 .I Mk
 uses the dependency rules specified in
@@ -529,18 +525,6 @@
 (see
 .IR 9c (1))
 archives.
-.PP
-.I Membername
-echoes just the member names of a list of aggregate names.
-It is useful in recipes like:
-.IP
-.EX
-OFILES=a.o b.o
-libc.a(%):N: %
-libc.a:	${OFILES:%=libc.a(%)}
-	9ar rvc libc.a `membername $newprereq`
-.EE
-which re-archives only the new object files.
 .SS Attributes
 The colon separating the target from the prerequisites
 may be
@@ -669,6 +653,8 @@
 x.tab.h:Pcmp -s:	y.tab.h
 	cp y.tab.h x.tab.h
 .EE
+.SH SOURCE
+.B /usr/local/plan9/src/cmd/mk
 .SH SEE ALSO
 .IR sh (1),
 .IR regexp (7)
diff --git a/man/man3/print.3 b/man/man3/print.3
index af3f752..c4f96bb 100644
--- a/man/man3/print.3
+++ b/man/man3/print.3
@@ -411,6 +411,8 @@
 	exits("fatal error");
 }
 .EE
+.SH SOURCE
+.B \*9/src/lib9/libfmt
 .SH SEE ALSO
 .IR fmtinstall (3),
 .IR fprintf (3),
diff --git a/man/man5/INDEX b/man/man5/INDEX
index 6f51523..56cb5d9 100644
--- a/man/man5/INDEX
+++ b/man/man5/INDEX
@@ -1 +1 @@
-[a-z0-9:]* [a-z0-9:]*
+[a-z0-9:]* [a-z0-9:]*.[0-9]*
diff --git a/man/man8/INDEX b/man/man8/INDEX
deleted file mode 100644
index 9ca1d02..0000000
--- a/man/man8/INDEX
+++ /dev/null
@@ -1,2 +0,0 @@
-dump9660 mk9660.8
-mk9660 mk9660.8
diff --git a/man/man8/mk9660.8 b/man/man8/mk9660.8
deleted file mode 100644
index 3339246..0000000
--- a/man/man8/mk9660.8
+++ /dev/null
@@ -1,232 +0,0 @@
-.TH MK9660 8
-.SH NAME
-dump9660, mk9660 \- create an ISO-9660 CD image
-.SH SYNOPSIS
-.B mk9660
-[
-.B -:D
-]
-[
-.B -9cjr
-]
-[
-.B -b
-.I bootfile
-]
-[
-.B -p
-.I proto
-]
-[
-.B -s
-src
-]
-[
-.B -v
-volume
-]
-.I image
-.PP
-.B dump9660
-[
-.B -:D
-]
-[
-.B -9cjr
-]
-[
-.B -p
-.I proto
-]
-[
-.B -s
-src
-]
-[
-.B -v
-volume
-]
-[
-.B -m
-.I maxsize
-]
-[
-.B -n
-.I now
-]
-.I image
-.SH DESCRIPTION
-.I Mk9660
-writes to the random access file
-.I image
-an ISO-9660 CD image containing the
-files named in
-.I proto
-(by default,
-.BR \*9/proto/allproto )
-from the file tree
-.I src
-(by default,
-the current directory).
-The
-.I proto
-file is formatted as described in
-.IR proto (3).
-.PP
-The created CD image will be in ISO-9660
-format, but by default the file names will
-be stored in UTF-8 with no imposed length 
-or character restrictions.
-The
-.B -c
-flag causes
-.I mk9660
-to use only file names in ``8.3'' form
-that use digits, letters, and underscore.
-File names that do not conform are changed
-to 
-.BI D nnnnnn
-(for directories)
-or
-.BI F nnnnnn
-(for files);
-a key file
-.B _CONFORM.MAP
-is created in the root
-directory to ease the reverse process.
-.PP
-If the
-.B -9
-flag is given, the system use fields at the end of
-each directory entry will be populated with
-Plan directory information (owner, group, mode,
-full name); this is interpreted by
-.IR 9660srv .
-.PP
-If the
-.B -j
-flag is given, the usual directory tree is written,
-but an additional tree in Microsoft Joliet format is
-also added.
-This second tree can contain long Unicode file names,
-and can be read by
-.I 9660srv
-as well as most versions of Windows
-and many Unix clones.
-The characters
-.BR * ,
-.BR : ,
-.BR ; ,
-.BR ? ,
-and
-.B \e
-are allowed in Plan 9 file names but not in Joliet file names;
-non-conforming file names are translated
-and a 
-.B _CONFORM.MAP
-file written
-as in the case of the
-.B -c
-option.
-.PP
-If the
-.B -r
-flag is given, Rock Ridge extensions are written in the
-format of the system use sharing protocol;
-this format provides Posix-style file metadata and is 
-common on Unix platforms.
-.PP
-The options
-.BR -c ,
-.BR -9 ,
-.BR -j ,
-and
-.B -r
-may be mixed freely with the exception that
-.B -9
-and
-.B -r
-are mutually exclusive.
-.PP
-The
-.B -v
-flag sets the volume title;
-if unspecified, the base name of
-.I proto
-is used.
-.PP
-The 
-.B -:
-flag causes 
-.B mk9660
-to replace colons in scanned file names with spaces;
-this is the inverse of the map applied by Plan 9's
-\fIdossrv\fR(4)
-and is useful for writing Joliet CDs containing data
-from FAT file systems.
-.PP
-The
-.B -b
-option creates a bootable CD.
-Bootable CDs contain pointers to floppy images which are
-loaded and booted by the BIOS.
-.I Bootfile
-should be the name of the floppy image to use;
-it is a path relative to the root of the created CD.
-That is, the boot floppy image must be listed in the
-.I proto
-file already:
-the
-.B -b
-flag just creates a pointer to it.
-.PP
-The
-.B -D
-flag creates immense amounts of debugging output
-on standard error.
-.PP
-.I Dump9660
-is similar in specification to
-.I mk9660
-but creates and updates backup CD images in the style of
-the 
-.I dump
-file system
-(see Plan 9's \fIfs\fR(4)).
-The dump is file-based rather than block-based:
-if a file's contents have not changed since the last
-backup, only its directory entry will be rewritten.
-.PP
-The
-.B -n
-option specifies a time (in seconds since January 1, 1970)
-to be used for naming the dump directory.
-.PP
-The 
-.B -m
-option specifies a maximum size for the image;
-if a backup would cause the image to grow larger than
-.IR maxsize ,
-it will not be written, and
-.I dump9660
-will exit with a non-empty status.
-.SH EXAMPLE
-.PP
-Create an image of the Plan 9 source tree, 
-including a conformant ISO-9660 directory tree,
-Plan 9 extensions in the system use fields, and
-a Joliet directory tree.
-.IP
-.EX
-mk9660 -9cj -s /n/bootes -p srcproto cdimage
-.EE
-.SH SOURCE
-\*9/src/cmd/9660
-.SH "SEE ALSO
-.IR proto (3)
-.\" .SH "SEE ALSO"
-.\" .I 9660srv
-.\" (in
-.\" .IR dossrv (4)),
-.\" .IR cdfs (4),
-.\" .IR proto (3)
diff --git a/man/secindex b/man/secindex
index 4ffc83b..d042ac1 100755
--- a/man/secindex
+++ b/man/secindex
@@ -1,6 +1,6 @@
 #!/usr/local/plan9/bin/rc
 builtin cd $1
-for (i in [a-z0-9:]*) {
+for (i in [a-z0-9:]*.[0-9]*) {
 	b=`{echo $i | sed 's/\..*//'}
 	9 sed -n '
 	/SH *NAM/,/SH/{