20 files changed, 295 insertions, 1168 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index e7423991dde..ba44b9e31a1 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2008/01/11 20:16:02 jmc Exp $
+#	$OpenBSD: Makefile,v 1.10 2010/01/04 17:50:36 deraadt Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -40,8 +40,4 @@ const.h: const.c
 
 .depend alloc.o: const.h error.h 
 
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
 .include <bsd.prog.mk>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 005d995d265..f9333bfcb64 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2003/07/29 18:36:30 jmc Exp $
+#	$OpenBSD: Makefile,v 1.9 2010/01/04 17:50:37 deraadt Exp $
 
 PROG=	ed
 CFLAGS+=-DBACKWARDS -DDES
@@ -7,9 +7,4 @@ SRCS=	 buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
 #LINKS=  ${BINDIR}/ed ${BINDIR}/red
 #MLINKS= ed.1 red.1
 
-# These just get installed verbatim
-.if make(install)
-SUBDIR+= USD.doc/09.edtut USD.doc/10.edadv
-.endif
-
 .include <bsd.prog.mk>
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 5141a77a5c3..361752af98f 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -2335,13 +2335,19 @@
 ./usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 ./usr/share/calendar/ru_RU.KOI8-R/calendar.primety
 ./usr/share/dict
+./usr/share/dict/README
 ./usr/share/dict/american
 ./usr/share/dict/british
+./usr/share/dict/eign
 ./usr/share/dict/papers
+./usr/share/dict/propernames
 ./usr/share/dict/special
 ./usr/share/dict/special/4bsd
 ./usr/share/dict/special/math
 ./usr/share/dict/stop
+./usr/share/dict/web2
+./usr/share/dict/web2a
+./usr/share/dict/words
 ./usr/share/doc
 ./usr/share/games
 ./usr/share/games/atc
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 11bdf0418d5..cb57faf7751 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,4 +1,262 @@
 ./usr/share/doc/html
+./usr/share/doc/html/bind
+./usr/share/doc/html/bind/Bv9ARM.ch01.html
+./usr/share/doc/html/bind/Bv9ARM.ch02.html
+./usr/share/doc/html/bind/Bv9ARM.ch03.html
+./usr/share/doc/html/bind/Bv9ARM.ch04.html
+./usr/share/doc/html/bind/Bv9ARM.ch05.html
+./usr/share/doc/html/bind/Bv9ARM.ch06.html
+./usr/share/doc/html/bind/Bv9ARM.ch07.html
+./usr/share/doc/html/bind/Bv9ARM.ch08.html
+./usr/share/doc/html/bind/Bv9ARM.ch09.html
+./usr/share/doc/html/bind/Bv9ARM.html
+./usr/share/doc/html/curses
+./usr/share/doc/html/curses/hackguide.html
+./usr/share/doc/html/curses/ncurses-intro.html
+./usr/share/doc/html/httpd
+./usr/share/doc/html/httpd/FAQ.html
+./usr/share/doc/html/httpd/LICENSE
+./usr/share/doc/html/httpd/bind.html
+./usr/share/doc/html/httpd/configuring.html
+./usr/share/doc/html/httpd/content-negotiation.html
+./usr/share/doc/html/httpd/custom-error.html
+./usr/share/doc/html/httpd/dns-caveats.html
+./usr/share/doc/html/httpd/dso.html
+./usr/share/doc/html/httpd/env.html
+./usr/share/doc/html/httpd/handler.html
+./usr/share/doc/html/httpd/howto
+./usr/share/doc/html/httpd/howto/auth.html
+./usr/share/doc/html/httpd/howto/cgi.html
+./usr/share/doc/html/httpd/howto/htaccess.html
+./usr/share/doc/html/httpd/howto/ssi.html
+./usr/share/doc/html/httpd/images
+./usr/share/doc/html/httpd/images/apache_header.gif
+./usr/share/doc/html/httpd/images/apache_pb.gif
+./usr/share/doc/html/httpd/images/custom_errordocs.gif
+./usr/share/doc/html/httpd/images/feather.jpg
+./usr/share/doc/html/httpd/images/home.gif
+./usr/share/doc/html/httpd/images/index.gif
+./usr/share/doc/html/httpd/images/mod_rewrite_fig1.fig
+./usr/share/doc/html/httpd/images/mod_rewrite_fig1.gif
+./usr/share/doc/html/httpd/images/mod_rewrite_fig2.fig
+./usr/share/doc/html/httpd/images/mod_rewrite_fig2.gif
+./usr/share/doc/html/httpd/images/mod_ssl_sb.gif
+./usr/share/doc/html/httpd/images/openssl_ics.gif
+./usr/share/doc/html/httpd/images/pixel.gif
+./usr/share/doc/html/httpd/images/sub.gif
+./usr/share/doc/html/httpd/index.html
+./usr/share/doc/html/httpd/invoking.html
+./usr/share/doc/html/httpd/ipv6.html
+./usr/share/doc/html/httpd/keepalive.html
+./usr/share/doc/html/httpd/location.html
+./usr/share/doc/html/httpd/logs.html
+./usr/share/doc/html/httpd/misc
+./usr/share/doc/html/httpd/misc/API.html
+./usr/share/doc/html/httpd/misc/FAQ.html
+./usr/share/doc/html/httpd/misc/custom_errordocs.html
+./usr/share/doc/html/httpd/misc/descriptors.html
+./usr/share/doc/html/httpd/misc/fin_wait_2.html
+./usr/share/doc/html/httpd/misc/howto.html
+./usr/share/doc/html/httpd/misc/index.html
+./usr/share/doc/html/httpd/misc/known_client_problems.html
+./usr/share/doc/html/httpd/misc/perf-bsd44.html
+./usr/share/doc/html/httpd/misc/perf-tuning.html
+./usr/share/doc/html/httpd/misc/perf.html
+./usr/share/doc/html/httpd/misc/rewriteguide.html
+./usr/share/doc/html/httpd/misc/security_tips.html
+./usr/share/doc/html/httpd/misc/tutorials.html
+./usr/share/doc/html/httpd/mod
+./usr/share/doc/html/httpd/mod/core.html
+./usr/share/doc/html/httpd/mod/directive-dict.html
+./usr/share/doc/html/httpd/mod/directives.html
+./usr/share/doc/html/httpd/mod/index-bytype.html
+./usr/share/doc/html/httpd/mod/index.html
+./usr/share/doc/html/httpd/mod/mod_access.html
+./usr/share/doc/html/httpd/mod/mod_actions.html
+./usr/share/doc/html/httpd/mod/mod_alias.html
+./usr/share/doc/html/httpd/mod/mod_asis.html
+./usr/share/doc/html/httpd/mod/mod_auth.html
+./usr/share/doc/html/httpd/mod/mod_auth_anon.html
+./usr/share/doc/html/httpd/mod/mod_auth_db.html
+./usr/share/doc/html/httpd/mod/mod_auth_dbm.html
+./usr/share/doc/html/httpd/mod/mod_auth_digest.html
+./usr/share/doc/html/httpd/mod/mod_autoindex.html
+./usr/share/doc/html/httpd/mod/mod_cern_meta.html
+./usr/share/doc/html/httpd/mod/mod_cgi.html
+./usr/share/doc/html/httpd/mod/mod_define.html
+./usr/share/doc/html/httpd/mod/mod_digest.html
+./usr/share/doc/html/httpd/mod/mod_dir.html
+./usr/share/doc/html/httpd/mod/mod_env.html
+./usr/share/doc/html/httpd/mod/mod_expires.html
+./usr/share/doc/html/httpd/mod/mod_headers.html
+./usr/share/doc/html/httpd/mod/mod_imap.html
+./usr/share/doc/html/httpd/mod/mod_include.html
+./usr/share/doc/html/httpd/mod/mod_info.html
+./usr/share/doc/html/httpd/mod/mod_log_agent.html
+./usr/share/doc/html/httpd/mod/mod_log_common.html
+./usr/share/doc/html/httpd/mod/mod_log_config.html
+./usr/share/doc/html/httpd/mod/mod_log_referer.html
+./usr/share/doc/html/httpd/mod/mod_mime.html
+./usr/share/doc/html/httpd/mod/mod_mime_magic.html
+./usr/share/doc/html/httpd/mod/mod_mmap_static.html
+./usr/share/doc/html/httpd/mod/mod_negotiation.html
+./usr/share/doc/html/httpd/mod/mod_proxy.html
+./usr/share/doc/html/httpd/mod/mod_rewrite.html
+./usr/share/doc/html/httpd/mod/mod_setenvif.html
+./usr/share/doc/html/httpd/mod/mod_so.html
+./usr/share/doc/html/httpd/mod/mod_speling.html
+./usr/share/doc/html/httpd/mod/mod_ssl
+./usr/share/doc/html/httpd/mod/mod_ssl/index.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_compat.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_compat.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_cover_logo.jpg
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_cover_title.jpg
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_faq.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_faq.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_glossary.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_howto.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_howto.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig1.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig2.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig3.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview_fig1.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_reference.gfont000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_reference.html
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-chapter.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-1.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-2.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-3.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-4.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-5.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-6.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-7.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-next-n.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-next-s.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-prev-n.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-prev-s.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-abstract.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-compat.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-faq.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-gloss.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-howto.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-intro.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-over.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-preface.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-ref.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-toc.gif
+./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-tutor.gif
+./usr/share/doc/html/httpd/mod/mod_status.html
+./usr/share/doc/html/httpd/mod/mod_unique_id.html
+./usr/share/doc/html/httpd/mod/mod_userdir.html
+./usr/share/doc/html/httpd/mod/mod_usertrack.html
+./usr/share/doc/html/httpd/mod/mod_vhost_alias.html
+./usr/share/doc/html/httpd/mod/module-dict.html
+./usr/share/doc/html/httpd/multilogs.html
+./usr/share/doc/html/httpd/process-model.html
+./usr/share/doc/html/httpd/programs
+./usr/share/doc/html/httpd/programs/ab.html
+./usr/share/doc/html/httpd/programs/apachectl.html
+./usr/share/doc/html/httpd/programs/apxs.html
+./usr/share/doc/html/httpd/programs/dbmmanage.html
+./usr/share/doc/html/httpd/programs/htdigest.html
+./usr/share/doc/html/httpd/programs/htpasswd.html
+./usr/share/doc/html/httpd/programs/httpd.html
+./usr/share/doc/html/httpd/programs/index.html
+./usr/share/doc/html/httpd/programs/logresolve.html
+./usr/share/doc/html/httpd/programs/other.html
+./usr/share/doc/html/httpd/programs/rotatelogs.html
+./usr/share/doc/html/httpd/programs/suexec.html
+./usr/share/doc/html/httpd/search
+./usr/share/doc/html/httpd/sections.html
+./usr/share/doc/html/httpd/server-wide.html
+./usr/share/doc/html/httpd/sitemap.html
+./usr/share/doc/html/httpd/stopping.html
+./usr/share/doc/html/httpd/suexec.html
+./usr/share/doc/html/httpd/urlmapping.html
+./usr/share/doc/html/httpd/vhosts
+./usr/share/doc/html/httpd/vhosts/details.html
+./usr/share/doc/html/httpd/vhosts/examples.html
+./usr/share/doc/html/httpd/vhosts/fd-limits.html
+./usr/share/doc/html/httpd/vhosts/host.html
+./usr/share/doc/html/httpd/vhosts/index.html
+./usr/share/doc/html/httpd/vhosts/ip-based.html
+./usr/share/doc/html/httpd/vhosts/mass.html
+./usr/share/doc/html/httpd/vhosts/name-based.html
+./usr/share/doc/html/httpd/vhosts/vhosts-in-depth.html
+./usr/share/doc/html/httpd/vhosts/virtual-host.html
+./usr/share/doc/html/lynx_help
+./usr/share/doc/html/lynx_help/Lynx_users_guide.html
+./usr/share/doc/html/lynx_help/about_lynx.html
+./usr/share/doc/html/lynx_help/keystrokes
+./usr/share/doc/html/lynx_help/keystrokes/alt_edit_help.html
+./usr/share/doc/html/lynx_help/keystrokes/bashlike_edit_help.html
+./usr/share/doc/html/lynx_help/keystrokes/bookmark_help.html
+./usr/share/doc/html/lynx_help/keystrokes/cookie_help.html
+./usr/share/doc/html/lynx_help/keystrokes/dired_help.html
+./usr/share/doc/html/lynx_help/keystrokes/edit_help.html
+./usr/share/doc/html/lynx_help/keystrokes/environments.html
+./usr/share/doc/html/lynx_help/keystrokes/follow_help.html
+./usr/share/doc/html/lynx_help/keystrokes/gopher_types_help.html
+./usr/share/doc/html/lynx_help/keystrokes/history_help.html
+./usr/share/doc/html/lynx_help/keystrokes/keystroke_help.html
+./usr/share/doc/html/lynx_help/keystrokes/movement_help.html
+./usr/share/doc/html/lynx_help/keystrokes/option_help.html
+./usr/share/doc/html/lynx_help/keystrokes/other_help.html
+./usr/share/doc/html/lynx_help/keystrokes/print_help.html
+./usr/share/doc/html/lynx_help/keystrokes/scrolling_help.html
+./usr/share/doc/html/lynx_help/keystrokes/test_display.html
+./usr/share/doc/html/lynx_help/keystrokes/visited_help.html
+./usr/share/doc/html/lynx_help/keystrokes/xterm_help.html
+./usr/share/doc/html/lynx_help/lynx-dev.html
+./usr/share/doc/html/lynx_help/lynx_help_main.html
+./usr/share/doc/html/lynx_help/lynx_url_support.html
+./usr/share/doc/html/milter
+./usr/share/doc/html/milter/api.html
+./usr/share/doc/html/milter/design.html
+./usr/share/doc/html/milter/figure1.jpg
+./usr/share/doc/html/milter/figure2.jpg
+./usr/share/doc/html/milter/index.html
+./usr/share/doc/html/milter/installation.html
+./usr/share/doc/html/milter/other.html
+./usr/share/doc/html/milter/overview.html
+./usr/share/doc/html/milter/sample.html
+./usr/share/doc/html/milter/smfi_addheader.html
+./usr/share/doc/html/milter/smfi_addrcpt.html
+./usr/share/doc/html/milter/smfi_chgheader.html
+./usr/share/doc/html/milter/smfi_delrcpt.html
+./usr/share/doc/html/milter/smfi_getpriv.html
+./usr/share/doc/html/milter/smfi_getsymval.html
+./usr/share/doc/html/milter/smfi_insheader.html
+./usr/share/doc/html/milter/smfi_main.html
+./usr/share/doc/html/milter/smfi_opensocket.html
+./usr/share/doc/html/milter/smfi_progress.html
+./usr/share/doc/html/milter/smfi_quarantine.html
+./usr/share/doc/html/milter/smfi_register.html
+./usr/share/doc/html/milter/smfi_replacebody.html
+./usr/share/doc/html/milter/smfi_setbacklog.html
+./usr/share/doc/html/milter/smfi_setconn.html
+./usr/share/doc/html/milter/smfi_setdbg.html
+./usr/share/doc/html/milter/smfi_setmlreply.html
+./usr/share/doc/html/milter/smfi_setpriv.html
+./usr/share/doc/html/milter/smfi_setreply.html
+./usr/share/doc/html/milter/smfi_settimeout.html
+./usr/share/doc/html/milter/smfi_stop.html
+./usr/share/doc/html/milter/xxfi_abort.html
+./usr/share/doc/html/milter/xxfi_body.html
+./usr/share/doc/html/milter/xxfi_close.html
+./usr/share/doc/html/milter/xxfi_connect.html
+./usr/share/doc/html/milter/xxfi_envfrom.html
+./usr/share/doc/html/milter/xxfi_envrcpt.html
+./usr/share/doc/html/milter/xxfi_eoh.html
+./usr/share/doc/html/milter/xxfi_eom.html
+./usr/share/doc/html/milter/xxfi_header.html
+./usr/share/doc/html/milter/xxfi_helo.html
 ./usr/share/info/amdref.info
 ./usr/share/info/annotate.info
 ./usr/share/info/as.info
