remove ".so man1/header.doc" and extra args to .TH

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9069 dc483132-0cff-0310-8789-dd5450dbe970

60 files changed, 137 insertions, 64 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 88e48d470b..e23fc867b3 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 10 14:03:53 1996  Tom Yu  <tlyu@mit.edu>
+
+	* klogind.M, kshd.M, login.M, rcp.M, rlogin.M, rsh.M: remove ".so
+	 	man1/header.doc"
+
 Fri Sep  6 13:22:46 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* login.M: Document that login_krb4_convert is off by default.
diff --git a/src/appl/bsd/klogind.M b/src/appl/bsd/klogind.M
index e48bc91f87..fbd015b2fa 100644
--- a/src/appl/bsd/klogind.M
+++ b/src/appl/bsd/klogind.M
@@ -4,8 +4,7 @@
 .\"
 .\"	@(#)rlogind.8c	6.3 (Berkeley) 5/24/86
 .\"
-.so man1/header.doc
-.TH KLOGIND 8C \*h
+.TH KLOGIND 8C
 .SH NAME
 klogind \- remote login server
 .SH SYNOPSIS
diff --git a/src/appl/bsd/kshd.M b/src/appl/bsd/kshd.M
index 3ebe5cf8df..5a10c5bc0e 100644
--- a/src/appl/bsd/kshd.M
+++ b/src/appl/bsd/kshd.M
@@ -4,8 +4,7 @@
 .\"
 .\"	@(#)rshd.8c	6.3 (Berkeley) 5/24/86
 .\"
-.so man1/header.doc
-.TH KRSHD 8C \*h
+.TH KRSHD 8C
 .SH NAME
 kshd \- kerberized remote shell server
 .SH SYNOPSIS
diff --git a/src/appl/bsd/login.M b/src/appl/bsd/login.M
index 5c107081c4..b6ea951d36 100644
--- a/src/appl/bsd/login.M
+++ b/src/appl/bsd/login.M
@@ -1,7 +1,6 @@
 .\"	login.1
 .\"
-.so man1/header.doc
-.TH LOGIN 8C \*h
+.TH LOGIN 8C
 .SH NAME
 login.krb5 \- kerberos enhanced login program
 .SH SYNOPSIS
diff --git a/src/appl/bsd/rcp.M b/src/appl/bsd/rcp.M
index 9e5040b4b7..46267a5dd6 100644
--- a/src/appl/bsd/rcp.M
+++ b/src/appl/bsd/rcp.M
@@ -17,8 +17,7 @@
 .\"
 .\"	@(#)rcp.1	6.6 (Berkeley) 9/20/88
 .\"
-.so man1/header.doc
-.TH RCP 1 \*h
+.TH RCP 1
 .SH NAME
 rcp \- remote file copy
 .SH SYNOPSIS
diff --git a/src/appl/bsd/rlogin.M b/src/appl/bsd/rlogin.M
index 0d47803aff..79ac327b14 100644
--- a/src/appl/bsd/rlogin.M
+++ b/src/appl/bsd/rlogin.M
@@ -17,8 +17,7 @@
 .\"
 .\"	@(#)rlogin.1	6.9 (Berkeley) 9/19/88
 .\" "
-.so man1/header.doc
-.TH RLOGIN 1 \*h
+.TH RLOGIN 1
 .SH NAME
 rlogin \- remote login
 .SH SYNOPSIS
diff --git a/src/appl/bsd/rsh.M b/src/appl/bsd/rsh.M
index ee262d2ca2..2b342c3d2a 100644
--- a/src/appl/bsd/rsh.M
+++ b/src/appl/bsd/rsh.M
@@ -17,8 +17,7 @@
 .\"
 .\"	@(#)rsh.1	6.2 (Berkeley) 9/20/88
 .\" "
-.so man1/header.doc
-.TH RSH 1 \*h
+.TH RSH
 .SH NAME
 rsh \- remote shell
 .SH SYNOPSIS
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 5863265b86..82d6ecf334 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:07:15 1996  Tom Yu  <tlyu@mit.edu>
+
+	* ftp.M: remove ".so man1/header.doc"
+
 Tue Jul 30 19:45:45 1996  Samuel D Hartman  (hartmans@vorlon)
 
 	* ftp.c (empt resety): Use fd_set as a typedef not a struct.
