From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 3 Dec 2010 20:23:11 +0000 (-0500)
Subject: Remove RCS keywords, since they no longer work after git migration.
X-Git-Tag: mmh-start~22
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=5dd6771b28c257af405d7248639ed0e3bcdce38b

Remove RCS keywords, since they no longer work after git migration.
---

diff --git a/INSTALL b/INSTALL
index e7a779b..3c48294 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,6 @@
 #
 # INSTALL -- installation instructions
 #
-# $Id$
-#
 
 --------------
 Installing nmh
diff --git a/MACHINES b/MACHINES
index c38c1a4..ddd30fa 100644
--- a/MACHINES
+++ b/MACHINES
@@ -1,8 +1,6 @@
 #
 # MACHINE -- operating system specific information
 #
-# $Id$
-#
 
 nmh is known to compile on the following platforms (save the
 exceptions noted below), using an ANSI C compiler, such as gcc.
diff --git a/Makefile.in b/Makefile.in
index eecef1b..1fe2d38 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for top level of nmh distribution
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
diff --git a/README b/README
index 1f74073..328f383 100644
--- a/README
+++ b/README
@@ -1,7 +1,3 @@
-#
-# $Id$
-#
-
 Installing
 ----------
 Please read the INSTALL file.
diff --git a/config/Makefile.in b/config/Makefile.in
index 6c4613d..23ded2a 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for config subdirectory
 #
-# $Id$
-#
 
 # nmh version
 VERSION = @VERSION@
diff --git a/config/config.c b/config/config.c
index 8a613b6..c2d307e 100644
--- a/config/config.c
+++ b/config/config.c
@@ -2,8 +2,6 @@
 /*
  * config.c -- master nmh configuration file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/config/version.sh b/config/version.sh
index 6257186..1ff7eed 100755
--- a/config/version.sh
+++ b/config/version.sh
@@ -4,8 +4,6 @@
 #
 # You need to pass the script the version number to use.
 #
-# $Id$
-#
 
 if [ -z "$1" ]; then
     echo "usage: version.sh VERSION" 1>&2
diff --git a/configure.in b/configure.in
index 2c47c90..f866c0a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,6 @@
 dnl
 dnl configure.in -- autoconf template for nmh
 dnl
-dnl $Id$
-dnl
 
 dnl Move this up a bit
 AC_PREREQ(2.61)
diff --git a/docs/MAILING-LISTS b/docs/MAILING-LISTS
index e65b9bb..66d49a9 100644
--- a/docs/MAILING-LISTS
+++ b/docs/MAILING-LISTS
@@ -1,7 +1,3 @@
-#
-# $Id$
-#
-
 There are currently three mailing lists related to nmh:
 
 nmh-announce@mhost.com
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 7421f21..695bdf0 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for h subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/docs/README-ATTACHMENTS b/docs/README-ATTACHMENTS
index a996364..ff9db2a 100644
--- a/docs/README-ATTACHMENTS
+++ b/docs/README-ATTACHMENTS
@@ -1,5 +1,3 @@
-$Id$
-
 Jon Steinhart's (jon@fourwinds.com) Attachment Handling Mods
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/README-HOOKS b/docs/README-HOOKS
index bb5d6ee..7546416 100644
--- a/docs/README-HOOKS
+++ b/docs/README-HOOKS
@@ -1,5 +1,3 @@
-$Id$
-
 Jon Steinhart's (jon@fourwinds.com) External Program Hooks
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/README.SASL b/docs/README.SASL
index 224600d..24a85ab 100644
--- a/docs/README.SASL
+++ b/docs/README.SASL
@@ -1,8 +1,6 @@
 #
 # README.SASL - Readme about SASL support in nmh
 #
-# $Id$
-#
 
 SASL is short for the Simple Authentication and Security Layer.  Is is
 a framework for adding authentication and encryption to network protocols.
diff --git a/docs/README.about b/docs/README.about
index 1038ed3..eba3004 100644
--- a/docs/README.about
+++ b/docs/README.about
@@ -1,8 +1,6 @@
 #
 # README.about -- about nmh
 #
-# $Id$
-#
 
 -----------
 what is it?
diff --git a/docs/README.developers b/docs/README.developers
index 23a1d2d..abfb3e5 100644
--- a/docs/README.developers
+++ b/docs/README.developers
@@ -1,8 +1,6 @@
 #
 # README.developers
 #
-# $Id$
-#
 
 This file is intended to provide a few tips for anyone doing development on nmh.
 Developers who learn things "the hard way" about the nmh codebase (as opposed to
diff --git a/docs/README.manpages b/docs/README.manpages
index fa423de..c4dc67b 100644
--- a/docs/README.manpages
+++ b/docs/README.manpages
@@ -4,7 +4,6 @@ nmh manpages should be in this general form:
 
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH COMP %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/etc/MailAliases b/etc/MailAliases
index c5be141..5037a54 100644
--- a/etc/MailAliases
+++ b/etc/MailAliases
@@ -1,8 +1,6 @@
 ;
 ; MailAliases -- nmh global aliases file
 ;
-; $Id$
-;
 ; This file is used to define aliases that are valid for all mh users.
 ; This file is almost empty as MH now supports personal aliases.
 ;
diff --git a/etc/Makefile.in b/etc/Makefile.in
index cffd939..4bec6a1 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index fc5a668..0db5d3a 100755
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -2,8 +2,6 @@
 #
 # mhn.defaults.sh -- create extra profile file for MIME handling
 #
-# $Id$
-#
 # USAGE: mhn.defaults.sh [ search-path [ search-prog ]]
 
 # If a search path is passed to the script, we
diff --git a/etc/mhn.find.sh b/etc/mhn.find.sh
index 8f128f7..3e5e98a 100755
--- a/etc/mhn.find.sh
+++ b/etc/mhn.find.sh
@@ -2,7 +2,6 @@
 #
 # mhn.find.sh -- check if a particular command is available
 #
-# $Id$
 
 if test -z "$2"; then
     echo "usage: mhn.find.sh search-path program" 1>&2
diff --git a/etc/sendfiles.in b/etc/sendfiles.in
index b443067..85ec6f0 100755
--- a/etc/sendfiles.in
+++ b/etc/sendfiles.in
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id$
-#
 # Send multiples files and/or directories as a tar/compressed
 # image, in a MIME message.
 #
diff --git a/h/Makefile.in b/h/Makefile.in
index 7b4a276..0988913 100644
--- a/h/Makefile.in
+++ b/h/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for h subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/h/addrsbr.h b/h/addrsbr.h
index e3aa7e8..a6c7a41 100644
--- a/h/addrsbr.h
+++ b/h/addrsbr.h
@@ -1,8 +1,6 @@
 
 /*
  * addrsbr.h -- definitions for the address parsing system
- *
- * $Id$
  */
 
 #define	AD_HOST	1		/* getm(): lookup official hostname    */
diff --git a/h/aliasbr.h b/h/aliasbr.h
index d379cfc..cc4da7f 100644
--- a/h/aliasbr.h
+++ b/h/aliasbr.h
@@ -2,7 +2,6 @@
 /*
  * aliasbr.h -- definitions for the aliasing system
  *
- * $Id$
  */
 
 extern char *AliasFile;		/* mh-alias(5)             */
diff --git a/h/crawl_folders.h b/h/crawl_folders.h
index d04287a..51fc882 100644
--- a/h/crawl_folders.h
+++ b/h/crawl_folders.h
@@ -1,8 +1,6 @@
 
 /*
  * crawl_folders.h -- crawl folder hierarchy
- *
- * $Id$
  */
 
 #define CRAWL_NUMFOLDERS 100