diff --git a/distrib/sets/lists/misc/mi b/distrib/sets/lists/misc/mi
index 3ec6d620d26..992f1c35327 100644
--- a/distrib/sets/lists/misc/mi
+++ b/distrib/sets/lists/misc/mi
@@ -1,303 +1,8 @@
-./usr/share/dict/README
-./usr/share/dict/eign
-./usr/share/dict/propernames
-./usr/share/dict/web2
-./usr/share/dict/web2a
-./usr/share/dict/words
 ./usr/share/doc/README
-./usr/share/doc/html/bind
-./usr/share/doc/html/bind/Bv9ARM.ch01.html
-./usr/share/doc/html/bind/Bv9ARM.ch02.html
-./usr/share/doc/html/bind/Bv9ARM.ch03.html
-./usr/share/doc/html/bind/Bv9ARM.ch04.html
-./usr/share/doc/html/bind/Bv9ARM.ch05.html
-./usr/share/doc/html/bind/Bv9ARM.ch06.html
-./usr/share/doc/html/bind/Bv9ARM.ch07.html
-./usr/share/doc/html/bind/Bv9ARM.ch08.html
-./usr/share/doc/html/bind/Bv9ARM.ch09.html
-./usr/share/doc/html/bind/Bv9ARM.html
-./usr/share/doc/html/curses
-./usr/share/doc/html/curses/hackguide.html
-./usr/share/doc/html/curses/ncurses-intro.html
-./usr/share/doc/html/httpd
-./usr/share/doc/html/httpd/FAQ.html
-./usr/share/doc/html/httpd/LICENSE
-./usr/share/doc/html/httpd/bind.html
-./usr/share/doc/html/httpd/configuring.html
-./usr/share/doc/html/httpd/content-negotiation.html
-./usr/share/doc/html/httpd/custom-error.html
-./usr/share/doc/html/httpd/dns-caveats.html
-./usr/share/doc/html/httpd/dso.html
-./usr/share/doc/html/httpd/env.html
-./usr/share/doc/html/httpd/handler.html
-./usr/share/doc/html/httpd/howto
-./usr/share/doc/html/httpd/howto/auth.html
-./usr/share/doc/html/httpd/howto/cgi.html
-./usr/share/doc/html/httpd/howto/htaccess.html
-./usr/share/doc/html/httpd/howto/ssi.html
-./usr/share/doc/html/httpd/images
-./usr/share/doc/html/httpd/images/apache_header.gif
-./usr/share/doc/html/httpd/images/apache_pb.gif
-./usr/share/doc/html/httpd/images/custom_errordocs.gif
-./usr/share/doc/html/httpd/images/feather.jpg
-./usr/share/doc/html/httpd/images/home.gif
-./usr/share/doc/html/httpd/images/index.gif
-./usr/share/doc/html/httpd/images/mod_rewrite_fig1.fig
-./usr/share/doc/html/httpd/images/mod_rewrite_fig1.gif
-./usr/share/doc/html/httpd/images/mod_rewrite_fig2.fig
-./usr/share/doc/html/httpd/images/mod_rewrite_fig2.gif
-./usr/share/doc/html/httpd/images/mod_ssl_sb.gif
-./usr/share/doc/html/httpd/images/openssl_ics.gif
-./usr/share/doc/html/httpd/images/pixel.gif
-./usr/share/doc/html/httpd/images/sub.gif
-./usr/share/doc/html/httpd/index.html
-./usr/share/doc/html/httpd/invoking.html
-./usr/share/doc/html/httpd/ipv6.html
-./usr/share/doc/html/httpd/keepalive.html
-./usr/share/doc/html/httpd/location.html
-./usr/share/doc/html/httpd/logs.html
-./usr/share/doc/html/httpd/misc
-./usr/share/doc/html/httpd/misc/API.html
-./usr/share/doc/html/httpd/misc/FAQ.html
-./usr/share/doc/html/httpd/misc/custom_errordocs.html
-./usr/share/doc/html/httpd/misc/descriptors.html
-./usr/share/doc/html/httpd/misc/fin_wait_2.html
-./usr/share/doc/html/httpd/misc/howto.html
-./usr/share/doc/html/httpd/misc/index.html
-./usr/share/doc/html/httpd/misc/known_client_problems.html
-./usr/share/doc/html/httpd/misc/perf-bsd44.html
-./usr/share/doc/html/httpd/misc/perf-tuning.html
-./usr/share/doc/html/httpd/misc/perf.html
-./usr/share/doc/html/httpd/misc/rewriteguide.html
-./usr/share/doc/html/httpd/misc/security_tips.html
-./usr/share/doc/html/httpd/misc/tutorials.html
-./usr/share/doc/html/httpd/mod
-./usr/share/doc/html/httpd/mod/core.html
-./usr/share/doc/html/httpd/mod/directive-dict.html
-./usr/share/doc/html/httpd/mod/directives.html
-./usr/share/doc/html/httpd/mod/index-bytype.html
-./usr/share/doc/html/httpd/mod/index.html
-./usr/share/doc/html/httpd/mod/mod_access.html
-./usr/share/doc/html/httpd/mod/mod_actions.html
-./usr/share/doc/html/httpd/mod/mod_alias.html
-./usr/share/doc/html/httpd/mod/mod_asis.html
-./usr/share/doc/html/httpd/mod/mod_auth.html
-./usr/share/doc/html/httpd/mod/mod_auth_anon.html
-./usr/share/doc/html/httpd/mod/mod_auth_db.html
-./usr/share/doc/html/httpd/mod/mod_auth_dbm.html
-./usr/share/doc/html/httpd/mod/mod_auth_digest.html
-./usr/share/doc/html/httpd/mod/mod_autoindex.html
-./usr/share/doc/html/httpd/mod/mod_cern_meta.html
-./usr/share/doc/html/httpd/mod/mod_cgi.html
-./usr/share/doc/html/httpd/mod/mod_define.html
-./usr/share/doc/html/httpd/mod/mod_digest.html
-./usr/share/doc/html/httpd/mod/mod_dir.html
-./usr/share/doc/html/httpd/mod/mod_env.html
-./usr/share/doc/html/httpd/mod/mod_expires.html
-./usr/share/doc/html/httpd/mod/mod_headers.html
-./usr/share/doc/html/httpd/mod/mod_imap.html
-./usr/share/doc/html/httpd/mod/mod_include.html
-./usr/share/doc/html/httpd/mod/mod_info.html
-./usr/share/doc/html/httpd/mod/mod_log_agent.html
-./usr/share/doc/html/httpd/mod/mod_log_common.html
-./usr/share/doc/html/httpd/mod/mod_log_config.html
-./usr/share/doc/html/httpd/mod/mod_log_referer.html
-./usr/share/doc/html/httpd/mod/mod_mime.html
-./usr/share/doc/html/httpd/mod/mod_mime_magic.html
-./usr/share/doc/html/httpd/mod/mod_mmap_static.html
-./usr/share/doc/html/httpd/mod/mod_negotiation.html
-./usr/share/doc/html/httpd/mod/mod_proxy.html
-./usr/share/doc/html/httpd/mod/mod_rewrite.html
-./usr/share/doc/html/httpd/mod/mod_setenvif.html
-./usr/share/doc/html/httpd/mod/mod_so.html
-./usr/share/doc/html/httpd/mod/mod_speling.html
-./usr/share/doc/html/httpd/mod/mod_ssl
-./usr/share/doc/html/httpd/mod/mod_ssl/index.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_compat.gfont000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_compat.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_cover_logo.jpg
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_cover_title.jpg
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_faq.gfont000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_faq.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_glossary.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_howto.gfont000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_howto.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro.gfont000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig1.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig2.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_intro_fig3.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview.gfont000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_overview_fig1.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_reference.gfont000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_reference.html
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-chapter.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-1.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-2.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-3.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-4.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-5.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-6.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.head-num-7.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.imgdot-1x1-000000.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.imgdot-1x1-transp.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-next-n.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-next-s.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-prev-n.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.navbut-prev-s.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-abstract.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-compat.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-faq.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-gloss.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-howto.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-intro.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-over.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-preface.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-ref.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-toc.gif
-./usr/share/doc/html/httpd/mod/mod_ssl/ssl_template.title-tutor.gif
-./usr/share/doc/html/httpd/mod/mod_status.html
-./usr/share/doc/html/httpd/mod/mod_unique_id.html
-./usr/share/doc/html/httpd/mod/mod_userdir.html
-./usr/share/doc/html/httpd/mod/mod_usertrack.html
-./usr/share/doc/html/httpd/mod/mod_vhost_alias.html
-./usr/share/doc/html/httpd/mod/module-dict.html
-./usr/share/doc/html/httpd/multilogs.html
-./usr/share/doc/html/httpd/process-model.html
-./usr/share/doc/html/httpd/programs
-./usr/share/doc/html/httpd/programs/ab.html
-./usr/share/doc/html/httpd/programs/apachectl.html
-./usr/share/doc/html/httpd/programs/apxs.html
-./usr/share/doc/html/httpd/programs/dbmmanage.html
-./usr/share/doc/html/httpd/programs/htdigest.html
-./usr/share/doc/html/httpd/programs/htpasswd.html
-./usr/share/doc/html/httpd/programs/httpd.html
-./usr/share/doc/html/httpd/programs/index.html
-./usr/share/doc/html/httpd/programs/logresolve.html
-./usr/share/doc/html/httpd/programs/other.html
-./usr/share/doc/html/httpd/programs/rotatelogs.html
-./usr/share/doc/html/httpd/programs/suexec.html
-./usr/share/doc/html/httpd/search
-./usr/share/doc/html/httpd/sections.html
-./usr/share/doc/html/httpd/server-wide.html
-./usr/share/doc/html/httpd/sitemap.html
-./usr/share/doc/html/httpd/stopping.html
-./usr/share/doc/html/httpd/suexec.html
-./usr/share/doc/html/httpd/urlmapping.html
-./usr/share/doc/html/httpd/vhosts
-./usr/share/doc/html/httpd/vhosts/details.html
-./usr/share/doc/html/httpd/vhosts/examples.html
-./usr/share/doc/html/httpd/vhosts/fd-limits.html
-./usr/share/doc/html/httpd/vhosts/host.html
-./usr/share/doc/html/httpd/vhosts/index.html
-./usr/share/doc/html/httpd/vhosts/ip-based.html
-./usr/share/doc/html/httpd/vhosts/mass.html
-./usr/share/doc/html/httpd/vhosts/name-based.html
-./usr/share/doc/html/httpd/vhosts/vhosts-in-depth.html
-./usr/share/doc/html/httpd/vhosts/virtual-host.html
-./usr/share/doc/html/lynx_help
-./usr/share/doc/html/lynx_help/Lynx_users_guide.html
-./usr/share/doc/html/lynx_help/about_lynx.html
-./usr/share/doc/html/lynx_help/keystrokes
-./usr/share/doc/html/lynx_help/keystrokes/alt_edit_help.html
-./usr/share/doc/html/lynx_help/keystrokes/bashlike_edit_help.html
-./usr/share/doc/html/lynx_help/keystrokes/bookmark_help.html
-./usr/share/doc/html/lynx_help/keystrokes/cookie_help.html
-./usr/share/doc/html/lynx_help/keystrokes/dired_help.html
-./usr/share/doc/html/lynx_help/keystrokes/edit_help.html
-./usr/share/doc/html/lynx_help/keystrokes/environments.html
-./usr/share/doc/html/lynx_help/keystrokes/follow_help.html
-./usr/share/doc/html/lynx_help/keystrokes/gopher_types_help.html
-./usr/share/doc/html/lynx_help/keystrokes/history_help.html
-./usr/share/doc/html/lynx_help/keystrokes/keystroke_help.html
-./usr/share/doc/html/lynx_help/keystrokes/movement_help.html
-./usr/share/doc/html/lynx_help/keystrokes/option_help.html
-./usr/share/doc/html/lynx_help/keystrokes/other_help.html
-./usr/share/doc/html/lynx_help/keystrokes/print_help.html
-./usr/share/doc/html/lynx_help/keystrokes/scrolling_help.html
-./usr/share/doc/html/lynx_help/keystrokes/test_display.html
-./usr/share/doc/html/lynx_help/keystrokes/visited_help.html
-./usr/share/doc/html/lynx_help/keystrokes/xterm_help.html
-./usr/share/doc/html/lynx_help/lynx-dev.html
-./usr/share/doc/html/lynx_help/lynx_help_main.html
-./usr/share/doc/html/lynx_help/lynx_url_support.html
-./usr/share/doc/html/milter
-./usr/share/doc/html/milter/api.html
-./usr/share/doc/html/milter/design.html
-./usr/share/doc/html/milter/figure1.jpg
-./usr/share/doc/html/milter/figure2.jpg
-./usr/share/doc/html/milter/index.html
-./usr/share/doc/html/milter/installation.html
-./usr/share/doc/html/milter/other.html
-./usr/share/doc/html/milter/overview.html
-./usr/share/doc/html/milter/sample.html
-./usr/share/doc/html/milter/smfi_addheader.html
-./usr/share/doc/html/milter/smfi_addrcpt.html
-./usr/share/doc/html/milter/smfi_chgheader.html
-./usr/share/doc/html/milter/smfi_delrcpt.html
-./usr/share/doc/html/milter/smfi_getpriv.html
-./usr/share/doc/html/milter/smfi_getsymval.html
-./usr/share/doc/html/milter/smfi_insheader.html
-./usr/share/doc/html/milter/smfi_main.html
-./usr/share/doc/html/milter/smfi_opensocket.html
-./usr/share/doc/html/milter/smfi_progress.html
-./usr/share/doc/html/milter/smfi_quarantine.html
-./usr/share/doc/html/milter/smfi_register.html
-./usr/share/doc/html/milter/smfi_replacebody.html
-./usr/share/doc/html/milter/smfi_setbacklog.html
-./usr/share/doc/html/milter/smfi_setconn.html
-./usr/share/doc/html/milter/smfi_setdbg.html
-./usr/share/doc/html/milter/smfi_setmlreply.html
-./usr/share/doc/html/milter/smfi_setpriv.html
-./usr/share/doc/html/milter/smfi_setreply.html
-./usr/share/doc/html/milter/smfi_settimeout.html
-./usr/share/doc/html/milter/smfi_stop.html
-./usr/share/doc/html/milter/xxfi_abort.html
-./usr/share/doc/html/milter/xxfi_body.html
-./usr/share/doc/html/milter/xxfi_close.html
-./usr/share/doc/html/milter/xxfi_connect.html
-./usr/share/doc/html/milter/xxfi_envfrom.html
-./usr/share/doc/html/milter/xxfi_envrcpt.html
-./usr/share/doc/html/milter/xxfi_eoh.html
-./usr/share/doc/html/milter/xxfi_eom.html
-./usr/share/doc/html/milter/xxfi_header.html
-./usr/share/doc/html/milter/xxfi_helo.html
 ./usr/share/doc/psd
