From 6106c1da54f0923550c7bdceb45246fb88e9ea19 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 1 Sep 2010 13:23:13 -0400
Subject: [PATCH] More removal of $Id$ tags

---
 citadel/include/citadel_ipc.h                 |  1 -
 citadel/include/commands.h                    |  1 -
 citadel/include/ctdl_module.h                 |  1 -
 citadel/include/datadefinitions.h             |  5 +---
 .../autocompletion/serv_autocompletion.c      |  4 +--
 .../autocompletion/serv_autocompletion.h      |  3 ---
 citadel/modules/bio/serv_bio.c                |  4 +--
 citadel/modules/calendar/serv_calendar.c      |  4 +--
 citadel/modules/calendar/serv_calendar.h      |  2 --
 citadel/modules/checkpoint/serv_checkpoint.c  |  4 +--
 citadel/modules/clamav/serv_virus.c           |  4 +--
 citadel/modules/crypto/serv_crypto.c          |  3 +--
 citadel/modules/crypto/serv_crypto.h          |  1 -
 citadel/modules/dspam/serv_dspam.c            |  6 ++---
 citadel/modules/expire/expire_policy.c        |  2 --
 citadel/modules/expire/policy.h               |  1 -
 citadel/modules/expire/serv_expire.c          |  4 +--
 citadel/modules/extnotify/extnotify_main.c    |  2 +-
 citadel/modules/fulltext/ft_wordbreaker.c     |  2 --
 citadel/modules/fulltext/ft_wordbreaker.h     |  3 ---
 citadel/modules/fulltext/serv_fulltext.c      |  6 +----
 citadel/modules/fulltext/serv_fulltext.h      |  3 ---
 citadel/modules/imap/imap_acl.c               |  2 --
 citadel/modules/imap/imap_acl.h               | 25 ++++++++-----------
 citadel/modules/imap/imap_fetch.c             |  2 --
 citadel/modules/imap/imap_fetch.h             |  3 ---
 citadel/modules/imap/imap_list.c              |  2 --
 citadel/modules/imap/imap_list.h              |  3 ---
 citadel/modules/imap/imap_metadata.c          |  2 --
 citadel/modules/imap/imap_metadata.h          |  3 ---
 citadel/modules/imap/imap_misc.c              |  2 --
 citadel/modules/imap/imap_misc.h              |  3 ---
 citadel/modules/imap/imap_search.c            |  2 --
 citadel/modules/imap/imap_search.h            |  3 ---
 citadel/modules/imap/imap_store.c             |  2 --
 citadel/modules/imap/imap_store.h             |  3 ---
 citadel/modules/imap/imap_tools.c             |  2 --
 citadel/modules/imap/serv_imap.c              |  4 +--
 citadel/modules/imap/serv_imap.h              |  4 ---
 citadel/modules/inetcfg/serv_inetcfg.c        |  4 +--
 citadel/modules/instmsg/serv_instmsg.c        |  4 +--
 citadel/modules/instmsg/serv_instmsg.h        |  1 -
 citadel/modules/listsub/serv_listsub.c        |  4 +--
 .../modules/managesieve/serv_managesieve.c    |  4 +--
 citadel/modules/migrate/serv_migrate.c        |  4 +--
 citadel/modules/mrtg/serv_mrtg.c              |  4 +--
 citadel/modules/netfilter/serv_netfilter.c    |  4 +--
 citadel/modules/network/serv_network.c        |  4 +--
 citadel/modules/newuser/serv_newuser.c        |  4 +--
 citadel/modules/notes/serv_notes.c            |  4 +--
 citadel/modules/openid/serv_openid_rp.c       |  4 +--
 citadel/modules/pas2/serv_pas2.c              |  2 +-
 citadel/modules/pop3/serv_pop3.c              |  4 +--
 citadel/modules/pop3client/serv_pop3client.c  |  4 +--
 citadel/textclient/citadel.c                  |  2 --
 citadel/textclient/client_chat.c              |  2 --
 citadel/textclient/client_chat.h              |  3 +--
 citadel/textclient/client_passwords.c         |  2 --
 citadel/textclient/client_passwords.h         |  2 --
 citadel/textclient/commands.c                 |  2 --
 citadel/textclient/messages.c                 |  2 --
 citadel/textclient/messages.h                 |  1 -
 citadel/textclient/rooms.c                    |  2 --
 citadel/textclient/rooms.h                    |  1 -
 citadel/textclient/routines.c                 |  3 ---
 citadel/textclient/routines.h                 |  1 -
 citadel/textclient/routines2.c                |  4 +--
 citadel/textclient/routines2.h                |  1 -
 citadel/textclient/screen.c                   |  1 -
 citadel/textclient/screen.h                   |  1 -
 citadel/textclient/tuiconfig.c                |  3 +--
 citadel/textclient/tuiconfig.h                |  1 -
 citadel/utillib/citadel_ipc.c                 |  3 +--
 citadel/utils/aidepost.c                      |  2 --
 citadel/utils/base64.c                        |  2 --
 citadel/utils/chkpwd.c                        |  2 --
 citadel/utils/citmail.c                       |  2 --
 citadel/utils/ctdlmigrate.c                   |  2 --
 citadel/utils/getmail.c                       |  2 --
 citadel/utils/msgform.c                       |  2 --
 citadel/utils/sendcommand.c                   |  2 --
 citadel/utils/setup.c                         |  3 ---
 citadel/utils/stress.c                        |  1 -
 citadel/utils/userlist.c                      |  2 --
 citadel/utils/whobbs.c                        |  2 --
 85 files changed, 42 insertions(+), 207 deletions(-)