diff --git a/h/dropsbr.h b/h/dropsbr.h
index 146a63b..5a84ae1 100644
--- a/h/dropsbr.h
+++ b/h/dropsbr.h
@@ -1,8 +1,6 @@
 
 /*
  * dropsbr.h -- definitions for maildrop-style files
- *
- * $Id$
  */
 
 /*
diff --git a/h/fmt_compile.h b/h/fmt_compile.h
index eb79751..22be450 100644
--- a/h/fmt_compile.h
+++ b/h/fmt_compile.h
@@ -1,8 +1,6 @@
 
 /*
  * fmt_compile.h -- format types
- *
- * $Id$
  */
 
 /* types that output text */
diff --git a/h/fmt_scan.h b/h/fmt_scan.h
index cece50e..9872e09 100644
--- a/h/fmt_scan.h
+++ b/h/fmt_scan.h
@@ -1,8 +1,6 @@
 
 /*
  * fmt_scan.h -- definitions for fmt_scan()
- *
- * $Id$
  */
 
 /*
diff --git a/h/md5.h b/h/md5.h
index 6ca6399..e49ef4e 100644
--- a/h/md5.h
+++ b/h/md5.h
@@ -1,8 +1,6 @@
 /*
  * md5.h -- header file for md5 message digest
  *          taken from RFC-1321/Appendices A.1/A.2
- *
- * $Id$
  */
 
 /*
diff --git a/h/mf.h b/h/mf.h
index 1f60919..6063e60 100644
--- a/h/mf.h
+++ b/h/mf.h
@@ -1,8 +1,6 @@
 
 /*
  * mf.h -- include file for mailbox filters
- *
- * $Id$
  */
 
 #include <h/nmh.h>
diff --git a/h/mh.h b/h/mh.h
index 6513f24..abcf445 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -1,8 +1,6 @@
 
 /*
  * mh.h -- main header file for all of nmh
- *
- * $Id$
  */
 
 #include <h/nmh.h>
diff --git a/h/mhcachesbr.h b/h/mhcachesbr.h
index a197738..9c1db6a 100644
--- a/h/mhcachesbr.h
+++ b/h/mhcachesbr.h
@@ -1,8 +1,6 @@
 
 /*
  * mhcachesbr.h -- definitions for manipulating MIME content cache
- *
- * $Id$
  */
 
 /*
diff --git a/h/mhparse.h b/h/mhparse.h
index eb7cb18..48f221f 100644
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -2,8 +2,6 @@
 /*
  * mhparse.h -- definitions for parsing/building of MIME content
  *           -- (mhparse.c/mhbuildsbr.c)
- *
- * $Id$
  */
 
 #define	NPARTS	50
diff --git a/h/mime.h b/h/mime.h
index 1a85b42..3e50ce2 100644
--- a/h/mime.h
+++ b/h/mime.h
@@ -1,8 +1,6 @@
 
 /*
  * mime.h -- definitions for MIME
- *
- * $Id$
  */
 
 #define	VRSN_FIELD	"MIME-Version"
diff --git a/h/msh.h b/h/msh.h
index c6b0fa5..201c7ec 100644
--- a/h/msh.h
+++ b/h/msh.h
@@ -1,8 +1,6 @@
 
 /*
  * msh.h -- definitions for msh
- *
- * $Id$
  */
 
 /* flags for stream */
diff --git a/h/mts.h b/h/mts.h
index ce063d9..f782d67 100644
--- a/h/mts.h
+++ b/h/mts.h
@@ -1,8 +1,6 @@
 
 /*
  * mts.h -- definitions for the mail system
- *
- * $Id$
  */
 
 /*
diff --git a/h/nmh.h b/h/nmh.h
index f00a3ad..f1711d5 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -1,8 +1,6 @@
 
 /*
  * nmh.h -- system configuration header file
- *
- * $Id$
  */
 
 #include <config.h>
diff --git a/h/nntp.h b/h/nntp.h
index b232949..5464715 100644
--- a/h/nntp.h
+++ b/h/nntp.h
@@ -1,8 +1,6 @@
 /*
  * nntp.h -- Response codes for NNTP server
  *
- * $Id$
- *
  * First digit:
  *
  *	1xx	Informative message
diff --git a/h/picksbr.h b/h/picksbr.h
index 811836d..27c2e66 100644
--- a/h/picksbr.h
+++ b/h/picksbr.h
@@ -1,8 +1,6 @@
 
 /*
  * picksbr.h -- definitions for picksbr.c
- *
- * $Id$
  */
 
 /*
diff --git a/h/popsbr.h b/h/popsbr.h
index 5d0ed31..168b8c6 100644
--- a/h/popsbr.h
+++ b/h/popsbr.h
@@ -1,8 +1,6 @@
 
 /*
  * popsbr.h -- header for POP client subroutines
- *
- * $Id$
  */
 
 #if 0
diff --git a/h/prototypes.h b/h/prototypes.h
index b044390..1bc19d4 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -1,8 +1,6 @@
 
 /*
  * prototypes.h -- various prototypes
- *
- * $Id$
  */
 
 /*
diff --git a/h/rcvmail.h b/h/rcvmail.h
index 9717919..37fba4d 100644
--- a/h/rcvmail.h
+++ b/h/rcvmail.h
@@ -1,8 +1,6 @@
 
 /*
  * rcvmail.h -- rcvmail hook definitions
- *
- * $Id$
  */
 
 #if defined(SMTPMTS)
diff --git a/h/scansbr.h b/h/scansbr.h
index b050d97..f6cd35c 100644
--- a/h/scansbr.h
+++ b/h/scansbr.h
@@ -1,8 +1,6 @@
 
 /*
  * scansbr.h -- definitions for scan()
- *
- * $Id$
  */
 
 extern char *scanl;
diff --git a/h/signals.h b/h/signals.h
index 9648e04..4ad2b57 100644
--- a/h/signals.h
+++ b/h/signals.h
@@ -1,8 +1,6 @@
 
 /*
  * signals.h -- header file for nmh signal interface
- *
- * $Id$
  */
 
 #include <config.h>
diff --git a/h/tws.h b/h/tws.h
index 47a31b9..5d99cf5 100644
--- a/h/tws.h
+++ b/h/tws.h
@@ -1,8 +1,6 @@
 
 /*
  * tws.h
- *
- * $Id$
  */
 
 /* If the following is #defined, a timezone given as a numeric-only offset will
diff --git a/h/utils.h b/h/utils.h
index 8f32754..b9660a5 100644
--- a/h/utils.h
+++ b/h/utils.h
@@ -1,8 +1,6 @@
 
 /*
  * utils.h -- utility prototypes
- *
- * $Id$
  */
 
 void *mh_xmalloc(size_t);
diff --git a/h/vmhsbr.h b/h/vmhsbr.h
index 452f2e3..0b5a9a3 100644
--- a/h/vmhsbr.h
+++ b/h/vmhsbr.h
@@ -1,8 +1,6 @@
 
 /*
  * vmhsbr.h -- definitions for the vmh protocol
- *
- * $Id$
  */
 
 #define	RC_VRSN	1
diff --git a/man/Makefile.in b/man/Makefile.in
index ab93318..c94ab00 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for man subdirectory
 #
-# $Id$
-#
 
 VERSION = @VERSION@
 DATE = @DATE@