-./usr/share/doc/psd/00.contents
-./usr/share/doc/psd/01.cacm
-./usr/share/doc/psd/02.implement
-./usr/share/doc/psd/03.iosys
-./usr/share/doc/psd/04.uprog
-./usr/share/doc/psd/05.sysman
-./usr/share/doc/psd/05.sysman/0.t
-./usr/share/doc/psd/05.sysman/1.0.t
-./usr/share/doc/psd/05.sysman/1.1.t
-./usr/share/doc/psd/05.sysman/1.2.t
-./usr/share/doc/psd/05.sysman/1.3.t
-./usr/share/doc/psd/05.sysman/1.4.t
-./usr/share/doc/psd/05.sysman/1.5.t
-./usr/share/doc/psd/05.sysman/1.6.t
-./usr/share/doc/psd/05.sysman/1.7.t
-./usr/share/doc/psd/05.sysman/2.0.t
-./usr/share/doc/psd/05.sysman/2.1.t
-./usr/share/doc/psd/05.sysman/2.2.t
-./usr/share/doc/psd/05.sysman/2.3.t
-./usr/share/doc/psd/05.sysman/2.4.t
-./usr/share/doc/psd/05.sysman/2.5.t
-./usr/share/doc/psd/05.sysman/Makefile
-./usr/share/doc/psd/05.sysman/a.t
-./usr/share/doc/psd/06.Clang
-./usr/share/doc/psd/07.pascal
-./usr/share/doc/psd/08.f77
-./usr/share/doc/psd/09.f77io
-./usr/share/doc/psd/10.gdb
-./usr/share/doc/psd/11.adb
 ./usr/share/doc/psd/12.make
 ./usr/share/doc/psd/12.make/Makefile
 ./usr/share/doc/psd/12.make/tutorial.ms