diff --git a/citadel/include/citadel_ipc.h b/citadel/include/citadel_ipc.h
index ff339e441..b066127f8 100644
--- a/citadel/include/citadel_ipc.h
+++ b/citadel/include/citadel_ipc.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #define	UDS			"_UDS_"
 #ifdef __CYGWIN__
diff --git a/citadel/include/commands.h b/citadel/include/commands.h
index 5f12b23ff..ba07aae54 100644
--- a/citadel/include/commands.h
+++ b/citadel/include/commands.h
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * Copyright (c) 1987-2009 by the citadel.org team
  *
diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index de0939461..c3db1af9c 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #ifndef CTDL_MODULE_H
 #define CTDL_MODULE_H
diff --git a/citadel/include/datadefinitions.h b/citadel/include/datadefinitions.h
index a6ca931e7..b2d86f0a7 100644
--- a/citadel/include/datadefinitions.h
+++ b/citadel/include/datadefinitions.h
@@ -1,7 +1,4 @@
-/**
- *
- * $Id$
- *
+/*
  * this file contains the defines that convert our x-macros to datatypes
  */
 #define CFG_VALUE(a,b) a
diff --git a/citadel/modules/autocompletion/serv_autocompletion.c b/citadel/modules/autocompletion/serv_autocompletion.c
index 28cc0bec4..9c1c97991 100644
--- a/citadel/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/modules/autocompletion/serv_autocompletion.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Autocompletion of email recipients, etc.
  *
  * Copyright (c) 1987-2009 by the citadel.org team
@@ -230,5 +228,5 @@ CTDL_MODULE_INIT(autocompletion) {
 		CtdlRegisterProtoHook(cmd_auto, "AUTO", "Do recipient autocompletion");
 	}
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "autocompletion";
 }
diff --git a/citadel/modules/autocompletion/serv_autocompletion.h b/citadel/modules/autocompletion/serv_autocompletion.h
index 83f37e0a3..b111886fc 100644
--- a/citadel/modules/autocompletion/serv_autocompletion.h
+++ b/citadel/modules/autocompletion/serv_autocompletion.h
@@ -1,7 +1,4 @@
 /* 
- * $Id$
- *
- *
  * Copyright (c) 1987-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/bio/serv_bio.c b/citadel/modules/bio/serv_bio.c
index 43cc0e98c..a3a9c6a61 100644
--- a/citadel/modules/bio/serv_bio.c
+++ b/citadel/modules/bio/serv_bio.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module implementsserver commands related to the display and
  * manipulation of user "bio" files.
  *
@@ -121,7 +119,7 @@ CTDL_MODULE_INIT(bio)
 	        CtdlRegisterProtoHook(cmd_lbio, "LBIO", "List users with bios");
 	}
 	/* return our Subversion id for the Log */
-        return "$Id$";
+        return "bio";
 }
 
 
diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index e1e02ae54..f697f3570 100644
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * This module implements iCalendar object processing and the Calendar>
  * room on a Citadel server.  It handles iCalendar objects using the
  * iTIP protocol.  See RFCs 2445 and 2446.
@@ -2599,5 +2597,5 @@ CTDL_MODULE_INIT(calendar)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "calendar";
 }
diff --git a/citadel/modules/calendar/serv_calendar.h b/citadel/modules/calendar/serv_calendar.h
index af280af08..f9cadc09f 100644
--- a/citadel/modules/calendar/serv_calendar.h
+++ b/citadel/modules/calendar/serv_calendar.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * iCalendar implementation for Citadel
  *
  *
diff --git a/citadel/modules/checkpoint/serv_checkpoint.c b/citadel/modules/checkpoint/serv_checkpoint.c
index edc26a906..0b36b086c 100644
--- a/citadel/modules/checkpoint/serv_checkpoint.c
+++ b/citadel/modules/checkpoint/serv_checkpoint.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * checkpointing module for the database
  *
  * Copyright (c) 1987-2009 by the citadel.org team