diff --git a/src/appl/gssftp/ftp/ftp.M b/src/appl/gssftp/ftp/ftp.M
index 429a97e966..39668436c9 100644
--- a/src/appl/gssftp/ftp/ftp.M
+++ b/src/appl/gssftp/ftp/ftp.M
@@ -31,8 +31,7 @@
 .\"
 .\"	@(#)ftp.1	6.18 (Berkeley) 7/30/91
 .\" "
-.so man1/header.doc
-.TH FTP 1 \*h
+.TH FTP 1
 .SH NAME
 ftp \- ARPANET file transfer program
 .SH SYNOPSIS
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 8440ea53ba..a510b6b44e 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:07:36 1996  Tom Yu  <tlyu@mit.edu>
+
+	* ftpd.M: remove ".so man1/header.doc"
+
 Mon Jul 29 22:37:05 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* configure.in: Determine sizeof short, int, long for secure.c
diff --git a/src/appl/gssftp/ftpd/ftpd.M b/src/appl/gssftp/ftpd/ftpd.M
index 77c1a537c2..0a782e6f5c 100644
--- a/src/appl/gssftp/ftpd/ftpd.M
+++ b/src/appl/gssftp/ftpd/ftpd.M
@@ -31,8 +31,7 @@
 .\"
 .\"     @(#)ftpd.8	6.9 (Berkeley) 3/16/91
 .\" "
-.so man1/header.doc
-.TH FTPD 8 \*h
+.TH FTPD 8
 .SH NAME
 .B ftpd
 \-
diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index 46bf2e886c..06098b2677 100644
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,3 +1,6 @@
+Tue Sep 10 14:08:06 1996  Tom Yu  <tlyu@mit.edu>
+
+	* mailquery.M: remove ".so man1/header.doc"
 
 Fri Jul 7 15:43:24 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Remove all explicit library handling.
diff --git a/src/appl/mailquery/mailquery.M b/src/appl/mailquery/mailquery.M
index 5f17678b8a..113146f40d 100644
--- a/src/appl/mailquery/mailquery.M
+++ b/src/appl/mailquery/mailquery.M
@@ -15,8 +15,7 @@
 .\"
 .\" $Id
 .\"
-.so man1/header.doc
-.TH mailquery 1 \*h
+.TH mailquery 1
 .SH NAME
 mailquery \- queries a pop server about how much mail is available
 .SH SYNTAX
diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index ecfed9772d..b7970b81db 100644
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:08:36 1996  Tom Yu  <tlyu@mit.edu>
+
+	* popper.M: remove ".so man1/header.doc"
+
 Wed Aug 21 19:39:11 1996  Sam Hartman  <hartmans@mit.edu>
 
 	* mh-6.8.patch: Ken Hornstein <kenh@cmf.nrl.navy.mil> contributed
diff --git a/src/appl/popper/popper.M b/src/appl/popper/popper.M
index eecf96fde0..b8802fa27f 100644
--- a/src/appl/popper/popper.M
+++ b/src/appl/popper/popper.M
@@ -10,8 +10,7 @@
 .\"
 .\" @(#)@(#)popper.8	2.3    2.3    (CCS)   4/2/91     Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n
 .\" "
-.so man1/header.doc
-.TH popper 8 \*h
+.TH popper 8
 .UC 6
 .ad
 .SH NAME
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 56b1c08685..9479f2ddac 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:09:01 1996  Tom Yu  <tlyu@mit.edu>
+
+	* sclient.M: remove ".so man1/header.doc"
+
 Mon Sep 18 05:05:48 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* sclient.c (main): Set the default service name to SAMPLE_SERVICE.
diff --git a/src/appl/sample/sclient/sclient.M b/src/appl/sample/sclient/sclient.M
index cce2930d79..4eb934a649 100644
--- a/src/appl/sample/sclient/sclient.M
+++ b/src/appl/sample/sclient/sclient.M
@@ -19,8 +19,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.so man1/header.doc
-.TH SCLIENT 1 \*h
+.TH SCLIENT 1
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .SH SYNOPSIS
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index 8d311f66ee..b38e905777 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:09:19 1996  Tom Yu  <tlyu@mit.edu>
+
+	* sserver.M: remove ".so man1/header.doc"
+
 Sat Sep 16 00:21:01 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* sserver.c (main): Allow the user to specify the service instance