-./usr/share/doc/psd/13.rcs
-./usr/share/doc/psd/14.sccs
 ./usr/share/doc/psd/15.yacc
 ./usr/share/doc/psd/15.yacc/Makefile
 ./usr/share/doc/psd/15.yacc/ss..
@@ -320,228 +25,15 @@
 ./usr/share/doc/psd/16.lex
 ./usr/share/doc/psd/16.lex/Makefile
 ./usr/share/doc/psd/16.lex/lex.ms
-./usr/share/doc/psd/17.m4
 ./usr/share/doc/psd/18.gprof
-./usr/share/doc/psd/18.gprof/Makefile
-./usr/share/doc/psd/18.gprof/abstract.me
-./usr/share/doc/psd/18.gprof/gathering.me
-./usr/share/doc/psd/18.gprof/header.me
-./usr/share/doc/psd/18.gprof/intro.me
-./usr/share/doc/psd/18.gprof/postp.me
-./usr/share/doc/psd/18.gprof/postp1.pic
-./usr/share/doc/psd/18.gprof/postp2.pic
-./usr/share/doc/psd/18.gprof/postp3.pic
-./usr/share/doc/psd/18.gprof/pres1.pic
-./usr/share/doc/psd/18.gprof/pres2.pic
-./usr/share/doc/psd/18.gprof/present.me
-./usr/share/doc/psd/18.gprof/profiling.me
-./usr/share/doc/psd/18.gprof/refs.me
-./usr/share/doc/psd/19.curses
-./usr/share/doc/psd/19.curses/Makefile
-./usr/share/doc/psd/19.curses/Master
-./usr/share/doc/psd/19.curses/appen.A
-./usr/share/doc/psd/19.curses/appen.B
-./usr/share/doc/psd/19.curses/appen.C
-./usr/share/doc/psd/19.curses/c_macros
-./usr/share/doc/psd/19.curses/doc.I
-./usr/share/doc/psd/19.curses/doc.II
-./usr/share/doc/psd/19.curses/doc.III
-./usr/share/doc/psd/19.curses/doc.IV
-./usr/share/doc/psd/19.curses/ex1.c
-./usr/share/doc/psd/19.curses/ex2.c
-./usr/share/doc/psd/19.curses/fns.doc
-./usr/share/doc/psd/19.curses/intro.0
-./usr/share/doc/psd/19.curses/intro.1
-./usr/share/doc/psd/19.curses/intro.2
-./usr/share/doc/psd/19.curses/intro.3
-./usr/share/doc/psd/19.curses/intro.4
-./usr/share/doc/psd/19.curses/intro.5
-./usr/share/doc/psd/19.curses/intro.6
-./usr/share/doc/psd/19.curses/life.c
-./usr/share/doc/psd/19.curses/macros
-./usr/share/doc/psd/19.curses/twinkle1.c
-./usr/share/doc/psd/19.curses/twinkle2.c
-./usr/share/doc/psd/19.curses/win_st.c
-./usr/share/doc/psd/20.ipctut
-./usr/share/doc/psd/20.ipctut/Makefile
-./usr/share/doc/psd/20.ipctut/dgramread.c
-./usr/share/doc/psd/20.ipctut/dgramsend.c
-./usr/share/doc/psd/20.ipctut/fig2.pic
-./usr/share/doc/psd/20.ipctut/fig3.pic
-./usr/share/doc/psd/20.ipctut/fig8.pic
-./usr/share/doc/psd/20.ipctut/pipe.c
-./usr/share/doc/psd/20.ipctut/socketpair.c
-./usr/share/doc/psd/20.ipctut/strchkread.c
-./usr/share/doc/psd/20.ipctut/streamread.c
-./usr/share/doc/psd/20.ipctut/streamwrite.c
-./usr/share/doc/psd/20.ipctut/tutor.me
-./usr/share/doc/psd/20.ipctut/udgramread.c
-./usr/share/doc/psd/20.ipctut/udgramsend.c
-./usr/share/doc/psd/20.ipctut/ustreamread.c
-./usr/share/doc/psd/20.ipctut/ustreamwrite.c
-./usr/share/doc/psd/21.ipc
-./usr/share/doc/psd/21.ipc/0.t
-./usr/share/doc/psd/21.ipc/1.t
-./usr/share/doc/psd/21.ipc/2.t
-./usr/share/doc/psd/21.ipc/3.t
-./usr/share/doc/psd/21.ipc/4.t
-./usr/share/doc/psd/21.ipc/5.t
-./usr/share/doc/psd/21.ipc/Makefile
-./usr/share/doc/psd/Makefile
-./usr/share/doc/psd/Title
 ./usr/share/doc/smm