@@ -86,5 +84,5 @@ CTDL_MODULE_INIT(checkpoint) {
 		CtdlThreadCreate ("checkpoint", CTDLTHREAD_BIGSTACK, checkpoint_thread, NULL);
 	}
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "checkpoint";
 }
diff --git a/citadel/modules/clamav/serv_virus.c b/citadel/modules/clamav/serv_virus.c
index ab77f1865..e31638aee 100644
--- a/citadel/modules/clamav/serv_virus.c
+++ b/citadel/modules/clamav/serv_virus.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module allows Citadel to use clamd to filter incoming messages
  * arriving via SMTP.  For more information on clamd, visit
  * http://clamav.net (the ClamAV project is not in any way
@@ -204,5 +202,5 @@ CTDL_MODULE_INIT(virus)
 	}
 	
 	/* return our Subversion id for the Log */
-        return "$Id$";
+        return "virus";
 }
diff --git a/citadel/modules/crypto/serv_crypto.c b/citadel/modules/crypto/serv_crypto.c
index 30309f896..e962d7f01 100644
--- a/citadel/modules/crypto/serv_crypto.c
+++ b/citadel/modules/crypto/serv_crypto.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Copyright (c) 1987-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/crypto/serv_crypto.h b/citadel/modules/crypto/serv_crypto.h
index c7b033794..650b8e94a 100644
--- a/citadel/modules/crypto/serv_crypto.h
+++ b/citadel/modules/crypto/serv_crypto.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /*
  * Number of days for which self-signed certs are valid.
diff --git a/citadel/modules/dspam/serv_dspam.c b/citadel/modules/dspam/serv_dspam.c
index 7d5e4f0cb..1f1349a17 100644
--- a/citadel/modules/dspam/serv_dspam.c
+++ b/citadel/modules/dspam/serv_dspam.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module glues libDSpam to the Citadel server in order to implement
  * DSPAM Spamchecking 
  *
@@ -240,7 +238,7 @@ void serv_dspam_shutdown (void)
 
 CTDL_MODULE_INIT(dspam)
 {
-	return "$Id$" "disabled.";
+	return "disabled.";
 	if (!threading)
 	{
 #ifdef HAVE_LIBDSPAM
@@ -261,6 +259,6 @@ CTDL_MODULE_INIT(dspam)
 	}
 	
         /* return our Subversion id for the Log */
-	return "$Id$";
+	return "dspam";
 }
 
diff --git a/citadel/modules/expire/expire_policy.c b/citadel/modules/expire/expire_policy.c
index bc5d155d8..43475b589 100644
--- a/citadel/modules/expire/expire_policy.c
+++ b/citadel/modules/expire/expire_policy.c
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- *
  * Functions which manage policy for rooms (such as message expiry)
  */
 
diff --git a/citadel/modules/expire/policy.h b/citadel/modules/expire/policy.h
index 65c8bda2f..e07fe8b28 100644
--- a/citadel/modules/expire/policy.h
+++ b/citadel/modules/expire/policy.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 void GetExpirePolicy(struct ExpirePolicy *epbuf, struct ctdlroom *qrbuf);
 void cmd_gpex(char *argbuf);
 void cmd_spex(char *argbuf);
diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index 25c926bf1..b78498efb 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module handles the expiry of old messages and the purging of old users.
  *
  * You might also see this module affectionately referred to as the DAP (the Dreaded Auto-Purger).
@@ -1059,5 +1057,5 @@ CTDL_MODULE_INIT(expire)
 	else
 		CtdlThreadCreate("Auto Purger", CTDLTHREAD_BIGSTACK, purge_databases, NULL);
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "expire";
 }
diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index c649587f9..1ceca2ca8 100644
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -414,5 +414,5 @@ CTDL_MODULE_INIT(extnotify)
 		CtdlRegisterSessionHook(do_extnotify_queue, EVT_TIMER);
 	}
 	/* return our Subversion id for the Log */
-        return "$Id$";
+        return "extnotify";
 }
diff --git a/citadel/modules/fulltext/ft_wordbreaker.c b/citadel/modules/fulltext/ft_wordbreaker.c
index 5308e8757..44f40a45c 100644
--- a/citadel/modules/fulltext/ft_wordbreaker.c
+++ b/citadel/modules/fulltext/ft_wordbreaker.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Default wordbreaker module for full text indexing.
  *
  * Copyright (c) 2005-2009 by the citadel.org team