diff --git a/src/appl/sample/sserver/sserver.M b/src/appl/sample/sserver/sserver.M
index 023786f4aa..f0ea721b07 100644
--- a/src/appl/sample/sserver/sserver.M
+++ b/src/appl/sample/sserver/sserver.M
@@ -18,8 +18,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.so man1/header.doc
-.TH SSERVER 8 \*h
+.TH SSERVER 8
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .SH SYNOPSIS
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 704f9c7508..1f8fcaed65 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:09:49 1996  Tom Yu  <tlyu@mit.edu>
+
+	* telnet.1: remove ".so man1/header.doc"
+
 Sat Jul 27 21:34:22 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
 	* telnet.c(setupterm): Only compile if setupterm not present in
diff --git a/src/appl/telnet/telnet/telnet.1 b/src/appl/telnet/telnet/telnet.1
index 6f022d3cc8..cef8f5d1a1 100644
--- a/src/appl/telnet/telnet/telnet.1
+++ b/src/appl/telnet/telnet/telnet.1
@@ -31,8 +31,7 @@
 .\"
 .\"	@(#)telnet.1	8.4 (Berkeley) 2/3/94
 .\" "
-.so man1/header.doc
-.TH TELNET 1 \*h
+.TH TELNET 1
 .SH NAME
 telnet \- user interface to the TELNET protocol
 .SH SYNOPSIS
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index ceee5a4ffb..98f5ceb8ba 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:10:41 1996  Tom Yu  <tlyu@mit.edu>
+
+	* telnetd.8: remove ".so man1/header.doc"
+
 Mon Aug 19 23:22:55 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* state.c (envvarok): Don't allow the environment variable
diff --git a/src/appl/telnet/telnetd/telnetd.8 b/src/appl/telnet/telnetd/telnetd.8
index cd3e77fc84..f7dadedd46 100644
--- a/src/appl/telnet/telnetd/telnetd.8
+++ b/src/appl/telnet/telnetd/telnetd.8
@@ -31,8 +31,7 @@
 .\"
 .\"	@(#)telnetd.8	8.2 (Berkeley) 2/3/94
 .\" "
-.so man1/header.doc
-.TH TELNETD 8 \*h
+.TH TELNETD 8
 .SH NAME
 telnetd \-
 .SM DARPA TELNET
diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 76be2b4c2c..35675e0f83 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,6 @@
+Tue Sep 10 14:13:33 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kdestroy.M: remove ".so man1/header.doc"
 
 Fri Jul 7 15:52:51 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* Makefile.in - Remove explicit library handling and LDFLAGS..
diff --git a/src/clients/kdestroy/kdestroy.M b/src/clients/kdestroy/kdestroy.M
index 8dbd07872d..9886dad58c 100644
--- a/src/clients/kdestroy/kdestroy.M
+++ b/src/clients/kdestroy/kdestroy.M
@@ -18,8 +18,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.so man1/header.doc
-.TH KDESTROY 1 \*h
+.TH KDESTROY 1
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .SH SYNOPSIS
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index 7fa4f102bd..33d6bbec0b 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:13:52 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kinit.M: remove ".so man1/header.doc"
+
 Sun Jul  7 15:21:58 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* kinit.M: Document -R option.
diff --git a/src/clients/kinit/kinit.M b/src/clients/kinit/kinit.M
index b35dd67da0..86465b9a0e 100644
--- a/src/clients/kinit/kinit.M
+++ b/src/clients/kinit/kinit.M
@@ -18,8 +18,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.so man1/header.doc
-.TH KINIT 1 \*h
+.TH KINIT 1
 .SH NAME
 kinit \- obtain and cache Kerberos ticket-granting ticket
 .SH SYNOPSIS
diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 23e58601b7..c245813029 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:14:21 1996  Tom Yu  <tlyu@mit.edu>
+
+	* klist.M: remove ".so man1/header.doc"
+
 Fri May 10 02:50:58 1996  Richard Basch  <basch@lehman.com>
 
 	* klist.c (etype_string): changed des3-md5 to des3-sha
diff --git a/src/clients/klist/klist.M b/src/clients/klist/klist.M
index acc110224c..acf80ab465 100644
--- a/src/clients/klist/klist.M
+++ b/src/clients/klist/klist.M
@@ -18,8 +18,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.so man1/header.doc
-.TH KLIST 1 \*h
+.TH KLIST 1
 .SH NAME
 klist \- list cached Kerberos tickets
 .SH SYNOPSIS
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index a0ffde8076..d4bbbd4f07 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:15:02 1996  Tom Yu  <tlyu@mit.edu>
+
+	* ksu.M: remove ".so man1/header.doc"
+
 Thu Aug  8 12:31:30 1996  Sam Hartman  <hartmans@mit.edu>
 
 	* main.c (main): Close source cache before executing command.
