6 files changed, 11 insertions, 17 deletions

diff --git a/FILES b/FILES
index bbf25c2..b167843 100644
--- a/FILES
+++ b/FILES
@@ -66,7 +66,7 @@ maildir2mbox.1
 maildirmake.1
 maildirwatch.1
 mailsubj.1
-mbox.5
+qmail-mbox.5
 preline.1
 qbiff.1
 qmail-clean.8
@@ -428,6 +428,5 @@ trysalen.c
 maildir.5
 maildir.h
 maildir.c
-tcp-environ.5
 constmap.h
 constmap.c
diff --git a/Makefile b/Makefile
index aef981f..1483434 100644
--- a/Makefile
+++ b/Makefile
@@ -970,12 +970,12 @@ qmail-smtpd.0 tcp-env.0 qmail-newmrh.0 qreceipt.0 qbiff.0 forward.0 \
 preline.0 condredirect.0 bouncesaying.0 except.0 maildirmake.0 \
 maildir2mbox.0 maildirwatch.0 qmail.0 qmail-limits.0 qmail-log.0 \
 qmail-control.0 qmail-header.0 qmail-users.0 dot-qmail.0 \
-qmail-command.0 tcp-environ.0 maildir.0 mbox.0 addresses.0 \
+qmail-command.0 maildir.0 qmail-mbox.0 addresses.0 \
 envelopes.0 forgeries.0
 
-mbox.0: \
-mbox.5
-        nroff -man mbox.5 > mbox.0
+qmail-mbox.0: \
+qmail-mbox.5
+        nroff -man qmail-mbox.5 > qmail-mbox.0
 
 myctime.o: \
 compile myctime.c datetime.h fmt.h myctime.h
@@ -1851,7 +1851,7 @@ auto_spawn.h chkspawn.c conf-split auto_split.h conf-patrn \
 auto_patrn.h conf-users conf-groups auto_uids.h auto_usera.h extra.h \
 addresses.5 except.1 bouncesaying.1 condredirect.1 dot-qmail.9 \
 envelopes.5 forgeries.7 forward.1 maildir2mbox.1 maildirmake.1 \
-maildirwatch.1 mailsubj.1 mbox.5 preline.1 qbiff.1 qmail-clean.8 \
+maildirwatch.1 mailsubj.1 qmail-mbox.5 preline.1 qbiff.1 qmail-clean.8 \
 qmail-command.8 qmail-control.9 qmail-getpw.9 qmail-header.5 \
 qmail-inject.8 qmail-limits.9 qmail-local.8 qmail-log.5 \
 qmail-lspawn.8 qmail-newmrh.9 qmail-newu.9 qmail-pop3d.8 \
@@ -1914,7 +1914,7 @@ date822fmt.h date822fmt.c dns.h dns.c trylsock.c tryrsolv.c ip.h ip.c \
 ipalloc.h ipalloc.c select.h1 select.h2 trysysel.c ndelay.h ndelay.c \
 ndelay_off.c direntry.3 direntry.h1 direntry.h2 trydrent.c prot.h \
 prot.c chkshsgr.c warn-shsgr tryshsgr.c ipme.h ipme.c trysalen.c \
-maildir.5 maildir.h maildir.c tcp-environ.5 constmap.h constmap.c \
+maildir.5 maildir.h maildir.c constmap.h constmap.c \
 update_tmprsadh
         shar -m `cat FILES` > shar
         chmod 400 shar
@@ -2170,10 +2170,6 @@ compile tcp-env.c sig.h stralloc.h gen_alloc.h str.h env.h fmt.h \
 scan.h subgetopt.h ip.h dns.h byte.h remoteinfo.h exit.h case.h
         ./compile tcp-env.c
 
-tcp-environ.0: \
-tcp-environ.5
-        nroff -man tcp-environ.5 > tcp-environ.0
-
 tcpto.o: \
 compile tcpto.c tcpto.h open.h lock.h seek.h now.h datetime.h ip.h \
 byte.h datetime.h readwrite.h
diff --git a/TARGETS b/TARGETS
index 27706f3..f5a5bbe 100644
--- a/TARGETS
+++ b/TARGETS
@@ -393,9 +393,8 @@ qmail-users.0
 dot-qmail.5
 dot-qmail.0
 qmail-command.0
-tcp-environ.0
 maildir.0
-mbox.0
+qmail-mbox.0
 addresses.0
 envelopes.0
 forgeries.0
diff --git a/maildir.5 b/maildir.5
index 5da9573..31d7ff8 100644
--- a/maildir.5
+++ b/maildir.5
@@ -235,5 +235,5 @@ use the
 environment variable
 as the name of the user's primary mail directory.
 .SH "SEE ALSO"
-mbox(5),
+qmail-mbox(5),
 qmail-local(8)
diff --git a/preline.1 b/preline.1
index 69a757c..946c86d 100644
--- a/preline.1
+++ b/preline.1
@@ -53,5 +53,5 @@ Do not include the
 .B Return-Path
 line.
 .SH "SEE ALSO"
-mbox(5),
+qmail-mbox(5),
 qmail-command(8)
diff --git a/mbox.5 b/qmail-mbox.5
index de1f837..05dd737 100644
--- a/mbox.5
+++ b/qmail-mbox.5
@@ -1,4 +1,4 @@
-.TH mbox 5
+.TH qmail-mbox 5
 .SH "NAME"
 mbox \- file containing mail messages
 .SH "INTRODUCTION"