-./usr/share/doc/smm/00.contents
-./usr/share/doc/smm/01.setup
-./usr/share/doc/smm/01.setup/0.t
-./usr/share/doc/smm/01.setup/1.t
-./usr/share/doc/smm/01.setup/2.t
-./usr/share/doc/smm/01.setup/3.t
-./usr/share/doc/smm/01.setup/4.t
-./usr/share/doc/smm/01.setup/5.t
-./usr/share/doc/smm/01.setup/6.t
-./usr/share/doc/smm/01.setup/Makefile
-./usr/share/doc/smm/02.config
-./usr/share/doc/smm/03.fsck_ffs
-./usr/share/doc/smm/03.fsck_ffs/0.t
-./usr/share/doc/smm/03.fsck_ffs/1.t
-./usr/share/doc/smm/03.fsck_ffs/2.t
-./usr/share/doc/smm/03.fsck_ffs/3.t
-./usr/share/doc/smm/03.fsck_ffs/4.t
-./usr/share/doc/smm/03.fsck_ffs/Makefile
-./usr/share/doc/smm/04.quotas
-./usr/share/doc/smm/04.quotas/Makefile
-./usr/share/doc/smm/04.quotas/quotas.ms
-./usr/share/doc/smm/05.fastfs
-./usr/share/doc/smm/05.fastfs/0.t
-./usr/share/doc/smm/05.fastfs/1.t
-./usr/share/doc/smm/05.fastfs/2.t
-./usr/share/doc/smm/05.fastfs/3.t
-./usr/share/doc/smm/05.fastfs/4.t
-./usr/share/doc/smm/05.fastfs/5.t
-./usr/share/doc/smm/05.fastfs/6.t
-./usr/share/doc/smm/05.fastfs/Makefile
-./usr/share/doc/smm/06.nfs
-./usr/share/doc/smm/06.nfs/0.t
-./usr/share/doc/smm/06.nfs/1.t
-./usr/share/doc/smm/06.nfs/2.t
-./usr/share/doc/smm/06.nfs/Makefile
-./usr/share/doc/smm/06.nfs/ref.t
-./usr/share/doc/smm/07.lpd
-./usr/share/doc/smm/07.lpd/0.t
-./usr/share/doc/smm/07.lpd/1.t
-./usr/share/doc/smm/07.lpd/2.t
-./usr/share/doc/smm/07.lpd/3.t
-./usr/share/doc/smm/07.lpd/4.t
-./usr/share/doc/smm/07.lpd/5.t
-./usr/share/doc/smm/07.lpd/6.t
-./usr/share/doc/smm/07.lpd/7.t
-./usr/share/doc/smm/07.lpd/Makefile
 ./usr/share/doc/smm/08.sendmailop
 ./usr/share/doc/smm/08.sendmailop/Makefile
 ./usr/share/doc/smm/08.sendmailop/op.me
-./usr/share/doc/smm/09.sendmail
-./usr/share/doc/smm/09.sendmail/Makefile
-./usr/share/doc/smm/09.sendmail/intro.me
-./usr/share/doc/smm/11.timedop
-./usr/share/doc/smm/11.timedop/Makefile
-./usr/share/doc/smm/11.timedop/timed.ms
-./usr/share/doc/smm/12.timed
-./usr/share/doc/smm/12.timed/Makefile
-./usr/share/doc/smm/12.timed/date
-./usr/share/doc/smm/12.timed/loop
-./usr/share/doc/smm/12.timed/time
-./usr/share/doc/smm/12.timed/timed.ms
-./usr/share/doc/smm/12.timed/unused
-./usr/share/doc/smm/13.amd
-./usr/share/doc/smm/14.uucpimpl
-./usr/share/doc/smm/15.uucpnet
-./usr/share/doc/smm/16.security
-./usr/share/doc/smm/17.password
-./usr/share/doc/smm/17.password/Makefile
-./usr/share/doc/smm/17.password/password.ms
-./usr/share/doc/smm/18.net
-./usr/share/doc/smm/18.net/0.t
-./usr/share/doc/smm/18.net/1.t
-./usr/share/doc/smm/18.net/2.t
-./usr/share/doc/smm/18.net/3.t
-./usr/share/doc/smm/18.net/4.t
-./usr/share/doc/smm/18.net/5.t
-./usr/share/doc/smm/18.net/6.t
-./usr/share/doc/smm/18.net/7.t
-./usr/share/doc/smm/18.net/8.t
-./usr/share/doc/smm/18.net/9.t
-./usr/share/doc/smm/18.net/Makefile
-./usr/share/doc/smm/18.net/a.t
-./usr/share/doc/smm/18.net/b.t
-./usr/share/doc/smm/18.net/c.t
-./usr/share/doc/smm/18.net/d.t
-./usr/share/doc/smm/18.net/e.t
-./usr/share/doc/smm/18.net/f.t
-./usr/share/doc/smm/Makefile
-./usr/share/doc/smm/Title
 ./usr/share/doc/usd
-./usr/share/doc/usd/00.contents
-./usr/share/doc/usd/01.begin
-./usr/share/doc/usd/01.begin/Makefile
-./usr/share/doc/usd/01.begin/u.mac
-./usr/share/doc/usd/01.begin/u0
-./usr/share/doc/usd/01.begin/u1
-./usr/share/doc/usd/01.begin/u2
-./usr/share/doc/usd/01.begin/u3
-./usr/share/doc/usd/01.begin/u4
-./usr/share/doc/usd/01.begin/u5
-./usr/share/doc/usd/02.learn
-./usr/share/doc/usd/03.shell
-./usr/share/doc/usd/04.csh
-./usr/share/doc/usd/04.csh/Makefile
-./usr/share/doc/usd/04.csh/csh.1
-./usr/share/doc/usd/04.csh/csh.2
-./usr/share/doc/usd/04.csh/csh.3
-./usr/share/doc/usd/04.csh/csh.4
-./usr/share/doc/usd/04.csh/csh.a
-./usr/share/doc/usd/04.csh/csh.g
-./usr/share/doc/usd/04.csh/tabs
-./usr/share/doc/usd/05.dc
 ./usr/share/doc/usd/06.bc
 ./usr/share/doc/usd/06.bc/Makefile
 ./usr/share/doc/usd/06.bc/bc
-./usr/share/doc/usd/07.mail
-./usr/share/doc/usd/07.mail/Makefile
-./usr/share/doc/usd/07.mail/mail0.nr
-./usr/share/doc/usd/07.mail/mail1.nr
-./usr/share/doc/usd/07.mail/mail2.nr
-./usr/share/doc/usd/07.mail/mail3.nr
-./usr/share/doc/usd/07.mail/mail4.nr
-./usr/share/doc/usd/07.mail/mail5.nr
-./usr/share/doc/usd/07.mail/mail6.nr
-./usr/share/doc/usd/07.mail/mail7.nr
-./usr/share/doc/usd/07.mail/mail8.nr
-./usr/share/doc/usd/07.mail/mail9.nr
-./usr/share/doc/usd/07.mail/maila.nr
-./usr/share/doc/usd/08.mh
-./usr/share/doc/usd/09.edtut
-./usr/share/doc/usd/09.edtut/Makefile
-./usr/share/doc/usd/09.edtut/e.mac
-./usr/share/doc/usd/09.edtut/e0
-./usr/share/doc/usd/09.edtut/e1
-./usr/share/doc/usd/09.edtut/e2
-./usr/share/doc/usd/09.edtut/e3
-./usr/share/doc/usd/09.edtut/e4
-./usr/share/doc/usd/09.edtut/e5
-./usr/share/doc/usd/09.edtut/e6
-./usr/share/doc/usd/09.edtut/e7
-./usr/share/doc/usd/10.edadv
-./usr/share/doc/usd/10.edadv/Makefile
-./usr/share/doc/usd/10.edadv/ae.mac
-./usr/share/doc/usd/10.edadv/ae0
-./usr/share/doc/usd/10.edadv/ae1
-./usr/share/doc/usd/10.edadv/ae2
-./usr/share/doc/usd/10.edadv/ae3
-./usr/share/doc/usd/10.edadv/ae4
-./usr/share/doc/usd/10.edadv/ae5
-./usr/share/doc/usd/10.edadv/ae6
-./usr/share/doc/usd/10.edadv/ae7
-./usr/share/doc/usd/10.edadv/ae9
 ./usr/share/doc/usd/11.edit
 ./usr/share/doc/usd/11.edit/Makefile
 ./usr/share/doc/usd/11.edit/edittut.ms
@@ -564,37 +56,17 @@
 ./usr/share/doc/usd/13.viref/spell.ok
 ./usr/share/doc/usd/13.viref/vi.cmd.roff
 ./usr/share/doc/usd/13.viref/vi.ref