diff --git a/src/clients/ksu/ksu.M b/src/clients/ksu/ksu.M
index 5fa3a3e0ac..2eea2a0940 100644
--- a/src/clients/ksu/ksu.M
+++ b/src/clients/ksu/ksu.M
@@ -23,8 +23,7 @@
 .\"
 .\" KSU was writen by:  Ari Medvinsky, ari@isi.edu
 .\" "
-.so man1/header.doc
-.TH KSU 1 \*h
+.TH KSU 1
 .SH NAME
 ksu \- Kerberized super-user    	
 .SH SYNOPSIS
diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog
index 43e6118b63..afb665eb71 100644
--- a/src/config-files/ChangeLog
+++ b/src/config-files/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:35:53 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kdc.conf.M, krb5.conf.M: remove extra args from .TH
+
 Fri Jul 26 14:05:42 1996  Marc Horowitz  <marc@mit.edu>
 
 	* kdc.conf: added acl_file to prototype
diff --git a/src/config-files/kdc.conf.M b/src/config-files/kdc.conf.M
index f40e9148ba..4e05bebcd6 100644
--- a/src/config-files/kdc.conf.M
+++ b/src/config-files/kdc.conf.M
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\"
-.TH KDC.CONF 5 "Kerberos Version 5.0" "MIT Project Athena"
+.TH KDC.CONF 5
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .SH DESCRIPTION
diff --git a/src/config-files/krb5.conf.M b/src/config-files/krb5.conf.M
index 2296e208a1..0bc9aba37d 100644
--- a/src/config-files/krb5.conf.M
+++ b/src/config-files/krb5.conf.M
@@ -16,7 +16,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.TH KRB5.CONF 5 "Kerberos Version 5.0" "MIT Project Athena"
+.TH KRB5.CONF 5
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .SH DESCRIPTION
diff --git a/src/gen-manpages/ChangeLog b/src/gen-manpages/ChangeLog
index d908848b5f..3160470bd5 100644
--- a/src/gen-manpages/ChangeLog
+++ b/src/gen-manpages/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 10 14:22:14 1996  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (install): don't install header.doc
+
+	* k5login.M, kerberos.M: remove ".so man1/header.doc"
+
 Tue Aug 27 16:38:29 1996  Jeff Bigler  <jcb@viola.cygnus.com>
 
 	* Makefile.in (install): Added line to install .k5login man page.
diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in
index 653c74b492..59d50e730d 100644
--- a/src/gen-manpages/Makefile.in
+++ b/src/gen-manpages/Makefile.in
@@ -2,5 +2,4 @@ all::
 
 install::
 	$(INSTALL_DATA) $(srcdir)/kerberos.M ${DESTDIR}$(CLIENT_MANDIR)/kerberos.1
-	$(INSTALL_DATA) $(srcdir)/header.doc ${DESTDIR}$(CLIENT_MANDIR)/header.doc
 	$(INSTALL_DATA) $(srcdir)/k5login.M ${DESTDIR}$(FILE_MANDIR)/.k5login.5
diff --git a/src/gen-manpages/k5login.M b/src/gen-manpages/k5login.M
index 4f1cbb14f2..d6b30ae57f 100644
--- a/src/gen-manpages/k5login.M
+++ b/src/gen-manpages/k5login.M
@@ -1,5 +1,4 @@
-.so man1/header.doc
-.TH .K5LOGIN 5 \*h
+.TH .K5LOGIN 5
 .SH NAME
 .k5login \- Kerberos V5 acl file for host access.
 .SH DESCRIPTION
diff --git a/src/gen-manpages/kerberos.M b/src/gen-manpages/kerberos.M
index 212bec29e6..3ee9a30ebd 100644
--- a/src/gen-manpages/kerberos.M
+++ b/src/gen-manpages/kerberos.M
@@ -3,8 +3,7 @@
 .\" For copying and distribution information,
 .\" please see the file <mit-copyright.h>.
 .\" "
-.so man1/header.doc
-.TH KERBEROS 1 \*h
+.TH KERBEROS 1
 .SH NAME
 kerberos \- introduction to the Kerberos system
 .SH DESCRIPTION
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 3a7a89601e..206c560611 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:15:28 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kadmin.M: remove ".so man1/header.doc"
+
 Mon Sep  9 11:14:23 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* kadmin.c: Fix the usage messages to state -randkey, not