diff --git a/man/ali.man b/man/ali.man
index f9b07c2..f2fb580 100644
--- a/man/ali.man
+++ b/man/ali.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH ALI %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/anno.man b/man/anno.man
index e2a77c1..f97efa5 100644
--- a/man/anno.man
+++ b/man/anno.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH ANNO %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/ap.man b/man/ap.man
index 35241e5..c77b39e 100644
--- a/man/ap.man
+++ b/man/ap.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH AP %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/burst.man b/man/burst.man
index 5bca99d..cb1e6f4 100644
--- a/man/burst.man
+++ b/man/burst.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH BURST %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/comp.man b/man/comp.man
index 17180ac..bfb78b3 100644
--- a/man/comp.man
+++ b/man/comp.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH COMP %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/conflict.man b/man/conflict.man
index 6cc6944..f690596 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/dist.man b/man/dist.man
index 6359b77..ae7be11 100644
--- a/man/dist.man
+++ b/man/dist.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH DIST %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/dp.man b/man/dp.man
index 1b21419..363f44a 100644
--- a/man/dp.man
+++ b/man/dp.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH DP %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/flist.man b/man/flist.man
index 8fc7b8d..66f2f85 100644
--- a/man/flist.man
+++ b/man/flist.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH FLIST %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/fmtdump.man b/man/fmtdump.man
index aaca927..0524f01 100644
--- a/man/fmtdump.man
+++ b/man/fmtdump.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH FMTDUMP %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/folder.man b/man/folder.man
index deded86..9b14527 100644
--- a/man/folder.man
+++ b/man/folder.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH FOLDER %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/forw.man b/man/forw.man
index 0f05b68..877b49b 100644
--- a/man/forw.man
+++ b/man/forw.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH FORW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/inc.man b/man/inc.man
index 86280b9..7e7a787 100644
--- a/man/inc.man
+++ b/man/inc.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH INC %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/install-mh.man b/man/install-mh.man
index ce1f61d..094ec4c 100644
--- a/man/install-mh.man
+++ b/man/install-mh.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH INSTALL-MH %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mark.man b/man/mark.man
index 6915792..eff4bf0 100644
--- a/man/mark.man
+++ b/man/mark.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MARK %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-alias.man b/man/mh-alias.man
index 6c3eb6b..ad47699 100644
--- a/man/mh-alias.man
+++ b/man/mh-alias.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-ALIAS %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-chart.man b/man/mh-chart.man
index b31cb0b..c451f62 100644
--- a/man/mh-chart.man
+++ b/man/mh-chart.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-CHART %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-draft.man b/man/mh-draft.man
index 7f86635..63b7b0d 100644
--- a/man/mh-draft.man
+++ b/man/mh-draft.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-DRAFT %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-format.man b/man/mh-format.man
index d7ceccc..8925b8c 100644
--- a/man/mh-format.man
+++ b/man/mh-format.man
@@ -1,6 +1,5 @@
 .\"
 .\" THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.
-.\" $Id$
 .\"
 .TH MH-FORMAT %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-mail.man b/man/mh-mail.man
index 1874d9b..2f29640 100644
--- a/man/mh-mail.man
+++ b/man/mh-mail.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-MAIL %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-profile.man b/man/mh-profile.man
index 62db35f..cd47524 100644
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-PROFILE %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-sequence.man b/man/mh-sequence.man
index a97af0e..12fdb1c 100644
--- a/man/mh-sequence.man
+++ b/man/mh-sequence.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-SEQUENCE %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mh-tailor.man b/man/mh-tailor.man
index 6a3fda5..31e5b90 100644
--- a/man/mh-tailor.man
+++ b/man/mh-tailor.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MH-TAILOR %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhbuild.man b/man/mhbuild.man
index 72ce281..b0af881 100644
--- a/man/mhbuild.man
+++ b/man/mhbuild.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHBUILD %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhl.man b/man/mhl.man
index 10f4b13..f8546c3 100644
--- a/man/mhl.man
+++ b/man/mhl.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhlist.man b/man/mhlist.man
index 42cb918..f0ef31a 100644
--- a/man/mhlist.man
+++ b/man/mhlist.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHLIST %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhmail.man b/man/mhmail.man
index 75f4918..6e3cf13 100644
--- a/man/mhmail.man
+++ b/man/mhmail.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHMAIL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhn.man b/man/mhn.man
index d867251..fc682ef 100644
--- a/man/mhn.man
+++ b/man/mhn.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHN %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhparam.man b/man/mhparam.man
index b190351..eb8caec 100644
--- a/man/mhparam.man
+++ b/man/mhparam.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHPARAM %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhpath.man b/man/mhpath.man
index c744868..ab4d42f 100644
--- a/man/mhpath.man
+++ b/man/mhpath.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHPATH %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhshow.man b/man/mhshow.man
index 78d8ed9..27ebd95 100644
--- a/man/mhshow.man
+++ b/man/mhshow.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHSHOW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/mhstore.man b/man/mhstore.man
index 4907273..af05bf2 100644
--- a/man/mhstore.man
+++ b/man/mhstore.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MHSTORE %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/msgchk.man b/man/msgchk.man
index 6decb1e..219bfe6 100644
--- a/man/msgchk.man
+++ b/man/msgchk.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MSGCHK %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/msh.man b/man/msh.man
index 89e52e7..93d0282 100644
--- a/man/msh.man
+++ b/man/msh.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH MSH %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/new.man b/man/new.man
index c724d3e..5be7983 100644
--- a/man/new.man
+++ b/man/new.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH NEW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 
diff --git a/man/next.man b/man/next.man
index 89abd9a..eecc044 100644
--- a/man/next.man
+++ b/man/next.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH NEXT %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/nmh.man b/man/nmh.man
index 18b6031..46fd8fb 100644
--- a/man/nmh.man
+++ b/man/nmh.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH NMH %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/packf.man b/man/packf.man
index a351578..fd32b3a 100644
--- a/man/packf.man
+++ b/man/packf.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH PACKF %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/pick.man b/man/pick.man
index a9171f4..1a1b0ff 100644
--- a/man/pick.man
+++ b/man/pick.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH PICK %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/post.man b/man/post.man
index 772bbfb..b6e395e 100644
--- a/man/post.man
+++ b/man/post.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH POST %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/prev.man b/man/prev.man
index ce861ab..6ef0b8e 100644
--- a/man/prev.man
+++ b/man/prev.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH PREV %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/prompter.man b/man/prompter.man
index 10a9873..623abba 100644
--- a/man/prompter.man
+++ b/man/prompter.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH PROMPTER %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/rcvdist.man b/man/rcvdist.man
index 1904134..f24ea8e 100644
--- a/man/rcvdist.man
+++ b/man/rcvdist.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH RCVDIST %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/rcvpack.man b/man/rcvpack.man
index c8030c4..26ba263 100644
--- a/man/rcvpack.man
+++ b/man/rcvpack.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH RCVPACK %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/rcvstore.man b/man/rcvstore.man
index 76505eb..010e238 100644
--- a/man/rcvstore.man
+++ b/man/rcvstore.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH RCVSTORE %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/rcvtty.man b/man/rcvtty.man
index badb4b0..f098b21 100644
--- a/man/rcvtty.man
+++ b/man/rcvtty.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH RCVTTY %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/refile.man b/man/refile.man
index c83da66..4b55fe1 100644
--- a/man/refile.man
+++ b/man/refile.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH REFILE %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/repl.man b/man/repl.man
index 41f5870..9f2f489 100644
--- a/man/repl.man
+++ b/man/repl.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH REPL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/rmf.man b/man/rmf.man
index ff2740e..047db5a 100644
--- a/man/rmf.man
+++ b/man/rmf.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH RMF %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/rmm.man b/man/rmm.man
index 614b97a..0f8b5ce 100644
--- a/man/rmm.man
+++ b/man/rmm.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH RMM %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/scan.man b/man/scan.man
index 7da788e..fb72ac3 100644
--- a/man/scan.man
+++ b/man/scan.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SCAN %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/send.man b/man/send.man
index a20296e..0ac8c3a 100644
--- a/man/send.man
+++ b/man/send.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SEND %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/sendfiles.man b/man/sendfiles.man
index 442c7f6..76b793a 100644
--- a/man/sendfiles.man
+++ b/man/sendfiles.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SENDFILES %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/show.man b/man/show.man
index 64a1a67..bdca14f 100644
--- a/man/show.man
+++ b/man/show.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SHOW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/slocal.man b/man/slocal.man
index f32b489..cc822f0 100644
--- a/man/slocal.man
+++ b/man/slocal.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SLOCAL %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/sortm.man b/man/sortm.man
index c9d99c5..283cf12 100644
--- a/man/sortm.man
+++ b/man/sortm.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SORTM %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/vmh.man b/man/vmh.man
index 7375991..9fe9220 100644
--- a/man/vmh.man
+++ b/man/vmh.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH VMH %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/whatnow.man b/man/whatnow.man
index cc2e989..4fca2cd 100644
--- a/man/whatnow.man
+++ b/man/whatnow.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH WHATNOW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/man/whom.man b/man/whom.man
index 1988121..c054dcf 100644
--- a/man/whom.man
+++ b/man/whom.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH WHOM %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
diff --git a/mts/Makefile.in b/mts/Makefile.in
index fcec813..821caa8 100644
--- a/mts/Makefile.in
+++ b/mts/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for mts subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/mts/smtp/Makefile.in b/mts/smtp/Makefile.in
index e837ddc..b2a4059 100644
--- a/mts/smtp/Makefile.in
+++ b/mts/smtp/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for mts/smtp subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/mts/smtp/hosts.c b/mts/smtp/hosts.c
index 908e619..a10509c 100644
--- a/mts/smtp/hosts.c
+++ b/mts/smtp/hosts.c
@@ -2,8 +2,6 @@
 /*
  * hosts.c -- find out the official name of a host
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 20fdce5..470d72d 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -1,8 +1,6 @@
 /*
  * smtp.c -- nmh SMTP interface
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/mts/smtp/smtp.h b/mts/smtp/smtp.h
index 12fdedb..c88620e 100644
--- a/mts/smtp/smtp.h
+++ b/mts/smtp/smtp.h
@@ -1,8 +1,6 @@
 
 /*
  * smtp.h -- definitions for the nmh SMTP Interface
- *
- * $Id$
  */
 
 /* various modes for SMTP */
diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 0f84568..95c220d 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for sbr subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index 09e4c6c..484ec5e 100644
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -2,8 +2,6 @@
 /*
  * addrsbr.c -- parse addresses 822-style
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/ambigsw.c b/sbr/ambigsw.c
index 42796b3..c11b9e7 100644
--- a/sbr/ambigsw.c
+++ b/sbr/ambigsw.c
@@ -2,8 +2,6 @@
 /*
  * ambigsw.c -- report an ambiguous switch
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/atooi.c b/sbr/atooi.c
index 353a5c1..d62de17 100644
--- a/sbr/atooi.c
+++ b/sbr/atooi.c
@@ -2,8 +2,6 @@
 /*
  * atooi.c -- octal version of atoi()
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index d2f71aa..5375596 100644
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -3,8 +3,6 @@
  * brkstring.c -- (destructively) split a string into
  *             -- an array of substrings
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/check_charset.c b/sbr/check_charset.c
index 9d0d625..8ee93b1 100644
--- a/sbr/check_charset.c
+++ b/sbr/check_charset.c
@@ -2,8 +2,6 @@
 /*
  * check_charset.c -- routines for character sets
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/client.c b/sbr/client.c
index d3374ad..c558536 100644
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -2,8 +2,6 @@
 /*
  * client.c -- connect to a server
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/closefds.c b/sbr/closefds.c
index 191bd31..d292112 100644
--- a/sbr/closefds.c
+++ b/sbr/closefds.c
@@ -2,8 +2,6 @@
 /*
  * closefds.c -- close-up fd's
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/concat.c b/sbr/concat.c
index 4d4e15c..82979f5 100644
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -3,8 +3,6 @@
  * concat.c -- concatenate a variable number (minimum of 1)
  *             of strings in managed memory
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/context_del.c b/sbr/context_del.c
index 859c851..474e51c 100644
--- a/sbr/context_del.c
+++ b/sbr/context_del.c
@@ -2,8 +2,6 @@
 /*
  * context_del.c -- delete an entry from the context/profile list
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/context_find.c b/sbr/context_find.c
index f96d0b3..8c0675f 100644
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -2,8 +2,6 @@
 /*
  * context_find.c -- find an entry in the context/profile list
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/context_foil.c b/sbr/context_foil.c
index 7eccd79..12dab45 100644
--- a/sbr/context_foil.c
+++ b/sbr/context_foil.c
@@ -2,8 +2,6 @@
 /*
  * context_foil.c -- foil search of profile and context
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/context_read.c b/sbr/context_read.c
index 1a584e4..a655eff 100644
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -1,8 +1,6 @@
 /*
  * context_read.c -- find and read profile and context files
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 4416eee..a0c5032 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -2,8 +2,6 @@
 /*
  * context_replace.c -- add/replace an entry in the context/profile list
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/context_save.c b/sbr/context_save.c
index 36b1634..4ee40ca 100644
--- a/sbr/context_save.c
+++ b/sbr/context_save.c
@@ -2,8 +2,6 @@
 /*
  * context_save.c -- write out the updated context file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/copy.c b/sbr/copy.c
index 52989aa..cc35e95 100644
--- a/sbr/copy.c
+++ b/sbr/copy.c
@@ -2,8 +2,6 @@
 /*
  * copy.c -- copy a string and return pointer to NULL terminator
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/copyip.c b/sbr/copyip.c
index 93ff5e8..84f724c 100644
--- a/sbr/copyip.c
+++ b/sbr/copyip.c
@@ -2,8 +2,6 @@
 /*
  * copyip.c -- copy a string array and return pointer to end
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/cpydata.c b/sbr/cpydata.c
index c3ca3ed..d322ba9 100644
--- a/sbr/cpydata.c
+++ b/sbr/cpydata.c
@@ -2,8 +2,6 @@
 /*
  * cpydata.c -- copy all data from one fd to another
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/cpydgst.c b/sbr/cpydgst.c
index a1a887a..12829f1 100644
--- a/sbr/cpydgst.c
+++ b/sbr/cpydgst.c
@@ -3,8 +3,6 @@
  * cpydgst.c -- copy from one fd to another in encapsulating mode
  *           -- (do dashstuffing of input data).
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index 4889bf1..d8bcdba 100644
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -2,8 +2,6 @@
 /*
  * crawl_folders.c -- crawl folder hierarchy
  *
- * $Id$
- *
  * This code is Copyright (c) 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/discard.c b/sbr/discard.c
index 55c160b..dbc865c 100644
--- a/sbr/discard.c
+++ b/sbr/discard.c
@@ -2,8 +2,6 @@
 /*
  * discard.c -- discard output on a file pointer
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/done.c b/sbr/done.c
index 65ec1cb..05bcf52 100644
--- a/sbr/done.c
+++ b/sbr/done.c
@@ -2,8 +2,6 @@
 /*
  * done.c -- terminate the program
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/dtime.c b/sbr/dtime.c
index 1435955..2e978d7 100644
--- a/sbr/dtime.c
+++ b/sbr/dtime.c
@@ -2,8 +2,6 @@
 /*
  * dtime.c -- time/date routines
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/error.c b/sbr/error.c
index 299e3a6..6dc6995 100644
--- a/sbr/error.c
+++ b/sbr/error.c
@@ -2,8 +2,6 @@
 /*
  * error.c -- main error handling routines
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index d228848..e94083b 100644
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -1,4 +1,4 @@
-/*	$Id$
+/*
  *
  *	Run a program that hooks into some other system.  The first argument is
  *	name of the hook to use, the second is the full path name of a mail message.
diff --git a/sbr/fdcompare.c b/sbr/fdcompare.c
index 6a45da6..38174e0 100644
--- a/sbr/fdcompare.c
+++ b/sbr/fdcompare.c
@@ -2,8 +2,6 @@
 /*
  * fdcompare.c -- are two files identical?
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index d71d956..be9b483 100644
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -2,8 +2,6 @@
 /*
  * fmt_addr.c -- format an address field (from fmt_scan)
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 89c25de..a180c56 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -2,8 +2,6 @@
 /*
  * fmt_compile.c -- "compile" format strings for fmt_scan
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/fmt_def.c b/sbr/fmt_def.c
index 478a466..1edb787 100644
--- a/sbr/fmt_def.c
+++ b/sbr/fmt_def.c
@@ -2,8 +2,6 @@
 /*
  * fmt_def.c -- some defines for sbr/fmt_scan.c
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index c1bc7c7..44a18b3 100644
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -2,8 +2,6 @@
 /*
  * fmt_new.c -- read format file/string and normalize
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/fmt_rfc2047.c b/sbr/fmt_rfc2047.c
index 87fddb9..6f208a1 100644
--- a/sbr/fmt_rfc2047.c
+++ b/sbr/fmt_rfc2047.c
@@ -2,8 +2,6 @@
 /*
  * fmt_rfc2047.c -- decode RFC-2047 header format 
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 9054963..97a0b4a 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -2,8 +2,6 @@
 /*
  * fmt_scan.c -- format string interpretation
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index f90cedf..52baa7a 100644
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -2,8 +2,6 @@
 /*
  * folder_addmsg.c -- Link message into folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 20ac1a5..6bde76f 100644
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -2,8 +2,6 @@
 /*
  * folder_delmsgs.c -- "remove" SELECTED messages from a folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/folder_free.c b/sbr/folder_free.c
index f06bbf5..ebb58ab 100644
--- a/sbr/folder_free.c
+++ b/sbr/folder_free.c
@@ -2,8 +2,6 @@
 /*
  * folder_free.c -- free a folder/message structure
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/folder_pack.c b/sbr/folder_pack.c
index 2bddb0d..b0bc67b 100644
--- a/sbr/folder_pack.c
+++ b/sbr/folder_pack.c
@@ -3,8 +3,6 @@
  * folder_pack.c -- pack (renumber) the messages in a folder
  *               -- into a contiguous range from 1 to n.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index 0dec537..bb88659 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -2,8 +2,6 @@
 /*
  * folder_read.c -- initialize folder structure and read folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/folder_realloc.c b/sbr/folder_realloc.c
index e7c4bc4..6a94a00 100644
--- a/sbr/folder_realloc.c
+++ b/sbr/folder_realloc.c
@@ -2,8 +2,6 @@
 /*
  * folder_realloc.c -- realloc a folder/msgs structure
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/gans.c b/sbr/gans.c
index c0804cd..6b76b7b 100644
--- a/sbr/gans.c
+++ b/sbr/gans.c
@@ -2,8 +2,6 @@
 /*
  * gans.c -- get an answer from the user
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/getans.c b/sbr/getans.c
index deb884e..3229eb5 100644
--- a/sbr/getans.c
+++ b/sbr/getans.c
@@ -2,8 +2,6 @@
 /*
  * getans.c -- get an answer from the user and return a string array
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index 55fd06e..0f8834b 100644
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -2,8 +2,6 @@
 /*
  * getarguments.c -- Get the argument vector ready to go.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/getcpy.c b/sbr/getcpy.c
index 1186831..6633248 100644
--- a/sbr/getcpy.c
+++ b/sbr/getcpy.c
@@ -6,8 +6,6 @@
  * OF GETCPY WITH STRDUP.  BUT THIS WILL REQUIRE
  * CHANGING PARTS OF THE CODE TO DEAL WITH NULL VALUES.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/getfolder.c b/sbr/getfolder.c
index 544a144..6c6d267 100644
--- a/sbr/getfolder.c
+++ b/sbr/getfolder.c
@@ -2,8 +2,6 @@
 /*
  * getfolder.c -- get the current or default folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/getpass.c b/sbr/getpass.c
index 6bc2cb8..f3ae829 100644
--- a/sbr/getpass.c
+++ b/sbr/getpass.c
@@ -29,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 866d047..7eaa0de 100644
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -2,8 +2,6 @@
 /*
  * lock.c -- routines to lock/unlock files
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_atoi.c b/sbr/m_atoi.c
index dffc799..174c407 100644
--- a/sbr/m_atoi.c
+++ b/sbr/m_atoi.c
@@ -4,8 +4,6 @@
  *          -- return the numeric value of the message.  If the string
  *          -- contains any non-digit characters, then return 0.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_backup.c b/sbr/m_backup.c
index 9dcfdf6..c34c409 100644
--- a/sbr/m_backup.c
+++ b/sbr/m_backup.c
@@ -2,8 +2,6 @@
 /*
  * m_backup.c -- construct a backup file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_convert.c b/sbr/m_convert.c
index 15c2906..1696190 100644
--- a/sbr/m_convert.c
+++ b/sbr/m_convert.c
@@ -2,8 +2,6 @@
 /*
  * m_convert.c -- parse a message range or sequence and set SELECTED
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_draft.c b/sbr/m_draft.c
index d3e988e..e479186 100644
--- a/sbr/m_draft.c
+++ b/sbr/m_draft.c
@@ -2,8 +2,6 @@
 /*
  * m_draft.c -- construct the name of a draft message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index ecbbd3c..be871c4 100644
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -2,8 +2,6 @@
 /*
  * m_getfld.c -- read/parse a message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_gmprot.c b/sbr/m_gmprot.c
index d7aec6f..92ead2d 100644
--- a/sbr/m_gmprot.c
+++ b/sbr/m_gmprot.c
@@ -2,8 +2,6 @@
 /*
  * m_gmprot.c -- return the msg-protect value
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_maildir.c b/sbr/m_maildir.c
index 441ca50..6c8c584 100644
--- a/sbr/m_maildir.c
+++ b/sbr/m_maildir.c
@@ -2,8 +2,6 @@
 /*
  * m_maildir.c -- get the path for the mail directory
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 59ee37d..aa25636 100644
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -1,8 +1,6 @@
 /*
  * m_mktemp.c -- Construct a temporary file.
  *
- * $Id$
- *
  * This code is Copyright (c) 2010, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_msgdef.c b/sbr/m_msgdef.c
index 96f54f0..d602973 100644
--- a/sbr/m_msgdef.c
+++ b/sbr/m_msgdef.c
@@ -2,8 +2,6 @@
 /*
  * m_msgdef.c -- some defines for sbr/m_getfld.c
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_name.c b/sbr/m_name.c
index 2c403d0..18ee081 100644
--- a/sbr/m_name.c
+++ b/sbr/m_name.c
@@ -2,8 +2,6 @@
 /*
  * m_name.c -- return a message number as a string
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_scratch.c b/sbr/m_scratch.c
index 353da56..3c63d09 100644
--- a/sbr/m_scratch.c
+++ b/sbr/m_scratch.c
@@ -2,8 +2,6 @@
 /*
  * m_scratch.c -- construct a scratch file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/m_tmpfil.c b/sbr/m_tmpfil.c
index 4382061..291d996 100644
--- a/sbr/m_tmpfil.c
+++ b/sbr/m_tmpfil.c
@@ -1,8 +1,6 @@
 /*
  * m_tmpfil.c -- construct a temporary file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/makedir.c b/sbr/makedir.c
index c5332ca..4337b7c 100644
--- a/sbr/makedir.c
+++ b/sbr/makedir.c
@@ -2,8 +2,6 @@
 /*
  * makedir.c -- make a directory
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/mf.c b/sbr/mf.c
index ac04c29..fd92e36 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -2,8 +2,6 @@
 /*
  * mf.c -- mail filter subroutines
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/mts.c b/sbr/mts.c
index 7610cda..6a9d84f 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -2,8 +2,6 @@
 /*
  * mts.c -- definitions for the mail transport system
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/path.c b/sbr/path.c
index 7ef83ea..5a9529d 100644
--- a/sbr/path.c
+++ b/sbr/path.c
@@ -2,8 +2,6 @@
 /*
  * path.c -- return a pathname
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/peekc.c b/sbr/peekc.c
index a687e69..5ed8c3f 100644
--- a/sbr/peekc.c
+++ b/sbr/peekc.c
@@ -2,8 +2,6 @@
 /*
  * peekc.c -- peek at the next character in a stream
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/pidstatus.c b/sbr/pidstatus.c
index 7991d59..f16f7e0 100644
--- a/sbr/pidstatus.c
+++ b/sbr/pidstatus.c
@@ -2,8 +2,6 @@
 /*
  * pidstatus.c -- report child's status
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/pidwait.c b/sbr/pidwait.c
index 607538f..ef42e1a 100644
--- a/sbr/pidwait.c
+++ b/sbr/pidwait.c
@@ -2,8 +2,6 @@
 /*
  * pidwait.c -- wait for child to exit
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/print_help.c b/sbr/print_help.c
index a7bc7e5..e045788 100644
--- a/sbr/print_help.c
+++ b/sbr/print_help.c
@@ -3,8 +3,6 @@
  * print_help.c -- print a help message, and possibly the
  *              -- profile/context entries for this command
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/print_sw.c b/sbr/print_sw.c
index bd7b5aa..6d475ab 100644
--- a/sbr/print_sw.c
+++ b/sbr/print_sw.c
@@ -2,8 +2,6 @@
 /*
  * print_sw.c -- print switches
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/print_version.c b/sbr/print_version.c
index b3300a9..b828b3c 100644
--- a/sbr/print_version.c
+++ b/sbr/print_version.c
@@ -2,8 +2,6 @@
 /*
  * print_version.c -- print a version string
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/push.c b/sbr/push.c
index 82b85b0..ce00f68 100644
--- a/sbr/push.c
+++ b/sbr/push.c
@@ -2,8 +2,6 @@
 /*
  * push.c -- push a fork into the background
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/putenv.c b/sbr/putenv.c
index fb4a77c..dd66514 100644
--- a/sbr/putenv.c
+++ b/sbr/putenv.c
@@ -2,8 +2,6 @@
 /*
  * putenv.c -- (un)set an envariable
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/r1bindex.c b/sbr/r1bindex.c
index 92e152d..92818f9 100644
--- a/sbr/r1bindex.c
+++ b/sbr/r1bindex.c
@@ -5,8 +5,6 @@
  *            -- character.  If the character doesn't occur, the
  *            -- pointer will be at the beginning of the string.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index eba6eec..2a68019 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -3,8 +3,6 @@
  * readconfig.c -- base routine to read nmh configuration files
  *              -- such as nmh profile, context file, or mhn.defaults.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/refile.c b/sbr/refile.c
index dc068fe..fc2793c 100644
--- a/sbr/refile.c
+++ b/sbr/refile.c
@@ -3,8 +3,6 @@
  * refile.c -- call the "fileproc" to refile the
  *          -- msg or draft into another folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/remdir.c b/sbr/remdir.c
index 627ff3f..4ce0b14 100644
--- a/sbr/remdir.c
+++ b/sbr/remdir.c
@@ -2,8 +2,6 @@
 /*
  * remdir.c -- remove a directory
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index 5ed6fde..882889c 100644
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -14,8 +14,6 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Id$
  */
 
 #include <h/mh.h>