diff --git a/citadel/modules/fulltext/ft_wordbreaker.h b/citadel/modules/fulltext/ft_wordbreaker.h
index 001dda815..9e919b3e5 100644
--- a/citadel/modules/fulltext/ft_wordbreaker.h
+++ b/citadel/modules/fulltext/ft_wordbreaker.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2005-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c
index f6266e9c4..88064ad50 100644
--- a/citadel/modules/fulltext/serv_fulltext.c
+++ b/citadel/modules/fulltext/serv_fulltext.c
@@ -1,9 +1,5 @@
 /*
- * $Id$
- *
  * This module handles fulltext indexing of the message base.
- *
- *
  * Copyright (c) 2005-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -536,5 +532,5 @@ CTDL_MODULE_INIT(fulltext)
 		CtdlThreadCreate("Indexer", CTDLTHREAD_BIGSTACK, indexer_thread, NULL);
 	}
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "fulltext";
 }
diff --git a/citadel/modules/fulltext/serv_fulltext.h b/citadel/modules/fulltext/serv_fulltext.h
index 6793f4790..a15067c3c 100644
--- a/citadel/modules/fulltext/serv_fulltext.h
+++ b/citadel/modules/fulltext/serv_fulltext.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2005-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_acl.c b/citadel/modules/imap/imap_acl.c
index 39d8d70e4..76fc7e4f7 100644
--- a/citadel/modules/imap/imap_acl.c
+++ b/citadel/modules/imap/imap_acl.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions which implement RFC2086 (and maybe RFC4314) (IMAP ACL extension)
  *
  *
diff --git a/citadel/modules/imap/imap_acl.h b/citadel/modules/imap/imap_acl.h
index f4d1f50e0..089e4c0d8 100644
--- a/citadel/modules/imap/imap_acl.h
+++ b/citadel/modules/imap/imap_acl.h
@@ -1,22 +1,19 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2007-2009 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 void imap_setacl(int num_parms, ConstStr *Params);
diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c
index 66dd774fa..29e64ed37 100644
--- a/citadel/modules/imap/imap_fetch.c
+++ b/citadel/modules/imap/imap_fetch.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Implements the FETCH command in IMAP.
  * This is a good example of the protocol's gratuitous complexity.
  *
diff --git a/citadel/modules/imap/imap_fetch.h b/citadel/modules/imap/imap_fetch.h
index c87fd9cd0..1e41ca8fd 100644
--- a/citadel/modules/imap/imap_fetch.h
+++ b/citadel/modules/imap/imap_fetch.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2001-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_list.c b/citadel/modules/imap/imap_list.c
index 2c342e94c..005f8c88d 100644
--- a/citadel/modules/imap/imap_list.c
+++ b/citadel/modules/imap/imap_list.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Implements the LIST and LSUB commands.
  *
  * Copyright (c) 2000-2009 by Art Cancro and others.
diff --git a/citadel/modules/imap/imap_list.h b/citadel/modules/imap/imap_list.h
index b780c7e0f..902c6d1c2 100644
--- a/citadel/modules/imap/imap_list.h
+++ b/citadel/modules/imap/imap_list.h
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 /*
  * In the extended form of LIST the client is allowed to specify
diff --git a/citadel/modules/imap/imap_metadata.c b/citadel/modules/imap/imap_metadata.c
index 7dc3179ad..5ffa1f5b0 100644
--- a/citadel/modules/imap/imap_metadata.c
+++ b/citadel/modules/imap/imap_metadata.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * IMAP METADATA extension
  *
  * This is an implementation of the Bynari variant of the METADATA extension.
diff --git a/citadel/modules/imap/imap_metadata.h b/citadel/modules/imap/imap_metadata.h
index d014a581e..567f90999 100644
--- a/citadel/modules/imap/imap_metadata.h
+++ b/citadel/modules/imap/imap_metadata.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2007-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 04300d8d8..4f2824b64 100644
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 1987-2010 by the citadel.org team
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_misc.h b/citadel/modules/imap/imap_misc.h
index 8847aec9e..7bacf91a1 100644
--- a/citadel/modules/imap/imap_misc.h
+++ b/citadel/modules/imap/imap_misc.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2001-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_search.c b/citadel/modules/imap/imap_search.c
index e14678e45..001a96ce8 100644
--- a/citadel/modules/imap/imap_search.c
+++ b/citadel/modules/imap/imap_search.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Implements IMAP's gratuitously complex SEARCH command.
  *
  *
diff --git a/citadel/modules/imap/imap_search.h b/citadel/modules/imap/imap_search.h
index fe90308a9..993706b64 100644
--- a/citadel/modules/imap/imap_search.h
+++ b/citadel/modules/imap/imap_search.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2001-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_store.c b/citadel/modules/imap/imap_store.c
index 4b2f1b45d..a25908708 100644
--- a/citadel/modules/imap/imap_store.c
+++ b/citadel/modules/imap/imap_store.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Implements the STORE command in IMAP.
  *
  * Copyright (c) 2001-2009 by the citadel.org team
diff --git a/citadel/modules/imap/imap_store.h b/citadel/modules/imap/imap_store.h
index ce6a7a425..92d9c4240 100644
--- a/citadel/modules/imap/imap_store.h
+++ b/citadel/modules/imap/imap_store.h
@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (c) 2001-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/modules/imap/imap_tools.c b/citadel/modules/imap/imap_tools.c
index 23e27419a..645478a47 100644
--- a/citadel/modules/imap/imap_tools.c
+++ b/citadel/modules/imap/imap_tools.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Utility functions for the IMAP module.
  *
  * Copyright (c) 2001-2009 by the citadel.org team and others, except for
diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index eca6f3c7f..a7c3cb195 100644
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * IMAP server for the Citadel system
  * Copyright (C) 2000-2009 by Art Cancro and others.
  * This code is released under the terms of the GNU General Public License.
@@ -1749,5 +1747,5 @@ CTDL_MODULE_INIT(imap)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "imap";
 }
diff --git a/citadel/modules/imap/serv_imap.h b/citadel/modules/imap/serv_imap.h
index 5d96ea95d..354c13d69 100644
--- a/citadel/modules/imap/serv_imap.h
+++ b/citadel/modules/imap/serv_imap.h
@@ -1,7 +1,3 @@
-/* $Id$ 
- */
-
-
 #define GLOBAL_UIDVALIDITY_VALUE	1L
 
 