diff --git a/src/kadmin/cli/kadmin.M b/src/kadmin/cli/kadmin.M
index db298a2464..e2c9a2b848 100644
--- a/src/kadmin/cli/kadmin.M
+++ b/src/kadmin/cli/kadmin.M
@@ -1,5 +1,4 @@
-.so man1/header.doc
-.TH KADMIN 8 \*h
+.TH KADMIN 8
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .SH SYNOPSYS
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 90556295d5..e0f8c50212 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 10 14:16:40 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kdb5_edit.M: remove extra args from .TH
+
+	* kdb5_util.M: remove ".so man1/header.doc"
+
 Mon Sep  9 11:06:29 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* loadv4.c: Don't call get_config_params again, since it's not
diff --git a/src/kadmin/dbutil/kdb5_edit.M b/src/kadmin/dbutil/kdb5_edit.M
index 8405c01cd1..4281ac9473 100644
--- a/src/kadmin/dbutil/kdb5_edit.M
+++ b/src/kadmin/dbutil/kdb5_edit.M
@@ -19,7 +19,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.TH KDB5_EDIT 8 "Kerberos Version 5.0" "MIT Project Athena"
+.TH KDB5_EDIT 8
 .SH NAME
 kdb5_edit \- edit a Kerberos V5 principal database
 .SH SYNOPSIS
diff --git a/src/kadmin/dbutil/kdb5_util.M b/src/kadmin/dbutil/kdb5_util.M
index 31eaf69c34..b364eeb4bb 100644
--- a/src/kadmin/dbutil/kdb5_util.M
+++ b/src/kadmin/dbutil/kdb5_util.M
@@ -1,5 +1,4 @@
-.so man1/header.doc
-.TH KDB5_UTIL 8 \*h
+.TH KDB5_UTIL 8
 .SH NAME
 kdb5_util \- Kerberos database maintainance utility
 .SH SYNOPSIS
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index e44710e16f..30b6966c1f 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:17:17 1996  Tom Yu  <tlyu@mit.edu>
+
+	* ktutil.M: remove ".so man1/header.doc"
+
 Thu Aug 29 16:06:39 1996  Jeff Bigler  <jcb@mit.edu>
 
 	* Makefile.in (install): added man page
diff --git a/src/kadmin/ktutil/ktutil.M b/src/kadmin/ktutil/ktutil.M
index 2ee1199d45..de5fe7cb7f 100644
--- a/src/kadmin/ktutil/ktutil.M
+++ b/src/kadmin/ktutil/ktutil.M
@@ -1,5 +1,4 @@
-.so man1/header.doc
-.TH KTUTIL 8 \*h
+.TH KTUTIL 8
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .SH SYNOPSIS
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 75a263d1bb..7caf2c3f1f 100644
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:17:45 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kpasswd.M: remove ".so man1/header.doc"
+
 Sat Sep  7 02:13:32 1996  Sam Hartman  <hartmans@planet-zorp.MIT.EDU>
 
 	* Makefile.in (install): Fix BINDIR to be CLIENT_BINDIR
diff --git a/src/kadmin/passwd/kpasswd.M b/src/kadmin/passwd/kpasswd.M
index fe81ddba45..c3da8ae311 100644
--- a/src/kadmin/passwd/kpasswd.M
+++ b/src/kadmin/passwd/kpasswd.M
@@ -18,8 +18,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.so man1/header.doc
-.TH KPASSWD 1 \*h
+.TH KPASSWD 1
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .SH SYNOPSIS
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 3d3969fdaf..cf52441a07 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:18:12 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kadmind.M: remove ".so man1/header.doc", fix up .TH call
+
 Tue Sep  3 22:11:25 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in (install): Fix typo: ($PROG) -> $(PROG)