diff --git a/sbr/seq_add.c b/sbr/seq_add.c
index ff3e23a..68fa724 100644
--- a/sbr/seq_add.c
+++ b/sbr/seq_add.c
@@ -2,8 +2,6 @@
 /*
  * seq_add.c -- add message(s) to a sequence
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_bits.c b/sbr/seq_bits.c
index 56bd2ec..30dd3f5 100644
--- a/sbr/seq_bits.c
+++ b/sbr/seq_bits.c
@@ -2,8 +2,6 @@
 /*
  * seq_bits.c -- return the snprintb() string for a sequence
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_del.c b/sbr/seq_del.c
index 67a93bb..eb41ec4 100644
--- a/sbr/seq_del.c
+++ b/sbr/seq_del.c
@@ -2,8 +2,6 @@
 /*
  * seq_del.c -- delete message(s) from a sequence
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_getnum.c b/sbr/seq_getnum.c
index aa9d57d..251b609 100644
--- a/sbr/seq_getnum.c
+++ b/sbr/seq_getnum.c
@@ -3,8 +3,6 @@
  * seq_getnum.c -- find the index for a sequence
  *              -- return -1 if sequence doesn't exist
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_list.c b/sbr/seq_list.c
index f5dbb65..b64e8cd 100644
--- a/sbr/seq_list.c
+++ b/sbr/seq_list.c
@@ -3,8 +3,6 @@
  * seq_list.c -- Get all messages in a sequence and return them
  *            -- as a space separated list of message ranges.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_nameok.c b/sbr/seq_nameok.c
index 678ab5b..6887ac6 100644
--- a/sbr/seq_nameok.c
+++ b/sbr/seq_nameok.c
@@ -2,8 +2,6 @@
 /*
  * seq_nameok.c -- check if a sequence name is ok
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_print.c b/sbr/seq_print.c
index 81a1f5c..3d97038 100644
--- a/sbr/seq_print.c
+++ b/sbr/seq_print.c
@@ -2,8 +2,6 @@
 /*
  * seq_print.c -- Routines to print sequence information.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index c18d1da..e349121 100644
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -3,8 +3,6 @@
  * seq_read.c -- read the .mh_sequence file and
  *            -- initialize sequence information
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_save.c b/sbr/seq_save.c
index 84775b9..94b7543 100644
--- a/sbr/seq_save.c
+++ b/sbr/seq_save.c
@@ -3,8 +3,6 @@
  * seq_save.c -- 1) synchronize sequences
  *            -- 2) save public sequences
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_setcur.c b/sbr/seq_setcur.c
index 4219572..f18a388 100644
--- a/sbr/seq_setcur.c
+++ b/sbr/seq_setcur.c
@@ -2,8 +2,6 @@
 /*
  * seq_setcur.c -- set the current message ("cur" sequence) for a folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_setprev.c b/sbr/seq_setprev.c
index fdffa95..11de143 100644
--- a/sbr/seq_setprev.c
+++ b/sbr/seq_setprev.c
@@ -2,8 +2,6 @@
 /*
  * seq_setprev.c -- set the Previous-Sequence
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/seq_setunseen.c b/sbr/seq_setunseen.c
index 022982e..ea18d17 100644
--- a/sbr/seq_setunseen.c
+++ b/sbr/seq_setunseen.c
@@ -3,8 +3,6 @@
  * seq_setunseen.c -- add/delete all messages which have the SELECT_UNSEEN
  *                 -- bit set to/from the Unseen-Sequence
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/showfile.c b/sbr/showfile.c
index c099c1c..59ae795 100644
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -2,8 +2,6 @@
 /*
  * showfile.c -- invoke the `lproc' command
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/sigmsg.awk b/sbr/sigmsg.awk
index d4f6e52..88beac1 100755
--- a/sbr/sigmsg.awk
+++ b/sbr/sigmsg.awk
@@ -3,8 +3,6 @@
 #
 # provided by Geoff Wing <mason@werple.apana.org.au>
 #
-# $Id$
-#
 # On SunOS 4.1.3 - user-functions don't work properly, also \" problems
 # Without 0 + hacks some nawks compare numbers as strings
 #
diff --git a/sbr/signals.c b/sbr/signals.c
index 9f5f379..919b8e0 100644
--- a/sbr/signals.c
+++ b/sbr/signals.c
@@ -2,8 +2,6 @@
 /*
  * signals.c -- general signals interface for nmh
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/smatch.c b/sbr/smatch.c
index 1a104ad..88a098b 100644
--- a/sbr/smatch.c
+++ b/sbr/smatch.c
@@ -2,8 +2,6 @@
 /*
  * smatch.c -- match a switch (option)
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/snprintb.c b/sbr/snprintb.c
index 558c2cf..5f3f124 100644
--- a/sbr/snprintb.c
+++ b/sbr/snprintb.c
@@ -2,8 +2,6 @@
 /*
  * snprintb.c -- snprintf a %b string
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/ssequal.c b/sbr/ssequal.c
index 32edca9..5ccf28f 100644
--- a/sbr/ssequal.c
+++ b/sbr/ssequal.c
@@ -2,8 +2,6 @@
 /*
  * ssequal.c -- check if a string is a substring of another
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/strcasecmp.c b/sbr/strcasecmp.c
index 4a026a3..04aad7d 100644
--- a/sbr/strcasecmp.c
+++ b/sbr/strcasecmp.c
@@ -2,8 +2,6 @@
 /*
  * strcasecmp.c -- compare strings, ignoring case
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/strdup.c b/sbr/strdup.c
index ebc29f5..251145a 100644
--- a/sbr/strdup.c
+++ b/sbr/strdup.c
@@ -2,8 +2,6 @@
 /*
  * strdup.c -- duplicate a string
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/strerror.c b/sbr/strerror.c
index d780955..476a574 100644
--- a/sbr/strerror.c
+++ b/sbr/strerror.c
@@ -1,8 +1,6 @@
 
 /*
  * strerror.c -- get error message string
- *
- * $Id$
  */
 
 #include <h/mh.h>