diff --git a/citadel/modules/inetcfg/serv_inetcfg.c b/citadel/modules/inetcfg/serv_inetcfg.c
index 051aae3bc..1e74c1df6 100644
--- a/citadel/modules/inetcfg/serv_inetcfg.c
+++ b/citadel/modules/inetcfg/serv_inetcfg.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * This module handles the loading/saving and maintenance of the
  * system's Internet configuration.  It's not an optional component; I
  * wrote it as a module merely to keep things as clean and loosely coupled
@@ -198,6 +196,6 @@ CTDL_MODULE_INIT(inetcfg)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "inetcfg";
 }
 
diff --git a/citadel/modules/instmsg/serv_instmsg.c b/citadel/modules/instmsg/serv_instmsg.c
index a061fc846..a7503133b 100644
--- a/citadel/modules/instmsg/serv_instmsg.c
+++ b/citadel/modules/instmsg/serv_instmsg.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module handles instant messaging between users.
  * 
  * Copyright (c) 1987-2010 by the citadel.org team
@@ -609,5 +607,5 @@ CTDL_MODULE_INIT(instmsg)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "instmsg";
 }
diff --git a/citadel/modules/instmsg/serv_instmsg.h b/citadel/modules/instmsg/serv_instmsg.h
index 9f2bc9d8b..a1654a056 100644
--- a/citadel/modules/instmsg/serv_instmsg.h
+++ b/citadel/modules/instmsg/serv_instmsg.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 #include "ctdl_module.h"
 
 void ChatUnloadingTest(void);
diff --git a/citadel/modules/listsub/serv_listsub.c b/citadel/modules/listsub/serv_listsub.c
index 2e1355f55..15cd194eb 100644
--- a/citadel/modules/listsub/serv_listsub.c
+++ b/citadel/modules/listsub/serv_listsub.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module handles self-service subscription/unsubscription to mail lists.
  *
  * Copyright (c) 2002-2009 by the citadel.org team
@@ -587,5 +585,5 @@ CTDL_MODULE_INIT(listsub)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "listsub";
 }
diff --git a/citadel/modules/managesieve/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c
index e96378104..2f67d2f6f 100644
--- a/citadel/modules/managesieve/serv_managesieve.c
+++ b/citadel/modules/managesieve/serv_managesieve.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module is an managesieve implementation for the Citadel system.
  * It is compliant with all of the following:
  *
@@ -614,7 +612,7 @@ CTDL_MODULE_INIT(managesieve)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "managesieve";
 }
 
 
diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index 8b431c8af..d1b6cfca0 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module dumps and/or loads the Citadel database in XML format.
  *
  * Copyright (c) 1987-2010 by the citadel.org team
@@ -988,5 +986,5 @@ CTDL_MODULE_INIT(migrate)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "migrate";
 }
diff --git a/citadel/modules/mrtg/serv_mrtg.c b/citadel/modules/mrtg/serv_mrtg.c
index 06c1f92cb..2a7d24084 100644
--- a/citadel/modules/mrtg/serv_mrtg.c
+++ b/citadel/modules/mrtg/serv_mrtg.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module supplies statistics about the activity levels of your Citadel
  * system.  We didn't bother writing a reporting module, because there is
  * already an excellent tool called MRTG (Multi Router Traffic Grapher) which
