From 7a6a01ddca9307aa0f0abe27bb0f9074b86b1093 Mon Sep 17 00:00:00 2001
From: jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 21 Jun 2006 00:20:03 +0000
Subject: [PATCH] More svn:properties changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@177 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 Makedefs.in                        | 4 ++--
 Makefile                           | 4 ++--
 backend/Makefile                   | 4 ++--
 backend/betest.c                   | 4 ++--
 backend/ieee1284.c                 | 4 ++--
 backend/ieee1394-linux.c           | 4 ++--
 backend/ieee1394.c                 | 4 ++--
 backend/ieee1394.h                 | 4 ++--
 backend/ipp.c                      | 4 ++--
 backend/lpd.c                      | 4 ++--
 backend/pap.c                      | 2 +-
 backend/parallel.c                 | 4 ++--
 backend/scsi-irix.c                | 4 ++--
 backend/scsi-linux.c               | 4 ++--
 backend/scsi.c                     | 4 ++--
 backend/serial.c                   | 4 ++--
 backend/snmp.c                     | 4 ++--
 backend/socket.c                   | 4 ++--
 backend/test1284.c                 | 4 ++--
 backend/usb-darwin.c               | 4 ++--
 backend/usb-unix.c                 | 4 ++--
 backend/usb.c                      | 4 ++--
 berkeley/Makefile                  | 4 ++--
 berkeley/lpc.c                     | 4 ++--
 berkeley/lpq.c                     | 4 ++--
 berkeley/lpr.c                     | 4 ++--
 berkeley/lprm.c                    | 4 ++--
 cgi-bin/Makefile                   | 4 ++--
 cgi-bin/admin.c                    | 4 ++--
 cgi-bin/cgi-private.h              | 4 ++--
 cgi-bin/cgi.h                      | 4 ++--
 cgi-bin/classes.c                  | 4 ++--
 cgi-bin/help-index.c               | 4 ++--
 cgi-bin/help-index.h               | 4 ++--
 cgi-bin/html.c                     | 4 ++--
 cgi-bin/ipp-var.c                  | 4 ++--
 cgi-bin/jobs.c                     | 4 ++--
 cgi-bin/printers.c                 | 4 ++--
 cgi-bin/search.c                   | 4 ++--
 cgi-bin/template.c                 | 4 ++--
 cgi-bin/testcgi.c                  | 4 ++--
 cgi-bin/testhi.c                   | 4 ++--
 cgi-bin/testtemplate.c             | 4 ++--
 cgi-bin/var.c                      | 4 ++--
 conf/Makefile                      | 4 ++--
 conf/cupsd.conf.in                 | 4 ++--
 conf/mime.convs                    | 4 ++--
 conf/mime.types                    | 4 ++--
 config-scripts/cups-common.m4      | 4 ++--
 config-scripts/cups-compiler.m4    | 4 ++--
 config-scripts/cups-defaults.m4    | 4 ++--
 config-scripts/cups-directories.m4 | 4 ++--
 config-scripts/cups-image.m4       | 4 ++--
 config-scripts/cups-largefile.m4   | 4 ++--
 config-scripts/cups-launchd.m4     | 4 ++--
 config-scripts/cups-ldap.m4        | 4 ++--
 config-scripts/cups-libtool.m4     | 4 ++--
 config-scripts/cups-manpages.m4    | 4 ++--
 config-scripts/cups-network.m4     | 4 ++--
 config-scripts/cups-opsys.m4       | 4 ++--
 config-scripts/cups-pam.m4         | 4 ++--
 config-scripts/cups-pap.m4         | 4 ++--
 config-scripts/cups-pdf.m4         | 4 ++--
 config-scripts/cups-scripting.m4   | 4 ++--
 config-scripts/cups-sharedlibs.m4  | 4 ++--
 config-scripts/cups-slp.m4         | 4 ++--
 config-scripts/cups-ssl.m4         | 4 ++--
 config-scripts/cups-threads.m4     | 4 ++--
 config.h.in                        | 4 ++--
 configure.in                       | 4 ++--
 cups-config.in                     | 4 ++--
 cups/Makefile                      | 4 ++--
 cups/adminutil.c                   | 4 ++--
 cups/adminutil.h                   | 4 ++--
 cups/api-array.shtml               | 2 +-
 cups/api-cups.shtml                | 2 +-
 cups/api-filedir.shtml             | 2 +-
 cups/api-filter.shtml              | 2 +-
 cups/api-httpipp.shtml             | 2 +-
 cups/api-ppd.shtml                 | 2 +-
 cups/array.c                       | 4 ++--
 cups/array.h                       | 4 ++--
 cups/attr.c                        | 4 ++--
 cups/auth.c                        | 4 ++--
 cups/backchannel.c                 | 4 ++--
 cups/backend.c                     | 4 ++--
 cups/backend.h                     | 4 ++--
 cups/cups.h                        | 4 ++--
 cups/custom.c                      | 4 ++--
 cups/debug.h                       | 4 ++--
 cups/dest.c                        | 4 ++--
 cups/emit.c                        | 4 ++--
 cups/encode.c                      | 4 ++--
 cups/file.c                        | 4 ++--
 cups/file.h                        | 4 ++--
 cups/getifaddrs.c                  | 4 ++--
 cups/getputfile.c                  | 4 ++--
 cups/globals.c                     | 4 ++--
 cups/globals.h                     | 4 ++--
 cups/http-addr.c                   | 4 ++--
 cups/http-addrlist.c               | 4 ++--
 cups/http-private.h                | 4 ++--
 cups/http-support.c                | 4 ++--
 cups/http.c                        | 4 ++--
 cups/http.h                        | 4 ++--
 cups/i18n.h                        | 4 ++--
 cups/ipp-private.h                 | 4 ++--
 cups/ipp-support.c                 | 4 ++--
 cups/ipp.c                         | 4 ++--
 cups/ipp.h                         | 4 ++--
 cups/langprintf.c                  | 4 ++--
 cups/language.c                    | 4 ++--
 cups/language.h                    | 4 ++--
 cups/localize.c                    | 4 ++--
 cups/mark.c                        | 4 ++--
 cups/md5-apple.h                   | 4 ++--
 cups/md5.c                         | 2 +-
 cups/md5.h                         | 2 +-
 cups/md5passwd.c                   | 4 ++--
 cups/notify.c                      | 4 ++--
 cups/options.c                     | 4 ++--
 cups/page.c                        | 4 ++--
 cups/ppd.c                         | 4 ++--
 cups/ppd.h                         | 4 ++--
 cups/request.c                     | 4 ++--
 cups/snprintf.c                    | 4 ++--
 cups/string.c                      | 4 ++--
 cups/string.h                      | 4 ++--
 cups/tempfile.c                    | 4 ++--
 cups/test.ppd                      | 4 ++--
 cups/testadmin.c                   | 4 ++--
 cups/testarray.c                   | 4 ++--
 cups/testfile.c                    | 4 ++--
 cups/testhttp.c                    | 4 ++--
 cups/testi18n.c                    | 4 ++--
 cups/testipp.c                     | 4 ++--
 cups/testlang.c                    | 4 ++--
 cups/testppd.c                     | 4 ++--
 cups/transcode.c                   | 4 ++--
 cups/transcode.h                   | 4 ++--
 cups/usersys.c                     | 4 ++--
 cups/util.c                        | 4 ++--
 data/HPGLprolog                    | 2 +-
 data/Makefile                      | 4 ++--
 data/classified                    | 2 +-
 data/confidential                  | 2 +-
 data/secret                        | 2 +-
 data/standard                      | 2 +-
 data/testprint.ps                  | 2 +-
 data/topsecret                     | 2 +-
 data/unclassified                  | 2 +-
 doc/Makefile                       | 2 +-
 doc/help/api-array.html            | 2 +-
 doc/help/api-cups.html             | 2 +-
 doc/help/api-filedir.html          | 2 +-
 doc/help/api-filter.html           | 2 +-
 doc/help/api-httpipp.html          | 2 +-
 doc/help/api-ppd.html              | 2 +-
 doc/help/spec-ppd.html             | 2 +-
 doc/robots.txt                     | 4 ++--
 driver/testdriver.c                | 4 ++--
 filter/Makefile                    | 4 ++--
 filter/common.c                    | 4 ++--
 filter/common.h                    | 4 ++--
 filter/form-main.c                 | 4 ++--
 filter/form-ps.c                   | 4 ++--
 filter/form-tree.c                 | 4 ++--
 filter/form.h                      | 4 ++--
 filter/gziptoany.c                 | 4 ++--
 filter/hpgl-attr.c                 | 4 ++--
 filter/hpgl-char.c                 | 4 ++--
 filter/hpgl-config.c               | 4 ++--
 filter/hpgl-input.c                | 4 ++--
 filter/hpgl-main.c                 | 4 ++--
 filter/hpgl-polygon.c              | 4 ++--
 filter/hpgl-prolog.c               | 4 ++--
 filter/hpgl-vector.c               | 4 ++--
 filter/hpgltops.h                  | 4 ++--
 filter/image-bmp.c                 | 4 ++--
 filter/image-colorspace.c          | 4 ++--
 filter/image-gif.c                 | 4 ++--
 filter/image-jpeg.c                | 4 ++--
 filter/image-photocd.c             | 4 ++--
 filter/image-pix.c                 | 4 ++--
 filter/image-png.c                 | 4 ++--
 filter/image-pnm.c                 | 4 ++--
 filter/image-private.h             | 4 ++--
 filter/image-sgi.c                 | 4 ++--
 filter/image-sgi.h                 | 4 ++--
 filter/image-sgilib.c              | 4 ++--
 filter/image-sun.c                 | 4 ++--
 filter/image-tiff.c                | 4 ++--
 filter/image-zoom.c                | 4 ++--
 filter/image.c                     | 4 ++--
 filter/image.h                     | 4 ++--
 filter/imagetops.c                 | 4 ++--
 filter/imagetoraster.c             | 4 ++--
 filter/interpret.c                 | 4 ++--
 filter/pstops.c                    | 4 ++--
 filter/raster.c                    | 4 ++--
 filter/raster.h                    | 4 ++--
 filter/rastertoepson.c             | 4 ++--
 filter/rastertohp.c                | 4 ++--
 filter/rastertolabel.c             | 4 ++--
 filter/testimage.c                 | 4 ++--
 filter/testraster.c                | 4 ++--
 filter/textcommon.c                | 4 ++--
 filter/textcommon.h                | 4 ++--
 filter/texttops.c                  | 4 ++--
 fonts/Makefile                     | 4 ++--
 init/cups.sh.in                    | 4 ++--
 locale/Makefile                    | 4 ++--
 locale/translate.c                 | 4 ++--
 man/Makefile                       | 4 ++--
 man/accept.man                     | 4 ++--
 man/backend.man                    | 4 ++--
 man/classes.conf.man               | 4 ++--
 man/client.conf.man.in             | 4 ++--
 man/cups-config.man                | 4 ++--
 man/cups-deviced.man.in            | 4 ++--
 man/cups-driverd.man.in            | 4 ++--
 man/cups-lpd.man.in                | 4 ++--
 man/cups-polld.man                 | 4 ++--
 man/cupsaddsmb.man.in              | 4 ++--
 man/cupsd.conf.man.in              | 4 ++--
 man/cupsd.man.in                   | 4 ++--
 man/cupsenable.man                 | 4 ++--
 man/cupstestdsc.man                | 2 +-
 man/cupstestppd.man                | 4 ++--
 man/filter.man                     | 4 ++--
 man/lp.man                         | 4 ++--
 man/lpadmin.man                    | 4 ++--
 man/lpc.man                        | 4 ++--
 man/lpinfo.man                     | 4 ++--
 man/lpmove.man                     | 4 ++--
 man/lpoptions.man.in               | 4 ++--
 man/lppasswd.man                   | 4 ++--
 man/lpq.man                        | 4 ++--
 man/lpr.man                        | 4 ++--
 man/lprm.man                       | 4 ++--
 man/lpstat.man                     | 4 ++--
 man/mantohtml.c                    | 4 ++--
 man/mime.convs.man                 | 4 ++--
 man/mime.types.man                 | 4 ++--
 man/printers.conf.man              | 4 ++--
 man/subscriptions.conf.man         | 4 ++--
 monitor/Makefile                   | 4 ++--
 monitor/bcp.c                      | 4 ++--
 monitor/tbcp.c                     | 4 ++--
 notifier/Makefile                  | 4 ++--
 notifier/mailto.c                  | 4 ++--
 notifier/testnotify.c              | 4 ++--
 packaging/cups.list.in             | 4 ++--
 packaging/cups.spec.in             | 4 ++--
 pdftops/Makefile                   | 4 ++--
 pdftops/pdftops.cxx                | 4 ++--
 ppd/Makefile                       | 4 ++--
 ppd/deskjet.ppd                    | 4 ++--
 ppd/deskjet2.ppd                   | 4 ++--
 ppd/dymo.ppd                       | 4 ++--
 ppd/epson24.ppd                    | 4 ++--
 ppd/epson9.ppd                     | 4 ++--
 ppd/laserjet.ppd                   | 4 ++--
 ppd/okidat24.ppd                   | 4 ++--
 ppd/okidata9.ppd                   | 4 ++--
 ppd/stcolor.ppd                    | 4 ++--
 ppd/stcolor2.ppd                   | 4 ++--
 ppd/stphoto.ppd                    | 4 ++--
 ppd/stphoto2.ppd                   | 4 ++--
 ppd/zebra.ppd                      | 4 ++--
 ppd/zebracpl.ppd                   | 4 ++--
 ppd/zebraep1.ppd                   | 4 ++--
 ppd/zebraep2.ppd                   | 4 ++--
 scheduler/Makefile                 | 4 ++--
 scheduler/auth.c                   | 4 ++--
 scheduler/auth.h                   | 4 ++--
 scheduler/banners.c                | 4 ++--
 scheduler/banners.h                | 4 ++--
 scheduler/cert.c                   | 4 ++--
 scheduler/cert.h                   | 4 ++--
 scheduler/classes.c                | 4 ++--
 scheduler/classes.h                | 4 ++--
 scheduler/client.c                 | 4 ++--
 scheduler/client.h                 | 4 ++--
 scheduler/conf.c                   | 4 ++--
 scheduler/conf.h                   | 4 ++--
 scheduler/cups-deviced.c           | 4 ++--
 scheduler/cups-driverd.c           | 4 ++--
 scheduler/cups-lpd.c               | 4 ++--
 scheduler/cups-polld.c             | 4 ++--
 scheduler/cupsd.h                  | 4 ++--
 scheduler/dirsvc.c                 | 4 ++--
 scheduler/dirsvc.h                 | 4 ++--
 scheduler/env.c                    | 4 ++--
 scheduler/filter.c                 | 4 ++--
 scheduler/ipp.c                    | 4 ++--
 scheduler/job.c                    | 4 ++--
 scheduler/job.h                    | 4 ++--
 scheduler/listen.c                 | 4 ++--
 scheduler/log.c                    | 4 ++--
 scheduler/main.c                   | 4 ++--
 scheduler/mime.c                   | 4 ++--
 scheduler/mime.h                   | 4 ++--
 scheduler/network.c                | 4 ++--
 scheduler/network.h                | 4 ++--
 scheduler/policy.c                 | 4 ++--
 scheduler/policy.h                 | 4 ++--
 scheduler/printers.c               | 4 ++--
 scheduler/printers.h               | 4 ++--
 scheduler/process.c                | 4 ++--
 scheduler/quotas.c                 | 4 ++--
 scheduler/server.c                 | 4 ++--
 scheduler/statbuf.c                | 4 ++--
 scheduler/statbuf.h                | 4 ++--
 scheduler/subscriptions.c          | 4 ++--
 scheduler/subscriptions.h          | 4 ++--
 scheduler/sysman.c                 | 4 ++--
 scheduler/sysman.h                 | 4 ++--
 scheduler/testdirsvc.c             | 4 ++--
 scheduler/testmime.c               | 4 ++--
 scheduler/testspeed.c              | 4 ++--
 scheduler/type.c                   | 4 ++--
 scheduler/util.c                   | 4 ++--
 scheduler/util.h                   | 4 ++--
 scripting/php/Makefile             | 4 ++--
 scripting/php/phpcups.c            | 4 ++--
 scripting/php/phpcups.h            | 4 ++--
 standards/Makefile                 | 4 ++--
 standards/rfctohtml.c              | 4 ++--
 systemv/Makefile                   | 4 ++--
 systemv/accept.c                   | 4 ++--
 systemv/cancel.c                   | 4 ++--
 systemv/cupsaddsmb.c               | 4 ++--
 systemv/cupstestdsc.c              | 4 ++--
 systemv/cupstestppd.c              | 4 ++--
 systemv/lp.c                       | 4 ++--
 systemv/lpadmin.c                  | 4 ++--
 systemv/lpinfo.c                   | 4 ++--
 systemv/lpmove.c                   | 4 ++--
 systemv/lpoptions.c                | 4 ++--
 systemv/lppasswd.c                 | 4 ++--
 systemv/lpstat.c                   | 4 ++--
 templates/Makefile                 | 4 ++--
 test/4.1-requests.test             | 4 ++--
 test/4.2-cups-printer-ops.test     | 4 ++--
 test/4.3-job-ops.test              | 4 ++--
 test/4.4-subscription-ops.test     | 4 ++--
 test/5.1-lpadmin.sh                | 4 ++--
 test/5.2-lpc.sh                    | 4 ++--
 test/5.3-lpq.sh                    | 4 ++--
 test/5.4-lpstat.sh                 | 4 ++--
 test/5.5-lp.sh                     | 4 ++--
 test/5.6-lpr.sh                    | 4 ++--
 test/5.7-lprm.sh                   | 4 ++--
 test/5.8-cancel.sh                 | 4 ++--
 test/5.9-lpinfo.sh                 | 4 ++--
 test/Makefile                      | 4 ++--
 test/ipptest.c                     | 4 ++--
 test/run-stp-tests.sh              | 4 ++--
 test/testhp.ppd                    | 4 ++--
 test/testps.ppd                    | 4 ++--
 tools/makesrcdist                  | 4 ++--
 vcnet/config.h                     | 4 ++--
 363 files changed, 700 insertions(+), 700 deletions(-)

diff --git a/Makedefs.in b/Makedefs.in
index 122d437b2..e1bd9f381 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 5564 2006-05-22 00:59:11Z mike $"
+# "$Id$"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -263,5 +263,5 @@ DBUSDIR		=	@DBUSDIR@
 
 
 #
-# End of "$Id: Makedefs.in 5564 2006-05-22 00:59:11Z mike $"
+# End of "$Id$"
 #
diff --git a/Makefile b/Makefile
index d1fe2d02d..527b5ba32 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5547 2006-05-19 12:44:29Z mike $"
+# "$Id$"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -239,5 +239,5 @@ epm:
 
 
 #