-./usr/share/doc/usd/14.jove
-./usr/share/doc/usd/15.sed
-./usr/share/doc/usd/15.sed/Makefile
-./usr/share/doc/usd/15.sed/sed
-./usr/share/doc/usd/16.awk
-./usr/share/doc/usd/16.awk/Makefile
-./usr/share/doc/usd/16.awk/awk
-./usr/share/doc/usd/17.msmacros
-./usr/share/doc/usd/17.msmacros/Makefile
-./usr/share/doc/usd/17.msmacros/fig1.pic
-./usr/share/doc/usd/17.msmacros/ms
-./usr/share/doc/usd/18.msdiffs
-./usr/share/doc/usd/18.msdiffs/Makefile
-./usr/share/doc/usd/18.msdiffs/ms.diffs
-./usr/share/doc/usd/19.memacros
-./usr/share/doc/usd/19.memacros/Makefile
-./usr/share/doc/usd/19.memacros/intro.me
-./usr/share/doc/usd/20.meref
-./usr/share/doc/usd/20.meref/Makefile
-./usr/share/doc/usd/20.meref/ref.me
-./usr/share/doc/usd/21.troff
-./usr/share/doc/usd/22.trofftut
-./usr/share/doc/usd/23.eqn
-./usr/share/doc/usd/24.eqnguide
-./usr/share/doc/usd/25.tbl
-./usr/share/doc/usd/26.refer
-./usr/share/doc/usd/27.invert
-./usr/share/doc/usd/28.bib
-./usr/share/doc/usd/29.diction
-./usr/share/doc/usd/31.trek
-./usr/share/doc/usd/31.trek/Makefile
-./usr/share/doc/usd/31.trek/trek.me
-./usr/share/doc/usd/Makefile
-./usr/share/doc/usd/Title
+./usr/share/doc/psd/18.gprof/Makefile
+./usr/share/doc/psd/18.gprof/abstract.me
+./usr/share/doc/psd/18.gprof/gathering.me
+./usr/share/doc/psd/18.gprof/header.me
+./usr/share/doc/psd/18.gprof/intro.me
+./usr/share/doc/psd/18.gprof/postp.me
+./usr/share/doc/psd/18.gprof/postp1.pic
+./usr/share/doc/psd/18.gprof/postp2.pic
+./usr/share/doc/psd/18.gprof/postp3.pic
+./usr/share/doc/psd/18.gprof/pres1.pic
+./usr/share/doc/psd/18.gprof/pres2.pic
+./usr/share/doc/psd/18.gprof/present.me
+./usr/share/doc/psd/18.gprof/profiling.me
+./usr/share/doc/psd/18.gprof/refs.me
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index eca89861944..5f8505b50ba 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.199 2009/09/06 16:51:01 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.200 2010/01/04 17:50:38 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -651,76 +651,11 @@ programs  type=dir uname=root gname=wheel mode=755
 # ./usr/share/doc/psd
 psd
 
-# ./usr/share/doc/psd/01.cacm
-01.cacm
-# ./usr/share/doc/psd/01.cacm
-..
-
-# ./usr/share/doc/psd/02.implement
-02.implement
-# ./usr/share/doc/psd/02.implement
-..
-
-# ./usr/share/doc/psd/03.iosys
-03.iosys
-# ./usr/share/doc/psd/03.iosys
-..
-
-# ./usr/share/doc/psd/04.uprog
-04.uprog
-# ./usr/share/doc/psd/04.uprog
-..
-
-# ./usr/share/doc/psd/05.sysman
-05.sysman
-# ./usr/share/doc/psd/05.sysman
-..
-
-# ./usr/share/doc/psd/06.Clang
-06.Clang
-# ./usr/share/doc/psd/06.Clang
-..
-
-# ./usr/share/doc/psd/07.pascal
-07.pascal
-# ./usr/share/doc/psd/07.pascal
-..
-
-# ./usr/share/doc/psd/08.f77
-08.f77
-# ./usr/share/doc/psd/08.f77
-..
-
-# ./usr/share/doc/psd/09.f77io
-09.f77io
-# ./usr/share/doc/psd/09.f77io
-..
-
-# ./usr/share/doc/psd/10.gdb
-10.gdb
-# ./usr/share/doc/psd/10.gdb
-..
-
-# ./usr/share/doc/psd/11.adb
-11.adb
-# ./usr/share/doc/psd/11.adb
-..
-
 # ./usr/share/doc/psd/12.make
 12.make
 # ./usr/share/doc/psd/12.make
 ..
 
-# ./usr/share/doc/psd/13.rcs
-13.rcs
-# ./usr/share/doc/psd/13.rcs
-..
-
-# ./usr/share/doc/psd/14.sccs
-14.sccs
-# ./usr/share/doc/psd/14.sccs
-..
-
 # ./usr/share/doc/psd/15.yacc
 15.yacc
 # ./usr/share/doc/psd/15.yacc
@@ -731,178 +666,33 @@ psd
 # ./usr/share/doc/psd/16.lex
 ..
 
-# ./usr/share/doc/psd/17.m4
-17.m4
-# ./usr/share/doc/psd/17.m4
-..
-
 # ./usr/share/doc/psd/18.gprof
 18.gprof
 # ./usr/share/doc/psd/18.gprof
 ..
 
-# ./usr/share/doc/psd/19.curses
-19.curses
-# ./usr/share/doc/psd/19.curses
-..
-
-# ./usr/share/doc/psd/20.ipctut
-20.ipctut
-# ./usr/share/doc/psd/20.ipctut
-..
-
-# ./usr/share/doc/psd/21.ipc
-21.ipc
-# ./usr/share/doc/psd/21.ipc
-..
-
 # ./usr/share/doc/psd
 ..
 
 # ./usr/share/doc/smm
 smm
 
-# ./usr/share/doc/smm/01.setup
-01.setup
-# ./usr/share/doc/smm/01.setup
-..
-
-# ./usr/share/doc/smm/02.config
-02.config
-# ./usr/share/doc/smm/02.config
-..
-
-# ./usr/share/doc/smm/03.fsck_ffs
-03.fsck_ffs
-# ./usr/share/doc/smm/03.fsck_ffs
-..
-
-# ./usr/share/doc/smm/04.quotas
-04.quotas
-# ./usr/share/doc/smm/04.quotas
-..
-
-# ./usr/share/doc/smm/05.fastfs
-05.fastfs
-# ./usr/share/doc/smm/05.fastfs
-..
-
-# ./usr/share/doc/smm/06.nfs
-06.nfs
-# ./usr/share/doc/smm/06.nfs
-..
-
-# ./usr/share/doc/smm/07.lpd
-07.lpd
-# ./usr/share/doc/smm/07.lpd
-..
-
 # ./usr/share/doc/smm/08.sendmailop
 08.sendmailop
 # ./usr/share/doc/smm/08.sendmailop
 ..
 
-# ./usr/share/doc/smm/09.sendmail
-09.sendmail
-# ./usr/share/doc/smm/09.sendmail
-..
-
-# ./usr/share/doc/smm/11.timedop
-11.timedop
-# ./usr/share/doc/smm/11.timedop
-..
-
-# ./usr/share/doc/smm/12.timed
-12.timed
-# ./usr/share/doc/smm/12.timed
-..
-
-# ./usr/share/doc/smm/13.amd
-13.amd
-# ./usr/share/doc/smm/13.amd
-..
-
-# ./usr/share/doc/smm/14.uucpimpl
-14.uucpimpl
-# ./usr/share/doc/smm/14.uucpimpl
-..
-
-# ./usr/share/doc/smm/15.uucpnet
-15.uucpnet
-# ./usr/share/doc/smm/15.uucpnet
-..
-
-# ./usr/share/doc/smm/16.security
-16.security
-# ./usr/share/doc/smm/16.security
-..
-
-# ./usr/share/doc/smm/17.password
-17.password
-# ./usr/share/doc/smm/17.password
-..
-
-# ./usr/share/doc/smm/18.net
-18.net
-# ./usr/share/doc/smm/18.net
-..
-
 # ./usr/share/doc/smm
 ..
 
 # ./usr/share/doc/usd
 usd
 
-# ./usr/share/doc/usd/01.begin
-01.begin
-# ./usr/share/doc/usd/01.begin
-..
-
-# ./usr/share/doc/usd/02.learn
-02.learn
-# ./usr/share/doc/usd/02.learn
-..
-
-# ./usr/share/doc/usd/03.shell
-03.shell
-# ./usr/share/doc/usd/03.shell
-..
-
-# ./usr/share/doc/usd/04.csh
-04.csh
-# ./usr/share/doc/usd/04.csh
-..
-
-# ./usr/share/doc/usd/05.dc
-05.dc
-# ./usr/share/doc/usd/05.dc
-..
-
 # ./usr/share/doc/usd/06.bc
 06.bc
 # ./usr/share/doc/usd/06.bc
 ..
 
-# ./usr/share/doc/usd/07.mail
-07.mail
-# ./usr/share/doc/usd/07.mail
-..
-
-# ./usr/share/doc/usd/08.mh
-08.mh
-# ./usr/share/doc/usd/08.mh
-..
-
-# ./usr/share/doc/usd/09.edtut
-09.edtut
-# ./usr/share/doc/usd/09.edtut
-..
-
-# ./usr/share/doc/usd/10.edadv
-10.edadv
-# ./usr/share/doc/usd/10.edadv
-..
-
 # ./usr/share/doc/usd/11.edit
 11.edit
 # ./usr/share/doc/usd/11.edit
@@ -923,91 +713,6 @@ usd
 # ./usr/share/doc/usd/13.ex
 ..
 