@@ -184,5 +182,5 @@ CTDL_MODULE_INIT(mrtg)
 	}
 	
 	/* return our Subversion id for the Log */
-        return "$Id$";
+        return "mrtg";
 }
diff --git a/citadel/modules/netfilter/serv_netfilter.c b/citadel/modules/netfilter/serv_netfilter.c
index a32a0e06c..e379fbe41 100644
--- a/citadel/modules/netfilter/serv_netfilter.c
+++ b/citadel/modules/netfilter/serv_netfilter.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- * 
  * A server-side module for Citadel designed to filter idiots off the network.
  * 
  * Copyright (c) 2002-2009 by the citadel.org team
@@ -125,5 +123,5 @@ CTDL_MODULE_INIT(netfilter)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "netfilter";
 }
diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 964f1611c..840fb68e0 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
@@ -2421,5 +2419,5 @@ CTDL_MODULE_INIT(network)
 	else
 		CtdlThreadSchedule("IGnet Network", CTDLTHREAD_BIGSTACK, network_do_queue, NULL, 0);
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "network";
 }
diff --git a/citadel/modules/newuser/serv_newuser.c b/citadel/modules/newuser/serv_newuser.c
index 71f89ad63..df534c25a 100644
--- a/citadel/modules/newuser/serv_newuser.c
+++ b/citadel/modules/newuser/serv_newuser.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Automatically copies the contents of a "New User Greetings" room to the
  * inbox of any new user upon account creation.
  *
@@ -116,5 +114,5 @@ CTDL_MODULE_INIT(newuser)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "newuser";
 }
diff --git a/citadel/modules/notes/serv_notes.c b/citadel/modules/notes/serv_notes.c
index 436559a58..e1e6b81cc 100644
--- a/citadel/modules/notes/serv_notes.c
+++ b/citadel/modules/notes/serv_notes.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Handles functions related to yellow sticky notes.
  *
  * Copyright (c) 2007-2009 by the citadel.org team
@@ -185,5 +183,5 @@ CTDL_MODULE_INIT(notes)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "notes";
 }
diff --git a/citadel/modules/openid/serv_openid_rp.c b/citadel/modules/openid/serv_openid_rp.c
index a802a6c58..6c2daad63 100644
--- a/citadel/modules/openid/serv_openid_rp.c
+++ b/citadel/modules/openid/serv_openid_rp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This is an implementation of OpenID 1.1 Relying Party support, in stateless mode.
  *
  * Copyright (c) 2007-2010 by the citadel.org team
@@ -969,5 +967,5 @@ CTDL_MODULE_INIT(openid_rp)
 	}
 
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "openid_rp";
 }
diff --git a/citadel/modules/pas2/serv_pas2.c b/citadel/modules/pas2/serv_pas2.c
index bb79dbdae..29fd2e47f 100644
--- a/citadel/modules/pas2/serv_pas2.c
+++ b/citadel/modules/pas2/serv_pas2.c
@@ -110,5 +110,5 @@ CTDL_MODULE_INIT(pas2)
 	}
 	
 	/* return our Subversion id for the Log */
-        return "$Id$";
+        return "pas2";
 }
diff --git a/citadel/modules/pop3/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c
index 50c274901..2441a0e4b 100644
--- a/citadel/modules/pop3/serv_pop3.c
+++ b/citadel/modules/pop3/serv_pop3.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * POP3 service for the Citadel system
  *
  * Copyright (c) 1998-2009 by the citadel.org team
@@ -745,5 +743,5 @@ CTDL_MODULE_INIT(pop3)
 	}
 	
 	/* return our Subversion id for the Log */
-	return "$Id$";
+	return "pop3";
 }
diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index 4250cc446..c6b349c6c 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Consolidate mail from remote POP3 accounts.
  *
  * Copyright (c) 2007-2009 by the citadel.org team
@@ -363,5 +361,5 @@ CTDL_MODULE_INIT(pop3client)
 	}
 	
 	/* return our Subversion id for the Log */
-        return "$Id$";
+        return "pop3client";
 }
diff --git a/citadel/textclient/citadel.c b/citadel/textclient/citadel.c
index 998451f7b..3ea33eea1 100644
--- a/citadel/textclient/citadel.c
+++ b/citadel/textclient/citadel.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Main source module for the client program.
  *
  * Copyright (c) 1987-2009 by the citadel.org team
diff --git a/citadel/textclient/client_chat.c b/citadel/textclient/client_chat.c
index 590d8b4c9..3f8ed7799 100644
--- a/citadel/textclient/client_chat.c
+++ b/citadel/textclient/client_chat.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * front end for chat mode
  * (the "single process" version - no more fork() anymore)
  *