diff --git a/src/kadmin/server/kadmind.M b/src/kadmin/server/kadmind.M
index 2d4683734e..3d359be3ca 100644
--- a/src/kadmin/server/kadmind.M
+++ b/src/kadmin/server/kadmind.M
@@ -1,5 +1,4 @@
-.so man1/header.doc
-.TH KADMIND(8 \*h
+.TH KADMIND 8
 .SH NAME
 kadmind \- KADM5 administration server
 .SH SYNOPSIS
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index b511230a04..d329893c93 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:37:23 1996  Tom Yu  <tlyu@mit.edu>
+
+	* v5passwd.M: remove extra args to .TH
+
 Sun Aug 18 18:29:39 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in: Compile v5passwd - the old passwd changing client. 
diff --git a/src/kadmin/v5passwdd/v5passwd.M b/src/kadmin/v5passwdd/v5passwd.M
index 5c3bd32c91..90688a8db4 100644
--- a/src/kadmin/v5passwdd/v5passwd.M
+++ b/src/kadmin/v5passwdd/v5passwd.M
@@ -19,7 +19,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.TH V5PASSWD 1 "Kerberos Version 5.0" "MIT Project Athena"
+.TH V5PASSWD 1
 .SH NAME
 v5passwd \- change a user's Kerberos password
 .SH SYNOPSIS
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 3b394a9c46..351382cb0b 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:18:41 1996  Tom Yu  <tlyu@mit.edu>
+
+	* krb5kdc.M: remove ".so man1/header.doc"
+
 Fri Aug 23 14:22:45 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
 	* kerberos_v4.c (check_princ): Assume an expiration date of zero means never expire.
diff --git a/src/kdc/krb5kdc.M b/src/kdc/krb5kdc.M
index 2876a527ed..5d6caaa485 100644
--- a/src/kdc/krb5kdc.M
+++ b/src/kdc/krb5kdc.M
@@ -18,8 +18,7 @@
 .\" this software for any purpose.  It is provided "as is" without express
 .\" or implied warranty.
 .\" "
-.so man1/header.doc
-.TH KRB5KDC 8 \*h
+.TH KRB5KDC 8
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .SH SYNOPSIS
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index ac07e19810..6aae306ab6 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:37:47 1996  Tom Yu  <tlyu@mit.edu>
+
+	* krb5strings.M: remove extra args to .TH
+
 Thu Jun 13 22:12:21 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
 	* configure.in: remove ref to ET_RULES
diff --git a/src/lib/kadm/krb5strings.M b/src/lib/kadm/krb5strings.M
index de118ba8ed..24aac28010 100644
--- a/src/lib/kadm/krb5strings.M
+++ b/src/lib/kadm/krb5strings.M
@@ -18,7 +18,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.TH KRB5STRINGS 3 "Kerberos Version 5.0" "MIT Project Athena"
+.TH KRB5STRINGS 3
 .SH NAME
 krb5strings \- String representations of Kerberos V5 internal data.
 .SH KEY TYPES
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index af04f0b74f..aa2906c5b7 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:19:08 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kprop.M, kpropd.M: remove ".so man1/header.doc"
+
 Mon Aug 12 14:33:31 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* kpropd.c: rework to use kdb5_util instead of kdb5_edit; don't
diff --git a/src/slave/kprop.M b/src/slave/kprop.M
index f29375591f..7a25db6dfb 100644
--- a/src/slave/kprop.M
+++ b/src/slave/kprop.M
@@ -19,8 +19,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.so man1/header.doc
-.TH KPROP 8 \*h
+.TH KPROP 8
 .SH NAME
 kprop \- propagate a Kerberos V5 principal database to a slave server
 .SH SYNOPSIS
diff --git a/src/slave/kpropd.M b/src/slave/kpropd.M
index 9fc62a0a69..3228ed9532 100644
--- a/src/slave/kpropd.M
+++ b/src/slave/kpropd.M
@@ -19,8 +19,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.so man1/header.doc
-.TH KPROPD 8 \*h
+.TH KPROPD 8
 .SH NAME
 kpropd \- Kerberos V5 slave KDC update server
 .SH SYNOPSIS
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 2d7720c07a..5a3471fbf7 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:20:09 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kdb5_mkdums.M: remove ".so man1/header.doc"
+
 Thu May  2 21:17:27 1996  Richard Basch  <basch@lehman.com>
 
 	* kdb5_mkdums.c: fixed various abstraction violations where the
diff --git a/src/tests/create/kdb5_mkdums.M b/src/tests/create/kdb5_mkdums.M
index a95c5b687a..be8b5a3fdf 100644
--- a/src/tests/create/kdb5_mkdums.M
+++ b/src/tests/create/kdb5_mkdums.M
@@ -19,8 +19,7 @@
 .\" or implied warranty.
 .\" 
 .\"
-.so man1/header.doc
-.TH KDB5_MKDUMS 8 \*h
+.TH KDB5_MKDUMS 8
 .SH NAME
 kdb5_mkdums \- create a new Kerberos V5 principal database
 .SH SYNOPSIS