-# ./usr/share/doc/usd/14.jove
-14.jove
-# ./usr/share/doc/usd/14.jove
-..
-
-# ./usr/share/doc/usd/15.sed
-15.sed
-# ./usr/share/doc/usd/15.sed
-..
-
-# ./usr/share/doc/usd/16.awk
-16.awk
-# ./usr/share/doc/usd/16.awk
-..
-
-# ./usr/share/doc/usd/17.msmacros
-17.msmacros
-# ./usr/share/doc/usd/17.msmacros
-..
-
-# ./usr/share/doc/usd/18.msdiffs
-18.msdiffs
-# ./usr/share/doc/usd/18.msdiffs
-..
-
-# ./usr/share/doc/usd/19.memacros
-19.memacros
-# ./usr/share/doc/usd/19.memacros
-..
-
-# ./usr/share/doc/usd/20.meref
-20.meref
-# ./usr/share/doc/usd/20.meref
-..
-
-# ./usr/share/doc/usd/21.troff
-21.troff
-# ./usr/share/doc/usd/21.troff
-..
-
-# ./usr/share/doc/usd/22.trofftut
-22.trofftut
-# ./usr/share/doc/usd/22.trofftut
-..
-
-# ./usr/share/doc/usd/23.eqn
-23.eqn
-# ./usr/share/doc/usd/23.eqn
-..
-
-# ./usr/share/doc/usd/24.eqnguide
-24.eqnguide
-# ./usr/share/doc/usd/24.eqnguide
-..
-
-# ./usr/share/doc/usd/25.tbl
-25.tbl
-# ./usr/share/doc/usd/25.tbl
-..
-
-# ./usr/share/doc/usd/26.refer
-26.refer
-# ./usr/share/doc/usd/26.refer
-..
-
-# ./usr/share/doc/usd/27.invert
-27.invert
-# ./usr/share/doc/usd/27.invert
-..
-
-# ./usr/share/doc/usd/28.bib
-28.bib
-# ./usr/share/doc/usd/28.bib
-..
-
-# ./usr/share/doc/usd/29.diction
-29.diction
-# ./usr/share/doc/usd/29.diction
-..
-
-# ./usr/share/doc/usd/31.trek
-31.trek
-# ./usr/share/doc/usd/31.trek
-..
-
 # ./usr/share/doc/usd
 ..
 
diff --git a/etc/mtree/4.4BSD.usr b/etc/mtree/4.4BSD.usr
index 65565ddee01..220b6520089 100644
--- a/etc/mtree/4.4BSD.usr
+++ b/etc/mtree/4.4BSD.usr
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.usr,v 1.22 2004/08/06 21:49:10 pefo Exp $
+#	$OpenBSD: 4.4BSD.usr,v 1.23 2010/01/04 17:50:38 deraadt Exp $
 #	$NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $
 #
 #	   user: bostic
@@ -116,13 +116,6 @@ term            type=dir uname=root gname=wheel mode=0755
 ..
 
 
-# ./contrib/lib/jove
-/set type=file gname=wheel uname=root mode=0755
-jove            type=dir
-# ./contrib/lib/jove
-..
-
-
 # ./contrib/lib/perl
 /set type=file gname=obin uname=root mode=0644
 perl            type=dir mode=0755
@@ -193,49 +186,6 @@ cat8            type=dir gname=wheel mode=0755
 ..
 
 
-# ./contrib/mh-6.8
-/set type=file gname=wheel uname=root mode=0755
-mh-6.8          type=dir
-
-# ./contrib/mh-6.8/bin
-/set type=file gname=wheel uname=root mode=0755
-bin             type=dir
-# ./contrib/mh-6.8/bin
-..
-
-
-# ./contrib/mh-6.8/lib
-/set type=file gname=wheel uname=root mode=0644
-lib             type=dir mode=0755
-# ./contrib/mh-6.8/lib
-..
-
-# ./contrib/mh-6.8
-..
-
-
-# ./contrib/news
-/set type=file gname=news uname=news mode=0775
-news            type=dir
-
-# ./contrib/news/bin
-bin             type=dir
-# ./contrib/news/bin
-..
-
-# ./contrib/news
-..
-
-
-# ./contrib/rnews
-rnews           type=dir
-# ./contrib/rnews
-..
-
-# ./contrib
-..
-
-
 # ./games
 /set type=file gname=wheel uname=root mode=0755
 games           type=dir
@@ -727,82 +677,6 @@ curses		type=dir uname=root gname=wheel mode=0755
 /set type=file gname=wheel uname=root mode=0775
 psd             type=dir
 
-# ./share/doc/psd/01.cacm
-/set type=file gname=bin uname=root mode=0444
-01.cacm         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/01.cacm
-..
-
-
-# ./share/doc/psd/02.implement
-/set type=file gname=bin uname=root mode=0444
-02.implement    type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/02.implement
-..
-
-
-# ./share/doc/psd/03.iosys
-/set type=file gname=bin uname=root mode=0444
-03.iosys        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/03.iosys
-..
-
-
-# ./share/doc/psd/04.uprog
-/set type=file gname=bin uname=root mode=0444
-04.uprog        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/04.uprog
-..
-
-
-# ./share/doc/psd/05.sysman
-/set type=file gname=bin uname=root mode=0444
-05.sysman       type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/05.sysman
-..
-
-
-# ./share/doc/psd/06.Clang
-/set type=file gname=bin uname=root mode=0444
-06.Clang        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/06.Clang
-..
-
-
-# ./share/doc/psd/07.pascal
-/set type=file gname=bin uname=root mode=0444
-07.pascal       type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/07.pascal
-..
-
-
-# ./share/doc/psd/08.f77
-/set type=file gname=bin uname=root mode=0444
-08.f77          type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/08.f77
-..
-
-
-# ./share/doc/psd/09.f77io
-/set type=file gname=bin uname=root mode=0444
-09.f77io        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/09.f77io
-..
-
-
-# ./share/doc/psd/10.gdb
-10.gdb          type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/10.gdb
-..
-
-
-# ./share/doc/psd/11.adb
-/set type=file gname=bin uname=root mode=0444
-11.adb          type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/11.adb
-..
-
-
 # ./share/doc/psd/12.make
 /set type=file gname=bin uname=root mode=0444
 12.make         type=dir uname=root gname=wheel mode=0775
@@ -810,19 +684,6 @@ psd             type=dir
 ..
 
 
-# ./share/doc/psd/13.rcs
-13.rcs          type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/13.rcs
-..
-
-
-# ./share/doc/psd/14.sccs
-/set type=file gname=bin uname=root mode=0444
-14.sccs         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/14.sccs
-..
-
-
 # ./share/doc/psd/15.yacc
 /set type=file gname=bin uname=root mode=0444
 15.yacc         type=dir uname=root gname=wheel mode=0775
@@ -837,13 +698,6 @@ psd             type=dir
 ..
 
 
-# ./share/doc/psd/17.m4
-/set type=file gname=bin uname=root mode=0444
-17.m4           type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/17.m4
-..
-
-
 # ./share/doc/psd/18.gprof
 /set type=file gname=bin uname=root mode=0444
 18.gprof        type=dir uname=root gname=wheel mode=0775
@@ -851,26 +705,6 @@ psd             type=dir
 ..
 
 
-# ./share/doc/psd/19.curses
-/set type=file gname=bin uname=root mode=0444
-19.curses       type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/19.curses
-..
-
-
-# ./share/doc/psd/20.ipctut
-/set type=file gname=bin uname=root mode=0444
-20.ipctut       type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/20.ipctut
-..
-
-
-# ./share/doc/psd/21.ipc
-/set type=file gname=bin uname=root mode=0444
-21.ipc          type=dir uname=root gname=wheel mode=0775
-# ./share/doc/psd/21.ipc
-..
-
 # ./share/doc/psd
 ..
 
@@ -949,13 +783,6 @@ vax             type=dir uname=root gname=wheel mode=0775
 ..
 
 
-# ./share/doc/smm/09.sendmail
-/set type=file gname=bin uname=root mode=0444
-09.sendmail     type=dir uname=root gname=wheel mode=0775
-# ./share/doc/smm/09.sendmail
-..
-
-
 # ./share/doc/smm/11.timedop
 /set type=file gname=bin uname=root mode=0444
 11.timedop      type=dir uname=root gname=wheel mode=0775
@@ -1018,27 +845,6 @@ vax             type=dir uname=root gname=wheel mode=0775
 /set type=file gname=wheel uname=root mode=0775
 usd             type=dir
 
-# ./share/doc/usd/01.begin
-/set type=file gname=bin uname=root mode=0444
-01.begin        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/01.begin
-..
-
-
-# ./share/doc/usd/02.learn
-/set type=file gname=bin uname=root mode=0444
-02.learn        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/02.learn
-..
-
-
-# ./share/doc/usd/03.shell
-/set type=file gname=bin uname=root mode=0444
-03.shell        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/03.shell
-..
-
-
 # ./share/doc/usd/04.csh
 /set type=file gname=bin uname=root mode=0444
 04.csh          type=dir uname=root gname=wheel mode=0775
@@ -1046,13 +852,6 @@ usd             type=dir
 ..
 
 
-# ./share/doc/usd/05.dc
-/set type=file gname=bin uname=root mode=0444
-05.dc           type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/05.dc
-..
-
-
 # ./share/doc/usd/06.bc
 /set type=file gname=bin uname=root mode=0444
 06.bc           type=dir uname=root gname=wheel mode=0775