diff --git a/citadel/textclient/client_chat.h b/citadel/textclient/client_chat.h
index 4515961f8..aa5d1034c 100644
--- a/citadel/textclient/client_chat.h
+++ b/citadel/textclient/client_chat.h
@@ -1,5 +1,4 @@
-/* $Id$ 
- *
+/*
  * Copyright (c) 1987-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/textclient/client_passwords.c b/citadel/textclient/client_passwords.c
index 4922a1249..83907f8a2 100644
--- a/citadel/textclient/client_passwords.c
+++ b/citadel/textclient/client_passwords.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Functions which allow the client to remember usernames and passwords for
  * various sites.
  *
diff --git a/citadel/textclient/client_passwords.h b/citadel/textclient/client_passwords.h
index 6f6a4547e..a36e88dc4 100644
--- a/citadel/textclient/client_passwords.h
+++ b/citadel/textclient/client_passwords.h
@@ -1,6 +1,4 @@
 /* 
- * $Id$
- *
  * Copyright (c) 1987-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/textclient/commands.c b/citadel/textclient/commands.c
index 427887cbb..7999c6253 100644
--- a/citadel/textclient/commands.c
+++ b/citadel/textclient/commands.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This file contains functions which implement parts of the
  * text-mode user interface.
  *
diff --git a/citadel/textclient/messages.c b/citadel/textclient/messages.c
index 6729ca10f..e98e262ab 100644
--- a/citadel/textclient/messages.c
+++ b/citadel/textclient/messages.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Text client functions for reading and writing of messages
  *
  * Copyright (c) 1987-2010 by the citadel.org team
diff --git a/citadel/textclient/messages.h b/citadel/textclient/messages.h
index 7154cced0..0ece30f22 100644
--- a/citadel/textclient/messages.h
+++ b/citadel/textclient/messages.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #define MAXURLS		50	/* Max embedded URL's per message */
 extern int num_urls;
diff --git a/citadel/textclient/rooms.c b/citadel/textclient/rooms.c
index 3bd9698dc..a27df0723 100644
--- a/citadel/textclient/rooms.c
+++ b/citadel/textclient/rooms.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Client-side functions which perform room operations
  *
  * Copyright (c) 1987-2010 by the citadel.org team
diff --git a/citadel/textclient/rooms.h b/citadel/textclient/rooms.h
index 6e323657c..d207853bf 100644
--- a/citadel/textclient/rooms.h
+++ b/citadel/textclient/rooms.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 void listzrooms(CtdlIPC *ipc);
 void readinfo(CtdlIPC *ipc);
 void forget(CtdlIPC *ipc);
diff --git a/citadel/textclient/routines.c b/citadel/textclient/routines.c
index 2cf1acf0b..1c0675d40 100644
--- a/citadel/textclient/routines.c
+++ b/citadel/textclient/routines.c
@@ -1,8 +1,5 @@
 /*
- * $Id$
- *
  * Client-side support functions.
- *
  */
 
 #include "sysdep.h"
diff --git a/citadel/textclient/routines.h b/citadel/textclient/routines.h
index 6bb516a2c..3ecc03d7e 100644
--- a/citadel/textclient/routines.h
+++ b/citadel/textclient/routines.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 void edituser(CtdlIPC *ipc, int cmd);
 void interr(int errnum);
 int struncmp(char *lstr, char *rstr, int len);
diff --git a/citadel/textclient/routines2.c b/citadel/textclient/routines2.c
index 3fbff5f3d..3aab13d83 100644
--- a/citadel/textclient/routines2.c
+++ b/citadel/textclient/routines2.c
@@ -1,8 +1,6 @@
-/* $Id$
- *
+/*
  * More client-side support functions.
  * Unlike routines.c, some of these DO use global variables.
- *
  */
 
 #include <stdlib.h>
diff --git a/citadel/textclient/routines2.h b/citadel/textclient/routines2.h
index ba1c17964..6187b0117 100644
--- a/citadel/textclient/routines2.h
+++ b/citadel/textclient/routines2.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 void updatels(CtdlIPC *ipc);
 void updatelsa(CtdlIPC *ipc);
 void movefile(CtdlIPC *ipc);
diff --git a/citadel/textclient/screen.c b/citadel/textclient/screen.c
index 0924261c9..3299b0506 100644
--- a/citadel/textclient/screen.c
+++ b/citadel/textclient/screen.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /*
  * Handle full-screen curses stuff
diff --git a/citadel/textclient/screen.h b/citadel/textclient/screen.h
index 02975030b..134a99cd2 100644
--- a/citadel/textclient/screen.h
+++ b/citadel/textclient/screen.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* client code may need the ERR define: */
 