diff --git a/sbr/strindex.c b/sbr/strindex.c
index 51cbe7c..9a1e4fe 100644
--- a/sbr/strindex.c
+++ b/sbr/strindex.c
@@ -2,8 +2,6 @@
 /*
  * strindex.c -- "unsigned" lexical index
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/trimcpy.c b/sbr/trimcpy.c
index 8b57ad6..b640ea6 100644
--- a/sbr/trimcpy.c
+++ b/sbr/trimcpy.c
@@ -4,8 +4,6 @@
  *           -- replace internal whitespace with spaces,
  *           -- then return a copy.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/uprf.c b/sbr/uprf.c
index dedb0e5..b3c81ff 100644
--- a/sbr/uprf.c
+++ b/sbr/uprf.c
@@ -2,8 +2,6 @@
 /*
  * uprf.c -- "unsigned" lexical prefix
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/utils.c b/sbr/utils.c
index 7c4ddcf..48969ab 100644
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -2,8 +2,6 @@
 /*
  * utils.c -- various utility routines
  *
- * $Id$
- *
  * This code is Copyright (c) 2006, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/sbr/vfgets.c b/sbr/vfgets.c
index c6a39ea..3a376e1 100644
--- a/sbr/vfgets.c
+++ b/sbr/vfgets.c
@@ -2,8 +2,6 @@
 /*
  * vfgets.c -- virtual fgets
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/Makefile.in b/uip/Makefile.in
index 6f27177..31515ba 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for uip subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
diff --git a/uip/ali.c b/uip/ali.c
index 8513092..41f92a6 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -2,8 +2,6 @@
 /*
  * ali.c -- list nmh mail aliases
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index ec7be94..b1a7e61 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -2,8 +2,6 @@
 /*
  * aliasbr.c -- new aliasing mechanism
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/anno.c b/uip/anno.c
index ee9dcd7..41716f7 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -2,8 +2,6 @@
 /*
  * anno.c -- annotate messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/annosbr.c b/uip/annosbr.c
index 7f1bdde..87e9580 100644
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -2,8 +2,6 @@
 /*
  * annosbr.c -- prepend annotation to messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/ap.c b/uip/ap.c
index ea2d36d..a0f7f77 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -2,8 +2,6 @@
 /*
  * ap.c -- parse addresses 822-style
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/burst.c b/uip/burst.c
index f9dd951..fa3ac73 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -2,8 +2,6 @@
 /*
  * burst.c -- explode digests into individual messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/comp.c b/uip/comp.c
index 9c915bf..5ebce6e 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -2,8 +2,6 @@
 /*
  * comp.c -- compose a message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/conflict.c b/uip/conflict.c
index 8247ff0..07e77fc 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -2,8 +2,6 @@
 /*
  * conflict.c -- check for conflicts in mail system
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/dist.c b/uip/dist.c
index 1effbb0..4bad51a 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -2,8 +2,6 @@
 /*
  * dist.c -- re-distribute a message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/distsbr.c b/uip/distsbr.c
index e5f7bc5..afd4e41 100644
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -2,8 +2,6 @@
 /*
  * distsbr.c -- routines to do additional "dist-style" processing
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/dp.c b/uip/dp.c
index 6b41bb6..c94c8ea 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -2,8 +2,6 @@
 /*
  * dp.c -- parse dates 822-style
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 84435a2..3bd5c9b 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -2,8 +2,6 @@
 /*
  * dropsbr.c -- create/read/manipulate mail drops
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/flist.c b/uip/flist.c
index b5226ce..e3da709 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -12,8 +12,6 @@
  * control laws. This software is made available AS IS, and Xerox Corporation
  * makes no warranty about the software, its performance or its conformity to
  * any specification.
- *
- *  $Id$
  */
 
 #include <h/mh.h>
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index a590a00..fff4502 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -2,8 +2,6 @@
 /*
  * fmtdump.c -- compile format file and dump out instructions
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/folder.c b/uip/folder.c
index f83bedc..3e7c85d 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -4,8 +4,6 @@
  *             -- push/pop a folder onto/from the folder stack
  *             -- list the folder stack
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/forw.c b/uip/forw.c
index 7892d7f..ac0c4c5 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -2,8 +2,6 @@
 /*
  * forw.c -- forward a message, or group of messages.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/ftpsbr.c b/uip/ftpsbr.c
index 1d6727f..57f25ba 100644
--- a/uip/ftpsbr.c
+++ b/uip/ftpsbr.c
@@ -1,8 +1,6 @@
 /*
  * ftpsbr.c -- simple FTP client library
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/inc.c b/uip/inc.c
index d31cdf7..f23a565 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -2,8 +2,6 @@
 /*
  * inc.c -- incorporate messages from a maildrop into a folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/install-mh.c b/uip/install-mh.c
index d389093..c484771 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -1,8 +1,6 @@
 /*
  * install-mh.c -- initialize the nmh environment of a new user
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mark.c b/uip/mark.c
index 372568a..dd09b48 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -4,8 +4,6 @@
  *        -- delete messages (s) from sequences in given folder
  *        -- list sequences in given folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/md5.c b/uip/md5.c
index 2cb6cb5..5e0ab3b 100644
--- a/uip/md5.c
+++ b/uip/md5.c
@@ -2,8 +2,6 @@
 /*
  * md5.c -- md5 message digest algorithm
  *          taken from RFC-1321/Appendix A.3
- *
- * $Id$
  */
 
 /*
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index fbe2b2c..1e86290 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -2,8 +2,6 @@
 /*
  * mhbuild.c -- expand/translate MIME composition files
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index d95eee5..f01abd5 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -2,8 +2,6 @@
 /*
  * mhbuildsbr.c -- routines to expand/translate MIME composition files
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index ba66f6e..2223e80 100644
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -2,8 +2,6 @@
 /*
  * mhcachesbr.c -- routines to manipulate the MIME content cache
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhfree.c b/uip/mhfree.c
index df0ee46..38b830e 100644
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -3,8 +3,6 @@
  * mhfree.c -- routines to free the data structures used to
  *          -- represent MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhl.c b/uip/mhl.c
index e37c3ba..de12dde 100644
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -2,8 +2,6 @@
 /*
  * mhl.c -- the nmh message listing program
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 4cca8d2..cb6a3cf 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -2,8 +2,6 @@
 /*
  * mhlist.c -- list the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 1a02629..1aac74a 100644
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -3,8 +3,6 @@
  * mhlistsbr.c -- routines to list information about the
  *             -- contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index a386771..58b2978 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -2,8 +2,6 @@
 /*
  * mhlsbr.c -- main routines for nmh message lister
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhmail.c b/uip/mhmail.c
index e906b1d..e586860 100644
--- a/uip/mhmail.c
+++ b/uip/mhmail.c
@@ -2,8 +2,6 @@
 /*
  * mhmail.c -- simple mail program
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index fddd552..7a23139 100644
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -2,8 +2,6 @@
 /*
  * mhparse.c -- misc routines to process MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhn.c b/uip/mhn.c
index 45358e7..a7644a3 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -2,8 +2,6 @@
 /*
  * mhn.c -- display, list, cache, or store the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 9235253..7e12c46 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -3,8 +3,6 @@
  * mhoutsbr.c -- routines to output MIME messages
  *            -- given a Content structure
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhparam.c b/uip/mhparam.c
index f9f78c3..19f418e 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -5,8 +5,6 @@
  * Originally contributed by
  * Jeffrey C Honig <Jeffrey_C_Honig@cornell.edu>
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhparse.c b/uip/mhparse.c
index bca7942..d40d78c 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -2,8 +2,6 @@
 /*
  * mhparse.c -- routines to parse the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhpath.c b/uip/mhpath.c
index c4fd935..23ca542 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -2,8 +2,6 @@
 /*
  * mhpath.c -- print full pathnames of nmh messages and folders
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 2b406d4..191eeff 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -2,8 +2,6 @@
 /*
  * mhshow.c -- display the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 9317def..a63b8ed 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -2,8 +2,6 @@
 /*
  * mhshowsbr.c -- routines to display the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhstore.c b/uip/mhstore.c
index bef9122..7b44a96 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -2,8 +2,6 @@
 /*
  * mhstore.c -- store the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 151b2e6..a1b5e2a 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -2,8 +2,6 @@
 /*
  * mhstoresbr.c -- routines to save/store the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mhtest.c b/uip/mhtest.c
index 9590fd3..5c10b8b 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -2,8 +2,6 @@
 /*
  * mhtest.c -- test harness for MIME routines
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/msgchk.c b/uip/msgchk.c
index 1a59a3b..e052b42 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -2,8 +2,6 @@
 /*
  * msgchk.c -- check for mail
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/msh.c b/uip/msh.c
index f492a37..aed4bc7 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -2,8 +2,6 @@
 /*
  * msh.c -- The nmh shell
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 0201cbc..0190bee 100644
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -2,8 +2,6 @@
 /*
  * mshcmds.c -- command handlers in msh
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/new.c b/uip/new.c
index 82d6db5..41d2ebf 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -4,8 +4,6 @@
  *       -- as fnext,  move to next folder with unseen messages
  *       -- as fprev,  move to previous folder with unseen messages
  *       -- as unseen, scan all unseen messages
- * $Id$
- *
  * This code is Copyright (c) 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/packf.c b/uip/packf.c
index a696e72..c365440 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -2,8 +2,6 @@
 /*
  * packf.c -- pack a nmh folder into a file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/pick.c b/uip/pick.c
index e0d6136..24e6862 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -2,8 +2,6 @@
 /*
  * pick.c -- search for messages by content
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, 2008, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/picksbr.c b/uip/picksbr.c
index 61d5afb..bd4c263 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -2,8 +2,6 @@
 /*
  * picksbr.c -- routines to help pick along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/popsbr.c b/uip/popsbr.c
index 30e4c27..3ac88be 100644
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -1,8 +1,6 @@
 /*
  * popsbr.c -- POP client subroutines
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/post.c b/uip/post.c
index 87e31e8..d5760a2 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -2,8 +2,6 @@
 /*
  * post.c -- enter messages into the mail transport system
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/prompter.c b/uip/prompter.c
index 6f97a88..7c28aec 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -2,8 +2,6 @@
 /*
  * prompter.c -- simple prompting editor front-end
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 7d66910..9038d5f 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -2,8 +2,6 @@
 /*
  * rcvdist.c -- asynchronously redistribute messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f03fc99..0b4dc9f 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -2,8 +2,6 @@
 /*
  * rcvpack.c -- append message to a file
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 668eb86..3131076 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -2,8 +2,6 @@
 /*
  * rcvstore.c -- asynchronously add mail to a folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 333a3b2..8b04d61 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -2,8 +2,6 @@
 /*
  * rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/refile.c b/uip/refile.c
index 7bc6d0b..25f7629 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -3,8 +3,6 @@
  * refile.c -- move or link message(s) from a source folder
  *          -- into one or more destination folders
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/repl.c b/uip/repl.c
index 4584b67..d2b75df 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -2,8 +2,6 @@
 /*
  * repl.c -- reply to a message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/replsbr.c b/uip/replsbr.c
index a415346..3dda470 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -2,8 +2,6 @@
 /*
  * replsbr.c -- routines to help repl along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/rmf.c b/uip/rmf.c
index c3dcc91..a49ba4c 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -2,8 +2,6 @@
 /*
  * rmf.c -- remove a folder
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/rmm.c b/uip/rmm.c
index 1530289..7680008 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -2,8 +2,6 @@
 /*
  * rmm.c -- remove a message(s)
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/scan.c b/uip/scan.c
index 31aa245..077f824 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -2,8 +2,6 @@
 /*
  * scan.c -- display a one-line "scan" listing of folder or messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/scansbr.c b/uip/scansbr.c
index c5f0329..04dc215 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -2,8 +2,6 @@
 /*
  * scansbr.c -- routines to help scan along...
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/send.c b/uip/send.c
index 7eb75bd..d06b6c4 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -2,8 +2,6 @@
 /*
  * send.c -- send a composed message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 65b5ba1..57ef007 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -2,8 +2,6 @@
 /*
  * sendsbr.c -- routines to help WhatNow/Send along
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/show.c b/uip/show.c
index 604f2ea..a59e10c 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -2,8 +2,6 @@
 /*
  * show.c -- show/list messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/slocal.c b/uip/slocal.c
index f24228a..37173f6 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -2,8 +2,6 @@
 /*
  * slocal.c -- asynchronously filter and deliver new mail
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/sortm.c b/uip/sortm.c
index 212b441..cfad3d3 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -2,8 +2,6 @@
 /*
  * sortm.c -- sort messages in a folder by date/time
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/spost.c b/uip/spost.c
index 1c1a8bc..c7582ba 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -5,8 +5,6 @@
  * This is a simpler, faster, replacement for "post" for use
  * when "sendmail" is the transport system.
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/termsbr.c b/uip/termsbr.c
index a1b8ebf..740d021 100644
--- a/uip/termsbr.c
+++ b/uip/termsbr.c
@@ -2,8 +2,6 @@
 /*
  * termsbr.c -- termcap support
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/viamail.c b/uip/viamail.c
index 5b67ba1..aea746d 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -2,8 +2,6 @@
 /*
  * viamail.c -- send multiple files in a MIME message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/vmh.c b/uip/vmh.c
index 327f451..908df85 100644
--- a/uip/vmh.c
+++ b/uip/vmh.c
@@ -2,8 +2,6 @@
 /*
  * vmh.c -- visual front-end to nmh
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/vmhsbr.c b/uip/vmhsbr.c
index a504220..eb6e037 100644
--- a/uip/vmhsbr.c
+++ b/uip/vmhsbr.c
@@ -2,8 +2,6 @@
 /*
  * vmhsbr.c -- routines to help vmh along
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/vmhtest.c b/uip/vmhtest.c
index 4093c38..572bad5 100644
--- a/uip/vmhtest.c
+++ b/uip/vmhtest.c
@@ -2,8 +2,6 @@
 /*
  * vmhtest.c -- test out vmh protocol
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/whatnow.c b/uip/whatnow.c
index d995426..d3fccfd 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -2,8 +2,6 @@
 /*
  * whatnow.c -- the nmh `WhatNow' shell
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index cd21502..6bf4b36 100644
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -2,8 +2,6 @@
 /*
  * whatnowproc.c -- exec the "whatnowproc"
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 58ac8bd..723d408 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -2,8 +2,6 @@
 /*
  * whatnowsbr.c -- the WhatNow shell
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/whom.c b/uip/whom.c
index fe01326..ddf99ef 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -2,8 +2,6 @@
 /*
  * whom.c -- report to whom a message would be sent
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
diff --git a/uip/wmh.c b/uip/wmh.c
index af06698..e5ff490 100644
--- a/uip/wmh.c
+++ b/uip/wmh.c
@@ -2,8 +2,6 @@
 /*
  * wmh.c -- window front-end to nmh
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.