@@ -1060,40 +859,6 @@ usd             type=dir
 ..
 
 
-# ./share/doc/usd/07.mail
-/set type=file gname=bin uname=root mode=0444
-07.mail         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/07.mail
-..
-
-
-# ./share/doc/usd/08.mh
-08.mh           type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/08.mh
-..
-
-
-# ./share/doc/usd/09.edtut
-/set type=file gname=bin uname=root mode=0444
-09.edtut        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/09.edtut
-..
-
-
-# ./share/doc/usd/10.edadv
-/set type=file gname=bin uname=root mode=0444
-10.edadv        type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/10.edadv
-..
-
-
-# ./share/doc/usd/11.edit
-/set type=file gname=bin uname=root mode=0444
-11.edit         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/11.edit
-..
-
-
 # ./share/doc/usd/12.vi
 /set type=file gname=bin uname=root mode=0444
 12.vi           type=dir uname=root gname=wheel mode=0775
@@ -1108,13 +873,6 @@ usd             type=dir
 ..
 
 
-# ./share/doc/usd/14.jove
-/set type=file gname=bin uname=root mode=0444
-14.jove         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/14.jove
-..
-
-
 # ./share/doc/usd/15.sed
 /set type=file gname=bin uname=root mode=0444
 15.sed          type=dir uname=root gname=wheel mode=0775
@@ -1220,12 +978,6 @@ usd             type=dir
 ..
 
 
-# ./share/doc/usd/31.trek
-/set type=file gname=bin uname=root mode=0444
-31.trek         type=dir uname=root gname=wheel mode=0775
-# ./share/doc/usd/31.trek
-..
-
 # ./share/doc/usd
 ..
 
diff --git a/games/rogue/Makefile b/games/rogue/Makefile
index 17b747d85b1..d0c3f9d08c2 100644
--- a/games/rogue/Makefile
+++ b/games/rogue/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2004/01/21 19:12:13 espie Exp $
+#	$OpenBSD: Makefile,v 1.11 2010/01/04 17:50:38 deraadt Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	rogue
@@ -11,10 +11,6 @@ LDADD=	-lcurses
 MAN=	rogue.6
 BINMODE=2555
 
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
 beforeinstall: 
 	@if [ ! -f ${DESTDIR}/var/games/rogue.scores ]; then \
 	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 664 \
diff --git a/games/trek/Makefile b/games/trek/Makefile
index 69a61ebff15..599f8d3ec81 100644
--- a/games/trek/Makefile
+++ b/games/trek/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2002/05/23 18:43:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2010/01/04 17:50:38 deraadt Exp $
 
 PROG=	trek
 SRCS=	abandon.c attack.c autover.c capture.c check_out.c checkcond.c \
@@ -12,8 +12,4 @@ MAN=	trek.6
 DPADD=	${LIBM}
 LDADD=	-lm
 
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
 .include <bsd.prog.mk>
diff --git a/lib/libocurses/Makefile b/lib/libocurses/Makefile
index e37308803b9..f2cf4da9a61 100644
--- a/lib/libocurses/Makefile
+++ b/lib/libocurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2005/11/24 20:49:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2010/01/04 17:50:38 deraadt Exp $
 
 CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
 CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}
@@ -14,10 +14,6 @@ SRCS=	addbytes.c addch.c addnstr.c box.c clear.c clrtobot.c clrtoeol.c \
 SRCS+=	termcap.c tgoto.c tputs.c
 MAN=	ocurses.3 otermcap.3
 
-.if make(install)
-SUBDIR+= PSD.doc
-.endif
-
 includes:
 	-cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/ocurses.h || \
 	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile
index 17be02a04a1..3481017d397 100644
--- a/sbin/fsck_ffs/Makefile
+++ b/sbin/fsck_ffs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/09/21 11:36:37 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2010/01/04 17:50:38 deraadt Exp $
 
 PROG=	fsck_ffs
 MAN=	fsck_ffs.8
@@ -7,8 +7,4 @@ SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
 .PATH:	${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../fsck
 CFLAGS+= -I${.CURDIR}/../fsck
 
-.if make(install)
-SUBDIR+= SMM.doc
-.endif
-
 .include <bsd.prog.mk>
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 0134244e668..0e0bb4a3746 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 2004/02/12 10:03:31 jmc Exp $
+#	$OpenBSD: Makefile,v 1.4 2010/01/04 17:50:39 deraadt Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 FILES=	README
-SUBDIR=	psd smm usd
 
 all depend includes lint tags:
 
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 9a3624923bf..767d13bdd58 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,8 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2004/10/10 02:42:59 mickey Exp $
-
-# Missing or not installed:
-# 01.cacm 02.implement 03.iosys 04.uprog 06.Clang
-# 07.pascal 08.f77 09.f77io 11.adb 13.rcs 14.sccs
+#	$OpenBSD: Makefile,v 1.7 2010/01/04 17:50:39 deraadt Exp $
 
 DOCDIR=	/usr/share/doc/psd
 FILES=	00.contents Makefile Title
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index ac47f03c3b5..0467ba7b6fd 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2004/10/10 02:44:18 mickey Exp $
+#	$OpenBSD: Makefile,v 1.8 2010/01/04 17:50:39 deraadt Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
 
 # Missing or not installed:
@@ -6,19 +6,6 @@
 
 DOCDIR=	/usr/share/doc/smm
 FILES=	00.contents Makefile Title
-SUBDIR=	01.setup 04.quotas 05.fastfs 06.nfs 17.password 18.net
-.if exists(03.fsck_ffs)
-SUBDIR+= 03.fsck_ffs
-.endif
-.if exists(07.lpd)
-SUBDIR+= 07.lpd
-.endif
-.if exists(08.sendmailop)
-SUBDIR+= 08.sendmailop
-.endif
-.if exists(09.sendmail)
-SUBDIR+= 09.sendmail
-.endif
 
 Title.ps: ${FILES}
 	groff Title > ${.TARGET}
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 02ad85cfb5f..af2b96afcb6 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2004/10/10 02:53:28 mickey Exp $
+#	$OpenBSD: Makefile,v 1.9 2010/01/04 17:50:39 deraadt Exp $
 
 # Missing or not installed:
 # 03.shell 08.mh 14.jove 21.troff 22.trofftut 23.eqn 24.eqnguide
@@ -6,7 +6,6 @@
 
 DOCDIR=	/usr/share/doc/usd
 FILES=	00.contents Makefile Title
-SUBDIR=	01.begin 17.msmacros 18.msdiffs 19.memacros 20.meref
 
 Title.ps: ${FILES}
 	groff Title > ${.TARGET}
diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile
index 49361184f74..b3b26a20e41 100644
--- a/usr.bin/awk/Makefile
+++ b/usr.bin/awk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2007/11/24 15:43:08 espie Exp $
+#	$OpenBSD: Makefile,v 1.10 2010/01/04 17:50:39 deraadt Exp $
 
 PROG=	awk
 LINKS=	${BINDIR}/awk ${BINDIR}/nawk
@@ -10,11 +10,6 @@ CFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 HOSTCFLAGS+=-I. -I${.CURDIR} -DHAS_ISBLANK -DNDEBUG
 MLINKS=	awk.1 nawk.1
 
-# This just gets installed verbatim
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
 stamp_tabs: awkgram.y
 	${YACC} -d ${.CURDIR}/awkgram.y
 	mv y.tab.c ytab.c
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 37765d90087..7bbb5306add 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1997/09/21 11:49:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2010/01/04 17:50:39 deraadt Exp $
 
 PROG=	mail
 SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
@@ -17,8 +17,4 @@ distribution:
 	cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o root -g wheel \
 	    -m 644 ${EFILES} ${DESTDIR}/etc
 
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index ff4cd09a179..363b67ffcb2 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -1,11 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2003/08/27 07:54:38 jmc Exp $
+#	$OpenBSD: Makefile,v 1.4 2010/01/04 17:50:39 deraadt Exp $
 
 PROG=	sed
 SRCS=	compile.c main.c misc.c process.c
 
-# These get installed verbatim
-.if make(install)
-SUBDIR+= USD.doc
-.endif
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile
index d9e6a50cff7..5072e4afda2 100644
--- a/usr.sbin/lpr/Makefile
+++ b/usr.sbin/lpr/Makefile
@@ -1,10 +1,6 @@
-#	$OpenBSD: Makefile,v 1.4 2001/12/06 03:12:30 ericj Exp $
+#	$OpenBSD: Makefile,v 1.5 2010/01/04 17:50:39 deraadt Exp $
 
 SUBDIR=	lpc lpd lpq lpr lprm lptest pac filters
 
-.if make(install)
-SUBDIR+= SMM.doc
-.endif
-
 CFLAGS+=	-Wall
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/timed/Makefile b/usr.sbin/timed/Makefile
index 71b5cf7addc..38a64a7926a 100644
--- a/usr.sbin/timed/Makefile
+++ b/usr.sbin/timed/Makefile
@@ -1,9 +1,5 @@
-#	$OpenBSD: Makefile,v 1.4 2001/05/05 06:46:59 mickey Exp $
+#	$OpenBSD: Makefile,v 1.5 2010/01/04 17:50:40 deraadt Exp $
 
 SUBDIR=	timed timedc
 
-.if make(install)
-SUBDIR+= SMM.doc/timedop SMM.doc/timed
-.endif
-
 .include <bsd.subdir.mk>