diff --git a/citadel/textclient/tuiconfig.c b/citadel/textclient/tuiconfig.c
index 467baef6a..4ea9cc0f0 100644
--- a/citadel/textclient/tuiconfig.c
+++ b/citadel/textclient/tuiconfig.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Configuration screens that are part of the text mode client.
  *
  */
diff --git a/citadel/textclient/tuiconfig.h b/citadel/textclient/tuiconfig.h
index 2d0a5d4a7..e810871fd 100644
--- a/citadel/textclient/tuiconfig.h
+++ b/citadel/textclient/tuiconfig.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 void do_internet_configuration(CtdlIPC *ipc);
 void do_ignet_configuration(CtdlIPC *ipc);
 void network_config_management(CtdlIPC *ipc, char *entrytype, char *comment);
diff --git a/citadel/utillib/citadel_ipc.c b/citadel/utillib/citadel_ipc.c
index bcd48b037..69a73116f 100644
--- a/citadel/utillib/citadel_ipc.c
+++ b/citadel/utillib/citadel_ipc.c
@@ -1,5 +1,4 @@
-/* $Id$ 
- *
+/*
  * Copyright (c) 1987-2009 by the citadel.org team
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/citadel/utils/aidepost.c b/citadel/utils/aidepost.c
index e3c5c386e..512298f91 100644
--- a/citadel/utils/aidepost.c
+++ b/citadel/utils/aidepost.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This is just a little hack to copy standard input to a message in Aide>
  *
  * Copyright (c) 1987-2009 by the citadel.org team
diff --git a/citadel/utils/base64.c b/citadel/utils/base64.c
index 388606cd2..1f043c13a 100644
--- a/citadel/utils/base64.c
+++ b/citadel/utils/base64.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Encode or decode file as MIME base64 (RFC 1341)
  * Public domain by John Walker, August 11 1997
  * Modified slightly for the Citadel system, June 1999
diff --git a/citadel/utils/chkpwd.c b/citadel/utils/chkpwd.c
index 7e9f39010..6182e7ac7 100644
--- a/citadel/utils/chkpwd.c
+++ b/citadel/utils/chkpwd.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * a setuid helper program for machines which use shadow passwords
  * by Nathan Bryant, March 1999
  *
diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index 2f1bdc2a1..36b714f4b 100644
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This program attempts to act like a local MDA if you're using sendmail or
  * some other non-Citadel MTA.  It basically just contacts the Citadel LMTP
  * listener on a unix domain socket and transmits the message.
diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 65f06c644..b165113b6 100644
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Across-the-wire migration utility for Citadel
  *
  * Yes, we used goto, and gets(), and committed all sorts of other heinous sins here.
diff --git a/citadel/utils/getmail.c b/citadel/utils/getmail.c
index af9780cb8..087ee034f 100644
--- a/citadel/utils/getmail.c
+++ b/citadel/utils/getmail.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Command-line utility to transmit a server command.
  *
  * Copyright (c) 1987-2009 by the citadel.org team
diff --git a/citadel/utils/msgform.c b/citadel/utils/msgform.c
index c17a25779..201745a03 100644
--- a/citadel/utils/msgform.c
+++ b/citadel/utils/msgform.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- * 
  * This is simply a filter that converts Citadel binary message format
  * to readable, formatted output.
  * 
diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index 097a9034b..c259a5b68 100644
--- a/citadel/utils/sendcommand.c
+++ b/citadel/utils/sendcommand.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Command-line utility to transmit a server command.
  *
  * Copyright (c) 1987-2010 by the citadel.org team
diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index b7fc0f065..fe47bba74 100644
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -1,8 +1,5 @@
 /*
- * $Id$
- *
  * Citadel setup utility
- *
  */
 
 #define SHOW_ME_VAPPEND_PRINTF
diff --git a/citadel/utils/stress.c b/citadel/utils/stress.c
index d62ea3cb8..9c6d1b24d 100644
--- a/citadel/utils/stress.c
+++ b/citadel/utils/stress.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /* This message is exactly 1024 bytes */
 char* const message =
diff --git a/citadel/utils/userlist.c b/citadel/utils/userlist.c
index 3f78cea6f..1bf75973a 100644
--- a/citadel/utils/userlist.c
+++ b/citadel/utils/userlist.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Command-line user list utility.
  *
  */
diff --git a/citadel/utils/whobbs.c b/citadel/utils/whobbs.c
index e3523aae9..7d4901a29 100644
--- a/citadel/utils/whobbs.c
+++ b/citadel/utils/whobbs.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- * 
  * Command-line "who is online?" utility
  *
  */
-- 
2.30.2