-# End of "$Id: Makefile 5547 2006-05-19 12:44:29Z mike $".
+# End of "$Id$".
 #
diff --git a/backend/Makefile b/backend/Makefile
index 2a1de0437..62b44d37e 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5469 2006-04-27 13:58:43Z mike $"
+# "$Id$"
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
@@ -210,5 +210,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5469 2006-04-27 13:58:43Z mike $".
+# End of "$Id$".
 #
diff --git a/backend/betest.c b/backend/betest.c
index f0ea6cdb2..10c5faf5e 100644
--- a/backend/betest.c
+++ b/backend/betest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: betest.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   Backend test program for the Common UNIX Printing System (CUPS).
  *
@@ -83,5 +83,5 @@ main(int  argc,		/* I - Number of command-line arguments (7 or 8) */
 
 
 /*
- * End of "$Id: betest.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index a6f8b2649..03720bf72 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1284.c 5440 2006-04-19 21:36:43Z mike $"
+ * "$Id$"
  *
  *   IEEE-1284 support functions for the Common UNIX Printing System (CUPS).
  *
@@ -506,5 +506,5 @@ get_make_model(
 
 
 /*
- * End of "$Id: ieee1284.c 5440 2006-04-19 21:36:43Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/ieee1394-linux.c b/backend/ieee1394-linux.c
index b95e8204e..89687ac61 100644
--- a/backend/ieee1394-linux.c
+++ b/backend/ieee1394-linux.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1394-linux.c 4703 2005-09-26 19:33:58Z mike $"
+ * "$Id$"
  *
  *   Linux IEEE-1394 glue for the Common UNIX Printing System (CUPS).
  *
@@ -873,5 +873,5 @@ ieee1394_error(void)
 
 
 /*
- * End of "$Id: ieee1394-linux.c 4703 2005-09-26 19:33:58Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/ieee1394.c b/backend/ieee1394.c
index 3d88c7a08..cb623fff4 100644
--- a/backend/ieee1394.c
+++ b/backend/ieee1394.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1394.c 5241 2006-03-07 22:07:44Z mike $"
+ * "$Id$"
  *
  *   IEEE-1394 backend for the Common UNIX Printing System (CUPS).
  *
@@ -263,5 +263,5 @@ list_devices(void)
 
 
 /*
- * End of "$Id: ieee1394.c 5241 2006-03-07 22:07:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/ieee1394.h b/backend/ieee1394.h
index 19181c5c0..e4b332c24 100644
--- a/backend/ieee1394.h
+++ b/backend/ieee1394.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ieee1394.h 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   IEEE-1394 header for the Common UNIX Printing System (CUPS).
  *
@@ -99,5 +99,5 @@ extern const char	*ieee1394_error(void);
 
 
 /*
- * End of "$Id: ieee1394.h 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/ipp.c b/backend/ipp.c
index 315f8e058..f1b22cdf8 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 5554 2006-05-20 12:23:40Z mike $"
+ * "$Id$"
  *
  *   IPP backend for the Common UNIX Printing System (CUPS).
  *
@@ -1619,5 +1619,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id: ipp.c 5554 2006-05-20 12:23:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/lpd.c b/backend/lpd.c
index ef7ef05d3..c349bde3f 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpd.c 5495 2006-05-05 17:58:07Z mike $"
+ * "$Id$"
  *
  *   Line Printer Daemon backend for the Common UNIX Printing System (CUPS).
  *
@@ -1230,5 +1230,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id: lpd.c 5495 2006-05-05 17:58:07Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/pap.c b/backend/pap.c
index f5eadae33..fbf30f4ad 100644
--- a/backend/pap.c
+++ b/backend/pap.c
@@ -1,5 +1,5 @@
 /*
-* "$Id: pap.c 5480 2006-05-02 15:17:04Z mike $"
+* "$Id$"
 *
 * © Copyright 2004 Apple Computer, Inc. All rights reserved.
 * 
diff --git a/backend/parallel.c b/backend/parallel.c
index d846c82a3..539fec755 100644
--- a/backend/parallel.c
+++ b/backend/parallel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: parallel.c 5387 2006-04-10 02:51:12Z mike $"
+ * "$Id$"
  *
  *   Parallel port backend for the Common UNIX Printing System (CUPS).
  *
@@ -735,5 +735,5 @@ list_devices(void)
 
 
 /*
- * End of "$Id: parallel.c 5387 2006-04-10 02:51:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/scsi-irix.c b/backend/scsi-irix.c
index cec216e87..ae9be6914 100644
--- a/backend/scsi-irix.c
+++ b/backend/scsi-irix.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi-irix.c 5241 2006-03-07 22:07:44Z mike $"
+ * "$Id$"
  *
  *   IRIX SCSI printer support for the Common UNIX Printing System (CUPS).
  *
@@ -231,5 +231,5 @@ print_device(const char *resource,	/* I - SCSI device */
 
 
 /*
- * End of "$Id: scsi-irix.c 5241 2006-03-07 22:07:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/scsi-linux.c b/backend/scsi-linux.c
index 75c9629dc..763977d3e 100644
--- a/backend/scsi-linux.c
+++ b/backend/scsi-linux.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi-linux.c 5241 2006-03-07 22:07:44Z mike $"
+ * "$Id$"
  *
  *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
  *
@@ -249,5 +249,5 @@ print_device(const char *resource,	/* I - SCSI device */
 
 
 /*
- * End of "$Id: scsi-linux.c 5241 2006-03-07 22:07:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/scsi.c b/backend/scsi.c
index 06a088899..ffc33645a 100644
--- a/backend/scsi.c
+++ b/backend/scsi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id$"
  *
  *   SCSI printer backend for the Common UNIX Printing System (CUPS).
  *
@@ -220,5 +220,5 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: scsi.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/serial.c b/backend/serial.c
index 33d74f8b5..24533d5e1 100644
--- a/backend/serial.c
+++ b/backend/serial.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: serial.c 5554 2006-05-20 12:23:40Z mike $"
+ * "$Id$"
  *
  *   Serial port backend for the Common UNIX Printing System (CUPS).
  *
@@ -1169,5 +1169,5 @@ list_devices(void)
 
 
 /*
- * End of "$Id: serial.c 5554 2006-05-20 12:23:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/snmp.c b/backend/snmp.c
index 478dc5abd..701e3f460 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snmp.c 5479 2006-05-02 15:03:17Z mike $"
+ * "$Id$"
  *
  *   SNMP discovery backend for the Common UNIX Printing System (CUPS).
  *
@@ -2212,5 +2212,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id: snmp.c 5479 2006-05-02 15:03:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/socket.c b/backend/socket.c
index 1833be6fc..d09509cb8 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: socket.c 5241 2006-03-07 22:07:44Z mike $"
+ * "$Id$"
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
@@ -492,5 +492,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: socket.c 5241 2006-03-07 22:07:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/test1284.c b/backend/test1284.c
index 20a505d39..8491fd0ce 100644
--- a/backend/test1284.c
+++ b/backend/test1284.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: test1284.c 4903 2006-01-10 20:02:46Z mike $"
+ * "$Id$"
  *
  *   IEEE-1284 support functions test program for the Common UNIX Printing
  *   System (CUPS).
@@ -91,5 +91,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id: test1284.c 4903 2006-01-10 20:02:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 3f9f2c066..b1f283b1f 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-darwin.c 5488 2006-05-03 19:39:30Z mike $"
+ * "$Id$"
  *
  * © Copyright 2005-2006 Apple Computer, Inc. All rights reserved.
  *
@@ -1346,5 +1346,5 @@ static void *read_thread(void *reference)
 
 
 /*
- * End of "$Id: usb-darwin.c 5488 2006-05-03 19:39:30Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index 90d58e2a8..3ca30c965 100644
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb-unix.c 5554 2006-05-20 12:23:40Z mike $"
+ * "$Id$"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -633,5 +633,5 @@ open_device(const char *uri)		/* I - Device URI */
 
 
 /*
- * End of "$Id: usb-unix.c 5554 2006-05-20 12:23:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/backend/usb.c b/backend/usb.c
index 6665f282e..9e81f8f12 100644
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usb.c 5373 2006-04-06 20:03:32Z mike $"
+ * "$Id$"
  *
  *   USB port backend for the Common UNIX Printing System (CUPS).
  *
@@ -269,5 +269,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id: usb.c 5373 2006-04-06 20:03:32Z mike $".
+ * End of "$Id$".
  */
diff --git a/berkeley/Makefile b/berkeley/Makefile
index eb16d025c..c6abed8f3 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -121,5 +121,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index 271d60477..71402294e 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id$"
  *
  *   "lpc" command for the Common UNIX Printing System (CUPS).
  *
@@ -518,5 +518,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 8040340a7..59bb3187a 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpq.c 5345 2006-03-28 16:00:17Z mike $"
+ * "$Id$"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
@@ -677,5 +677,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c 5345 2006-03-28 16:00:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index f6b5fb3b7..dc92fd882 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpr.c 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id$"
  *
  *   "lpr" command for the Common UNIX Printing System (CUPS).
  *
@@ -529,5 +529,5 @@ sighandler(int s)			/* I - Signal number */
 
 
 /*
- * End of "$Id: lpr.c 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index 67479b5a3..db4c5b382 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id$"
  *
  *   "lprm" command for the Common UNIX Printing System (CUPS).
  *
@@ -283,5 +283,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: lprm.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 9497bb59f..7fb8a24eb 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
@@ -170,5 +170,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 85142e3a0..2ca121433 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: admin.c 5572 2006-05-22 18:47:09Z mike $"
+ * "$Id$"
  *
  *   Administration CGI for the Common UNIX Printing System (CUPS).
  *
@@ -2893,5 +2893,5 @@ match_string(const char *a,		/* I - First string */
 
     
 /*
- * End of "$Id: admin.c 5572 2006-05-22 18:47:09Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index b2af6d715..649d5ac24 100644
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cgi-private.h 4921 2006-01-12 21:26:26Z mike $"
+ * "$Id$"
  *
  *   Private CGI definitions for the Common UNIX Printing System (CUPS).
  *
@@ -40,5 +40,5 @@
 
 
 /*
- * End of "$Id: cgi-private.h 4921 2006-01-12 21:26:26Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h
index 0ffe2950d..02236b85e 100644
--- a/cgi-bin/cgi.h
+++ b/cgi-bin/cgi.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cgi.h 4931 2006-01-14 20:37:40Z mike $"
+ * "$Id$"
  *
  *   CGI support library definitions.
  *
@@ -105,5 +105,5 @@ extern const char	*cgiText(const char *message);
 #endif /* !_CUPS_CGI_H_ */
 
 /*
- * End of "$Id: cgi.h 4931 2006-01-14 20:37:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index f639525cc..600dc30ad 100644
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 5572 2006-05-22 18:47:09Z mike $"
+ * "$Id$"
  *
  *   Class status CGI for the Common UNIX Printing System (CUPS).
  *
@@ -463,5 +463,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: classes.c 5572 2006-05-22 18:47:09Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
index d3792e635..8f148c471 100644
--- a/cgi-bin/help-index.c
+++ b/cgi-bin/help-index.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.c 5143 2006-02-21 19:13:01Z mike $"
+ * "$Id$"
  *
  *   On-line help index routines for the Common UNIX Printing System (CUPS).
  *
@@ -979,5 +979,5 @@ help_sort_by_score(help_node_t *n1,	/* I - First node */
 
 
 /*
- * End of "$Id: help-index.c 5143 2006-02-21 19:13:01Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index d564663a0..fd587b0e4 100644
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: help-index.h 5143 2006-02-21 19:13:01Z mike $"
+ * "$Id$"
  *
  *   On-line help index definitions for the Common UNIX Printing System (CUPS).
  *
@@ -73,5 +73,5 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #endif /* !_CUPS_HELP_INDEX_H_ */
 
 /*
- * End of "$Id: help-index.h 5143 2006-02-21 19:13:01Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index da5f7cd20..45cb9f78b 100644
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: html.c 5549 2006-05-19 19:39:28Z mike $"
+ * "$Id$"
  *
  *   HTML support functions for the Common UNIX Printing System (CUPS).
  *
@@ -183,5 +183,5 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id: html.c 5549 2006-05-19 19:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index 0b515f123..4bf797776 100644
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-var.c 5572 2006-05-22 18:47:09Z mike $"
+ * "$Id$"
  *
  *   CGI <-> IPP variable routines for the Common UNIX Printing System (CUPS).
  *
@@ -1279,5 +1279,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id: ipp-var.c 5572 2006-05-22 18:47:09Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index ed379b001..d31fdd7f5 100644
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: jobs.c 5104 2006-02-15 03:21:04Z mike $"
+ * "$Id$"
  *
  *   Job status CGI for the Common UNIX Printing System (CUPS).
  *
@@ -199,5 +199,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id: jobs.c 5104 2006-02-15 03:21:04Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index e8ec0d2b3..40060a6b3 100644
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 5572 2006-05-22 18:47:09Z mike $"
+ * "$Id$"
  *
  *   Printer status CGI for the Common UNIX Printing System (CUPS).
  *
@@ -638,5 +638,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id: printers.c 5572 2006-05-22 18:47:09Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/search.c b/cgi-bin/search.c
index 4f1ea072a..eef424717 100644
--- a/cgi-bin/search.c
+++ b/cgi-bin/search.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: search.c 4859 2005-11-30 23:45:24Z mike $"
+ * "$Id$"
  *
  *   Search routines for the Common UNIX Printing System (CUPS).
  *
@@ -364,5 +364,5 @@ cgiFreeSearch(void *search)		/* I - Search context */
 
 
 /*
- * End of "$Id: search.c 4859 2005-11-30 23:45:24Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index 82cf0e45d..7fbe92f52 100644
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: template.c 5549 2006-05-19 19:39:28Z mike $"
+ * "$Id$"
  *
  *   CGI template function.
  *
@@ -670,5 +670,5 @@ cgi_puturi(const char *s,		/* I - String to output */
 
 
 /*
- * End of "$Id: template.c 5549 2006-05-19 19:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c
index e9300af87..e5ac7029d 100644
--- a/cgi-bin/testcgi.c
+++ b/cgi-bin/testcgi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testcgi.c 4869 2005-12-06 02:43:40Z mike $"
+ * "$Id$"
  *
  *   CGI test program for the Common UNIX Printing System (CUPS).
  *
@@ -80,5 +80,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testcgi.c 4869 2005-12-06 02:43:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c
index dad5d70b7..3270ddd13 100644
--- a/cgi-bin/testhi.c
+++ b/cgi-bin/testhi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhi.c 5143 2006-02-21 19:13:01Z mike $"
+ * "$Id$"
  *
  *   Help index test program for the Common UNIX Printing System (CUPS).
  *
@@ -114,5 +114,5 @@ list_nodes(const char   *title,		/* I - Title string */
 
 
 /*
- * End of "$Id: testhi.c 5143 2006-02-21 19:13:01Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c
index fa4714a8a..1311deb50 100644
--- a/cgi-bin/testtemplate.c
+++ b/cgi-bin/testtemplate.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testtemplate.c 5111 2006-02-16 02:08:09Z mike $"
+ * "$Id$"
  *
  *   CGI template test program for the Common UNIX Printing System (CUPS).
  *
@@ -108,5 +108,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testtemplate.c 5111 2006-02-16 02:08:09Z mike $".
+ * End of "$Id$".
  */
diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index 17d507756..e64c54dba 100644
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: var.c 5549 2006-05-19 19:39:28Z mike $"
+ * "$Id$"
  *
  *   CGI form variable and array functions.
  *
@@ -1027,5 +1027,5 @@ cgi_unlink_file(void)
 
 
 /*
- * End of "$Id: var.c 5549 2006-05-19 19:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/conf/Makefile b/conf/Makefile
index 968e66004..af0ddbb5a 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $"
+# "$Id$"
 #
 #   Configuration file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -102,5 +102,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5412 2006-04-17 14:30:53Z mike $".
+# End of "$Id$".
 #
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 21f43b2cc..aa558ce53 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf.in 5454 2006-04-23 21:46:38Z mike $"
+# "$Id$"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.  See "man cupsd.conf" for a complete description of this
@@ -73,5 +73,5 @@ DefaultAuthType Basic
 </Policy>
 
 #
-# End of "$Id: cupsd.conf.in 5454 2006-04-23 21:46:38Z mike $".
+# End of "$Id$".
 #
diff --git a/conf/mime.convs b/conf/mime.convs
index f07342df8..fa916361b 100644
--- a/conf/mime.convs
+++ b/conf/mime.convs
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $"
+# "$Id$"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
@@ -114,5 +114,5 @@ image/x-sun-raster	application/vnd.cups-raster	100	imagetoraster
 #application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id: mime.convs 5402 2006-04-14 19:21:03Z mike $".
+# End of "$Id$".
 #
diff --git a/conf/mime.types b/conf/mime.types
index 6f3d0467a..2e8f53f72 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $"
+# "$Id$"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -167,5 +167,5 @@ application/vnd.cups-raw	(string(0,<1B>E) + !string(2,<1B>%0B)) \
 application/octet-stream
 
 #
-# End of "$Id: mime.types 5402 2006-04-14 19:21:03Z mike $".
+# End of "$Id$".
 #
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 5495beaa0..a2340d2bc 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -265,5 +265,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 5619374f2..318df2103 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-compiler.m4 5566 2006-05-22 01:10:11Z mike $"
+dnl "$Id$"
 dnl
 dnl   Compiler stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -488,5 +488,5 @@ if test $uname = HP-UX; then
 fi
 
 dnl
-dnl End of "$Id: cups-compiler.m4 5566 2006-05-22 01:10:11Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 663ce1e73..4c6425af5 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-defaults.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Default cupsd configuration settings for the Common UNIX Printing System
 dnl   (CUPS).
@@ -236,5 +236,5 @@ fi
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_PRINTCAP, "$CUPS_DEFAULT_PRINTCAP")
 
 dnl
-dnl End of "$Id: cups-defaults.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index afbeba5aa..daa6533d2 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4 5547 2006-05-19 12:44:29Z mike $"
+dnl "$Id$"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -302,5 +302,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
-dnl End of "$Id: cups-directories.m4 5547 2006-05-19 12:44:29Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-image.m4 b/config-scripts/cups-image.m4
index c5204ee22..64a55f98a 100644
--- a/config-scripts/cups-image.m4
+++ b/config-scripts/cups-image.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-image.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Image library/filter stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -110,5 +110,5 @@ AC_SUBST(EXPORT_LIBZ)
 AC_CHECK_HEADER(stdlib.h,AC_DEFINE(HAVE_STDLIB_H))
 
 dnl
-dnl End of "$Id: cups-image.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4
index 25400ce2d..e9762317c 100644
--- a/config-scripts/cups-largefile.m4
+++ b/config-scripts/cups-largefile.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $"
+dnl "$Id$"
 dnl
 dnl   Large file support stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -57,5 +57,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
 
 dnl
-dnl End of "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-launchd.m4
index ded893b07..1da73934f 100644
--- a/config-scripts/cups-launchd.m4
+++ b/config-scripts/cups-launchd.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   launchd stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -49,5 +49,5 @@ AC_SUBST(DEFAULT_LAUNCHD_CONF)
 AC_SUBST(LAUNCHDLIBS)
 
 dnl
-dnl End of "$Id: cups-launchd.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-ldap.m4 b/config-scripts/cups-ldap.m4
index c78e17509..09e9edef8 100644
--- a/config-scripts/cups-ldap.m4
+++ b/config-scripts/cups-ldap.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $"
+dnl "$Id$"
 dnl
 dnl   LDAP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -46,5 +46,5 @@ AC_SUBST(LIBLDAP)
 
 
 dnl
-dnl End of "$Id: cups-ldap.m4 5564 2006-05-22 00:59:11Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 5b68a7080..060f91859 100644
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Libtool stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -45,5 +45,5 @@ if test x$LIBTOOL != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-libtool.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 1e6ae44de..f21b8df03 100644
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-manpages.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Manpage stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -103,5 +103,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
-dnl End of "$Id: cups-manpages.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 264efdfb5..776f7506b 100644
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-network.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Networking stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -85,5 +85,5 @@ AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
 
 dnl
-dnl End of "$Id: cups-network.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index b47f473a7..aa919ba5b 100644
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-opsys.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Operating system stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -39,5 +39,5 @@ case "$uname" in
 esac
 
 dnl
-dnl "$Id: cups-opsys.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index df445a2b7..fc2d065e6 100644
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   PAM stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -94,5 +94,5 @@ AC_SUBST(PAMLIBS)
 AC_SUBST(PAMMOD)
 
 dnl
-dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-pap.m4 b/config-scripts/cups-pap.m4
index 2fbed6776..7e2024e8a 100644
--- a/config-scripts/cups-pap.m4
+++ b/config-scripts/cups-pap.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   PAP (AppleTalk) stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -33,5 +33,5 @@ fi
 AC_SUBST(PAP)
 
 dnl
-dnl End of "$Id: cups-pam.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-pdf.m4 b/config-scripts/cups-pdf.m4
index f76974883..d905ada0e 100644
--- a/config-scripts/cups-pdf.m4
+++ b/config-scripts/cups-pdf.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -39,5 +39,5 @@ fi
 AC_SUBST(PDFTOPS)
 
 dnl
-dnl End of "$Id: cups-pdf.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index ee00b8a2e..6db4cbed8 100644
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Scripting configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -100,5 +100,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id: cups-scripting.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 0654faf89..8aa54d74f 100644
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-sharedlibs.m4 5568 2006-05-22 15:34:01Z mike $"
+dnl "$Id$"
 dnl
 dnl   Shared library support for the Common UNIX Printing System (CUPS).
 dnl
@@ -173,5 +173,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id: cups-sharedlibs.m4 5568 2006-05-22 15:34:01Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-slp.m4 b/config-scripts/cups-slp.m4
index 0afbbca31..15915dad6 100644
--- a/config-scripts/cups-slp.m4
+++ b/config-scripts/cups-slp.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   OpenSLP configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -44,5 +44,5 @@ AC_SUBST(LIBSLP)
 
 
 dnl
-dnl End of "$Id: cups-slp.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index 4446f22ac..156c72529 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-ssl.m4 5525 2006-05-15 13:52:16Z mike $"
+dnl "$Id$"
 dnl
 dnl   OpenSSL/GNUTLS stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -114,5 +114,5 @@ AC_SUBST(EXPORT_SSLLIBS)
 
 
 dnl
-dnl End of "$Id: cups-ssl.m4 5525 2006-05-15 13:52:16Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4
index 47f76e2ae..639eb7414 100644
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $"
+dnl "$Id$"
 dnl
 dnl   Threading stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -53,5 +53,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)
 
 dnl
-dnl End of "$Id: cups-threads.m4 5466 2006-04-26 19:52:27Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/config.h.in b/config.h.in
index 48281040d..4bc361995 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h.in 5474 2006-05-02 14:20:26Z mike $"
+ * "$Id$"
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
@@ -439,5 +439,5 @@
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h.in 5474 2006-05-02 14:20:26Z mike $".
+ * End of "$Id$".
  */
diff --git a/configure.in b/configure.in
index 823c453d7..9969eb617 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in 5468 2006-04-27 13:40:30Z mike $"
+dnl "$Id$"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -68,5 +68,5 @@ AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
 chmod +x cups-config
 
 dnl
-dnl End of "$Id: configure.in 5468 2006-04-27 13:40:30Z mike $".
+dnl End of "$Id$".
 dnl
diff --git a/cups-config.in b/cups-config.in
index 77541e48c..33fe5c41d 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id: cups-config.in 5504 2006-05-10 18:57:46Z mike $"
+# "$Id$"
 # 
 #   CUPS configuration utility.
 #
@@ -150,5 +150,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id: cups-config.in 5504 2006-05-10 18:57:46Z mike $".
+# End of "$Id$".
 #
diff --git a/cups/Makefile b/cups/Makefile
index 6f2fc67b6..b4bd58313 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5564 2006-05-22 00:59:11Z mike $"
+# "$Id$"
 #
 #   API library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -449,5 +449,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5564 2006-05-22 00:59:11Z mike $".
+# End of "$Id$".
 #
diff --git a/cups/adminutil.c b/cups/adminutil.c
index 0f32446f8..548deafa0 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.c 5288 2006-03-14 02:38:07Z mike $"
+ * "$Id$"
  *
  *   Administration utility API definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -1927,5 +1927,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id: adminutil.c 5288 2006-03-14 02:38:07Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/adminutil.h b/cups/adminutil.h
index 8b66d1b8d..6d755c63a 100644
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: adminutil.h 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id$"
  *
  *   Administration utility API definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -85,5 +85,5 @@ extern int	_cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id: adminutil.h 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/api-array.shtml b/cups/api-array.shtml
index 433ce5d28..32c4d8d12 100644
--- a/cups/api-array.shtml
+++ b/cups/api-array.shtml
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-array.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   Array API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml
index e53b36ef7..99732b8bd 100644
--- a/cups/api-cups.shtml
+++ b/cups/api-cups.shtml
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-cups.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   CUPS API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml
index 3e6e94433..d321cc604 100644
--- a/cups/api-filedir.shtml
+++ b/cups/api-filedir.shtml
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filedir.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   File and directory API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml
index 66f5e0a09..b098b0e58 100644
--- a/cups/api-filter.shtml
+++ b/cups/api-filter.shtml
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-filter.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   Filter and backend API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml
index 9b860bfd3..b318e93e2 100644
--- a/cups/api-httpipp.shtml
+++ b/cups/api-httpipp.shtml
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-httpipp.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   HTTP and IPP API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml
index 4dcd74909..1206ec879 100644
--- a/cups/api-ppd.shtml
+++ b/cups/api-ppd.shtml
@@ -1,5 +1,5 @@
 <!--
-  "$Id: api-ppd.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   PPD API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/cups/array.c b/cups/array.c
index b05168031..674a4b4d4 100644
--- a/cups/array.c
+++ b/cups/array.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: array.c 5493 2006-05-05 16:33:57Z mike $"
+ * "$Id$"
  *
  *   Sorted array routines for the Common UNIX Printing System (CUPS).
  *
@@ -962,5 +962,5 @@ cups_array_find(cups_array_t *a,	/* I - Array */
 
 
 /*
- * End of "$Id: array.c 5493 2006-05-05 16:33:57Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/array.h b/cups/array.h
index 137dd87a2..9919656fe 100644
--- a/cups/array.h
+++ b/cups/array.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: array.h 5258 2006-03-09 15:40:56Z mike $"
+ * "$Id$"
  *
  *   Sorted array definitions for the Common UNIX Printing System (CUPS).
  *
@@ -81,5 +81,5 @@ extern void		*cupsArrayUserData(cups_array_t *a);
 #endif /* !_CUPS_ARRAY_H_ */
 
 /*
- * End of "$Id: array.h 5258 2006-03-09 15:40:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/attr.c b/cups/attr.c
index 96b89ea05..9f7f7bdb3 100644
--- a/cups/attr.c
+++ b/cups/attr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: attr.c 5119 2006-02-16 15:52:06Z mike $"
+ * "$Id$"
  *
  *   PPD model-specific attribute routines for the Common UNIX Printing System
  *   (CUPS).
@@ -129,5 +129,5 @@ ppdFindNextAttr(ppd_file_t *ppd,	/* I - PPD file data */
 
 
 /*
- * End of "$Id: attr.c 5119 2006-02-16 15:52:06Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/auth.c b/cups/auth.c
index 8f515f8e0..9e2cc642a 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 5559 2006-05-21 13:59:42Z mike $"
+ * "$Id$"
  *
  *   Authentication functions for the Common UNIX Printing System (CUPS).
  *
@@ -249,5 +249,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: auth.c 5559 2006-05-21 13:59:42Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/backchannel.c b/cups/backchannel.c
index 09833fe46..8ce560bca 100644
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: backchannel.c 5551 2006-05-19 20:20:32Z mike $"
+ * "$Id$"
  *
  *   Backchannel functions for the Common UNIX Printing System (CUPS).
  *
@@ -197,5 +197,5 @@ cups_setup(fd_set         *set,		/* I - Set for select() */
 
 
 /*
- * End of "$Id: backchannel.c 5551 2006-05-19 20:20:32Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/backend.c b/cups/backend.c
index 68d234d12..f846a2a3a 100644
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $"
+ * "$Id$"
  *
  *   Backend functions for the Common UNIX Printing System (CUPS).
  *
@@ -63,5 +63,5 @@ cupsBackendDeviceURI(char **argv)	/* I - Command-line arguments */
 
 
 /*
- * End of "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/backend.h b/cups/backend.h
index ca107c93f..e9bd2d04b 100644
--- a/cups/backend.h
+++ b/cups/backend.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id$"
  *
  *   Backend definitions for the Common UNIX Printing System (CUPS).
  *
@@ -53,5 +53,5 @@ extern const char	*cupsBackendDeviceURI(char **argv);
 #endif /* !_CUPS_BACKEND_H_ */
 
 /*
- * End of "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/cups.h b/cups/cups.h
index 64b389a08..3085d5da5 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $"
+ * "$Id$"
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
@@ -244,5 +244,5 @@ extern cups_file_t	*cupsTempFile2(char *filename, int len);
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/custom.c b/cups/custom.c
index 23008e93c..78b8e3ef0 100644
--- a/cups/custom.c
+++ b/cups/custom.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $"
+ * "$Id$"
  *
  *   PPD custom option routines for the Common UNIX Printing System (CUPS).
  *
@@ -123,5 +123,5 @@ ppdNextCustomParam(ppd_coption_t *opt)	/* I - Custom option */
 
 
 /*
- * End of "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/debug.h b/cups/debug.h
index 65b1fa224..09e305f4d 100644
--- a/cups/debug.h
+++ b/cups/debug.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $"
+ * "$Id$"
  *
  *   Debugging macros for the Common UNIX Printing System (CUPS).
  *
@@ -55,5 +55,5 @@
 #endif /* !_CUPS_DEBUG_H_ */
 
 /*
- * End of "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/dest.c b/cups/dest.c
index a91e39847..38f1bda60 100644
--- a/cups/dest.c
+++ b/cups/dest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dest.c 5346 2006-03-28 16:05:19Z mike $"
+ * "$Id$"
  *
  *   User-defined destination (and option) support for the Common UNIX
  *   Printing System (CUPS).
@@ -1008,5 +1008,5 @@ cups_get_sdests(http_t      *http,	/* I - HTTP connection */
 
 
 /*
- * End of "$Id: dest.c 5346 2006-03-28 16:05:19Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/emit.c b/cups/emit.c
index 6f4dc78de..32dbe13c6 100644
--- a/cups/emit.c
+++ b/cups/emit.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: emit.c 5257 2006-03-09 15:27:27Z mike $"
+ * "$Id$"
  *
  *   PPD code emission routines for the Common UNIX Printing System (CUPS).
  *
@@ -917,5 +917,5 @@ ppd_sort(ppd_choice_t **c1,	/* I - First choice */
 
 
 /*
- * End of "$Id: emit.c 5257 2006-03-09 15:27:27Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/encode.c b/cups/encode.c
index a00e2c52a..f0a4c7681 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: encode.c 5545 2006-05-18 21:00:56Z mike $"
+ * "$Id$"
  *
  *   Option encoding routines for the Common UNIX Printing System (CUPS).
  *
@@ -559,5 +559,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */
 
 
 /*
- * End of "$Id: encode.c 5545 2006-05-18 21:00:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/file.c b/cups/file.c
index a5c1372f5..cfb6e91b5 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.c 5324 2006-03-23 16:47:46Z mike $"
+ * "$Id$"
  *
  *   File functions for the Common UNIX Printing System (CUPS).
  *
@@ -2080,5 +2080,5 @@ cups_write(cups_file_t *fp,		/* I - CUPS file */
 
 
 /*
- * End of "$Id: file.c 5324 2006-03-23 16:47:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/file.h b/cups/file.h
index 24649147b..17db07554 100644
--- a/cups/file.h
+++ b/cups/file.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: file.h 5319 2006-03-21 15:28:29Z mike $"
+ * "$Id$"
  *
  *   Public file definitions for the Common UNIX Printing System (CUPS).
  *
@@ -109,5 +109,5 @@ extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes);
 #endif /* !_CUPS_FILE_H_ */
 
 /*
- * End of "$Id: file.h 5319 2006-03-21 15:28:29Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index abfd0fac6..abecd43a1 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getifaddrs.c 5504 2006-05-10 18:57:46Z mike $"
+ * "$Id$"
  *
  *   Network interface functions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -272,5 +272,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
 
 
 /*
- * End of "$Id: getifaddrs.c 5504 2006-05-10 18:57:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/getputfile.c b/cups/getputfile.c
index 9dc7f7a9c..9e4056746 100644
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: getputfile.c 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id$"
  *
  *   Get/put file functions for the Common UNIX Printing System (CUPS).
  *
@@ -488,5 +488,5 @@ cupsPutFile(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: getputfile.c 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/globals.c b/cups/globals.c
index b7dbbf348..0f4efd26a 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.c 5373 2006-04-06 20:03:32Z mike $"
+ * "$Id$"
  *
  *   Global variable access routines for the Common UNIX Printing System (CUPS).
  *
@@ -226,5 +226,5 @@ _cupsGlobals(void)
 
 
 /*
- * End of "$Id: globals.c 5373 2006-04-06 20:03:32Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/globals.h b/cups/globals.h
index 819d2bd6f..a69e1726d 100644
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: globals.h 5366 2006-04-02 16:11:04Z mike $"
+ * "$Id$"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
@@ -151,5 +151,5 @@ extern void		_cupsSetError(ipp_status_t status, const char *message);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 5366 2006-04-02 16:11:04Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/http-addr.c b/cups/http-addr.c
index f0d5fb37e..170558e73 100644
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $"
+ * "$Id$"
  *
  *   HTTP address routines for the Common UNIX Printing System (CUPS).
  *
@@ -562,5 +562,5 @@ httpGetHostname(http_t *http,		/* I - HTTP connection or NULL */
 
 
 /*
- * End of "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 4638fb84b..71f4d18f2 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-addrlist.c 5351 2006-03-29 15:36:15Z mike $"
+ * "$Id$"
  *
  *   HTTP address list routines for the Common UNIX Printing System (CUPS).
  *
@@ -593,5 +593,5 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
 
 /*
- * End of "$Id: http-addrlist.c 5351 2006-03-29 15:36:15Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/http-private.h b/cups/http-private.h
index bef934ed9..78072dbf7 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $"
+ * "$Id$"
  *
  *   Private HTTP definitions for the Common UNIX Printing System (CUPS).
  *
@@ -187,5 +187,5 @@ extern void	_cups_freeifaddrs(struct ifaddrs *addrs);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/http-support.c b/cups/http-support.c
index 72bd4bde2..456800e79 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http-support.c 5360 2006-03-30 17:02:17Z mike $"
+ * "$Id$"
  *
  *   HTTP support routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -1316,5 +1316,5 @@ http_copy_encode(char       *dst,	/* O - Destination buffer */
 
 
 /*
- * End of "$Id: http-support.c 5360 2006-03-30 17:02:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/http.c b/cups/http.c
index 2e96795f0..1f90be5b4 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.c 5416 2006-04-17 21:24:17Z mike $"
+ * "$Id$"
  *
  *   HTTP routines for the Common UNIX Printing System (CUPS).
  *
@@ -2802,5 +2802,5 @@ http_write_ssl(http_t     *http,	/* I - HTTP connection */
 
 
 /*
- * End of "$Id: http.c 5416 2006-04-17 21:24:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/http.h b/cups/http.h
index 721fc9a65..a85971fcd 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: http.h 5295 2006-03-15 21:16:05Z mike $"
+ * "$Id$"
  *
  *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -496,5 +496,5 @@ extern ssize_t		httpWrite2(http_t *http, const char *buffer,
 #endif /* !_CUPS_HTTP_H_ */
 
 /*
- * End of "$Id: http.h 5295 2006-03-15 21:16:05Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/i18n.h b/cups/i18n.h
index 58de0eae5..4aa743529 100644
--- a/cups/i18n.h
+++ b/cups/i18n.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $"
+ * "$Id$"
  *
  *   (Private) localization support for the Common UNIX Printing System (CUPS).
  *
@@ -113,5 +113,5 @@ extern const char	*_cupsMessageLookup(cups_array_t *a, const char *m);
 #endif /* !_CUPS_I18N_H_ */
 
 /*
- * End of "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index af303f1da..c5eeed4ca 100644
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-private.h 5230 2006-03-05 17:01:51Z mike $"
+ * "$Id$"
  *
  *   Private IPP definitions for the Common UNIX Printing System (CUPS).
  *
@@ -61,5 +61,5 @@ extern void		_ippFreeAttr(ipp_attribute_t *);
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp-private.h 5230 2006-03-05 17:01:51Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index fef06af1c..e61117577 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-support.c 5246 2006-03-08 13:22:09Z mike $"
+ * "$Id$"
  *
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
@@ -333,5 +333,5 @@ ippSetPort(int p)			/* I - Port number to use */
 
 
 /*
- * End of "$Id: ipp-support.c 5246 2006-03-08 13:22:09Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/ipp.c b/cups/ipp.c
index 53da93e9b..96bf89114 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 5415 2006-04-17 20:39:05Z mike $"
+ * "$Id$"
  *
  *   Internet Printing Protocol support functions for the Common UNIX
  *   Printing System (CUPS).
@@ -2824,5 +2824,5 @@ _ipp_free_attr(ipp_attribute_t *attr)	/* I - Attribute to free */
 
 
 /*
- * End of "$Id: ipp.c 5415 2006-04-17 20:39:05Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/ipp.h b/cups/ipp.h
index 6435a0eca..57d43f72a 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $"
+ * "$Id$"
  *
  *   Internet Printing Protocol definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -497,5 +497,5 @@ extern ipp_state_t	ippWriteIO(void *dst, ipp_iocb_t cb, int blocking,
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/langprintf.c b/cups/langprintf.c
index 4430c6792..a1f28b6a4 100644
--- a/cups/langprintf.c
+++ b/cups/langprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: langprintf.c 4924 2006-01-13 01:55:20Z mike $"
+ * "$Id$"
  *
  *   Localized printf/puts functions for the Common UNIX Printing
  *   System (CUPS).
@@ -139,5 +139,5 @@ _cupsLangPuts(FILE        *fp,		/* I - File to write to */
 
 
 /*
- * End of "$Id: langprintf.c 4924 2006-01-13 01:55:20Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/language.c b/cups/language.c
index 6990d9127..435c84bc4 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c 5373 2006-04-06 20:03:32Z mike $"
+ * "$Id$"
  *
  *   I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -1295,5 +1295,5 @@ cups_unquote(char       *d,		/* O - Unquoted string */
 
 
 /*
- * End of "$Id: language.c 5373 2006-04-06 20:03:32Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/language.h b/cups/language.h
index 94f7bf81a..011eb1882 100644
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: language.h 5085 2006-02-06 13:27:53Z mike $"
+ * "$Id$"
  *
  *   Multi-language support for the Common UNIX Printing System (CUPS).
  *
@@ -119,5 +119,5 @@ extern cups_lang_t	*cupsLangGet(const char *language);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id: language.h 5085 2006-02-06 13:27:53Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/localize.c b/cups/localize.c
index b07609bbb..01d5d763f 100644
--- a/cups/localize.c
+++ b/cups/localize.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: localize.c 5391 2006-04-14 12:26:50Z mike $"
+ * "$Id$"
  *
  *   PPD custom option routines for the Common UNIX Printing System (CUPS).
  *
@@ -185,5 +185,5 @@ ppd_text(ppd_file_t *ppd,		/* I - PPD file */
 
 
 /*
- * End of "$Id: localize.c 5391 2006-04-14 12:26:50Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/mark.c b/cups/mark.c
index 3b2226774..84e24c4f9 100644
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c 5529 2006-05-15 20:06:46Z mike $"
+ * "$Id$"
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
@@ -679,5 +679,5 @@ ppd_defaults(ppd_file_t  *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id: mark.c 5529 2006-05-15 20:06:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/md5-apple.h b/cups/md5-apple.h
index 4284ad4ab..456235150 100644
--- a/cups/md5-apple.h
+++ b/cups/md5-apple.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $"
+ * "$Id$"
  *
  *   MD5 MacOS X compatibility header for the Common UNIX Printing
  *   System (CUPS).
@@ -35,5 +35,5 @@ void md5_finish(_cups_md5_state_t *pms, unsigned char digest[16])
      { _cupsMD5Finish(pms, digest); }
 
 /*
- * End of "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/md5.c b/cups/md5.c
index 9a3fab987..5fa8c6df7 100644
--- a/cups/md5.c
+++ b/cups/md5.c
@@ -26,7 +26,7 @@
   ghost@aladdin.com
 
  */
-/*$Id: md5.c 5232 2006-03-05 17:59:19Z mike $ */
+/*$Id$ */
 /*
   Independent implementation of MD5 (RFC 1321).
 
diff --git a/cups/md5.h b/cups/md5.h
index 3b0281c0f..3d39b8db4 100644
--- a/cups/md5.h
+++ b/cups/md5.h
@@ -26,7 +26,7 @@
   ghost@aladdin.com
 
  */
-/*$Id: md5.h 5232 2006-03-05 17:59:19Z mike $ */
+/*$Id$ */
 /*
   Independent implementation of MD5 (RFC 1321).
 
diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index df8a75881..1c903a9d6 100644
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: md5passwd.c 5232 2006-03-05 17:59:19Z mike $"
+ * "$Id$"
  *
  *   MD5 password support for the Common UNIX Printing System (CUPS).
  *
@@ -147,5 +147,5 @@ httpMD5String(const unsigned char *sum,	/* I - MD5 sum data */
 
 
 /*
- * End of "$Id: md5passwd.c 5232 2006-03-05 17:59:19Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/notify.c b/cups/notify.c
index 2a89aca3c..c9d56ca8d 100644
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: notify.c 4961 2006-01-20 22:19:13Z mike $"
+ * "$Id$"
  *
  *   Notification routines for the Common UNIX Printing System (CUPS).
  *
@@ -207,5 +207,5 @@ cupsNotifyText(cups_lang_t *lang,	/* I - Language data */
 
 
 /*
- * End of "$Id: notify.c 4961 2006-01-20 22:19:13Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/options.c b/cups/options.c
index e232caaad..64307cbee 100644
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: options.c 5151 2006-02-22 22:43:17Z mike $"
+ * "$Id$"
  *
  *   Option routines for the Common UNIX Printing System (CUPS).
  *
@@ -634,5 +634,5 @@ cupsRemoveOption(
 
 
 /*
- * End of "$Id: options.c 5151 2006-02-22 22:43:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/page.c b/cups/page.c
index f8b79832f..309515e1a 100644
--- a/cups/page.c
+++ b/cups/page.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: page.c 5549 2006-05-19 19:39:28Z mike $"
+ * "$Id$"
  *
  *   Page size functions for the Common UNIX Printing System (CUPS).
  *
@@ -193,5 +193,5 @@ ppdPageLength(ppd_file_t *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id: page.c 5549 2006-05-19 19:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/ppd.c b/cups/ppd.c
index 540b14a8d..2bdba8557 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c 5333 2006-03-24 00:52:21Z mike $"
+ * "$Id$"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -2938,5 +2938,5 @@ ppd_read(cups_file_t    *fp,		/* I - File to read from */
 
 
 /*
- * End of "$Id: ppd.c 5333 2006-03-24 00:52:21Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/ppd.h b/cups/ppd.h
index d7688c3d5..d24db5afd 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $"
+ * "$Id$"
  *
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -405,5 +405,5 @@ extern ppd_file_t	*ppdOpen2(cups_file_t *fp);
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/request.c b/cups/request.c
index 329cce881..d2df08676 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: request.c 5555 2006-05-20 13:35:58Z mike $"
+ * "$Id$"
  *
  *   IPP utilities for the Common UNIX Printing System (CUPS).
  *
@@ -479,5 +479,5 @@ _cupsSetError(ipp_status_t status,	/* I - IPP status code */
 
 
 /*
- * End of "$Id: request.c 5555 2006-05-20 13:35:58Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/snprintf.c b/cups/snprintf.c
index 683551b05..efd593e73 100644
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: snprintf.c 5529 2006-05-15 20:06:46Z mike $"
+ * "$Id$"
  *
  *   snprintf functions for the Common UNIX Printing System (CUPS).
  *
@@ -368,6 +368,6 @@ _cups_snprintf(char       *buffer,	/* O - Output buffer */
 
 
 /*
- * End of "$Id: snprintf.c 5529 2006-05-15 20:06:46Z mike $".
+ * End of "$Id$".
  */
 
diff --git a/cups/string.c b/cups/string.c
index 733304a82..e1337ac61 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.c 5368 2006-04-02 19:23:50Z mike $"
+ * "$Id$"
  *
  *   String functions for the Common UNIX Printing System (CUPS).
  *
@@ -702,5 +702,5 @@ compare_sp_items(_cups_sp_item_t *a,	/* I - First item */
 
 
 /*
- * End of "$Id: string.c 5368 2006-04-02 19:23:50Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/string.h b/cups/string.h
index 79ebd774b..966068a9c 100644
--- a/cups/string.h
+++ b/cups/string.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: string.h 5466 2006-04-26 19:52:27Z mike $"
+ * "$Id$"
  *
  *   String definitions for the Common UNIX Printing System (CUPS).
  *
@@ -158,5 +158,5 @@ extern double	_cupsStrScand(const char *buf, char **bufptr,
 #endif /* !_CUPS_STRING_H_ */
 
 /*
- * End of "$Id: string.h 5466 2006-04-26 19:52:27Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/tempfile.c b/cups/tempfile.c
index 0e64565b0..c03a5f7c9 100644
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tempfile.c 4918 2006-01-12 05:14:40Z mike $"
+ * "$Id$"
  *
  *   Temp file utilities for the Common UNIX Printing System (CUPS).
  *
@@ -236,5 +236,5 @@ cupsTempFile2(char *filename,		/* I - Pointer to buffer */
 
 
 /*
- * End of "$Id: tempfile.c 4918 2006-01-12 05:14:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/test.ppd b/cups/test.ppd
index bdcdc9971..c829700e3 100644
--- a/cups/test.ppd
+++ b/cups/test.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $"
+*% "$Id$"
 *%
 *%   Test PPD file for the Common UNIX Printing System (CUPS).
 *%
@@ -185,5 +185,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $".
+*% End of "$Id$".
 *%
diff --git a/cups/testadmin.c b/cups/testadmin.c
index 0f2e1d0c2..f92d256c0 100644
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testadmin.c 5240 2006-03-07 21:55:29Z mike $"
+ * "$Id$"
  *
  *   Admin function test program for the Common UNIX Printing System (CUPS).
  *
@@ -125,5 +125,5 @@ show_settings(
 
 
 /*
- * End of "$Id: testadmin.c 5240 2006-03-07 21:55:29Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/testarray.c b/cups/testarray.c
index 912035d51..23cf69636 100644
--- a/cups/testarray.c
+++ b/cups/testarray.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $"
+ * "$Id$"
  *
  *   Array test program for the Common UNIX Printing System (CUPS).
  *
@@ -525,5 +525,5 @@ load_words(const char   *filename,	/* I - File to load */
 
 
 /*
- * End of "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/testfile.c b/cups/testfile.c
index 7bd0c2b14..a110d2723 100644
--- a/cups/testfile.c
+++ b/cups/testfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testfile.c 5194 2006-02-27 20:57:07Z mike $"
+ * "$Id$"
  *
  *   File test program for the Common UNIX Printing System (CUPS).
  *
@@ -444,5 +444,5 @@ read_write_tests(int compression)	/* I - Use compression? */
 
 
 /*
- * End of "$Id: testfile.c 5194 2006-02-27 20:57:07Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/testhttp.c b/cups/testhttp.c
index 5a9a86ed9..a7fde7124 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testhttp.c 5350 2006-03-29 15:26:44Z mike $"
+ * "$Id$"
  *
  *   HTTP test program for the Common UNIX Printing System (CUPS).
  *
@@ -519,5 +519,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testhttp.c 5350 2006-03-29 15:26:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/testi18n.c b/cups/testi18n.c
index 0fc439793..3a01eb15e 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $"
+ * "$Id$"
  *
  *   Internationalization test for Common UNIX Printing System (CUPS).
  *
@@ -556,5 +556,5 @@ print_utf8(const char	     *msg,	/* I - Message String */
 
 
 /*
- * End of "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $"
+ * End of "$Id$"
  */
diff --git a/cups/testipp.c b/cups/testipp.c
index 07bcdffc0..34de16461 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testipp.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id$"
  *
  *   IPP test program for the Common UNIX Printing System (CUPS).
  *
@@ -645,5 +645,5 @@ write_cb(void        *data,		/* I - Data */
 
 
 /*
- * End of "$Id: testipp.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/testlang.c b/cups/testlang.c
index f41408b03..068119893 100644
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testlang.c 4903 2006-01-10 20:02:46Z mike $"
+ * "$Id$"
  *
  *   Localization test program for the Common UNIX Printing System (CUPS).
  *
@@ -85,5 +85,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testlang.c 4903 2006-01-10 20:02:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/testppd.c b/cups/testppd.c
index 7e59a4276..0610de296 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testppd.c 5484 2006-05-02 20:38:12Z mike $"
+ * "$Id$"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -172,5 +172,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testppd.c 5484 2006-05-02 20:38:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/transcode.c b/cups/transcode.c
index c7384d9cb..f21ab22e6 100644
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: transcode.c 5373 2006-04-06 20:03:32Z mike $"
+ * "$Id$"
  *
  *   Transcoding support for the Common UNIX Printing System (CUPS).
  *
@@ -1585,5 +1585,5 @@ get_vbcs_charmap(
 
 
 /*
- * End of "$Id: transcode.c 5373 2006-04-06 20:03:32Z mike $"
+ * End of "$Id$"
  */
diff --git a/cups/transcode.h b/cups/transcode.h
index c867b37e2..a8cb300b5 100644
--- a/cups/transcode.h
+++ b/cups/transcode.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $"
+ * "$Id$"
  *
  *   Transcoding definitions for the Common UNIX Printing System (CUPS).
  *
@@ -84,5 +84,5 @@ extern int	cupsUTF32ToUTF8(cups_utf8_t *dest,
 
 
 /*
- * End of "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $"
+ * End of "$Id$"
  */
diff --git a/cups/usersys.c b/cups/usersys.c
index b75dc3790..ca97e18da 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c 5182 2006-02-26 04:10:27Z mike $"
+ * "$Id$"
  *
  *   User, system, and password routines for the Common UNIX Printing
  *   System (CUPS).
@@ -484,5 +484,5 @@ cups_open_client_conf(void)
 
 
 /*
- * End of "$Id: usersys.c 5182 2006-02-26 04:10:27Z mike $".
+ * End of "$Id$".
  */
diff --git a/cups/util.c b/cups/util.c
index aea6055a2..3bd960b6d 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id$"
  *
  *   Printing utilities for the Common UNIX Printing System (CUPS).
  *
@@ -1641,5 +1641,5 @@ cups_get_printer_uri(
 
 
 /*
- * End of "$Id: util.c 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/data/HPGLprolog b/data/HPGLprolog
index eed0a0487..2badc04a4 100644
--- a/data/HPGLprolog
+++ b/data/HPGLprolog
@@ -1,6 +1,6 @@
 %%BeginResource: procset hpgltops 1.1 0
 %
-% "$Id: HPGLprolog 4494 2005-02-18 02:18:11Z mike $"
+% "$Id$"
 %
 %   HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
 %
diff --git a/data/Makefile b/data/Makefile
index 29a7aa0e7..0b0f8cf5f 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $"
+# "$Id$"
 #
 #   Datafile makefile for the Common UNIX Printing System (CUPS).
 #
@@ -180,5 +180,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5310 2006-03-19 03:23:34Z mike $".
+# End of "$Id$".
 #
diff --git a/data/classified b/data/classified
index 3f8a1ab82..71d89af76 100644
--- a/data/classified
+++ b/data/classified
@@ -272,6 +272,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: classified 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/data/confidential b/data/confidential
index 27d29fbcc..d8570bf28 100644
--- a/data/confidential
+++ b/data/confidential
@@ -272,6 +272,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: confidential 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/data/secret b/data/secret
index 998f59a92..9e2f81950 100644
--- a/data/secret
+++ b/data/secret
@@ -272,6 +272,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: secret 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/data/standard b/data/standard
index 8fac59e5f..c714ac7e6 100644
--- a/data/standard
+++ b/data/standard
@@ -256,6 +256,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: standard 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/data/testprint.ps b/data/testprint.ps
index c437ae212..66f504e4c 100644
--- a/data/testprint.ps
+++ b/data/testprint.ps
@@ -631,6 +631,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 4930 2006-01-14 16:54:03Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/data/topsecret b/data/topsecret
index 389cbf105..cae5a46b9 100644
--- a/data/topsecret
+++ b/data/topsecret
@@ -272,6 +272,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: topsecret 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/data/unclassified b/data/unclassified
index 804773e6e..0845470d0 100644
--- a/data/unclassified
+++ b/data/unclassified
@@ -272,6 +272,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: unclassified 4494 2005-02-18 02:18:11Z mike $".
+% End of "$Id$".
 %
 %%EOF
diff --git a/doc/Makefile b/doc/Makefile
index 2e701b76c..f3e0a30fa 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5500 2006-05-08 20:32:27Z mike $"
+# "$Id$"
 #
 #   Documentation makefile for the Common UNIX Printing System (CUPS).
 #
diff --git a/doc/help/api-array.html b/doc/help/api-array.html
index 6fbd8a3a1..d14268b98 100644
--- a/doc/help/api-array.html
+++ b/doc/help/api-array.html
@@ -16,7 +16,7 @@
 </head>
 <body>
 <!--
-  "$Id: api-array.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   Array API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html
index 42ffa2d1c..a93551651 100644
--- a/doc/help/api-cups.html
+++ b/doc/help/api-cups.html
@@ -16,7 +16,7 @@
 </head>
 <body>
 <!--
-  "$Id: api-cups.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   CUPS API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html
index fa862e96f..38992949e 100644
--- a/doc/help/api-filedir.html
+++ b/doc/help/api-filedir.html
@@ -16,7 +16,7 @@
 </head>
 <body>
 <!--
-  "$Id: api-filedir.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   File and directory API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html
index 63607f38b..308d0ce07 100644
--- a/doc/help/api-filter.html
+++ b/doc/help/api-filter.html
@@ -16,7 +16,7 @@
 </head>
 <body>
 <!--
-  "$Id: api-filter.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   Filter and backend API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html
index 7a08b3352..0a0a742d0 100644
--- a/doc/help/api-httpipp.html
+++ b/doc/help/api-httpipp.html
@@ -16,7 +16,7 @@
 </head>
 <body>
 <!--
-  "$Id: api-httpipp.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   HTTP and IPP API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html
index a3949abea..5106c6f98 100644
--- a/doc/help/api-ppd.html
+++ b/doc/help/api-ppd.html
@@ -16,7 +16,7 @@
 </head>
 <body>
 <!--
-  "$Id: api-ppd.shtml 5138 2006-02-21 10:49:06Z mike $"
+  "$Id$"
 
   PPD API introduction for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html
index d6f8f0879..d2ef925d1 100644
--- a/doc/help/spec-ppd.html
+++ b/doc/help/spec-ppd.html
@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
-  "$Id: spec-ppd.html 5496 2006-05-05 19:26:23Z mike $"
+  "$Id$"
 
   CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
 
diff --git a/doc/robots.txt b/doc/robots.txt
index 45dcdc221..6fe36b391 100644
--- a/doc/robots.txt
+++ b/doc/robots.txt
@@ -1,5 +1,5 @@
 #
-# "$Id: robots.txt 3494 2003-03-19 15:37:44Z mike $"
+# "$Id$"
 #
 #   This file tells search engines not to index your CUPS server.
 #
@@ -26,6 +26,6 @@ User-agent: *
 Disallow: /
 
 #
-# End of "$Id: robots.txt 3494 2003-03-19 15:37:44Z mike $".
+# End of "$Id$".
 #
 
diff --git a/driver/testdriver.c b/driver/testdriver.c
index eab00dffc..729f10753 100644
--- a/driver/testdriver.c
+++ b/driver/testdriver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testdriver.c 5390 2006-04-10 19:29:44Z mike $"
+ * "$Id$"
  *
  *   Sample/test driver interface program for the Common UNIX Printing
  *   System (CUPS).
@@ -175,5 +175,5 @@ list_ppds(const char *name)		/* I - Program name */
 
 
 /*
- * End of "$Id: testdriver.c 5390 2006-04-10 19:29:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/Makefile b/filter/Makefile
index 2783578d0..3e1651576 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5564 2006-05-22 00:59:11Z mike $"
+# "$Id$"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -377,5 +377,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5564 2006-05-22 00:59:11Z mike $".
+# End of "$Id$".
 #
diff --git a/filter/common.c b/filter/common.c
index 9e3c391e0..b097d5749 100644
--- a/filter/common.c
+++ b/filter/common.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: common.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   Common filter routines for the Common UNIX Printing System (CUPS).
  *
@@ -467,5 +467,5 @@ WriteLabels(int orient)	/* I - Orientation of the page */
 
 
 /*
- * End of "$Id: common.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/common.h b/filter/common.h
index 1c40b4765..65d1b6399 100644
--- a/filter/common.h
+++ b/filter/common.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: common.h 4493 2005-02-18 02:09:53Z mike $"
+ * "$Id$"
  *
  *   Common filter definitions for the Common UNIX Printing System (CUPS).
  *
@@ -88,5 +88,5 @@ extern void	WriteLabels(int orient);
 
 
 /*
- * End of "$Id: common.h 4493 2005-02-18 02:09:53Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/form-main.c b/filter/form-main.c
index a7b95cc45..10db34016 100644
--- a/filter/form-main.c
+++ b/filter/form-main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: form-main.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   CUPS form main entry for the Common UNIX Printing System (CUPS).
  *
@@ -58,5 +58,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: form-main.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/form-ps.c b/filter/form-ps.c
index 890100aa4..41142d706 100644
--- a/filter/form-ps.c
+++ b/filter/form-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: form-ps.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   CUPS form PostScript routines for the Common UNIX Printing System (CUPS).
  *
@@ -45,5 +45,5 @@ formWrite(tree_t *t)			/* I - Document tree to write */
 
 
 /*
- * End of "$Id: form-ps.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/form-tree.c b/filter/form-tree.c
index 188a254b1..d6f214a2f 100644
--- a/filter/form-tree.c
+++ b/filter/form-tree.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: form-tree.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   CUPS form document tree routines for the Common UNIX Printing
  *   System (CUPS).
@@ -620,5 +620,5 @@ parse_element(tree_t *t,		/* I - Current tree node */
 
 
 /*
- * End of "$Id: form-tree.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/form.h b/filter/form.h
index 39d7b7549..81b403cfc 100644
--- a/filter/form.h
+++ b/filter/form.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: form.h 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   CUPS form header file for the Common UNIX Printing System (CUPS).
  *
@@ -173,5 +173,5 @@ extern void	formWrite(tree_t *p);
 
 
 /*
- * End of "$Id: form.h 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index b83082fb4..69df07881 100644
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: gziptoany.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   GZIP pre-filter for the Common UNIX Printing System (CUPS).
  *
@@ -127,5 +127,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: gziptoany.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-attr.c b/filter/hpgl-attr.c
index 5a645c1cb..e27f6d00a 100644
--- a/filter/hpgl-attr.c
+++ b/filter/hpgl-attr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-attr.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 attribute processing for the Common UNIX Printing System (CUPS).
  *
@@ -450,5 +450,5 @@ WU_width_units(int     num_params,	/* I - Number of parameters */
 
 
 /*
- * End of "$Id: hpgl-attr.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-char.c b/filter/hpgl-char.c
index 3b1f9d3d7..ddb24a237 100644
--- a/filter/hpgl-char.c
+++ b/filter/hpgl-char.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-char.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 character processing for the Common UNIX Printing System (CUPS).
  *
@@ -636,5 +636,5 @@ TD_transparent_data(int     num_params,	/* I - Number of parameters */
 
 
 /*
- * End of "$Id: hpgl-char.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-config.c b/filter/hpgl-config.c
index 6f6c7ce65..4c4a93b3a 100644
--- a/filter/hpgl-config.c
+++ b/filter/hpgl-config.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-config.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -641,5 +641,5 @@ SC_scale(int     num_params,	/* I - Number of parameters */
 
 
 /*
- * End of "$Id: hpgl-config.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-input.c b/filter/hpgl-input.c
index abfb63310..4d384d5ea 100644
--- a/filter/hpgl-input.c
+++ b/filter/hpgl-input.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-input.c 5150 2006-02-22 19:21:50Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 input processing for the Common UNIX Printing System (CUPS).
  *
@@ -269,5 +269,5 @@ FreeParameters(int     num_params,	/* I - Number of parameters */
 
 
 /*
- * End of "$Id: hpgl-input.c 5150 2006-02-22 19:21:50Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-main.c b/filter/hpgl-main.c
index 98dc3a9b9..b94cb494e 100644
--- a/filter/hpgl-main.c
+++ b/filter/hpgl-main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-main.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 filter main entry for the Common UNIX Printing System (CUPS).
  *
@@ -270,5 +270,5 @@ compare_names(const void *p1,	/* I - First name */
 
 
 /*
- * End of "$Id: hpgl-main.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-polygon.c b/filter/hpgl-polygon.c
index 328dcff50..e26114348 100644
--- a/filter/hpgl-polygon.c
+++ b/filter/hpgl-polygon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-polygon.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 polygon routines for the Common UNIX Printing System (CUPS).
  *
@@ -390,5 +390,5 @@ WG_fill_wedge(int     num_params,	/* I - Number of parameters */
 
 
 /*
- * End of "$Id: hpgl-polygon.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-prolog.c b/filter/hpgl-prolog.c
index 5cf0ad315..f83c8f336 100644
--- a/filter/hpgl-prolog.c
+++ b/filter/hpgl-prolog.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-prolog.c 4680 2005-09-21 09:28:39Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 prolog routines for for the Common UNIX Printing System (CUPS).
  *
@@ -373,5 +373,5 @@ Outputf(const char *format,	/* I - Printf-style string */
 
 
 /*
- * End of "$Id: hpgl-prolog.c 4680 2005-09-21 09:28:39Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgl-vector.c b/filter/hpgl-vector.c
index d285b0c14..809290a0e 100644
--- a/filter/hpgl-vector.c
+++ b/filter/hpgl-vector.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgl-vector.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 vector routines for the Common UNIX Printing System (CUPS).
  *
@@ -771,5 +771,5 @@ plot_points(int     num_params,	/* I - Number of parameters */
 
 
 /*
- * End of "$Id: hpgl-vector.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/hpgltops.h b/filter/hpgltops.h
index db68bcd4e..816a0b095 100644
--- a/filter/hpgltops.h
+++ b/filter/hpgltops.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: hpgltops.h 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   HP-GL/2 to PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -237,5 +237,5 @@ extern void	OutputTrailer(void);
 extern int	Outputf(const char *format, ...);
 
 /*
- * End of "$Id: hpgltops.h 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-bmp.c b/filter/image-bmp.c
index dab979a65..fb58ae17d 100644
--- a/filter/image-bmp.c
+++ b/filter/image-bmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-bmp.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
@@ -535,5 +535,5 @@ read_long(FILE *fp)               /* I - File to read from */
 
 
 /*
- * End of "$Id: image-bmp.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-colorspace.c b/filter/image-colorspace.c
index 2cb4ced01..38791d4b3 100644
--- a/filter/image-colorspace.c
+++ b/filter/image-colorspace.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $"
+ * "$Id$"
  *
  *   Colorspace conversions for the Common UNIX Printing System (CUPS).
  *
@@ -1573,5 +1573,5 @@ zshear(float mat[3][3],			/* I - Matrix */
 
 
 /*
- * End of "$Id: image-colorspace.c 5519 2006-05-12 15:06:42Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-gif.c b/filter/image-gif.c
index b56dd0c88..627b171a1 100644
--- a/filter/image-gif.c
+++ b/filter/image-gif.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-gif.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   GIF image routines for the Common UNIX Printing System (CUPS).
  *
@@ -695,5 +695,5 @@ gif_read_lzw(FILE *fp,			/* I - File to read from */
 
 
 /*
- * End of "$Id: image-gif.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-jpeg.c b/filter/image-jpeg.c
index 7db80ae1f..f3144a1dc 100644
--- a/filter/image-jpeg.c
+++ b/filter/image-jpeg.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-jpeg.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   JPEG image routines for the Common UNIX Printing System (CUPS).
  *
@@ -320,5 +320,5 @@ _cupsImageReadJPEG(
 
 
 /*
- * End of "$Id: image-jpeg.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-photocd.c b/filter/image-photocd.c
index 195f0da39..28ca201ee 100644
--- a/filter/image-photocd.c
+++ b/filter/image-photocd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-photocd.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   PhotoCD routines for the Common UNIX Printing System (CUPS).
  *
@@ -313,5 +313,5 @@ _cupsImageReadPhotoCD(
 
 
 /*
- * End of "$Id: image-photocd.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-pix.c b/filter/image-pix.c
index 64e595623..fdc505bef 100644
--- a/filter/image-pix.c
+++ b/filter/image-pix.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-pix.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   Alias PIX image routines for the Common UNIX Printing System (CUPS).
  *
@@ -232,5 +232,5 @@ read_short(FILE *fp)			/* I - File to read from */
 
 
 /*
- * End of "$Id: image-pix.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-png.c b/filter/image-png.c
index 97cbfc13f..d36bd58a0 100644
--- a/filter/image-png.c
+++ b/filter/image-png.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-png.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   PNG image routines for the Common UNIX Printing System (CUPS).
  *
@@ -280,5 +280,5 @@ _cupsImageReadPNG(
 
 
 /*
- * End of "$Id: image-png.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-pnm.c b/filter/image-pnm.c
index 54f6c7447..f907b053d 100644
--- a/filter/image-pnm.c
+++ b/filter/image-pnm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-pnm.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
  *
@@ -301,5 +301,5 @@ _cupsImageReadPNM(
 
 
 /*
- * End of "$Id: image-pnm.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-private.h b/filter/image-private.h
index df7bed281..9b0314752 100644
--- a/filter/image-private.h
+++ b/filter/image-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-private.h 5191 2006-02-27 02:47:56Z mike $"
+ * "$Id$"
  *
  *   Private image library definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -217,5 +217,5 @@ extern cups_izoom_t	*_cupsImageZoomNew(cups_image_t *img, int xc0, int yc0,
 #endif /* !_CUPS_IMAGE_PRIVATE_H_ */
 
 /*
- * End of "$Id: image-private.h 5191 2006-02-27 02:47:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-sgi.c b/filter/image-sgi.c
index 234868512..9591123ba 100644
--- a/filter/image-sgi.c
+++ b/filter/image-sgi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-sgi.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   SGI image file routines for the Common UNIX Printing System (CUPS).
  *
@@ -279,5 +279,5 @@ _cupsImageReadSGI(
 
 
 /*
- * End of "$Id: image-sgi.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-sgi.h b/filter/image-sgi.h
index 41847e0af..696232b3b 100644
--- a/filter/image-sgi.h
+++ b/filter/image-sgi.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-sgi.h 4741 2005-10-02 04:25:52Z mike $"
+ * "$Id$"
  *
  *   SGI image file format library definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -92,5 +92,5 @@ extern int	sgiPutRow(sgi_t *sgip, unsigned short *row, int y, int z);
 #endif /* !_SGI_H_ */
 
 /*
- * End of "$Id: image-sgi.h 4741 2005-10-02 04:25:52Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-sgilib.c b/filter/image-sgilib.c
index 5401c4a7b..4672afc72 100644
--- a/filter/image-sgilib.c
+++ b/filter/image-sgilib.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-sgilib.c 4741 2005-10-02 04:25:52Z mike $"
+ * "$Id$"
  *
  *   SGI image file format library routines for the Common UNIX Printing
  *   System (CUPS).
@@ -855,5 +855,5 @@ write_rle16(FILE           *fp,		/* I - File to write to */
 
 
 /*
- * End of "$Id: image-sgilib.c 4741 2005-10-02 04:25:52Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-sun.c b/filter/image-sun.c
index c6b0622db..59900cd37 100644
--- a/filter/image-sun.c
+++ b/filter/image-sun.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-sun.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   Sun Raster image file routines for the Common UNIX Printing System (CUPS).
  *
@@ -389,5 +389,5 @@ read_unsigned(FILE *fp)			/* I - File to read from */
 
 
 /*
- * End of "$Id: image-sun.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-tiff.c b/filter/image-tiff.c
index 223324bbf..3622359b6 100644
--- a/filter/image-tiff.c
+++ b/filter/image-tiff.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-tiff.c 5509 2006-05-11 11:41:36Z mike $"
+ * "$Id$"
  *
  *   TIFF file routines for the Common UNIX Printing System (CUPS).
  *
@@ -1720,5 +1720,5 @@ _cupsImageReadTIFF(
 
 
 /*
- * End of "$Id: image-tiff.c 5509 2006-05-11 11:41:36Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image-zoom.c b/filter/image-zoom.c
index 8dc67ec1e..d29628286 100644
--- a/filter/image-zoom.c
+++ b/filter/image-zoom.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image-zoom.c 5191 2006-02-27 02:47:56Z mike $"
+ * "$Id$"
  *
  *   cupsImage zoom routines for the Common UNIX Printing System (CUPS).
  *
@@ -366,5 +366,5 @@ zoom_nearest(cups_izoom_t *z,		/* I - Zoom record to fill */
 
 
 /*
- * End of "$Id: image-zoom.c 5191 2006-02-27 02:47:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image.c b/filter/image.c
index 94bc96117..e5c3d35da 100644
--- a/filter/image.c
+++ b/filter/image.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: image.c 4741 2005-10-02 04:25:52Z mike $"
+ * "$Id$"
  *
  *   Base image support for the Common UNIX Printing System (CUPS).
  *
@@ -841,5 +841,5 @@ get_tile(cups_image_t *img,		/* I - Image */
 
 
 /*
- * End of "$Id: image.c 4741 2005-10-02 04:25:52Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/image.h b/filter/image.h
index b77e6ddc3..c028b293e 100644
--- a/filter/image.h
+++ b/filter/image.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: image.h 5191 2006-02-27 02:47:56Z mike $"
+ * "$Id$"
  *
  *   Image library definitions for the Common UNIX Printing System (CUPS).
  *
@@ -135,5 +135,5 @@ extern void		cupsImageWhiteToWhite(const cups_ib_t *in,
 #endif /* !_CUPS_IMAGE_H_ */
 
 /*
- * End of "$Id: image.h 5191 2006-02-27 02:47:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/imagetops.c b/filter/imagetops.c
index 4f512fc0d..71f6c765f 100644
--- a/filter/imagetops.c
+++ b/filter/imagetops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: imagetops.c 5379 2006-04-07 13:48:37Z mike $"
+ * "$Id$"
  *
  *   Image file to PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -1063,5 +1063,5 @@ ps_ascii85(cups_ib_t *data,		/* I - Data to print */
 
 
 /*
- * End of "$Id: imagetops.c 5379 2006-04-07 13:48:37Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/imagetoraster.c b/filter/imagetoraster.c
index 32bc9a7c7..deedac7fa 100644
--- a/filter/imagetoraster.c
+++ b/filter/imagetoraster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: imagetoraster.c 5522 2006-05-15 05:02:15Z mike $"
+ * "$Id$"
  *
  *   Image file to raster filter for the Common UNIX Printing System (CUPS).
  *
@@ -4310,5 +4310,5 @@ raster_cb(
 
 
 /*
- * End of "$Id: imagetoraster.c 5522 2006-05-15 05:02:15Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/interpret.c b/filter/interpret.c
index 3e7b47be1..8754fb092 100644
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: interpret.c 5513 2006-05-11 18:07:25Z mike $"
+ * "$Id$"
  *
  *   PPD command interpreter for the Common UNIX Printing System (CUPS).
  *
@@ -608,5 +608,5 @@ exec_code(
 
 
 /*
- * End of "$Id: interpret.c 5513 2006-05-11 18:07:25Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/pstops.c b/filter/pstops.c
index e91e1fb32..9978ba94a 100644
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c 5570 2006-05-22 18:31:23Z mike $"
+ * "$Id$"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -2935,5 +2935,5 @@ start_nup(pstops_doc_t *doc,		/* I - Document information */
 
 
 /*
- * End of "$Id: pstops.c 5570 2006-05-22 18:31:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/raster.c b/filter/raster.c
index 8dee94b1a..45bc06f84 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.c 5522 2006-05-15 05:02:15Z mike $"
+ * "$Id$"
  *
  *   Raster file routines for the Common UNIX Printing System (CUPS).
  *
@@ -964,5 +964,5 @@ cups_write(int                 fd,	/* I - File descriptor */
 
 
 /*
- * End of "$Id: raster.c 5522 2006-05-15 05:02:15Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/raster.h b/filter/raster.h
index 987e00d2c..bb74543e1 100644
--- a/filter/raster.h
+++ b/filter/raster.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: raster.h 5519 2006-05-12 15:06:42Z mike $"
+ * "$Id$"
  *
  *   Raster file definitions for the Common UNIX Printing System (CUPS).
  *
@@ -342,5 +342,5 @@ extern unsigned		cupsRasterWriteHeader2(cups_raster_t *r,
 #endif /* !_CUPS_RASTER_H_ */
 
 /*
- * End of "$Id: raster.h 5519 2006-05-12 15:06:42Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index 75d2352b1..ba616591c 100644
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertoepson.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id$"
  *
  *   EPSON ESC/P and ESC/P2 filter for the Common UNIX Printing System
  *   (CUPS).
@@ -1148,5 +1148,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertoepson.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index e36c5902d..32263536f 100644
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertohp.c 4493 2005-02-18 02:09:53Z mike $"
+ * "$Id$"
  *
  *   Hewlett-Packard Page Control Language filter for the Common UNIX
  *   Printing System (CUPS).
@@ -884,5 +884,5 @@ main(int  argc,		/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertohp.c 4493 2005-02-18 02:09:53Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 90de48f82..9534467d4 100644
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rastertolabel.c 5287 2006-03-13 16:41:45Z mike $"
+ * "$Id$"
  *
  *   Label printer filter for the Common UNIX Printing System (CUPS).
  *
@@ -1003,5 +1003,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: rastertolabel.c 5287 2006-03-13 16:41:45Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/testimage.c b/filter/testimage.c
index ca5c31fb2..186ad1518 100644
--- a/filter/testimage.c
+++ b/filter/testimage.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testimage.c 4485 2005-01-03 19:30:00Z mike $"
+ * "$Id$"
  *
  *   Image library test program for the Common UNIX Printing System (CUPS).
  *
@@ -104,5 +104,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testimage.c 4485 2005-01-03 19:30:00Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/testraster.c b/filter/testraster.c
index bc35bb01a..3e9c87142 100644
--- a/filter/testraster.c
+++ b/filter/testraster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testraster.c 4545 2005-06-21 19:26:28Z mike $"
+ * "$Id$"
  *
  *   Raster test program routines for the Common UNIX Printing System (CUPS).
  *
@@ -206,5 +206,5 @@ main(void)
 
 
 /*
- * End of "$Id: testraster.c 4545 2005-06-21 19:26:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/textcommon.c b/filter/textcommon.c
index 66255e18a..6c8a28487 100644
--- a/filter/textcommon.c
+++ b/filter/textcommon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: textcommon.c 4559 2005-08-04 18:40:13Z mike $"
+ * "$Id$"
  *
  *   Common text filter routines for the Common UNIX Printing System (CUPS).
  *
@@ -1191,5 +1191,5 @@ getutf8(FILE *fp)	/* I - File to read from */
 
 
 /*
- * End of "$Id: textcommon.c 4559 2005-08-04 18:40:13Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/textcommon.h b/filter/textcommon.h
index c11737019..b5453cd61 100644
--- a/filter/textcommon.h
+++ b/filter/textcommon.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: textcommon.h 4559 2005-08-04 18:40:13Z mike $"
+ * "$Id$"
  *
  *   Common text filter definitions for the Common UNIX Printing System (CUPS).
  *
@@ -119,5 +119,5 @@ extern void	WriteProlog(const char *title, const char *user,
 
 
 /*
- * End of "$Id: textcommon.h 4559 2005-08-04 18:40:13Z mike $".
+ * End of "$Id$".
  */
diff --git a/filter/texttops.c b/filter/texttops.c
index 879672c95..5f073363f 100644
--- a/filter/texttops.c
+++ b/filter/texttops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: texttops.c 4680 2005-09-21 09:28:39Z mike $"
+ * "$Id$"
  *
  *   Text to PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -1307,5 +1307,5 @@ write_text(const char *s)	/* I - String to write */
 
 
 /*
- * End of "$Id: texttops.c 4680 2005-09-21 09:28:39Z mike $".
+ * End of "$Id$".
  */
diff --git a/fonts/Makefile b/fonts/Makefile
index b6c37c9e9..c3b00ae4f 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   Fonts makefile for the Common UNIX Printing System (CUPS).
 #
@@ -76,5 +76,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/init/cups.sh.in b/init/cups.sh.in
index 975af256c..b29159519 100755
--- a/init/cups.sh.in
+++ b/init/cups.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: cups.sh.in 5118 2006-02-16 14:29:53Z mike $"
+# "$Id$"
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
@@ -215,5 +215,5 @@ exit 0
 
 
 #
-# End of "$Id: cups.sh.in 5118 2006-02-16 14:29:53Z mike $".
+# End of "$Id$".
 #
diff --git a/locale/Makefile b/locale/Makefile
index 815645428..658311816 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5449 2006-04-22 04:05:45Z mike $"
+# "$Id$"
 #
 #   Locale file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -110,5 +110,5 @@ translate.o:	../cups/http.h ../cups/i18n.h ../cups/language.h ../cups/string.h
 
 
 #
-# End of "$Id: Makefile 5449 2006-04-22 04:05:45Z mike $".
+# End of "$Id$".
 #
diff --git a/locale/translate.c b/locale/translate.c
index e55890828..20e7533df 100644
--- a/locale/translate.c
+++ b/locale/translate.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: translate.c 5261 2006-03-09 20:47:49Z mike $"
+ * "$Id$"
  *
  *   HTTP-based translation program for the Common UNIX Printing System (CUPS).
  *
@@ -448,5 +448,5 @@ write_string(cups_file_t *fp,		/* I - File to write to */
 
 
 /*
- * End of "$Id: translate.c 5261 2006-03-09 20:47:49Z mike $".
+ * End of "$Id$".
  */
diff --git a/man/Makefile b/man/Makefile
index 6071d57e0..e2066b40d 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5472 2006-04-30 16:27:50Z mike $"
+# "$Id$"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -183,5 +183,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 5472 2006-04-30 16:27:50Z mike $".
+# End of "$Id$".
 #
diff --git a/man/accept.man b/man/accept.man
index 331d41f5b..b0867f3fc 100644
--- a/man/accept.man
+++ b/man/accept.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: accept.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   accept/reject man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -84,5 +84,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: accept.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/backend.man b/man/backend.man
index 796a46f56..ee609fa3b 100644
--- a/man/backend.man
+++ b/man/backend.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: backend.man 5313 2006-03-20 15:29:09Z mike $"
+.\" "$Id$"
 .\"
 .\"   Backend man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -184,5 +184,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: backend.man 5313 2006-03-20 15:29:09Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/classes.conf.man b/man/classes.conf.man
index eb38be57c..616dcc591 100644
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: classes.conf.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   classes.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -123,5 +123,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: classes.conf.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 55b4c8e46..fa03970c2 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: client.conf.man.in 5182 2006-02-26 04:10:27Z mike $"
+.\" "$Id$"
 .\"
 .\"   client.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -54,5 +54,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: client.conf.man.in 5182 2006-02-26 04:10:27Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cups-config.man b/man/cups-config.man
index bf0840660..58d11ac3f 100644
--- a/man/cups-config.man
+++ b/man/cups-config.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-config.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cups-config man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -115,5 +115,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cups-config.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in
index 859a3970e..12a218714 100644
--- a/man/cups-deviced.man.in
+++ b/man/cups-deviced.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-deviced.man.in 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cups-deviced man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -49,5 +49,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cups-deviced.man.in 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in
index e9f1862bd..1c326a95e 100644
--- a/man/cups-driverd.man.in
+++ b/man/cups-driverd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-driverd.man.in 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cups-driverd man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -110,5 +110,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cups-driverd.man.in 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index 14cd8258d..2dc889569 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-lpd.man.in 5455 2006-04-24 13:49:59Z mike $"
+.\" "$Id$"
 .\"
 .\"   cups-lpd man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -123,5 +123,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cups-lpd.man.in 5455 2006-04-24 13:49:59Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cups-polld.man b/man/cups-polld.man
index f75dbbc40..013e4b59b 100644
--- a/man/cups-polld.man
+++ b/man/cups-polld.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-polld.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cups-polld man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -43,5 +43,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cups-polld.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 054ee9798..babf5d9df 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 5445 2006-04-20 18:25:40Z mike $"
+.\" "$Id$"
 .\"
 .\"   cupsaddsmb man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -209,5 +209,5 @@ http://www.cups.org/windows/
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 5445 2006-04-20 18:25:40Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 31dad1041..da38d9a71 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id$"
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -607,5 +607,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index cbcc0ea91..2e4539e1d 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.man.in 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cupsd man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -74,5 +74,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsd.man.in 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cupsenable.man b/man/cupsenable.man
index e446991fc..b7eec7068 100644
--- a/man/cupsenable.man
+++ b/man/cupsenable.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsenable.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cupsenable/cupsdisable man page for the Common UNIX Printing System
 .\"   (CUPS).
@@ -89,5 +89,5 @@ http://localhost:631/help
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 
 .\"
-.\" End of "$Id: cupsenable.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
index 62db95e1f..b98106c9e 100644
--- a/man/cupstestdsc.man
+++ b/man/cupstestdsc.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupstestdsc.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cupstestdsc man page for the Common UNIX Printing System (CUPS).
 .\"
diff --git a/man/cupstestppd.man b/man/cupstestppd.man
index 149ddbf94..e6d00732e 100644
--- a/man/cupstestppd.man
+++ b/man/cupstestppd.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupstestppd.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   cupstestppd man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -111,5 +111,5 @@ Adobe PostScript Printer Description File Format Specification, Version 4.3.
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupstestppd.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/filter.man b/man/filter.man
index d3537d40a..f7e710117 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id$"
 .\"
 .\"   filter man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -226,5 +226,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lp.man b/man/lp.man
index 87ff04e67..165e49bc8 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lp.man 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id$"
 .\"
 .\"   lp man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -248,5 +248,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lp.man 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index 28d747053..cc86d63b9 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpadmin.man 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -182,5 +182,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpadmin.man 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpc.man b/man/lpc.man
index f183f3de6..d2e168422 100644
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpc.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpc man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -76,5 +76,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpc.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpinfo.man b/man/lpinfo.man
index 3d8fdfb99..a143986bf 100644
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpinfo.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpinfo man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -70,5 +70,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpinfo.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpmove.man b/man/lpmove.man
index e2f05b99a..0a36109dd 100644
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpmove.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpmove man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -71,5 +71,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpmove.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index 6b88e737c..b0cc64fff 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpoptions.man.in 5313 2006-03-20 15:29:09Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpoptions man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -140,5 +140,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpoptions.man.in 5313 2006-03-20 15:29:09Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lppasswd.man b/man/lppasswd.man
index f1d8c79c5..463c44018 100644
--- a/man/lppasswd.man
+++ b/man/lppasswd.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lppasswd.man 5313 2006-03-20 15:29:09Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -66,5 +66,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lppasswd.man 5313 2006-03-20 15:29:09Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpq.man b/man/lpq.man
index c59bf0b84..f873cace5 100644
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpq.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpq man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -77,5 +77,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpq.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpr.man b/man/lpr.man
index 6f6798b14..267af1bd6 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpr.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpr man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -123,5 +123,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpr.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lprm.man b/man/lprm.man
index 723a00808..a83ae60d2 100644
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lprm.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   lprm man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -70,5 +70,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lprm.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index 239b8d5cd..a544d0bbe 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpstat.man 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id$"
 .\"
 .\"   lpstat man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -144,5 +144,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpstat.man 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index a583231ae..6da2dda30 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mantohtml.c 5142 2006-02-21 14:52:34Z mike $"
+ * "$Id$"
  *
  *   Man page to HTML conversion program.
  *
@@ -725,5 +725,5 @@ strmove(char       *d,			/* I - Destination */
 
 
 /*
- * End of "$Id: mantohtml.c 5142 2006-02-21 14:52:34Z mike $".
+ * End of "$Id$".
  */
diff --git a/man/mime.convs.man b/man/mime.convs.man
index 37e765cb1..16cbe131f 100644
--- a/man/mime.convs.man
+++ b/man/mime.convs.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: mime.convs.man 5313 2006-03-20 15:29:09Z mike $"
+.\" "$Id$"
 .\"
 .\"   mime.convs man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -51,5 +51,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: mime.convs.man 5313 2006-03-20 15:29:09Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/mime.types.man b/man/mime.types.man
index 8b42b6c35..2a2a372d5 100644
--- a/man/mime.types.man
+++ b/man/mime.types.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: mime.types.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   mime.types man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -99,5 +99,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: mime.types.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/printers.conf.man b/man/printers.conf.man
index 45dedb85a..1e3c2ba43 100644
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: printers.conf.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   printers.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -127,5 +127,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: printers.conf.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man
index 15223a105..874e9faeb 100644
--- a/man/subscriptions.conf.man
+++ b/man/subscriptions.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: subscriptions.conf.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id$"
 .\"
 .\"   subscriptions.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -94,5 +94,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: subscriptions.conf.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id$".
 .\"
diff --git a/monitor/Makefile b/monitor/Makefile
index e7ae20c7a..16cf2ece7 100644
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   Port monitor makefile for the Common UNIX Printing System (CUPS).
 #
@@ -103,5 +103,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/monitor/bcp.c b/monitor/bcp.c
index 7b19e4b84..2a74a0c0e 100644
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: bcp.c 5087 2006-02-07 03:43:29Z mike $"
+ * "$Id$"
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
@@ -282,5 +282,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id: bcp.c 5087 2006-02-07 03:43:29Z mike $".
+ * End of "$Id$".
  */
diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 400e1ce0b..5ce91d8db 100644
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: tbcp.c 5087 2006-02-07 03:43:29Z mike $"
+ * "$Id$"
  *
  *   TBCP port monitor for the Common UNIX Printing System (CUPS).
  *
@@ -279,5 +279,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id: tbcp.c 5087 2006-02-07 03:43:29Z mike $".
+ * End of "$Id$".
  */
diff --git a/notifier/Makefile b/notifier/Makefile
index ecfd7a51f..fca98392a 100644
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   Notifier makefile for the Common UNIX Printing System (CUPS).
 #
@@ -99,5 +99,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/notifier/mailto.c b/notifier/mailto.c
index afa1a30d0..05bf912c0 100644
--- a/notifier/mailto.c
+++ b/notifier/mailto.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mailto.c 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id$"
  *
  *   "mailto" notifier for the Common UNIX Printing System (CUPS).
  *
@@ -795,5 +795,5 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
 
 
 /*
- * End of "$Id: mailto.c 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index d334a4a9e..915746893 100644
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testnotify.c 4829 2005-11-12 03:15:10Z mike $"
+ * "$Id$"
  *
  *   Test notifier for the Common UNIX Printing System (CUPS).
  *
@@ -281,5 +281,5 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
 
 
 /*
- * End of "$Id: testnotify.c 4829 2005-11-12 03:15:10Z mike $".
+ * End of "$Id$".
  */
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 863a9281a..ab1d520e2 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.list.in 5472 2006-04-30 16:27:50Z mike $"
+# "$Id$"
 #
 #   ESP Package Manager (EPM) file list for the Common UNIX Printing
 #   System (CUPS).
@@ -550,5 +550,5 @@ f 0644 root sys $AMANDIR/man$MAN8DIR/cups-lpd.$MAN8EXT man/cups-lpd.$MAN8EXT
 i 0755 root sys cups init/cups.sh
 
 #
-# End of "$Id: cups.list.in 5472 2006-04-30 16:27:50Z mike $".
+# End of "$Id$".
 #
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index bc799e7c0..fd5d95567 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec.in 5449 2006-04-22 04:05:45Z mike $"
+# "$Id$"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -419,5 +419,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 5449 2006-04-22 04:05:45Z mike $".
+# End of "$Id$".
 #
diff --git a/pdftops/Makefile b/pdftops/Makefile
index 1cc9e861a..04ffa61de 100644
--- a/pdftops/Makefile
+++ b/pdftops/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5491 2006-05-04 20:53:35Z mike $"
+# "$Id$"
 #
 #   pdftops filter Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -143,5 +143,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5491 2006-05-04 20:53:35Z mike $".
+# End of "$Id$".
 #
diff --git a/pdftops/pdftops.cxx b/pdftops/pdftops.cxx
index b9459cfa9..1f1c534be 100644
--- a/pdftops/pdftops.cxx
+++ b/pdftops/pdftops.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: pdftops.cxx 4906 2006-01-10 20:53:28Z mike $"
+// "$Id$"
 //
 //   PDF to PostScript filter front-end for the Common UNIX Printing
 //   System (CUPS).
@@ -341,5 +341,5 @@ main(int  argc,				// I - Number of command-line args
 
 
 //
-// End of "$Id: pdftops.cxx 4906 2006-01-10 20:53:28Z mike $".
+// End of "$Id$".
 //
diff --git a/ppd/Makefile b/ppd/Makefile
index 0307dc54b..017040176 100644
--- a/ppd/Makefile
+++ b/ppd/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   PPD file makefile for the Common UNIX Printing System (CUPS).
 #
@@ -79,5 +79,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/ppd/deskjet.ppd b/ppd/deskjet.ppd
index 4752f013a..cdb02fbae 100644
--- a/ppd/deskjet.ppd
+++ b/ppd/deskjet.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: deskjet.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample HP DeskJet driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -195,5 +195,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: deskjet.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/deskjet2.ppd b/ppd/deskjet2.ppd
index f583b08d6..dadd7d88e 100644
--- a/ppd/deskjet2.ppd
+++ b/ppd/deskjet2.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: deskjet2.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Second sample HP DeskJet driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -214,5 +214,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: deskjet2.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/dymo.ppd b/ppd/dymo.ppd
index 69426a938..6c6ad8e90 100644
--- a/ppd/dymo.ppd
+++ b/ppd/dymo.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: dymo.ppd 5130 2006-02-17 20:25:33Z mike $"
+*% "$Id$"
 *%
 *%   Sample DYMO label printer driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -152,5 +152,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: dymo.ppd 5130 2006-02-17 20:25:33Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/epson24.ppd b/ppd/epson24.ppd
index 689c2c368..d28c479ae 100644
--- a/ppd/epson24.ppd
+++ b/ppd/epson24.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: epson24.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample EPSON 24-Pin driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -135,5 +135,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: epson24.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/epson9.ppd b/ppd/epson9.ppd
index 97470aa00..63b1f0618 100644
--- a/ppd/epson9.ppd
+++ b/ppd/epson9.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: epson9.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample EPSON 9-Pin driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -133,5 +133,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: epson9.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/laserjet.ppd b/ppd/laserjet.ppd
index 5c02dcecb..e2590d77e 100644
--- a/ppd/laserjet.ppd
+++ b/ppd/laserjet.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: laserjet.ppd 4905 2006-01-10 20:07:15Z mike $"
+*% "$Id$"
 *%
 *%   Sample HP LaserJet driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -197,5 +197,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: laserjet.ppd 4905 2006-01-10 20:07:15Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/okidat24.ppd b/ppd/okidat24.ppd
index b60f0634d..5fa617ca4 100644
--- a/ppd/okidat24.ppd
+++ b/ppd/okidat24.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: okidat24.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample OKIDATA 24-Pin driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -125,5 +125,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: okidat24.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/okidata9.ppd b/ppd/okidata9.ppd
index 189c8db6d..d5b4c7090 100644
--- a/ppd/okidata9.ppd
+++ b/ppd/okidata9.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: okidata9.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample OKIDATA 9-Pin driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -123,5 +123,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: okidata9.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/stcolor.ppd b/ppd/stcolor.ppd
index aba03926b..f8077b665 100644
--- a/ppd/stcolor.ppd
+++ b/ppd/stcolor.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: stcolor.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample EPSON Stylus Color driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -129,5 +129,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: stcolor.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/stcolor2.ppd b/ppd/stcolor2.ppd
index f66142b47..7132cacf5 100644
--- a/ppd/stcolor2.ppd
+++ b/ppd/stcolor2.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: stcolor2.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample EPSON Stylus Color driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -129,5 +129,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: stcolor2.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/stphoto.ppd b/ppd/stphoto.ppd
index ce01eba5f..c1e1675ae 100644
--- a/ppd/stphoto.ppd
+++ b/ppd/stphoto.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: stphoto.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample EPSON Stylus Photo driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -129,5 +129,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: stphoto.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/stphoto2.ppd b/ppd/stphoto2.ppd
index f093582da..e526302be 100644
--- a/ppd/stphoto2.ppd
+++ b/ppd/stphoto2.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: stphoto2.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample EPSON Stylus Photo driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -129,5 +129,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: stphoto2.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/zebra.ppd b/ppd/zebra.ppd
index 536896cb4..8e78489b6 100644
--- a/ppd/zebra.ppd
+++ b/ppd/zebra.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: zebra.ppd 5511 2006-05-11 17:43:12Z mike $"
+*% "$Id$"
 *%
 *%   Sample Zebra label printer driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -479,5 +479,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: zebra.ppd 5511 2006-05-11 17:43:12Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/zebracpl.ppd b/ppd/zebracpl.ppd
index db46f8d03..fe51f0358 100644
--- a/ppd/zebracpl.ppd
+++ b/ppd/zebracpl.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: zebra.ppd 4905 2006-01-10 20:07:15Z mike $"
+*% "$Id$"
 *%
 *%   Sample Zebra label printer driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -268,5 +268,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: zebra.ppd 4905 2006-01-10 20:07:15Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/zebraep1.ppd b/ppd/zebraep1.ppd
index 1e157654b..4435bac00 100644
--- a/ppd/zebraep1.ppd
+++ b/ppd/zebraep1.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample Zebra label printer driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -326,5 +326,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/ppd/zebraep2.ppd b/ppd/zebraep2.ppd
index 6bd774713..471a15798 100644
--- a/ppd/zebraep2.ppd
+++ b/ppd/zebraep2.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $"
+*% "$Id$"
 *%
 *%   Sample Zebra label printer driver PPD file for the Common UNIX Printing
 *%   System (CUPS).
@@ -338,5 +338,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: zebra.ppd 4880 2005-12-15 16:19:46Z mike $".
+*% End of "$Id$".
 *%
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 403997bb9..367f039f1 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -274,5 +274,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/scheduler/auth.c b/scheduler/auth.c
index ea9a07101..ee781150c 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.c 5568 2006-05-22 15:34:01Z mike $"
+ * "$Id$"
  *
  *   Authorization routines for the Common UNIX Printing System (CUPS).
  *
@@ -2168,5 +2168,5 @@ to64(char          *s,			/* O - Output string */
 
 
 /*
- * End of "$Id: auth.c 5568 2006-05-22 15:34:01Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/auth.h b/scheduler/auth.h
index 87bd72cd9..cd2e98e2f 100644
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: auth.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Authorization definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -158,5 +158,5 @@ extern http_status_t	cupsdIsAuthorized(cupsd_client_t *con, const char *owner);
 
 
 /*
- * End of "$Id: auth.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/banners.c b/scheduler/banners.c
index d83540c87..c7e6eb533 100644
--- a/scheduler/banners.c
+++ b/scheduler/banners.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: banners.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Banner routines for the Common UNIX Printing System (CUPS).
  *
@@ -215,5 +215,5 @@ free_banners(void)
 
 
 /*
- * End of "$Id: banners.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/banners.h b/scheduler/banners.h
index bff0e333f..2dc4ac594 100644
--- a/scheduler/banners.h
+++ b/scheduler/banners.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: banners.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Banner definitions for the Common UNIX Printing System (CUPS).
  *
@@ -50,5 +50,5 @@ extern void		cupsdLoadBanners(const char *d);
 
 
 /*
- * End of "$Id: banners.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cert.c b/scheduler/cert.c
index 8a0d7a161..10e8d93e3 100644
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $"
+ * "$Id$"
  *
  *   Authentication certificate routines for the Common UNIX
  *   Printing System (CUPS).
@@ -426,5 +426,5 @@ cupsdInitCerts(void)
 
 
 /*
- * End of "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cert.h b/scheduler/cert.h
index 2da5a3b8b..3d9ad2044 100644
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.h 4719 2005-09-28 21:12:44Z mike $"
+ * "$Id$"
  *
  *   Authentication certificate definitions for the Common UNIX
  *   Printing System (CUPS).
@@ -56,5 +56,5 @@ extern void		cupsdInitCerts(void);
 
 
 /*
- * End of "$Id: cert.h 4719 2005-09-28 21:12:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/classes.c b/scheduler/classes.c
index 749a1bda0..53a672c19 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.c 5151 2006-02-22 22:43:17Z mike $"
+ * "$Id$"
  *
  *   Printer class routines for the Common UNIX Printing System (CUPS).
  *
@@ -864,5 +864,5 @@ cupsdUpdateImplicitClasses(void)
 
 
 /*
- * End of "$Id: classes.c 5151 2006-02-22 22:43:17Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/classes.h b/scheduler/classes.h
index 5b9968167..7667742e7 100644
--- a/scheduler/classes.h
+++ b/scheduler/classes.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: classes.h 4719 2005-09-28 21:12:44Z mike $"
+ * "$Id$"
  *
  *   Printer class definitions for the Common UNIX Printing System (CUPS).
  *
@@ -42,5 +42,5 @@ extern void		cupsdUpdateImplicitClasses(void);
 
 
 /*
- * End of "$Id: classes.h 4719 2005-09-28 21:12:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/client.c b/scheduler/client.c
index 580097713..526e55bcc 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.c 5568 2006-05-22 15:34:01Z mike $"
+ * "$Id$"
  *
  *   Client routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -3825,5 +3825,5 @@ write_file(cupsd_client_t *con,		/* I - Client connection */
 
 
 /*
- * End of "$Id: client.c 5568 2006-05-22 15:34:01Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/client.h b/scheduler/client.h
index 7a7b70cd7..f2965d87e 100644
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: client.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Client definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -121,5 +121,5 @@ extern int	cupsdWriteClient(cupsd_client_t *con);
 
 
 /*
- * End of "$Id: client.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 69c013de7..10677426f 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.c 5482 2006-05-02 18:13:40Z mike $"
+ * "$Id$"
  *
  *   Configuration routines for the Common UNIX Printing System (CUPS).
  *
@@ -3261,5 +3261,5 @@ read_policy(cups_file_t *fp,		/* I - Configuration file */
 
 
 /*
- * End of "$Id: conf.c 5482 2006-05-02 18:13:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/conf.h b/scheduler/conf.h
index 7b6eea95c..605b39ea0 100644
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: conf.h 5216 2006-03-02 17:47:53Z mike $"
+ * "$Id$"
  *
  *   Configuration file definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -210,5 +210,5 @@ extern int	cupsdLogPage(cupsd_job_t *job, const char *page);
 
 
 /*
- * End of "$Id: conf.h 5216 2006-03-02 17:47:53Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 00ad8b860..c148753a5 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-deviced.c 5244 2006-03-08 12:12:12Z mike $"
+ * "$Id$"
  *
  *   Device scanning mini-daemon for the Common UNIX Printing System (CUPS).
  *
@@ -500,5 +500,5 @@ sigalrm_handler(int sig)		/* I - Signal number */
 
 
 /*
- * End of "$Id: cups-deviced.c 5244 2006-03-08 12:12:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cups-driverd.c b/scheduler/cups-driverd.c
index 1e0b1e45b..cbe2ebd32 100644
--- a/scheduler/cups-driverd.c
+++ b/scheduler/cups-driverd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-driverd.c 5422 2006-04-18 15:16:00Z mike $"
+ * "$Id$"
  *
  *   PPD/driver support for the Common UNIX Printing System (CUPS).
  *
@@ -1113,5 +1113,5 @@ load_drivers(void)
 
 
 /*
- * End of "$Id: cups-driverd.c 5422 2006-04-18 15:16:00Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c
index 60b68090f..0db521d07 100644
--- a/scheduler/cups-lpd.c
+++ b/scheduler/cups-lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-lpd.c 5455 2006-04-24 13:49:59Z mike $"
+ * "$Id$"
  *
  *   Line Printer Daemon interface for the Common UNIX Printing System (CUPS).
  *
@@ -1716,5 +1716,5 @@ smart_gets(char *s,			/* I - Pointer to line buffer */
 
 
 /*
- * End of "$Id: cups-lpd.c 5455 2006-04-24 13:49:59Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cups-polld.c b/scheduler/cups-polld.c
index 0a8b4c12a..a79ff63ca 100644
--- a/scheduler/cups-polld.c
+++ b/scheduler/cups-polld.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups-polld.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Polling daemon for the Common UNIX Printing System (CUPS).
  *
@@ -402,5 +402,5 @@ poll_server(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id: cups-polld.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index dbdca8bef..ebaa350aa 100644
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Main header file for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -204,5 +204,5 @@ extern int	cupsdStartProcess(const char *command, char *argv[],
 
 
 /*
- * End of "$Id: cupsd.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index d1b8ab792..ddc99b259 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 5549 2006-05-19 19:39:28Z mike $"
+ * "$Id$"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -3130,5 +3130,5 @@ slp_url_callback(
 
 
 /*
- * End of "$Id: dirsvc.c 5549 2006-05-19 19:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index 171933f93..f8d8c5adf 100644
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.h 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Directory services definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -180,5 +180,5 @@ extern void	cupsdUpdateSLPBrowse(void);
 
 
 /*
- * End of "$Id: dirsvc.h 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/env.c b/scheduler/env.c
index e6f84084c..5137217fb 100644
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: env.c 5373 2006-04-06 20:03:32Z mike $"
+ * "$Id$"
  *
  *   Environment management routines for the Common UNIX Printing System (CUPS).
  *
@@ -245,5 +245,5 @@ clear_env(void)
 
 
 /*
- * End of "$Id: env.c 5373 2006-04-06 20:03:32Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/filter.c b/scheduler/filter.c
index bb6390072..e97e2541b 100644
--- a/scheduler/filter.c
+++ b/scheduler/filter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: filter.c 5493 2006-05-05 16:33:57Z mike $"
+ * "$Id$"
  *
  *   File type conversion routines for the Common UNIX Printing System (CUPS).
  *
@@ -409,5 +409,5 @@ lookup(mime_t      *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id: filter.c 5493 2006-05-05 16:33:57Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 277196017..929654951 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp.c 5554 2006-05-20 12:23:40Z mike $"
+ * "$Id$"
  *
  *   IPP routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -9170,5 +9170,5 @@ validate_user(cupsd_job_t    *job,	/* I - Job */
 
 
 /*
- * End of "$Id: ipp.c 5554 2006-05-20 12:23:40Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/job.c b/scheduler/job.c
index 2cd60b616..9c04db161 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.c 5545 2006-05-18 21:00:56Z mike $"
+ * "$Id$"
  *
  *   Job management routines for the Common UNIX Printing System (CUPS).
  *
@@ -3455,5 +3455,5 @@ unload_job(cupsd_job_t *job)		/* I - Job */
 
 
 /*
- * End of "$Id: job.c 5545 2006-05-18 21:00:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/job.h b/scheduler/job.h
index 93bb774b2..33ff791a7 100644
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: job.h 5393 2006-04-14 18:17:18Z mike $"
+ * "$Id$"
  *
  *   Print job definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -121,5 +121,5 @@ extern void		cupsdUpdateJob(cupsd_job_t *job);
 
 
 /*
- * End of "$Id: job.h 5393 2006-04-14 18:17:18Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/listen.c b/scheduler/listen.c
index 467dcfdc8..37911059e 100644
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: listen.c 5083 2006-02-06 02:57:43Z mike $"
+ * "$Id$"
  *
  *   Server listening routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -439,5 +439,5 @@ cupsdStopListening(void)
 
 
 /*
- * End of "$Id: listen.c 5083 2006-02-06 02:57:43Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/log.c b/scheduler/log.c
index a53029f55..9c16c2d03 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: log.c 5493 2006-05-05 16:33:57Z mike $"
+ * "$Id$"
  *
  *   Log file routines for the Common UNIX Printing System (CUPS).
  *
@@ -546,5 +546,5 @@ check_log_file(cups_file_t **lf,	/* IO - Log file */
 
 
 /*
- * End of "$Id: log.c 5493 2006-05-05 16:33:57Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/main.c b/scheduler/main.c
index fa297b919..6e49fb8ab 100644
--- a/scheduler/main.c
+++ b/scheduler/main.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: main.c 5491 2006-05-04 20:53:35Z mike $"
+ * "$Id$"
  *
  *   Scheduler main loop for the Common UNIX Printing System (CUPS).
  *
@@ -2253,5 +2253,5 @@ usage(int status)			/* O - Exit status */
 
 
 /*
- * End of "$Id: main.c 5491 2006-05-04 20:53:35Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/mime.c b/scheduler/mime.c
index fc1f3fac7..0aa3d92e1 100644
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.c 5495 2006-05-05 17:58:07Z mike $"
+ * "$Id$"
  *
  *   MIME database file routines for the Common UNIX Printing System (CUPS).
  *
@@ -723,5 +723,5 @@ load_types(mime_t     *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id: mime.c 5495 2006-05-05 17:58:07Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/mime.h b/scheduler/mime.h
index 9c5aa6448..9f46aded4 100644
--- a/scheduler/mime.h
+++ b/scheduler/mime.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: mime.h 5487 2006-05-03 19:28:29Z mike $"
+ * "$Id$"
  *
  *   MIME type/conversion database definitions for the Common UNIX Printing System (CUPS).
  *
@@ -153,5 +153,5 @@ extern int		mimeNumFilters(mime_t *mime);
 #endif /* !_CUPS_MIME_H_ */
 
 /*
- * End of "$Id: mime.h 5487 2006-05-03 19:28:29Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/network.c b/scheduler/network.c
index eb89b1217..b4d96ebaa 100644
--- a/scheduler/network.c
+++ b/scheduler/network.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.c 5428 2006-04-18 20:45:30Z mike $"
+ * "$Id$"
  *
  *   Network interface functions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -314,5 +314,5 @@ compare_netif(cupsd_netif_t *a,		/* I - First network interface */
 
 
 /*
- * End of "$Id: network.c 5428 2006-04-18 20:45:30Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/network.h b/scheduler/network.h
index 21e810c3c..10e10cac8 100644
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: network.h 5043 2006-02-01 18:55:16Z mike $"
+ * "$Id$"
  *
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
@@ -57,5 +57,5 @@ extern void		cupsdNetIFUpdate(void);
 
 
 /*
- * End of "$Id: network.h 5043 2006-02-01 18:55:16Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/policy.c b/scheduler/policy.c
index e869c48ee..db851adc6 100644
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.c 5247 2006-03-08 13:43:38Z mike $"
+ * "$Id$"
  *
  *   Policy routines for the Common UNIX Printing System (CUPS).
  *
@@ -330,5 +330,5 @@ cupsdFindPolicyOp(cupsd_policy_t *p,	/* I - Policy */
 
 
 /*
- * End of "$Id: policy.c 5247 2006-03-08 13:43:38Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/policy.h b/scheduler/policy.h
index 4f7165664..34502b187 100644
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: policy.h 4871 2005-12-07 00:41:11Z mike $"
+ * "$Id$"
  *
  *   Policy definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -62,5 +62,5 @@ extern cupsd_location_t	*cupsdFindPolicyOp(cupsd_policy_t *p, ipp_op_t op);
 
 
 /*
- * End of "$Id: policy.h 4871 2005-12-07 00:41:11Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/printers.c b/scheduler/printers.c
index f6511b939..f6d939a41 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c 5535 2006-05-16 19:47:26Z mike $"
+ * "$Id$"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -3280,5 +3280,5 @@ write_irix_state(cupsd_printer_t *p)	/* I - Printer to update */
 
 
 /*
- * End of "$Id: printers.c 5535 2006-05-16 19:47:26Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/printers.h b/scheduler/printers.h
index ef8b34709..4b1629098 100644
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.h 5330 2006-03-23 21:07:20Z mike $"
+ * "$Id$"
  *
  *   Printer definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -146,5 +146,5 @@ extern char		*cupsdSanitizeURI(const char *uri, char *buffer,
 
 
 /*
- * End of "$Id: printers.h 5330 2006-03-23 21:07:20Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/process.c b/scheduler/process.c
index 5af7e5eef..03cdbd929 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: process.c 5376 2006-04-06 20:32:07Z mike $"
+ * "$Id$"
  *
  *   Process management routines for the Common UNIX Printing System (CUPS).
  *
@@ -344,5 +344,5 @@ compare_procs(cupsd_proc_t *a,		/* I - First process */
 
 
 /*
- * End of "$Id: process.c 5376 2006-04-06 20:32:07Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index db10d8677..e00f6ae37 100644
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: quotas.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Quota routines for the Common UNIX Printing System (CUPS).
  *
@@ -230,5 +230,5 @@ find_quota(cupsd_printer_t *p,		/* I - Printer */
 
 
 /*
- * End of "$Id: quotas.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/server.c b/scheduler/server.c
index bcc3c71e6..057f7767a 100644
--- a/scheduler/server.c
+++ b/scheduler/server.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: server.c 5493 2006-05-05 16:33:57Z mike $"
+ * "$Id$"
  *
  *   Server start/stop routines for the Common UNIX Printing System (CUPS).
  *
@@ -211,5 +211,5 @@ cupsdStopServer(void)
 
 
 /*
- * End of "$Id: server.c 5493 2006-05-05 16:33:57Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c
index eb257d787..cba454ae8 100644
--- a/scheduler/statbuf.c
+++ b/scheduler/statbuf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.c 5447 2006-04-21 20:07:51Z mike $"
+ * "$Id$"
  *
  *   Status buffer routines for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -330,5 +330,5 @@ cupsdStatBufUpdate(cupsd_statbuf_t *sb,	/* I - Status buffer */
 
 
 /*
- * End of "$Id: statbuf.c 5447 2006-04-21 20:07:51Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h
index fc3601533..729ba2241 100644
--- a/scheduler/statbuf.h
+++ b/scheduler/statbuf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: statbuf.h 4613 2005-08-30 12:41:48Z mike $"
+ * "$Id$"
  *
  *   Status buffer definitions for the Common UNIX Printing System (CUPS)
  *   scheduler.
@@ -55,5 +55,5 @@ extern char		*cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel,
 
 
 /*
- * End of "$Id: statbuf.h 4613 2005-08-30 12:41:48Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index 4841020c7..56f21d1d6 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: subscriptions.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Subscription routines for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -1661,5 +1661,5 @@ cupsd_start_notifier(
 
 
 /*
- * End of "$Id: subscriptions.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h
index ca5bb5807..8f98199ca 100644
--- a/scheduler/subscriptions.h
+++ b/scheduler/subscriptions.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: subscriptions.h 5373 2006-04-06 20:03:32Z mike $"
+ * "$Id$"
  *
  *   Subscription definitions for the Common UNIX Printing System (CUPS) scheduler.
  *
@@ -170,5 +170,5 @@ extern void	cupsdUpdateNotifierStatus(void);
 
 
 /*
- * End of "$Id: subscriptions.h 5373 2006-04-06 20:03:32Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index f83319853..d000c18ed 100644
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: sysman.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   System management definitions for the Common UNIX Printing System (CUPS).
  *
@@ -727,5 +727,5 @@ sysEventTimerNotifier(
 
 
 /*
- * End of "$Id: sysman.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/sysman.h b/scheduler/sysman.h
index 3119b134b..2a0d77263 100644
--- a/scheduler/sysman.h
+++ b/scheduler/sysman.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: sysman.h 5007 2006-01-27 18:25:42Z mike $"
+ * "$Id$"
  *
  *   System management definitions for the Common UNIX Printing System (CUPS).
  *
@@ -45,5 +45,5 @@ extern void	cupsdUpdateSystemMonitor(void);
 
 
 /*
- * End of "$Id: sysman.h 5007 2006-01-27 18:25:42Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/testdirsvc.c b/scheduler/testdirsvc.c
index 60378ebbe..83cb028d8 100644
--- a/scheduler/testdirsvc.c
+++ b/scheduler/testdirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testdirsvc.c 5301 2006-03-17 23:44:33Z mike $"
+ * "$Id$"
  *
  *   Browsing test program for the Common UNIX Printing System (CUPS).
  *
@@ -331,5 +331,5 @@ usage(void)
 
 
 /*
- * End of "$Id: testdirsvc.c 5301 2006-03-17 23:44:33Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index 889f5591f..196d1211f 100644
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testmime.c 5535 2006-05-16 19:47:26Z mike $"
+ * "$Id$"
  *
  *   MIME test program for the Common UNIX Printing System (CUPS).
  *
@@ -331,5 +331,5 @@ type_dir(mime_t     *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id: testmime.c 5535 2006-05-16 19:47:26Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c
index 559dfa8e4..1e99879cf 100644
--- a/scheduler/testspeed.c
+++ b/scheduler/testspeed.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testspeed.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Scheduler speed test for the Common UNIX Printing System (CUPS).
  *
@@ -303,5 +303,5 @@ usage(void)
 
 
 /*
- * End of "$Id: testspeed.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/type.c b/scheduler/type.c
index 79f7a229b..fd117ca0c 100644
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: type.c 5180 2006-02-26 01:31:45Z mike $"
+ * "$Id$"
  *
  *   MIME typing routines for the Common UNIX Printing System (CUPS).
  *
@@ -1161,5 +1161,5 @@ patmatch(const char *s,		/* I - String to match against */
 
 
 /*
- * End of "$Id: type.c 5180 2006-02-26 01:31:45Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/util.c b/scheduler/util.c
index 966c68250..a0d40a704 100644
--- a/scheduler/util.c
+++ b/scheduler/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Mini-daemon utility functions for the Common UNIX Printing System (CUPS).
  *
@@ -277,5 +277,5 @@ cupsdSendIPPTrailer(void)
 
 
 /*
- * End of "$Id: util.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */
diff --git a/scheduler/util.h b/scheduler/util.h
index e08a3d73d..285c246dc 100644
--- a/scheduler/util.h
+++ b/scheduler/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: util.h 4598 2005-08-25 21:36:26Z mike $"
+ * "$Id$"
  *
  *   Mini-daemon utility definitions for the Common UNIX Printing System (CUPS).
  *
@@ -55,5 +55,5 @@ extern void	cupsdSendIPPTrailer(void);
 #endif /* !_CUPSD_UTIL_H_ */
 
 /*
- * End of "$Id: util.h 4598 2005-08-25 21:36:26Z mike $".
+ * End of "$Id$".
  */
diff --git a/scripting/php/Makefile b/scripting/php/Makefile
index 3960571b3..dfa6c7db3 100644
--- a/scripting/php/Makefile
+++ b/scripting/php/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 3572 2003-04-08 19:56:25Z mike $"
+# "$Id$"
 #
 #   PHP Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -112,5 +112,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 3572 2003-04-08 19:56:25Z mike $".
+# End of "$Id$".
 #
diff --git a/scripting/php/phpcups.c b/scripting/php/phpcups.c
index 845177345..3faf1a192 100644
--- a/scripting/php/phpcups.c
+++ b/scripting/php/phpcups.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: phpcups.c 5171 2006-02-25 08:44:43Z mike $"
+ * "$Id$"
  *
  *   Printing utilities for the Common UNIX Printing System (CUPS).
  *
@@ -454,5 +454,5 @@ PHP_FUNCTION(cups_print_files)
 
 
 /*
- * End of "$Id: phpcups.c 5171 2006-02-25 08:44:43Z mike $".
+ * End of "$Id$".
  */
diff --git a/scripting/php/phpcups.h b/scripting/php/phpcups.h
index a318dad6f..ef79ad13f 100644
--- a/scripting/php/phpcups.h
+++ b/scripting/php/phpcups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: phpcups.h 5171 2006-02-25 08:44:43Z mike $"
+ * "$Id$"
  *
  *   PHP module include file for the Common UNIX Printing System (CUPS).
  *
@@ -75,5 +75,5 @@ PHP_FUNCTION(cups_print_files);
 
 
 /*
- * End of "$Id: phpcups.h 5171 2006-02-25 08:44:43Z mike $".
+ * End of "$Id$".
  */
diff --git a/standards/Makefile b/standards/Makefile
index c7bd373fc..4abbb9d0d 100644
--- a/standards/Makefile
+++ b/standards/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5409 2006-04-15 11:45:38Z mike $"
+# "$Id$"
 #
 #   Standards makefile for the Common UNIX Printing System (CUPS).
 #
@@ -117,5 +117,5 @@ rfctohtml:	rfctohtml.o ../cups/libcups.a
 
 
 #
-# End of "$Id: Makefile 5409 2006-04-15 11:45:38Z mike $".
+# End of "$Id$".
 #
diff --git a/standards/rfctohtml.c b/standards/rfctohtml.c
index 64f6b4688..4e0f267c4 100644
--- a/standards/rfctohtml.c
+++ b/standards/rfctohtml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: rfctohtml.c 5143 2006-02-21 19:13:01Z mike $"
+ * "$Id$"
  *
  *   RFC file to HTML conversion program.
  *
@@ -501,5 +501,5 @@ put_line(cups_file_t *fp,		/* I - File */
 
 
 /*
- * End of "$Id: rfctohtml.c 5143 2006-02-21 19:13:01Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/Makefile b/systemv/Makefile
index 14326f534..bd7546d96 100644
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5317 2006-03-21 02:35:37Z mike $"
+# "$Id$"
 #
 #   System V commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -225,5 +225,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5317 2006-03-21 02:35:37Z mike $".
+# End of "$Id$".
 #
diff --git a/systemv/accept.c b/systemv/accept.c
index 14f7201d4..ed6aa44ee 100644
--- a/systemv/accept.c
+++ b/systemv/accept.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: accept.c 5104 2006-02-15 03:21:04Z mike $"
+ * "$Id$"
  *
  *   "accept", "disable", "enable", and "reject" commands for the Common
  *   UNIX Printing System (CUPS).
@@ -286,5 +286,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: accept.c 5104 2006-02-15 03:21:04Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/cancel.c b/systemv/cancel.c
index 63c92fcfa..1ed4ff715 100644
--- a/systemv/cancel.c
+++ b/systemv/cancel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cancel.c 5091 2006-02-08 18:39:56Z mike $"
+ * "$Id$"
  *
  *   "cancel" command for the Common UNIX Printing System (CUPS).
  *
@@ -387,5 +387,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: cancel.c 5091 2006-02-08 18:39:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c
index a69e113f1..f90bea988 100644
--- a/systemv/cupsaddsmb.c
+++ b/systemv/cupsaddsmb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupsaddsmb.c 5233 2006-03-06 03:39:28Z mike $"
+ * "$Id$"
  *
  *   "cupsaddsmb" command for the Common UNIX Printing System (CUPS).
  *
@@ -290,5 +290,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupsaddsmb.c 5233 2006-03-06 03:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c
index b9d5ac2d3..93f9fcba6 100644
--- a/systemv/cupstestdsc.c
+++ b/systemv/cupstestdsc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestdsc.c 5392 2006-04-14 17:50:39Z mike $"
+ * "$Id$"
  *
  *   DSC test program for the Common UNIX Printing System (CUPS).
  *
@@ -452,5 +452,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupstestdsc.c 5392 2006-04-14 17:50:39Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index 20c3c0a34..561913658 100644
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cupstestppd.c 5549 2006-05-19 19:39:28Z mike $"
+ * "$Id$"
  *
  *   PPD test program for the Common UNIX Printing System (CUPS).
  *
@@ -1730,5 +1730,5 @@ usage(void)
 
 
 /*
- * End of "$Id: cupstestppd.c 5549 2006-05-19 19:39:28Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lp.c b/systemv/lp.c
index ee2ac802b..9cdb70293 100644
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lp.c 5235 2006-03-06 13:02:23Z mike $"
+ * "$Id$"
  *
  *   "lp" command for the Common UNIX Printing System (CUPS).
  *
@@ -838,5 +838,5 @@ sighandler(int s)			/* I - Signal number */
 
 
 /*
- * End of "$Id: lp.c 5235 2006-03-06 13:02:23Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index c0467fa76..f307d883b 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpadmin.c 5545 2006-05-18 21:00:56Z mike $"
+ * "$Id$"
  *
  *   "lpadmin" command for the Common UNIX Printing System (CUPS).
  *
@@ -1984,5 +1984,5 @@ validate_name(const char *name)		/* I - Name to check */
 
 
 /*
- * End of "$Id: lpadmin.c 5545 2006-05-18 21:00:56Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c
index df8bef1aa..d64a9158a 100644
--- a/systemv/lpinfo.c
+++ b/systemv/lpinfo.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpinfo.c 4925 2006-01-13 02:52:47Z mike $"
+ * "$Id$"
  *
  *   "lpinfo" command for the Common UNIX Printing System (CUPS).
  *
@@ -434,5 +434,5 @@ show_models(http_t *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpinfo.c 4925 2006-01-13 02:52:47Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lpmove.c b/systemv/lpmove.c
index 8f9fdefbf..c515c4ea8 100644
--- a/systemv/lpmove.c
+++ b/systemv/lpmove.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpmove.c 5023 2006-01-29 14:39:44Z mike $"
+ * "$Id$"
  *
  *   "lpmove" command for the Common UNIX Printing System (CUPS).
  *
@@ -233,5 +233,5 @@ move_job(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpmove.c 5023 2006-01-29 14:39:44Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c
index 8e6441d8a..8c4edc599 100644
--- a/systemv/lpoptions.c
+++ b/systemv/lpoptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpoptions.c 4924 2006-01-13 01:55:20Z mike $"
+ * "$Id$"
  *
  *   Printer option program for the Common UNIX Printing System (CUPS).
  *
@@ -452,5 +452,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpoptions.c 4924 2006-01-13 01:55:20Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c
index d9822a07e..788087e8f 100644
--- a/systemv/lppasswd.c
+++ b/systemv/lppasswd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lppasswd.c 4924 2006-01-13 01:55:20Z mike $"
+ * "$Id$"
  *
  *   MD5 password program for the Common UNIX Printing System (CUPS).
  *
@@ -509,5 +509,5 @@ usage(FILE *fp)		/* I - File to send usage to */
 
 
 /*
- * End of "$Id: lppasswd.c 4924 2006-01-13 01:55:20Z mike $".
+ * End of "$Id$".
  */
diff --git a/systemv/lpstat.c b/systemv/lpstat.c
index 731625eda..ef1b3e7a3 100644
--- a/systemv/lpstat.c
+++ b/systemv/lpstat.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: lpstat.c 5529 2006-05-15 20:06:46Z mike $"
+ * "$Id$"
  *
  *   "lpstat" command for the Common UNIX Printing System (CUPS).
  *
@@ -2248,5 +2248,5 @@ show_scheduler(http_t *http)	/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpstat.c 5529 2006-05-15 20:06:46Z mike $".
+ * End of "$Id$".
  */
diff --git a/templates/Makefile b/templates/Makefile
index 35fd4db4a..2c16f8977 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $"
+# "$Id$"
 #
 #   Template makefile for the Common UNIX Printing System (CUPS).
 #
@@ -151,5 +151,5 @@ uninstall:
 
 
 #
-# End of "$Id: Makefile 5308 2006-03-18 13:18:18Z mike $".
+# End of "$Id$".
 #
diff --git a/test/4.1-requests.test b/test/4.1-requests.test
index ca0c8d326..e8d432f46 100644
--- a/test/4.1-requests.test
+++ b/test/4.1-requests.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.1-requests.test 1595 2001-03-01 20:40:17Z mike $"
+# "$Id$"
 #
 #   Verify that the server requires the following attributes:
 #
@@ -136,5 +136,5 @@
 	EXPECT attributes-natural-language
 }
 #
-# End of "$Id: 4.1-requests.test 1595 2001-03-01 20:40:17Z mike $"
+# End of "$Id$"
 #
diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test
index 54189002f..8682df769 100644
--- a/test/4.2-cups-printer-ops.test
+++ b/test/4.2-cups-printer-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.2-cups-printer-ops.test 5493 2006-05-05 16:33:57Z mike $"
+# "$Id$"
 #
 #   Verify that the CUPS printer operations work.
 #
@@ -258,5 +258,5 @@
 }
 
 #
-# End of "$Id: 4.2-cups-printer-ops.test 5493 2006-05-05 16:33:57Z mike $"
+# End of "$Id$"
 #
diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test
index fa1849b29..f2d587d35 100644
--- a/test/4.3-job-ops.test
+++ b/test/4.3-job-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.3-job-ops.test 5493 2006-05-05 16:33:57Z mike $"
+# "$Id$"
 #
 #   Verify that the IPP job operations work.
 #
@@ -297,5 +297,5 @@
 }
 
 #
-# End of "$Id: 4.3-job-ops.test 5493 2006-05-05 16:33:57Z mike $"
+# End of "$Id$"
 #
diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test
index c3098ef07..7dcd2d728 100644
--- a/test/4.4-subscription-ops.test
+++ b/test/4.4-subscription-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id: 4.4-subscription-ops.test 4840 2005-11-14 21:53:30Z mike $"
+# "$Id$"
 #
 #   Verify that the CUPS subscription operations work.
 #
@@ -118,5 +118,5 @@
 }
 
 #
-# End of "$Id: 4.4-subscription-ops.test 4840 2005-11-14 21:53:30Z mike $"
+# End of "$Id$"
 #
diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index d73b99293..eedc786f7 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.1-lpadmin.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lpadmin command.
 #
@@ -60,5 +60,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.1-lpadmin.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh
index 282b63cf1..417d84338 100644
--- a/test/5.2-lpc.sh
+++ b/test/5.2-lpc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.2-lpc.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lpc command.
 #
@@ -36,5 +36,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.2-lpc.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh
index a77e4d65e..30c7ba5ce 100644
--- a/test/5.3-lpq.sh
+++ b/test/5.3-lpq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.3-lpq.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lpq command.
 #
@@ -36,5 +36,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.3-lpq.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index 9d1b1cc09..4155afabd 100644
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.4-lpstat.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lpstat command.
 #
@@ -36,5 +36,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.4-lpstat.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index 7fd6e22aa..d39cbf02d 100644
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.5-lp.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lp command.
 #
@@ -67,5 +67,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.5-lp.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index c16a121dc..e9b567855 100644
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.6-lpr.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lpr command.
 #
@@ -67,5 +67,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.6-lpr.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 500c8f458..13e94f14a 100644
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.7-lprm.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lprm command.
 #
@@ -48,5 +48,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.7-lprm.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index 926bc9eb6..dc4dab49a 100644
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.8-cancel.sh 5091 2006-02-08 18:39:56Z mike $"
+# "$Id$"
 #
 #   Test the cancel command.
 #
@@ -48,5 +48,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.8-cancel.sh 5091 2006-02-08 18:39:56Z mike $".
+# End of "$Id$".
 #
diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index 13a58ced4..8bfe49434 100644
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: 5.9-lpinfo.sh 4494 2005-02-18 02:18:11Z mike $"
+# "$Id$"
 #
 #   Test the lpinfo command.
 #
@@ -48,5 +48,5 @@ fi
 echo ""
 
 #
-# End of "$Id: 5.9-lpinfo.sh 4494 2005-02-18 02:18:11Z mike $".
+# End of "$Id$".
 #
diff --git a/test/Makefile b/test/Makefile
index de2fd5713..87443fcfd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id$"
 #
 #   IPP test makefile for the Common UNIX Printing System (CUPS).
 #
@@ -80,5 +80,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id$".
 #
diff --git a/test/ipptest.c b/test/ipptest.c
index 98843ff6c..1f4a966ba 100644
--- a/test/ipptest.c
+++ b/test/ipptest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $"
+ * "$Id$"
  *
  *   IPP test command for the Common UNIX Printing System (CUPS).
  *
@@ -897,5 +897,5 @@ usage(const char *option)		/* I - Option string or NULL */
 
 
 /*
- * End of "$Id: ipptest.c 5414 2006-04-17 20:07:24Z mike $".
+ * End of "$Id$".
  */
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index fe169ecda..c9df3bb5b 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: run-stp-tests.sh 5493 2006-05-05 16:33:57Z mike $"
+# "$Id$"
 #
 #   Perform the complete set of IPP compliance tests specified in the
 #   CUPS Software Test Plan.
@@ -595,5 +595,5 @@ echo "A HTML report was created in test/$strfile."
 echo ""
 
 #
-# End of "$Id: run-stp-tests.sh 5493 2006-05-05 16:33:57Z mike $"
+# End of "$Id$"
 #
diff --git a/test/testhp.ppd b/test/testhp.ppd
index 3e3e10f53..a15a3d540 100644
--- a/test/testhp.ppd
+++ b/test/testhp.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: testhp.ppd 4494 2005-02-18 02:18:11Z mike $"
+*% "$Id$"
 *%
 *%   Test HP PPD file for the Common UNIX Printing System (CUPS).
 *%
@@ -191,5 +191,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: testhp.ppd 4494 2005-02-18 02:18:11Z mike $".
+*% End of "$Id$".
 *%
diff --git a/test/testps.ppd b/test/testps.ppd
index 9694923c2..4e4964b3d 100644
--- a/test/testps.ppd
+++ b/test/testps.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id: testps.ppd 4494 2005-02-18 02:18:11Z mike $"
+*% "$Id$"
 *%
 *%   Test PS PPD file for the Common UNIX Printing System (CUPS).
 *%
@@ -188,5 +188,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id: testps.ppd 4494 2005-02-18 02:18:11Z mike $".
+*% End of "$Id$".
 *%
diff --git a/tools/makesrcdist b/tools/makesrcdist
index a17e8013a..70368c8b8 100755
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id: makesrcdist 5500 2006-05-08 20:32:27Z mike $"
+# "$Id$"
 #
 # makesrcdist - make a source distribution of CUPS.
 #
@@ -81,5 +81,5 @@ rm -rf cups-$version
 echo "Done!"
 
 #
-# End of "$Id: makesrcdist 5500 2006-05-08 20:32:27Z mike $".
+# End of "$Id$".
 #
diff --git a/vcnet/config.h b/vcnet/config.h
index c5f1752d0..f7f4fec48 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: config.h 4828 2005-11-11 12:53:38Z mike $"
+ * "$Id$"
  *
  *   Configuration file for the Common UNIX Printing System (CUPS).
  *
@@ -348,5 +348,5 @@
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id: config.h 4828 2005-11-11 12:53:38Z mike $".
+ * End of "$Id$".
  */
-- 
2.39.2