From: Michael Sweet <msweet@msweet-imac.local>
Date: Tue, 15 Mar 2016 15:13:26 +0000 (-0400)
Subject: Import experimental work-in-progress HTTP/2 branch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbranch-http2;p=thirdparty%2Fcups.git

Import experimental work-in-progress HTTP/2 branch
---

diff --git a/HTTP2.txt b/HTTP2.txt
new file mode 100644
index 0000000000..cea684588a
--- /dev/null
+++ b/HTTP2.txt
@@ -0,0 +1,44 @@
+HTTP/2.0 Implementation Notes - 2013-11-07
+------------------------------------------
+
+OVERVIEW
+
+    HTTP/2.0 allows clients to send multiple, simultaneous requests over a
+    single connection, as well as supporting server-side push delivery of
+    content.  In the context of IPP, this would allow a single connection to
+    support simultaneous job submission and monitoring.
+
+    This will require changes to the HTTP API used in CUPS, and to cupsd and
+    other CUPS-based servers.  This branch tracks that development.
+
+
+DESIGN
+
+    http_t will be updated to be accessible from multiple threads and track the
+    HTTP state in a thread ID to stream ID/state table.  Applications can
+    discover whether a Printer supports HTTP/2.0 with a new httpSupportsVersion
+    API and upgrade to HTTP/2.0 with httpUpgradeToVersion.
+
+    Calling httpPost in HTTP/1.1 mode will serialize requests between threads.
+    Calling httpPost in HTTP/2.0 mode will create a new stream ID and issue
+    requests in parallel.
+
+    Q: How to handle incoming 2.0 requests? New httpServerRunLoop with
+    callback that creates a new thread for all incoming requests and associates
+    the thread with the stream ID.  httpWriteResponse is then tied to the stream
+    ID.  For 1.1 mode the callback gets called on the current thread (no new
+    threads created).
+
+    Q: How to handle PUSH_PROMISE? New httpPushPromise API that creates a new
+    thread and stream ID?
+
+
+REFERENCES
+
+    HTTPbis WG web site: http://tools.ietf.org/wg/httpbis
+
+    Main spec: http://tools.ietf.org/html/draft-ietf-httpbis-http2
+
+    Header compression spec:
+        http://tools.ietf.org/html/draft-ietf-httpbis-header-compression
+
diff --git a/Makedefs.in b/Makedefs.in
index 5d261c39df..df1e8bc845 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makedefs.in 11984 2014-07-02 13:16:59Z msweet $"
 #
 # Common makefile definitions for CUPS.
 #
@@ -264,5 +264,5 @@ USBQUIRKS	=	@USBQUIRKS@
 
 
 #
-# End of "$Id$"
+# End of "$Id: Makedefs.in 11984 2014-07-02 13:16:59Z msweet $"
 #
diff --git a/Makefile b/Makefile
index 272b9a8002..3ab59522bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Top-level Makefile for CUPS.
 #
@@ -351,5 +351,5 @@ dist:	all
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/backend/Makefile b/backend/Makefile
index 639a0d7aee..4998937121 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $"
 #
 #   Backend makefile for CUPS.
 #
@@ -315,5 +315,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $".
 #
diff --git a/backend/backend-private.h b/backend/backend-private.h
index 1d211e3ed3..c64784a78b 100644
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backend-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Backend support definitions for CUPS.
  *
@@ -334,5 +334,5 @@ extern int		backendWaitLoop(int snmp_fd, http_addr_t *addr,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/backend/dnssd.c b/backend/dnssd.c
index b46d8cf5f3..dba5c1fd08 100644
--- a/backend/dnssd.c
+++ b/backend/dnssd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dnssd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * DNS-SD discovery backend for CUPS.
  *
@@ -1318,5 +1318,5 @@ unquote(char       *dst,		/* I - Destination buffer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dnssd.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/ieee1284.c b/backend/ieee1284.c
index 6ffa31af7c..021211ee16 100644
--- a/backend/ieee1284.c
+++ b/backend/ieee1284.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ieee1284.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * IEEE-1284 support functions for CUPS.
  *
@@ -476,5 +476,5 @@ backendGetMakeModel(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ieee1284.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/lpd.c b/backend/lpd.c
index 41f14913e7..7811211872 100644
--- a/backend/lpd.c
+++ b/backend/lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Line Printer Daemon backend for CUPS.
  *
@@ -1316,5 +1316,5 @@ sigterm_handler(int sig)		/* I - Signal */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpd.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/network.c b/backend/network.c
index 4560fb0337..c68fbeb673 100644
--- a/backend/network.c
+++ b/backend/network.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: network.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Common backend network APIs for CUPS.
  *
@@ -304,5 +304,5 @@ backendNetworkSideCB(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: network.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/runloop.c b/backend/runloop.c
index 2a0ec5f9c0..2d16a01187 100644
--- a/backend/runloop.c
+++ b/backend/runloop.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: runloop.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Common run loop APIs for CUPS backends.
  *
@@ -528,5 +528,5 @@ backendWaitLoop(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: runloop.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 129f70026b..c39741dcb9 100644
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp-supplies.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * SNMP supplies functions for CUPS.
  *
@@ -1099,5 +1099,5 @@ utf16_to_utf8(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp-supplies.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/snmp.c b/backend/snmp.c
index 876ca65205..87f5ae485a 100644
--- a/backend/snmp.c
+++ b/backend/snmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * SNMP discovery backend for CUPS.
  *
@@ -1364,5 +1364,5 @@ update_cache(snmp_cache_t *device,	/* I - Device */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/backend/socket.c b/backend/socket.c
index d7f98d9b07..490ffe7a2b 100644
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: socket.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * AppSocket backend for CUPS.
  *
@@ -517,5 +517,5 @@ wait_bc(int device_fd,			/* I - Socket */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: socket.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/backend/test1284.c b/backend/test1284.c
index 49bef87ee3..3a32391b17 100644
--- a/backend/test1284.c
+++ b/backend/test1284.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   IEEE-1284 support functions test program for CUPS.
  *
@@ -80,5 +80,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: test1284.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/backend/testbackend.c b/backend/testbackend.c
index 046fc3e30c..a910702ff6 100644
--- a/backend/testbackend.c
+++ b/backend/testbackend.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testbackend.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Backend test program for CUPS.
  *
@@ -680,5 +680,5 @@ walk_cb(const char *oid,		/* I - OID */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testbackend.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/backend/testsupplies.c b/backend/testsupplies.c
index 6cbdf8091a..0a300bc903 100644
--- a/backend/testsupplies.c
+++ b/backend/testsupplies.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $"
  *
  *   SNMP supplies test program for CUPS.
  *
@@ -79,5 +79,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testsupplies.c 3247 2011-05-12 06:22:31Z msweet $".
  */
diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c
index 17d62902bf..dfc62c9dfd 100644
--- a/backend/usb-darwin.c
+++ b/backend/usb-darwin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb-darwin.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Copyright 2005-2015 Apple Inc. All rights reserved.
  *
@@ -2538,5 +2538,5 @@ log_usb_class_driver(int is_64bit)	/* I - Is the USB class driver 64-bit? */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-darwin.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index c89727e514..4816e95cca 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb-libusb.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * LIBUSB interface code for CUPS.
  *
@@ -2022,6 +2022,6 @@ soft_reset_printer(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-libusb.c 13138 2016-03-15 14:59:54Z msweet $".
  */
 
diff --git a/backend/usb-unix.c b/backend/usb-unix.c
index 870cbfd68a..6aad4798e8 100644
--- a/backend/usb-unix.c
+++ b/backend/usb-unix.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb-unix.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * USB port backend for CUPS.
  *
@@ -603,5 +603,5 @@ side_cb(int         print_fd,		/* I - Print file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb-unix.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/backend/usb.c b/backend/usb.c
index ee8c1f4ed7..3ccbc0099f 100644
--- a/backend/usb.c
+++ b/backend/usb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   USB port backend for CUPS.
  *
@@ -260,5 +260,5 @@ main(int  argc,				/* I - Number of command-line arguments (6 or 7) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usb.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/berkeley/Makefile b/berkeley/Makefile
index 991481ac0a..6534f76cf2 100644
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
 #
 #   Berkeley commands makefile for CUPS.
 #
@@ -164,5 +164,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
 #
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index b2e2e4130d..48c6f40c76 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpc.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lpc" command for CUPS.
  *
@@ -438,5 +438,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpc.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index 3238706866..f1f78a615c 100644
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpq.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lpq" command for CUPS.
  *
@@ -641,5 +641,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpq.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/berkeley/lpr.c b/berkeley/lpr.c
index 4bda358d53..21f09fd021 100644
--- a/berkeley/lpr.c
+++ b/berkeley/lpr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpr.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lpr" command for CUPS.
  *
@@ -432,5 +432,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpr.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/berkeley/lprm.c b/berkeley/lprm.c
index e2d03e359f..922bbbd407 100644
--- a/berkeley/lprm.c
+++ b/berkeley/lprm.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   "lprm" command for CUPS.
  *
@@ -213,5 +213,5 @@ main(int  argc,			/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lprm.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index f1f0a4302c..a80ae8a909 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $"
 #
 # CGI makefile for CUPS.
 #
@@ -353,5 +353,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $".
 #
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index e3123986eb..890968b7f6 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: admin.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Administration CGI for CUPS.
  *
@@ -4277,5 +4277,5 @@ get_printer_ppd(const char *uri,	/* I - Printer URI */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: admin.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index 1f96902739..c5d0eef203 100644
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Private CGI definitions for CUPS.
  *
@@ -32,5 +32,5 @@
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cgi-private.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h
index 61eb7fc754..37732b5133 100644
--- a/cgi-bin/cgi.h
+++ b/cgi-bin/cgi.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   CGI support library definitions for CUPS.
  *
@@ -115,5 +115,5 @@ extern const char	*cgiText(const char *message);
 #endif /* !_CUPS_CGI_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cgi.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 2685e66a3e..725dc72268 100644
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: classes.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Class status CGI for CUPS.
  *
@@ -546,5 +546,5 @@ show_class(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: classes.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
index 42b4ab9109..649696078f 100644
--- a/cgi-bin/help-index.c
+++ b/cgi-bin/help-index.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help-index.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Online help index routines for CUPS.
  *
@@ -1306,5 +1306,5 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: help-index.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index 41d8d93db5..3618d606f4 100644
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Online help index definitions for CUPS.
  *
@@ -83,5 +83,5 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #endif /* !_CUPS_HELP_INDEX_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: help-index.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index 215c98bc43..75f70d9c46 100644
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Online help CGI for CUPS.
  *
@@ -393,5 +393,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: help.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index 9db5438ebf..af58c88f5e 100644
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   HTML support functions for CUPS.
  *
@@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: html.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index 4b43e9cc08..d293b10c55 100644
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp-var.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CGI <-> IPP variable routines for CUPS.
  *
@@ -1550,5 +1550,5 @@ cgiText(const char *message)		/* I - Message */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp-var.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index 35f913ca37..e85ed9bad3 100644
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: jobs.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Job status CGI for CUPS.
  *
@@ -204,5 +204,5 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: jobs.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
index 4aee5d9a41..6be2797b60 100644
--- a/cgi-bin/makedocset.c
+++ b/cgi-bin/makedocset.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   Xcode documentation set generator.
  *
@@ -482,5 +482,5 @@ write_nodes(const char   *path,		/* I - File to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: makedocset.c 3833 2012-05-23 22:51:18Z msweet $".
  */
diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index c713c68f43..44af864f85 100644
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: printers.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Printer status CGI for CUPS.
  *
@@ -566,5 +566,5 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: printers.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cgi-bin/search.c b/cgi-bin/search.c
index b475d9600f..b4d24028b2 100644
--- a/cgi-bin/search.c
+++ b/cgi-bin/search.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: search.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Search routines for CUPS.
  *
@@ -371,5 +371,5 @@ cgiFreeSearch(void *search)		/* I - Search context */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: search.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index 5325441747..5c62691e40 100644
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: template.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CGI template function.
  *
@@ -686,5 +686,5 @@ cgi_puturi(const char *s,		/* I - String to output */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: template.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c
index ca0158298a..b1e0d6be56 100644
--- a/cgi-bin/testcgi.c
+++ b/cgi-bin/testcgi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testcgi.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * CGI test program for CUPS.
  *
@@ -65,5 +65,5 @@ main(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testcgi.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c
index ce1b94b014..9feed6bb77 100644
--- a/cgi-bin/testhi.c
+++ b/cgi-bin/testhi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Help index test program for CUPS.
  *
@@ -109,5 +109,5 @@ list_nodes(const char   *title,		/* I - Title string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testhi.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c
index 02c0173658..c479b3a177 100644
--- a/cgi-bin/testtemplate.c
+++ b/cgi-bin/testtemplate.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   CGI template test program for CUPS.
  *
@@ -99,5 +99,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testtemplate.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index 3935508fc2..12c5add3ff 100644
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: var.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CGI form variable and array functions for CUPS.
  *
@@ -1297,5 +1297,5 @@ cgi_unlink_file(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: var.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/conf/Makefile b/conf/Makefile
index c6ff49c0a6..6ce66aa85f 100644
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Configuration file makefile for CUPS.
 #
@@ -139,5 +139,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index f460000dd1..0685b19214 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -59,5 +59,5 @@ application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
 @DEFAULT_RAW_PRINTING@application/octet-stream	application/vnd.cups-raw	0	-
 
 #
-# End of "$Id$".
+# End of "$Id: mime.convs.in 11025 2013-06-07 01:00:33Z msweet $".
 #
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 0b583cd17b..3b10a8f6e1 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-common.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Common configuration stuff for CUPS.
 dnl
@@ -474,5 +474,5 @@ esac
 AC_SUBST(BUILDDIRS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-common.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 3c2076aa1b..110b669234 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-compiler.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Compiler stuff for CUPS.
 dnl
@@ -246,5 +246,5 @@ case $uname in
 esac
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-compiler.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4
index 599825ca72..e23eb3a1e2 100644
--- a/config-scripts/cups-defaults.m4
+++ b/config-scripts/cups-defaults.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-defaults.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl   Default cupsd configuration settings for CUPS.
 dnl
@@ -409,5 +409,5 @@ AC_SUBST(CUPS_WEBIF)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-defaults.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4
index 40a17038a6..5368a70aa2 100644
--- a/config-scripts/cups-directories.m4
+++ b/config-scripts/cups-directories.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-directories.m4 11984 2014-07-02 13:16:59Z msweet $"
 dnl
 dnl Directory stuff for CUPS.
 dnl
@@ -305,5 +305,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
 AC_SUBST(CUPS_STATEDIR)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-directories.m4 11984 2014-07-02 13:16:59Z msweet $".
 dnl
diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4
index 3b5bee801f..cc6026ed98 100644
--- a/config-scripts/cups-dnssd.m4
+++ b/config-scripts/cups-dnssd.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-dnssd.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl   DNS Service Discovery (aka Bonjour) stuff for CUPS.
 dnl
@@ -82,5 +82,5 @@ AC_SUBST(IPPFIND_BIN)
 AC_SUBST(IPPFIND_MAN)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-dnssd.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4
index 531308d869..c01d8a7618 100644
--- a/config-scripts/cups-gssapi.m4
+++ b/config-scripts/cups-gssapi.m4
@@ -1,5 +1,5 @@
 dnl
-dnl   "$Id$"
+dnl   "$Id: cups-gssapi.m4 11984 2014-07-02 13:16:59Z msweet $"
 dnl
 dnl   GSSAPI/Kerberos library detection for CUPS.
 dnl
@@ -129,5 +129,5 @@ AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME")
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-gssapi.m4 11984 2014-07-02 13:16:59Z msweet $".
 dnl
diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4
index 6ef4b81e18..6be7b1f364 100644
--- a/config-scripts/cups-largefile.m4
+++ b/config-scripts/cups-largefile.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-largefile.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Large file support stuff for CUPS.
 dnl
@@ -48,5 +48,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-largefile.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl
diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 5fc0d6e3c5..2dcaab3a96 100644
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-libtool.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Libtool stuff for CUPS.
 dnl
@@ -35,5 +35,5 @@ if test x$LIBTOOL != x; then
 fi
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-libtool.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl
diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4
index 08aad8459f..bd6b8d5578 100644
--- a/config-scripts/cups-manpages.m4
+++ b/config-scripts/cups-manpages.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-manpages.m4 11342 2013-10-18 20:36:01Z msweet $"
 dnl
 dnl Manpage stuff for CUPS.
 dnl
@@ -78,5 +78,5 @@ AC_SUBST(MAN8EXT)
 AC_SUBST(MAN8DIR)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-manpages.m4 11342 2013-10-18 20:36:01Z msweet $".
 dnl
diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4
index 636518fb67..2c892f1b21 100644
--- a/config-scripts/cups-network.m4
+++ b/config-scripts/cups-network.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-network.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Networking stuff for CUPS.
 dnl
@@ -72,5 +72,5 @@ AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET)
 AC_SUBST(CUPS_LISTEN_DOMAINSOCKET)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-network.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4
index 700a284d08..755f9d7e2c 100644
--- a/config-scripts/cups-opsys.m4
+++ b/config-scripts/cups-opsys.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-opsys.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Operating system stuff for CUPS.
 dnl
@@ -35,5 +35,5 @@ case "$uname" in
 esac
 
 dnl
-dnl "$Id$"
+dnl "$Id: cups-opsys.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4
index 0d7d9adb86..904a2739dd 100644
--- a/config-scripts/cups-pam.m4
+++ b/config-scripts/cups-pam.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-pam.m4 11342 2013-10-18 20:36:01Z msweet $"
 dnl
 dnl   PAM stuff for CUPS.
 dnl
@@ -93,5 +93,5 @@ AC_SUBST(PAMMOD)
 AC_SUBST(PAMMODAUTH)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-pam.m4 11342 2013-10-18 20:36:01Z msweet $".
 dnl
diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4
index 901068c27b..8774a2f612 100644
--- a/config-scripts/cups-poll.m4
+++ b/config-scripts/cups-poll.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-poll.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Select/poll stuff for CUPS.
 dnl
@@ -18,5 +18,5 @@ AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL))
 AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE))
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-poll.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl
diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4
index af97a94dc4..defaf097f1 100644
--- a/config-scripts/cups-scripting.m4
+++ b/config-scripts/cups-scripting.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-scripting.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Scripting configuration stuff for CUPS.
 dnl
@@ -85,5 +85,5 @@ if test "x$CUPS_PYTHON" != x; then
 fi
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-scripting.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl
diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 23b1adfb75..a8df14a3e3 100644
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-sharedlibs.m4 11342 2013-10-18 20:36:01Z msweet $"
 dnl
 dnl Shared library support for CUPS.
 dnl
@@ -158,5 +158,5 @@ AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-sharedlibs.m4 11342 2013-10-18 20:36:01Z msweet $".
 dnl
diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4
index d48681ea11..91095c1bf2 100644
--- a/config-scripts/cups-ssl.m4
+++ b/config-scripts/cups-ssl.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-ssl.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl TLS stuff for CUPS.
 dnl
@@ -108,5 +108,5 @@ EXPORT_SSLLIBS="$SSLLIBS"
 AC_SUBST(EXPORT_SSLLIBS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-ssl.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
index 223cf2bded..fac079e60d 100644
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-startup.m4 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Launch-on-demand/startup stuff for CUPS.
 dnl
@@ -188,5 +188,5 @@ fi
 
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-startup.m4 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4
index bd5c69867e..9eaf63a121 100644
--- a/config-scripts/cups-threads.m4
+++ b/config-scripts/cups-threads.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: cups-threads.m4 11324 2013-10-04 03:11:42Z msweet $"
 dnl
 dnl   Threading stuff for CUPS.
 dnl
@@ -50,5 +50,5 @@ fi
 AC_SUBST(PTHREAD_FLAGS)
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: cups-threads.m4 11324 2013-10-04 03:11:42Z msweet $".
 dnl
diff --git a/config.h.in b/config.h.in
index 9a4ed16cdc..22618b1b89 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: config.h.in 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Configuration file for CUPS.
  *
@@ -740,5 +740,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: config.h.in 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/configure.ac b/configure.ac
index f55148f46c..6e2a8f7e2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id$"
+dnl "$Id: configure.ac 13138 2016-03-15 14:59:54Z msweet $"
 dnl
 dnl Configuration script for CUPS.
 dnl
@@ -95,5 +95,5 @@ AC_OUTPUT(Makedefs
 chmod +x cups-config
 
 dnl
-dnl End of "$Id$".
+dnl End of "$Id: configure.ac 13138 2016-03-15 14:59:54Z msweet $".
 dnl
diff --git a/cups-config.in b/cups-config.in
index 436800a640..07726c5fab 100755
--- a/cups-config.in
+++ b/cups-config.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# "$Id$"
+# "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $"
 #
 #   CUPS configuration utility.
 #
@@ -142,5 +142,5 @@ while test $# -gt 0; do
 done
 
 #
-# End of "$Id$".
+# End of "$Id: cups-config.in 10996 2013-05-29 11:51:34Z msweet $".
 #
diff --git a/cups/Makefile b/cups/Makefile
index 473328b51f..e0778a1a9c 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # API library Makefile for CUPS.
 #
@@ -52,6 +52,7 @@ LIBOBJS	=	\
 		http-addr.o \
 		http-addrlist.o \
 		http-support.o \
+		huffman.o \
 		ipp.o \
 		ipp-support.o \
 		langprintf.o \
@@ -91,6 +92,7 @@ TESTOBJS	= \
 		testdest.o \
 		testfile.o \
 		testhttp.o \
+		testhuffman.o \
 		testi18n.o \
 		testipp.o \
 		testoptions.o \
@@ -131,6 +133,7 @@ HEADERSPRIV =	\
 		debug-private.h \
 		file-private.h \
 		http-private.h \
+		huffman-private.h \
 		ipp-private.h \
 		language-private.h \
 		md5-private.h \
@@ -159,6 +162,7 @@ UNITTARGETS =	\
 		testdest \
 		testfile \
 		testhttp \
+		testhuffman \
 		testi18n \
 		testipp \
 		testlang \
@@ -463,6 +467,18 @@ testhttp:	testhttp.o $(LIBCUPSSTATIC)
 	./testhttp
 
 
+#
+# testhuffman (dependency on static CUPS library is intentional)
+#
+
+testhuffman:	testhuffman.o $(LIBCUPSSTATIC)
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhuffman.o $(LIBCUPSSTATIC) \
+		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running HTTP/2 Huffman tests...
+	./testhuffman
+
+
 #
 # testipp (dependency on static CUPS library is intentional)
 #
@@ -679,5 +695,5 @@ tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/cups/adminutil.c b/cups/adminutil.c
index 7b487b378c..e3d4178e49 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: adminutil.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Administration utility API definitions for CUPS.
  *
@@ -2370,5 +2370,5 @@ write_option(cups_file_t     *dstfp,	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: adminutil.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/adminutil.h b/cups/adminutil.h
index 52dfe92609..f03d2facbc 100644
--- a/cups/adminutil.h
+++ b/cups/adminutil.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Administration utility API definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern int	cupsAdminSetServerSettings(http_t *http,
 #endif /* !_CUPS_ADMINUTIL_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: adminutil.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/array-private.h b/cups/array-private.h
index 4d3c29734a..74b0c9bf0a 100644
--- a/cups/array-private.h
+++ b/cups/array-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $"
  *
  *   Private array definitions for CUPS.
  *
@@ -48,5 +48,5 @@ extern cups_array_t	*_cupsArrayNewStrings(const char *s, char delim)
 #endif /* !_CUPS_ARRAY_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: array-private.h 3933 2012-10-01 03:01:10Z msweet $".
  */
diff --git a/cups/array.c b/cups/array.c
index 855706994e..cd067c882e 100644
--- a/cups/array.c
+++ b/cups/array.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Sorted array routines for CUPS.
  *
@@ -1330,5 +1330,5 @@ cups_array_find(cups_array_t *a,	/* I - Array */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: array.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/array.h b/cups/array.h
index 385b7dffcf..7a5fc584d3 100644
--- a/cups/array.h
+++ b/cups/array.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Sorted array definitions for CUPS.
  *
@@ -88,5 +88,5 @@ extern void		*cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2;
 #endif /* !_CUPS_ARRAY_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: array.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/auth.c b/cups/auth.c
index ce9fce694c..18bd55c3ce 100644
--- a/cups/auth.c
+++ b/cups/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: auth.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Authentication functions for CUPS.
  *
@@ -876,5 +876,5 @@ cups_local_auth(http_t *http)		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: auth.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/backchannel.c b/cups/backchannel.c
index 06a6d2308f..86ba409b45 100644
--- a/cups/backchannel.c
+++ b/cups/backchannel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backchannel.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Backchannel functions for CUPS.
  *
@@ -189,5 +189,5 @@ cups_setup(fd_set         *set,		/* I - Set for select() */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backchannel.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/backend.c b/cups/backend.c
index 6e12c0f35d..4f417b894c 100644
--- a/cups/backend.c
+++ b/cups/backend.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backend.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Backend functions for CUPS.
  *
@@ -145,5 +145,5 @@ quote_string(const char *s)		/* I - String to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/backend.h b/cups/backend.h
index 85941c71a7..127c02790a 100644
--- a/cups/backend.h
+++ b/cups/backend.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Backend definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern void		cupsBackendReport(const char *device_scheme,
 #endif /* !_CUPS_BACKEND_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: backend.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/cups-private.h b/cups/cups-private.h
index c36fde6ee4..b9d15a1ab1 100644
--- a/cups/cups-private.h
+++ b/cups/cups-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   Private definitions for CUPS.
  *
@@ -274,5 +274,5 @@ extern char		*_cupsUserDefault(char *name, size_t namesize);
 #endif /* !_CUPS_CUPS_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/cups.h b/cups/cups.h
index 0e374b4504..02d91685af 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * API definitions for CUPS.
  *
@@ -623,5 +623,5 @@ extern ssize_t		cupsHashData(const char *algorithm, const void *data, size_t dat
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/debug-private.h b/cups/debug-private.h
index 26c75a379b..8968aebfef 100644
--- a/cups/debug-private.h
+++ b/cups/debug-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Private debugging macros for CUPS.
  *
@@ -113,5 +113,5 @@ extern int	_cups_gettimeofday(struct timeval *tv, void *tz);
 #endif /* !_CUPS_DEBUG_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: debug-private.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/debug.c b/cups/debug.c
index 3ee3a19007..d9f10d889e 100644
--- a/cups/debug.c
+++ b/cups/debug.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: debug.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Debugging functions for CUPS.
  *
@@ -645,5 +645,5 @@ _cups_safe_vsnprintf(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: debug.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/dest-localization.c b/cups/dest-localization.c
index 5174953b52..fd69799b1c 100644
--- a/cups/dest-localization.c
+++ b/cups/dest-localization.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dest-localization.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Destination localization support for CUPS.
  *
@@ -535,5 +535,5 @@ cups_scan_strings(char *buffer)		/* I - Start of string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dest-localization.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/dest-options.c b/cups/dest-options.c
index 43d231b2bf..5063e13c42 100644
--- a/cups/dest-options.c
+++ b/cups/dest-options.c
@@ -2267,5 +2267,5 @@ cups_update_ready(http_t       *http,	/* I - Connection to destination */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dest-options.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/dir.c b/cups/dir.c
index d30009ecfa..1bae123e2a 100644
--- a/cups/dir.c
+++ b/cups/dir.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Directory routines for CUPS.
  *
@@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp)		/* I - Directory pointer */
 #endif /* WIN32 */
 
 /*
- * End of "$Id$".
+ * End of "$Id: dir.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/dir.h b/cups/dir.h
index 75e5b1e610..ad8278c458 100644
--- a/cups/dir.h
+++ b/cups/dir.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Public directory definitions for CUPS.
  *
@@ -65,5 +65,5 @@ extern void		cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2;
 #endif /* !_CUPS_DIR_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: dir.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/encode.c b/cups/encode.c
index 44fe31ea20..a576509c7f 100644
--- a/cups/encode.c
+++ b/cups/encode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: encode.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Option encoding routines for CUPS.
  *
@@ -854,5 +854,5 @@ compare_ipp_options(_ipp_option_t *a,	/* I - First option */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: encode.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/file-private.h b/cups/file-private.h
index 219480fdbd..41d2c8a333 100644
--- a/cups/file-private.h
+++ b/cups/file-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Private file definitions for CUPS.
  *
@@ -135,5 +135,5 @@ extern void			_cupsFileCheckFilter(void *context,
 #endif /* !_CUPS_FILE_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: file-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/file.c b/cups/file.c
index 3b951aa6ca..df57a1fd45 100644
--- a/cups/file.c
+++ b/cups/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * File functions for CUPS.
  *
@@ -2752,5 +2752,5 @@ cups_write(cups_file_t *fp,		/* I - CUPS file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: file.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/file.h b/cups/file.h
index 6e73fea1b2..723bdff0e3 100644
--- a/cups/file.h
+++ b/cups/file.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Public file definitions for CUPS.
  *
@@ -114,5 +114,5 @@ extern ssize_t		cupsFileWrite(cups_file_t *fp, const char *buf,
 #endif /* !_CUPS_FILE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: file.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/getdevices.c b/cups/getdevices.c
index 0d53978585..ea862a7eae 100644
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $"
  *
  *   cupsGetDevices implementation for CUPS.
  *
@@ -280,5 +280,5 @@ cupsGetDevices(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: getdevices.c 4216 2013-03-11 13:57:36Z msweet $".
  */
diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c
index 8111e224db..02903a799c 100644
--- a/cups/getifaddrs.c
+++ b/cups/getifaddrs.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Network interface functions for CUPS.
  *
@@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: getifaddrs.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/getputfile.c b/cups/getputfile.c
index 443e0c4f10..ea3b1b16b3 100644
--- a/cups/getputfile.c
+++ b/cups/getputfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: getputfile.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Get/put file functions for CUPS.
  *
@@ -511,5 +511,5 @@ cupsPutFile(http_t     *http,		/* I - Connection to server or @code CUPS_HTTP_DE
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: getputfile.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/globals.c b/cups/globals.c
index fa0feb4c54..7e17f8a6c1 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: globals.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Global variable access routines for CUPS.
  *
@@ -382,5 +382,5 @@ cups_globals_init(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: globals.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/hash.c b/cups/hash.c
index e20590f26d..d45f1d393a 100644
--- a/cups/hash.c
+++ b/cups/hash.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: hash.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Hashing function for CUPS.
  *
@@ -248,5 +248,5 @@ cupsHashData(const char    *algorithm,	/* I - Algorithm name */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: hash.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/http-addr.c b/cups/http-addr.c
index 9ad2ea3070..cba7b96afa 100644
--- a/cups/http-addr.c
+++ b/cups/http-addr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http-addr.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP address routines for CUPS.
  *
@@ -924,5 +924,5 @@ httpResolveHostname(http_t *http,	/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: http-addr.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index 8a17f6fa66..91374ebe99 100644
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http-addrlist.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP address list routines for CUPS.
  *
@@ -892,5 +892,5 @@ httpAddrGetList(const char *hostname,	/* I - Hostname, IP address, or NULL for p
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: http-addrlist.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/http-private.h b/cups/http-private.h
index 39337dbcc3..5598cdd11d 100644
--- a/cups/http-private.h
+++ b/cups/http-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Private HTTP definitions for CUPS.
  *
@@ -442,5 +442,5 @@ extern int		_httpWait(http_t *http, int msec, int usessl);
 #endif /* !_CUPS_HTTP_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: http-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/http.c b/cups/http.c
index de0ee46b8f..c8c41110d3 100644
--- a/cups/http.c
+++ b/cups/http.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP routines for CUPS.
  *
@@ -4849,5 +4849,5 @@ http_write_chunk(http_t     *http,	/* I - HTTP connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: http.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/http.h b/cups/http.h
index 4f72c678cc..991ed794f5 100644
--- a/cups/http.h
+++ b/cups/http.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: http.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Hyper-Text Transport Protocol definitions for CUPS.
  *
@@ -656,5 +656,5 @@ extern const char	*httpURIStatusString(http_uri_status_t status) _CUPS_API_2_0;
 #endif /* !_CUPS_HTTP_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: http.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/huffman-private.h b/cups/huffman-private.h
new file mode 100644
index 0000000000..95590fefec
--- /dev/null
+++ b/cups/huffman-private.h
@@ -0,0 +1,56 @@
+/*
+ * "$Id: huffman-private.h 11985 2014-07-02 15:41:16Z msweet $"
+ *
+ * HTTP/2 Huffman compression/decompression definitions for CUPS.
+ *
+ * Copyright 2014 by Apple Inc.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ */
+
+#ifndef _CUPS_HUFFMAN_PRIVATE_H_
+#  define _CUPS_HUFFMAN_PRIVATE_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include "versioning.h"
+#  include <stdlib.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Functions...
+ */
+
+extern size_t	_http2HuffmanDecode(char *dst, size_t dstsize, const unsigned char *src, size_t srclen);
+extern size_t	_http2HuffmanEncode(unsigned char *dst, size_t dstsize, const char *src);
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif /* !_CUPS_HUFFMAN_PRIVATE_H_ */
+
+/*
+ * End of "$Id: huffman-private.h 11985 2014-07-02 15:41:16Z msweet $".
+ */
diff --git a/cups/huffman.c b/cups/huffman.c
new file mode 100644
index 0000000000..5859d5d865
--- /dev/null
+++ b/cups/huffman.c
@@ -0,0 +1,651 @@
+/*
+ * "$Id: huffman.c 11990 2014-07-02 21:13:22Z msweet $"
+ *
+ * HTTP/2 Huffman compression/decompression routines for CUPS.
+ *
+ * Copyright 2014 by Apple Inc.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "debug-private.h"
+#include "huffman-private.h"
+#include "thread-private.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/*
+ * Constants...
+ */
+
+#define _HTTP2_HUFFMAN_MAX	30	/* Max Huffman bits in table */
+
+
+/*
+ * Huffman table from HPACK-08 draft.
+ */
+
+typedef struct _http2_huffman_s		/**** Huffman code table ****/
+{
+  int		code;			/* Code */
+  short		len;			/* Length in bits */
+  short		ch;			/* Character */
+} _http2_huffman_t;
+
+static _http2_huffman_t http2_decode[256];
+					/* Decoder values */
+static int		http2_decode_max[_HTTP2_HUFFMAN_MAX + 1];
+static const _http2_huffman_t	*http2_decode_next[_HTTP2_HUFFMAN_MAX + 1];
+static int		http2_decode_init = 0;
+static _cups_mutex_t	http2_decode_mutex = _CUPS_MUTEX_INITIALIZER;
+static const _http2_huffman_t http2_encode[256] =
+{					/* Encoder values */
+  { 0x1ff8,	13,	0x00 },
+  { 0x7fffd8,	23,	0x01 },
+  { 0xfffffe2,	28,	0x02 },
+  { 0xfffffe3,	28,	0x03 },
+  { 0xfffffe4,	28,	0x04 },
+  { 0xfffffe5,	28,	0x05 },
+  { 0xfffffe6,	28,	0x06 },
+  { 0xfffffe7,	28,	0x07 },
+  { 0xfffffe8,	28,	0x08 },
+  { 0xffffea,	24,	0x09 },
+  { 0xffffffc,	30,	0x0a },
+  { 0xfffffe9,	28,	0x0b },
+  { 0xfffffea,	28,	0x0c },
+  { 0xffffffd,	30,	0x0d },
+  { 0xfffffeb,	28,	0x0e },
+  { 0xfffffec,	28,	0x0f },
+  { 0xfffffed,	28,	0x10 },
+  { 0xfffffee,	28,	0x11 },
+  { 0xfffffef,	28,	0x12 },
+  { 0xffffff0,	28,	0x13 },
+  { 0xffffff1,	28,	0x14 },
+  { 0xffffff2,	28,	0x15 },
+  { 0xffffffe,	30,	0x16 },
+  { 0xffffff3,	28,	0x17 },
+  { 0xffffff4,	28,	0x18 },
+  { 0xffffff5,	28,	0x19 },
+  { 0xffffff6,	28,	0x1a },
+  { 0xffffff7,	28,	0x1b },
+  { 0xffffff8,	28,	0x1c },
+  { 0xffffff9,	28,	0x1d },
+  { 0xffffffa,	28,	0x1e },
+  { 0xffffffb,	28,	0x1f },
+  { 0x14,	6,	0x20 },
+  { 0x3f8,	10,	0x21 },
+  { 0x3f9,	10,	0x22 },
+  { 0xffa,	12,	0x23 },
+  { 0x1ff9,	13,	0x24 },
+  { 0x15,	6,	0x25 },
+  { 0xf8,	8,	0x26 },
+  { 0x7fa,	11,	0x27 },
+  { 0x3fa,	10,	0x28 },
+  { 0x3fb,	10,	0x29 },
+  { 0xf9,	8,	0x2a },
+  { 0x7fb,	11,	0x2b },
+  { 0xfa,	8,	0x2c },
+  { 0x16,	6,	0x2d },
+  { 0x17,	6,	0x2e },
+  { 0x18,	6,	0x2f },
+  { 0x0,	5,	0x30 },
+  { 0x1,	5,	0x31 },
+  { 0x2,	5,	0x32 },
+  { 0x19,	6,	0x33 },
+  { 0x1a,	6,	0x34 },
+  { 0x1b,	6,	0x35 },
+  { 0x1c,	6,	0x36 },
+  { 0x1d,	6,	0x37 },
+  { 0x1e,	6,	0x38 },
+  { 0x1f,	6,	0x39 },
+  { 0x5c,	7,	0x3a },
+  { 0xfb,	8,	0x3b },
+  { 0x7ffc,	15,	0x3c },
+  { 0x20,	6,	0x3d },
+  { 0xffb,	12,	0x3e },
+  { 0x3fc,	10,	0x3f },
+  { 0x1ffa,	13,	0x40 },
+  { 0x21,	6,	0x41 },
+  { 0x5d,	7,	0x42 },
+  { 0x5e,	7,	0x43 },
+  { 0x5f,	7,	0x44 },
+  { 0x60,	7,	0x45 },
+  { 0x61,	7,	0x46 },
+  { 0x62,	7,	0x47 },
+  { 0x63,	7,	0x48 },
+  { 0x64,	7,	0x49 },
+  { 0x65,	7,	0x4a },
+  { 0x66,	7,	0x4b },
+  { 0x67,	7,	0x4c },
+  { 0x68,	7,	0x4d },
+  { 0x69,	7,	0x4e },
+  { 0x6a,	7,	0x4f },
+  { 0x6b,	7,	0x50 },
+  { 0x6c,	7,	0x51 },
+  { 0x6d,	7,	0x52 },
+  { 0x6e,	7,	0x53 },
+  { 0x6f,	7,	0x54 },
+  { 0x70,	7,	0x55 },
+  { 0x71,	7,	0x56 },
+  { 0x72,	7,	0x57 },
+  { 0xfc,	8,	0x58 },
+  { 0x73,	7,	0x59 },
+  { 0xfd,	8,	0x5a },
+  { 0x1ffb,	13,	0x5b },
+  { 0x7fff0,	19,	0x5c },
+  { 0x1ffc,	13,	0x5d },
+  { 0x3ffc,	14,	0x5e },
+  { 0x22,	6,	0x5f },
+  { 0x7ffd,	15,	0x60 },
+  { 0x3,	5,	0x61 },
+  { 0x23,	6,	0x62 },
+  { 0x4,	5,	0x63 },
+  { 0x24,	6,	0x64 },
+  { 0x5,	5,	0x65 },
+  { 0x25,	6,	0x66 },
+  { 0x26,	6,	0x67 },
+  { 0x27,	6,	0x68 },
+  { 0x6,	5,	0x69 },
+  { 0x74,	7,	0x6a },
+  { 0x75,	7,	0x6b },
+  { 0x28,	6,	0x6c },
+  { 0x29,	6,	0x6d },
+  { 0x2a,	6,	0x6e },
+  { 0x7,	5,	0x6f },
+  { 0x2b,	6,	0x70 },
+  { 0x76,	7,	0x71 },
+  { 0x2c,	6,	0x72 },
+  { 0x8,	5,	0x73 },
+  { 0x9,	5,	0x74 },
+  { 0x2d,	6,	0x75 },
+  { 0x77,	7,	0x76 },
+  { 0x78,	7,	0x77 },
+  { 0x79,	7,	0x78 },
+  { 0x7a,	7,	0x79 },
+  { 0x7b,	7,	0x7a },
+  { 0x7ffe,	15,	0x7b },
+  { 0x7fc,	11,	0x7c },
+  { 0x3ffd,	14,	0x7d },
+  { 0x1ffd,	13,	0x7e },
+  { 0xffffffc,	28,	0x7f },
+  { 0xfffe6,	20,	0x80 },
+  { 0x3fffd2,	22,	0x81 },
+  { 0xfffe7,	20,	0x82 },
+  { 0xfffe8,	20,	0x83 },
+  { 0x3fffd3,	22,	0x84 },
+  { 0x3fffd4,	22,	0x85 },
+  { 0x3fffd5,	22,	0x86 },
+  { 0x7fffd9,	23,	0x87 },
+  { 0x3fffd6,	22,	0x88 },
+  { 0x7fffda,	23,	0x89 },
+  { 0x7fffdb,	23,	0x8a },
+  { 0x7fffdc,	23,	0x8b },
+  { 0x7fffdd,	23,	0x8c },
+  { 0x7fffde,	23,	0x8d },
+  { 0xffffeb,	24,	0x8e },
+  { 0x7fffdf,	23,	0x8f },
+  { 0xffffec,	24,	0x90 },
+  { 0xffffed,	24,	0x91 },
+  { 0x3fffd7,	22,	0x92 },
+  { 0x7fffe0,	23,	0x93 },
+  { 0xffffee,	24,	0x94 },
+  { 0x7fffe1,	23,	0x95 },
+  { 0x7fffe2,	23,	0x96 },
+  { 0x7fffe3,	23,	0x97 },
+  { 0x7fffe4,	23,	0x98 },
+  { 0x1fffdc,	21,	0x99 },
+  { 0x3fffd8,	22,	0x9a },
+  { 0x7fffe5,	23,	0x9b },
+  { 0x3fffd9,	22,	0x9c },
+  { 0x7fffe6,	23,	0x9d },
+  { 0x7fffe7,	23,	0x9e },
+  { 0xffffef,	24,	0x9f },
+  { 0x3fffda,	22,	0xa0 },
+  { 0x1fffdd,	21,	0xa1 },
+  { 0xfffe9,	20,	0xa2 },
+  { 0x3fffdb,	22,	0xa3 },
+  { 0x3fffdc,	22,	0xa4 },
+  { 0x7fffe8,	23,	0xa5 },
+  { 0x7fffe9,	23,	0xa6 },
+  { 0x1fffde,	21,	0xa7 },
+  { 0x7fffea,	23,	0xa8 },
+  { 0x3fffdd,	22,	0xa9 },
+  { 0x3fffde,	22,	0xaa },
+  { 0xfffff0,	24,	0xab },
+  { 0x1fffdf,	21,	0xac },
+  { 0x3fffdf,	22,	0xad },
+  { 0x7fffeb,	23,	0xae },
+  { 0x7fffec,	23,	0xaf },
+  { 0x1fffe0,	21,	0xb0 },
+  { 0x1fffe1,	21,	0xb1 },
+  { 0x3fffe0,	22,	0xb2 },
+  { 0x1fffe2,	21,	0xb3 },
+  { 0x7fffed,	23,	0xb4 },
+  { 0x3fffe1,	22,	0xb5 },
+  { 0x7fffee,	23,	0xb6 },
+  { 0x7fffef,	23,	0xb7 },
+  { 0xfffea,	20,	0xb8 },
+  { 0x3fffe2,	22,	0xb9 },
+  { 0x3fffe3,	22,	0xba },
+  { 0x3fffe4,	22,	0xbb },
+  { 0x7ffff0,	23,	0xbc },
+  { 0x3fffe5,	22,	0xbd },
+  { 0x3fffe6,	22,	0xbe },
+  { 0x7ffff1,	23,	0xbf },
+  { 0x3ffffe0,	26,	0xc0 },
+  { 0x3ffffe1,	26,	0xc1 },
+  { 0xfffeb,	20,	0xc2 },
+  { 0x7fff1,	19,	0xc3 },
+  { 0x3fffe7,	22,	0xc4 },
+  { 0x7ffff2,	23,	0xc5 },
+  { 0x3fffe8,	22,	0xc6 },
+  { 0x1ffffec,	25,	0xc7 },
+  { 0x3ffffe2,	26,	0xc8 },
+  { 0x3ffffe3,	26,	0xc9 },
+  { 0x3ffffe4,	26,	0xca },
+  { 0x7ffffde,	27,	0xcb },
+  { 0x7ffffdf,	27,	0xcc },
+  { 0x3ffffe5,	26,	0xcd },
+  { 0xfffff1,	24,	0xce },
+  { 0x1ffffed,	25,	0xcf },
+  { 0x7fff2,	19,	0xd0 },
+  { 0x1fffe3,	21,	0xd1 },
+  { 0x3ffffe6,	26,	0xd2 },
+  { 0x7ffffe0,	27,	0xd3 },
+  { 0x7ffffe1,	27,	0xd4 },
+  { 0x3ffffe7,	26,	0xd5 },
+  { 0x7ffffe2,	27,	0xd6 },
+  { 0xfffff2,	24,	0xd7 },
+  { 0x1fffe4,	21,	0xd8 },
+  { 0x1fffe5,	21,	0xd9 },
+  { 0x3ffffe8,	26,	0xda },
+  { 0x3ffffe9,	26,	0xdb },
+  { 0xffffffd,	28,	0xdc },
+  { 0x7ffffe3,	27,	0xdd },
+  { 0x7ffffe4,	27,	0xde },
+  { 0x7ffffe5,	27,	0xdf },
+  { 0xfffec,	20,	0xe0 },
+  { 0xfffff3,	24,	0xe1 },
+  { 0xfffed,	20,	0xe2 },
+  { 0x1fffe6,	21,	0xe3 },
+  { 0x3fffe9,	22,	0xe4 },
+  { 0x1fffe7,	21,	0xe5 },
+  { 0x1fffe8,	21,	0xe6 },
+  { 0x7ffff3,	23,	0xe7 },
+  { 0x3fffea,	22,	0xe8 },
+  { 0x3fffeb,	22,	0xe9 },
+  { 0x1ffffee,	25,	0xea },
+  { 0x1ffffef,	25,	0xeb },
+  { 0xfffff4,	24,	0xec },
+  { 0xfffff5,	24,	0xed },
+  { 0x3ffffea,	26,	0xee },
+  { 0x7ffff4,	23,	0xef },
+  { 0x3ffffeb,	26,	0xf0 },
+  { 0x7ffffe6,	27,	0xf1 },
+  { 0x3ffffec,	26,	0xf2 },
+  { 0x3ffffed,	26,	0xf3 },
+  { 0x7ffffe7,	27,	0xf4 },
+  { 0x7ffffe8,	27,	0xf5 },
+  { 0x7ffffe9,	27,	0xf6 },
+  { 0x7ffffea,	27,	0xf7 },
+  { 0x7ffffeb,	27,	0xf8 },
+  { 0xffffffe,	28,	0xf9 },
+  { 0x7ffffec,	27,	0xfa },
+  { 0x7ffffed,	27,	0xfb },
+  { 0x7ffffee,	27,	0xfc },
+  { 0x7ffffef,	27,	0xfd },
+  { 0x7fffff0,	27,	0xfe },
+  { 0x3ffffee,	26,	0xff }
+};
+static const unsigned char http2_masks[9] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff };
+					/* Bitmasks */
+
+
+/*
+ * Local functions...
+ */
+
+static int	http2_compare_decode(const _http2_huffman_t *a, const _http2_huffman_t *b);
+
+
+/*
+ * '_http2HuffmanDecode()' - Decode (decompress) a HTTP/2 Huffman-encoded string.
+ *
+ * The "dst" string is nul-terminated even if the total length of the Huffman-
+ * encoded string does not fit.  The return value contains the actual length
+ * of the string after decoding.
+ */
+
+size_t					/* O - Actual length of string or 0 on error */
+_http2HuffmanDecode(
+    char                *dst,		/* I - Destination string buffer */
+    size_t              dstsize,	/* I - Size of string buffer */
+    const unsigned char *src,		/* I - Incoming Huffman data */
+    size_t              srclen)		/* I - Length of incoming Huffman data */
+{
+  char			*dstptr,	/* Pointer into string buffer */
+			*dstend;	/* End of string buffer */
+  const unsigned char	*srcend;	/* End of Huffman data */
+  unsigned char		srcbyte;	/* Current source string byte */
+  int			srcavail,	/* How many bits are available in the current byte? */
+			code,		/* Assembled code */
+			len,		/* Length of assembled code */
+			bits;		/* Bits to grab */
+  const _http2_huffman_t *dptr,		/* Pointer into decoder table */
+			*dend;		/* End of decoder table */
+
+
+  DEBUG_printf(("4_http2HuffmanDecode(dst=%p, dstsize=" CUPS_LLFMT ", src=%p, srclen=" CUPS_LLFMT ")", dst, CUPS_LLCAST dstsize, src, CUPS_LLCAST srclen));
+
+ /*
+  * Initialize the decoder array as needed...
+  */
+
+  dend = http2_decode + (sizeof(http2_decode) / sizeof(http2_decode[0]));
+
+  if (!http2_decode_init)
+  {
+    _cupsMutexLock(&http2_decode_mutex);
+    if (!http2_decode_init)
+    {
+      http2_decode_init = 1;
+      memcpy(http2_decode, http2_encode, sizeof(http2_decode));
+      qsort(http2_decode, sizeof(http2_decode) / sizeof(http2_decode[0]), sizeof(http2_decode[0]), (int (*)(const void *, const void *))http2_compare_decode);
+
+      for (len = 0, dptr = http2_decode; dptr < dend; dptr ++)
+      {
+        if (len != dptr->len)
+        {
+          http2_decode_next[len] = dptr;
+          len = dptr->len;
+        }
+
+        if ((dptr + 1) < dend && dptr[1].len != len)
+          http2_decode_max[len] = dptr->code;
+      }
+    }
+    _cupsMutexUnlock(&http2_decode_mutex);
+  }
+
+ /*
+  * Decode the string.
+  *
+  * Note: Initial implementation that has very little optimization applied.
+  */
+
+  dstptr   = dst;
+  dstend   = dst + dstsize - 1;
+  srcavail = 0;
+  srcbyte  = 0;
+  srcend   = src + srclen;
+
+  while (src < srcend || srcavail > 0)
+  {
+   /*
+    * Each Huffman code has a minimum of 5 bits.  We do a linear search of the
+    * decode table, which has been sorted in ascending order for length and
+    * code.  If we don't find the code in the table we return an error.
+    */
+
+    code = 0;
+    len  = 0;
+    dptr = http2_decode;
+
+    DEBUG_printf(("5_http2HuffmanDecode: init srcbyte=%02x, srcavail=%d", srcbyte, srcavail));
+
+    while (dptr < dend)
+    {
+      while (len < dptr->len)
+      {
+       /*
+        * Get N more bits from the input...
+        */
+
+        if (srcavail == 0)
+        {
+          if (src < srcend)
+          {
+	    srcbyte  = *src++;
+	    srcavail = 8;
+
+	    DEBUG_printf(("5_http2HuffmanDecode: cont srcbyte=%02x, srcavail=%d", srcbyte, srcavail));
+	  }
+	  else if (len < 8 && code == http2_masks[len])
+	    break;
+	  else
+	  {
+	    DEBUG_puts("5_http2HuffmanDecode: Early end-of-string.");
+	    return (0);
+	  }
+        }
+
+        if ((bits = dptr->len - len) > srcavail)
+          bits = srcavail;
+
+        DEBUG_printf(("5_http2HuffmanDecode: Pulling %d bits", bits));
+
+        if (bits == srcavail)
+        {
+	  if (len == 0)
+	  {
+	    if (bits == 8)
+	      code = srcbyte;
+	    else
+	      code = srcbyte & http2_masks[bits];
+	  }
+	  else
+	    code = (code << bits) | (srcbyte & http2_masks[bits]);
+
+          srcavail = 0;
+        }
+        else if (len == 0)
+        {
+          code     = (srcbyte >> (srcavail - bits)) & http2_masks[bits];
+          srcavail -= bits;
+        }
+        else
+        {
+          code     = (code << bits) | ((srcbyte >> (srcavail - bits)) & http2_masks[bits]);
+          srcavail -= bits;
+        }
+
+	len += bits;
+
+#ifdef DEBUG
+        if (len < dptr->len)
+          DEBUG_printf(("5_http2HuffmanDecode: code=%x, len=%d, srcavail=%d", code, len, srcavail));
+#endif /* DEBUG */
+      }
+
+      DEBUG_printf(("5_http2HuffmanDecode: code=%x, len=%d, dptr->len=%d", code, len, dptr->len));
+
+      if (len < dptr->len)
+        break;
+
+      if (code > http2_decode_max[len])
+      {
+        dptr = http2_decode_next[len];
+        continue;
+      }
+
+      while (len == dptr->len)
+        if (dptr->code == code)
+          break;
+        else
+          dptr ++;
+
+      if (dptr->code == code && dptr->len == len)
+      {
+        DEBUG_printf(("5_http2HuffmanDecode: code=%x, len=%d, match='%c' (0x%02x)", (unsigned)code, len, dptr->ch, dptr->ch));
+
+        if (dstptr < dstend)
+          *dstptr = (char)dptr->ch;
+
+        dstptr ++;
+        break;
+      }
+#ifdef DEBUG
+      else
+        DEBUG_printf(("5_http2HuffmanDecode: code=%x, len=%d, no match", (unsigned)code, len));
+#endif /* DEBUG */
+    }
+  }
+
+  if (dstptr < dstend)
+    *dstptr = '\0';
+  else
+    *dstend = '\0';
+
+  return ((size_t)(dstptr - dst));
+}
+
+
+/*
+ * '_http2HuffmanEncode()' - Encode (compress) a string using HTTP/2 Huffman-coding.
+ *
+ * The return value contains the actual length of the string after encoding.
+ */
+
+size_t					/* O - Number of bytes used for Huffman */
+_http2HuffmanEncode(
+    unsigned char *dst,			/* I - Output buffer */
+    size_t        dstsize,		/* I - Size of output buffer */
+    const char    *src)			/* I - String to encode */
+{
+  unsigned char	*dstptr,		/* Pointer into buffer */
+		*dstend,		/* End of buffer */
+		dstbyte;		/* Current output byte */
+  int		dstused,		/* Current bits used */
+		dstremaining;		/* Remaining bits */
+  int		ch;			/* Current character */
+  int		code,			/* Huffman code */
+		len;			/* Length of Huffman code */
+
+
+ /*
+  * Note: Initial implementation that has very little optimization applied.
+  */
+
+  dstptr  = dst;
+  dstend  = dst + dstsize;
+  dstbyte = 0;
+  dstused = 0;
+
+  while (*src)
+  {
+    ch   = *src++ & 255;
+    code = http2_encode[ch].code;
+    len  = http2_encode[ch].len;
+
+    while (len > 0)
+    {
+      if (dstused == 0)
+      {
+        if (len == 8)
+        {
+          dstbyte = (unsigned char)code;
+          dstused = 8;
+        }
+        else if (len > 8)
+        {
+          dstbyte = (unsigned char)(code >> (len - 8));
+          dstused = 8;
+        }
+        else
+        {
+          dstbyte = (unsigned char)(code << (8 - len));
+          dstused = len;
+        }
+
+        len -= dstused;
+      }
+      else
+      {
+        dstremaining = 8 - dstused;
+
+        if (len == dstremaining)
+        {
+          dstbyte |= (unsigned char)(code & http2_masks[dstremaining]);
+          dstused = 8;
+          len     = 0;
+        }
+        else if (len > dstremaining)
+        {
+          dstbyte |= (unsigned char)((code >> (len - dstremaining)) & http2_masks[dstremaining]);
+          dstused = 8;
+          len -= dstremaining;
+        }
+        else
+        {
+          dstbyte |= (unsigned char)((code << (dstremaining - len)) & http2_masks[dstremaining]);
+          dstused += len;
+          len = 0;
+        }
+      }
+
+      if (dstused == 8)
+      {
+       /*
+        * "Write" a byte to the output buffer
+        */
+
+        if (dstptr < dstend)
+          *dstptr = dstbyte;
+
+        dstptr ++;
+        dstused = 0;
+      }
+    }
+  }
+
+  if (dstused)
+  {
+   /*
+    * Pad the output string with 1's as an End-Of-String code...
+    */
+
+    dstremaining = 8 - dstused;
+    dstbyte |= http2_masks[dstremaining];
+    if (dstptr < dstend)
+      *dstptr = dstbyte;
+    dstptr ++;
+  }
+
+  return ((size_t)(dstptr - dst));
+}
+
+
+/*
+ * 'http2_compare_decode()' - Compare two Huffman codes for decoding.
+ */
+
+static int				/* O - Result of comparison */
+http2_compare_decode(
+    const _http2_huffman_t *a,		/* I - First code */
+    const _http2_huffman_t *b)		/* I - Second code */
+{
+  int	result;				/* Result of comparison */
+
+
+  if ((result = a->len - b->len) == 0)
+    result = a->code - b->code;
+
+  return (result);
+}
+
+
+/*
+ * End of "$Id: huffman.c 11990 2014-07-02 21:13:22Z msweet $".
+ */
diff --git a/cups/ipp-private.h b/cups/ipp-private.h
index 2d88408428..b3435ea3ff 100644
--- a/cups/ipp-private.h
+++ b/cups/ipp-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Private IPP definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern _ipp_option_t	*_ippFindOption(const char *name);
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 40c01eb609..150cb554b8 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp-support.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Internet Printing Protocol support functions for CUPS.
  *
@@ -2289,5 +2289,5 @@ ipp_col_string(ipp_t  *col,		/* I - Collection attribute */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp-support.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ipp.c b/cups/ipp.c
index e1a528c70b..a0dec3ba11 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Internet Printing Protocol functions for CUPS.
  *
@@ -7062,5 +7062,5 @@ ipp_write_file(int         *fd,		/* I - File descriptor */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ipp.h b/cups/ipp.h
index aefdcbfa4b..5ee6c35f2d 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Internet Printing Protocol definitions for CUPS.
  *
@@ -1036,5 +1036,5 @@ extern const char	*ippStateString(ipp_state_t state) _CUPS_API_2_0;
 #endif /* !_CUPS_IPP_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/langprintf.c b/cups/langprintf.c
index f5f92a9485..b0e9c34db7 100644
--- a/cups/langprintf.c
+++ b/cups/langprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: langprintf.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Localized printf/puts functions for CUPS.
  *
@@ -337,5 +337,5 @@ _cupsSetLocale(char *argv[])		/* IO - Command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: langprintf.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/language-private.h b/cups/language-private.h
index cf5b482b43..93cdf08317 100644
--- a/cups/language-private.h
+++ b/cups/language-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: language-private.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Private localization support for CUPS.
  *
@@ -82,5 +82,5 @@ extern void		_cupsSetLocale(char *argv[]);
 #endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: language-private.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/language.c b/cups/language.c
index 69e391f2a8..cb3d22c3d1 100644
--- a/cups/language.c
+++ b/cups/language.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: language.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * I18N/language support for CUPS.
  *
@@ -1624,5 +1624,5 @@ cups_unquote(char       *d,		/* O - Unquoted string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: language.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/language.h b/cups/language.h
index 0b8acdee42..4fcf9e84f7 100644
--- a/cups/language.h
+++ b/cups/language.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: language.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Multi-language support for CUPS.
  *
@@ -111,5 +111,5 @@ extern cups_lang_t	*cupsLangGet(const char *language);
 #endif /* !_CUPS_LANGUAGE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: language.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/md5-private.h b/cups/md5-private.h
index 3667cf0b33..7b9464262c 100644
--- a/cups/md5-private.h
+++ b/cups/md5-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: md5-private.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Private MD5 definitions for CUPS.
  *
@@ -75,5 +75,5 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]);
 #endif /* !_CUPS_MD5_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: md5-private.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/md5.c b/cups/md5.c
index 851715ff11..bedddcf10f 100644
--- a/cups/md5.c
+++ b/cups/md5.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: md5.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Private MD5 implementation for CUPS.
  *
@@ -342,5 +342,5 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16])
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: md5.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/md5passwd.c b/cups/md5passwd.c
index a0dc2cf5bd..135282c50e 100644
--- a/cups/md5passwd.c
+++ b/cups/md5passwd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: md5passwd.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   MD5 password support for CUPS.
  *
@@ -138,5 +138,5 @@ httpMD5String(const unsigned char *sum,	/* I - MD5 sum data */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: md5passwd.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/notify.c b/cups/notify.c
index 69363aa153..7e5cebb287 100644
--- a/cups/notify.c
+++ b/cups/notify.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: notify.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Notification routines for CUPS.
  *
@@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang,	/* I - Language data */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: notify.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/options.c b/cups/options.c
index 073edaee95..8f05bb8f48 100644
--- a/cups/options.c
+++ b/cups/options.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: options.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Option routines for CUPS.
  *
@@ -694,5 +694,5 @@ cups_find_option(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: options.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/ppd-attr.c b/cups/ppd-attr.c
index c98a36b47e..7db8329d0c 100644
--- a/cups/ppd-attr.c
+++ b/cups/ppd-attr.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-attr.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD model-specific attribute routines for CUPS.
  *
@@ -317,5 +317,5 @@ _ppdNormalizeMakeAndModel(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-attr.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index e02d443553..995574f8ac 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-cache.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD cache implementation for CUPS.
  *
@@ -3835,5 +3835,5 @@ pwg_unppdize_name(const char *ppd,	/* I - PPD keyword */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-cache.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c
index 31a82d7792..c518670efe 100644
--- a/cups/ppd-conflicts.c
+++ b/cups/ppd-conflicts.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-conflicts.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Option conflict management routines for CUPS.
  *
@@ -1196,5 +1196,5 @@ ppd_test_constraints(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-conflicts.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-custom.c b/cups/ppd-custom.c
index 5f5272ce33..ba08be20f4 100644
--- a/cups/ppd-custom.c
+++ b/cups/ppd-custom.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-custom.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD custom option routines for CUPS.
  *
@@ -112,5 +112,5 @@ ppdNextCustomParam(ppd_coption_t *opt)	/* I - Custom option */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-custom.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c
index e750029efd..b4b418a084 100644
--- a/cups/ppd-emit.c
+++ b/cups/ppd-emit.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-emit.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD code emission routines for CUPS.
  *
@@ -1203,5 +1203,5 @@ ppd_handle_media(ppd_file_t *ppd)	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-emit.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c
index 9f837b87ee..3f853b738f 100644
--- a/cups/ppd-localize.c
+++ b/cups/ppd-localize.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-localize.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD localization routines for CUPS.
  *
@@ -775,5 +775,5 @@ ppd_ll_CC(char   *ll_CC,		/* O - Country-specific locale name */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-localize.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c
index 0fddab5c31..82684d001d 100644
--- a/cups/ppd-mark.c
+++ b/cups/ppd-mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-mark.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Option marking routines for CUPS.
  *
@@ -1085,5 +1085,5 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-mark.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-page.c b/cups/ppd-page.c
index f7eb62b4a7..7e86126bfc 100644
--- a/cups/ppd-page.c
+++ b/cups/ppd-page.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-page.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Page size functions for CUPS.
  *
@@ -385,5 +385,5 @@ ppdPageLength(ppd_file_t *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-page.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index b8254446ad..c978054bac 100644
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Private PPD definitions for CUPS.
  *
@@ -249,5 +249,5 @@ extern const char	*_pwgPageSizeForMedia(pwg_media_t *media,
 #endif /* !_CUPS_PPD_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd-util.c b/cups/ppd-util.c
index 918ab78d6e..2bfd3f5c6d 100644
--- a/cups/ppd-util.c
+++ b/cups/ppd-util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd-util.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD utilities for CUPS.
  *
@@ -719,5 +719,5 @@ cups_get_printer_uri(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd-util.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd.c b/cups/ppd.c
index 21443e6b02..9db8ddcc68 100644
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD file routines for CUPS.
  *
@@ -3456,5 +3456,5 @@ ppd_update_filters(ppd_file_t     *ppd,	/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/ppd.h b/cups/ppd.h
index c5989835d1..e4a30ebfe3 100644
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppd.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   PostScript Printer Description definitions for CUPS.
  *
@@ -484,5 +484,5 @@ extern int		ppdPageSizeLimits(ppd_file_t *ppd,
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppd.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/pwg.h b/cups/pwg.h
index 505778e153..43e0e1c842 100644
--- a/cups/pwg.h
+++ b/cups/pwg.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: pwg.h 4274 2013-04-09 20:10:23Z msweet $"
  *
  *   PWG media API definitions for CUPS.
  *
@@ -90,5 +90,5 @@ extern pwg_media_t	*pwgMediaForSize(int width, int length) _CUPS_API_1_7;
 #endif /* !_CUPS_PWG_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: pwg.h 4274 2013-04-09 20:10:23Z msweet $".
  */
diff --git a/cups/raster-private.h b/cups/raster-private.h
index 95e54dc02b..e506c64822 100644
--- a/cups/raster-private.h
+++ b/cups/raster-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: raster-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Private image library definitions for CUPS.
  *
@@ -62,5 +62,5 @@ extern void		_cupsRasterClearError(void);
 #endif /* !_CUPS_RASTER_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: raster-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/request.c b/cups/request.c
index 881bffd5b9..caea4dd385 100644
--- a/cups/request.c
+++ b/cups/request.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: request.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * IPP utilities for CUPS.
  *
@@ -1189,5 +1189,5 @@ _cupsSetHTTPError(http_status_t status)	/* I - HTTP status code */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: request.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/sidechannel.c b/cups/sidechannel.c
index 8dc2ce0ff8..2214a52c2c 100644
--- a/cups/sidechannel.c
+++ b/cups/sidechannel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: sidechannel.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Side-channel API code for CUPS.
  *
@@ -625,5 +625,5 @@ cupsSideChannelWrite(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: sidechannel.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/sidechannel.h b/cups/sidechannel.h
index 48353d1ee3..4694bb974c 100644
--- a/cups/sidechannel.h
+++ b/cups/sidechannel.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: sidechannel.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Side-channel API definitions for CUPS.
  *
@@ -143,5 +143,5 @@ extern cups_sc_status_t	cupsSideChannelSNMPWalk(const char *oid, double timeout,
 #endif /* !_CUPS_SIDECHANNEL_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: sidechannel.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/snmp-private.h b/cups/snmp-private.h
index 604456191f..1ca37e9b87 100644
--- a/cups/snmp-private.h
+++ b/cups/snmp-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Private SNMP definitions for CUPS.
  *
@@ -142,5 +142,5 @@ extern int		_cupsSNMPWrite(int fd, http_addr_t *address, int version,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/snmp.c b/cups/snmp.c
index 4c62f959fa..b8e91d1b7c 100644
--- a/cups/snmp.c
+++ b/cups/snmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snmp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * SNMP functions for CUPS.
  *
@@ -1677,5 +1677,5 @@ snmp_set_error(cups_snmp_t *packet,	/* I - Packet */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snmp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/snprintf.c b/cups/snprintf.c
index 9af6b90f85..4029d2c1d2 100644
--- a/cups/snprintf.c
+++ b/cups/snprintf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: snprintf.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   snprintf functions for CUPS.
  *
@@ -361,6 +361,6 @@ _cups_snprintf(char       *buffer,	/* O - Output buffer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: snprintf.c 10996 2013-05-29 11:51:34Z msweet $".
  */
 
diff --git a/cups/string-private.h b/cups/string-private.h
index 845bfc9d2c..df2398822d 100644
--- a/cups/string-private.h
+++ b/cups/string-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: string-private.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Private string definitions for CUPS.
  *
@@ -219,5 +219,5 @@ extern char	*_cupsStrDate(char *buf, size_t bufsize, time_t timeval);
 #endif /* !_CUPS_STRING_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: string-private.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/string.c b/cups/string.c
index 19d1224f4a..e6d193b036 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: string.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * String functions for CUPS.
  *
@@ -772,5 +772,5 @@ compare_sp_items(_cups_sp_item_t *a,	/* I - First item */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: string.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/tempfile.c b/cups/tempfile.c
index 495eeb29c6..03a50bb2fb 100644
--- a/cups/tempfile.c
+++ b/cups/tempfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: tempfile.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Temp file utilities for CUPS.
  *
@@ -195,5 +195,5 @@ cupsTempFile2(char *filename,		/* I - Pointer to buffer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: tempfile.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testadmin.c b/cups/testadmin.c
index 28dafa7f26..04b02f1c9c 100644
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testadmin.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Admin function test program for CUPS.
  *
@@ -117,5 +117,5 @@ show_settings(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testadmin.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/cups/testarray.c b/cups/testarray.c
index dc90951ba6..8752b32a05 100644
--- a/cups/testarray.c
+++ b/cups/testarray.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testarray.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Array test program for CUPS.
  *
@@ -551,5 +551,5 @@ load_words(const char   *filename,	/* I - File to load */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testarray.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/testcache.c b/cups/testcache.c
index 2c92dbdc79..221076641c 100644
--- a/cups/testcache.c
+++ b/cups/testcache.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testcache.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * PPD cache testing program for CUPS.
  *
@@ -94,5 +94,5 @@ main(int  argc,				/* I - Number of command-line args */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testcache.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/testconflicts.c b/cups/testconflicts.c
index 269c53ec3d..0ccca82524 100644
--- a/cups/testconflicts.c
+++ b/cups/testconflicts.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $"
  *
  *   PPD constraint test program for CUPS.
  *
@@ -134,5 +134,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testconflicts.c 3755 2012-03-30 05:59:14Z msweet $".
  */
diff --git a/cups/testcups.c b/cups/testcups.c
index 74d0660bf1..91d38c4229 100644
--- a/cups/testcups.c
+++ b/cups/testcups.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testcups.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * CUPS API test program for CUPS.
  *
@@ -585,5 +585,5 @@ show_diffs(cups_dest_t *a,		/* I - First destination */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testcups.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/testdest.c b/cups/testdest.c
index 50835eceb1..22df1bf773 100644
--- a/cups/testdest.c
+++ b/cups/testdest.c
@@ -713,5 +713,5 @@ usage(const char *arg)			/* I - Argument for usage message */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testdest.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testfile.c b/cups/testfile.c
index 9dbd8d549d..df80aa2187 100644
--- a/cups/testfile.c
+++ b/cups/testfile.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testfile.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * File test program for CUPS.
  *
@@ -825,5 +825,5 @@ read_write_tests(int compression)	/* I - Use compression? */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testfile.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testhttp.c b/cups/testhttp.c
index 1c6bcb2cba..a7f36e9a73 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testhttp.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * HTTP test program for CUPS.
  *
@@ -889,5 +889,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testhttp.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testhuffman.c b/cups/testhuffman.c
new file mode 100644
index 0000000000..e5a2d2ef7c
--- /dev/null
+++ b/cups/testhuffman.c
@@ -0,0 +1,207 @@
+/*
+ * "$Id: testhuffman.c 11992 2014-07-03 13:54:10Z msweet $"
+ *
+ * HTTP/2 Huffman compression/decompression unit tests for CUPS.
+ *
+ * Copyright 2014 by Apple Inc.
+ *
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file.  If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ *
+ * This file is subject to the Apple OS-Developed Software exception.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "http.h"
+#include "huffman-private.h"
+
+
+/*
+ * Test data (from HPACK-08)...
+ */
+
+typedef struct _http2_huffman_test_s
+{
+  const char	*s;			/* Literal string */
+  unsigned char	h[256];			/* Huffman string */
+  size_t	hlen;			/* Length of Huffman string */
+} _http2_huffman_test_t;
+
+static const _http2_huffman_test_t test_data[] =
+{
+  { "www.example.com", { 0xf1, 0xe3, 0xc2, 0xe5, 0xf2, 0x3a, 0x6b, 0xa0, 0xab, 0x90, 0xf4, 0xff }, 12 },
+  { "no-cache", { 0xa8, 0xeb, 0x10, 0x64, 0x9c, 0xbf }, 6 },
+  { "custom-key", { 0x25, 0xa8, 0x49, 0xe9, 0x5b, 0xa9, 0x7d, 0x7f }, 8 },
+  { "custom-value", { 0x25, 0xa8, 0x49, 0xe9, 0x5b, 0xb8, 0xe8, 0xb4, 0xbf }, 9 },
+  { "302", { 0x64, 0x02 }, 2 },
+  { "private", { 0xae, 0xc3, 0x77, 0x1a, 0x4b }, 5 },
+  { "Mon, 21 Oct 2013 20:13:21 GMT", { 0xd0, 0x7a, 0xbe, 0x94, 0x10, 0x54, 0xd4, 0x44, 0xa8, 0x20, 0x05, 0x95, 0x04, 0x0b, 0x81, 0x66, 0xe0, 0x82, 0xa6, 0x2d, 0x1b, 0xff }, 22 },
+  { "https://www.example.com", { 0x9d, 0x29, 0xad, 0x17, 0x18, 0x63, 0xc7, 0x8f, 0x0b, 0x97, 0xc8, 0xe9, 0xae, 0x82, 0xae, 0x43, 0xd3 }, 17 },
+  { "Mon, 21 Oct 2013 20:13:22 GMT", { 0xd0, 0x7a, 0xbe, 0x94, 0x10, 0x54, 0xd4, 0x44, 0xa8, 0x20, 0x05, 0x95, 0x04, 0x0b, 0x81, 0x66, 0xe0, 0x84, 0xa6, 0x2d, 0x1b, 0xff }, 22 },
+  { "gzip", { 0x9b, 0xd9, 0xab }, 3 },
+  { "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1", { 0x94, 0xe7, 0x82, 0x1d, 0xd7, 0xf2, 0xe6, 0xc7, 0xb3, 0x35, 0xdf, 0xdf, 0xcd, 0x5b, 0x39, 0x60, 0xd5, 0xaf, 0x27, 0x08, 0x7f, 0x36, 0x72, 0xc1, 0xab, 0x27, 0x0f, 0xb5, 0x29, 0x1f, 0x95, 0x87, 0x31, 0x60, 0x65, 0xc0, 0x03, 0xed, 0x4e, 0xe5, 0xb1, 0x06, 0x3d, 0x50, 0x07 }, 45 }
+};
+
+
+/*
+ * Local functions...
+ */
+
+static void	printhex(const unsigned char *data, size_t len);
+
+
+/*
+ * 'main()' - Run HTTP/2 Huffman tests.
+ */
+
+int					/* O - Exit status */
+main(void)
+{
+  int		i,			/* Looping var */
+		status = 0;		/* Status of test */
+  char		s[131072];		/* Literal string */
+  size_t	slen;			/* Length of literal string */
+  unsigned char	huffdata[131072];	/* Huffman encoded data */
+  size_t	hufflen;		/* Length of Huffman encoded data */
+  unsigned char	data[65536];		/* Test data to simulate Kerberos nonsense */
+  char		base64[131072];
+					/* Base64 representation of data + "Negotiate " */
+  time_t	start, end;		/* Timing information for benchmarks */
+
+
+ /*
+  * Test examples from HPACK-08...
+  */
+
+  for (i = 0; i < (int)(sizeof(test_data) / sizeof(test_data[0])); i ++)
+  {
+    printf("_http2HuffmanEncode(\"%s\"): ", test_data[i].s);
+    fflush(stdout);
+
+    hufflen = _http2HuffmanEncode(huffdata, sizeof(huffdata), test_data[i].s);
+    if (hufflen != test_data[i].hlen || memcmp(huffdata, test_data[i].h, hufflen))
+    {
+      puts("FAIL");
+      status = 1;
+      printf("    Got %d bytes: ", (int)hufflen);
+      printhex(huffdata, hufflen);
+      printf("    Expected %d bytes: ", (int)test_data[i].hlen);
+      printhex(test_data[i].h, test_data[i].hlen);
+    }
+    else
+      puts("PASS");
+
+    printf("_http2HuffmanDecode(\"%s\"): ", test_data[i].s);
+    fflush(stdout);
+
+    slen = _http2HuffmanDecode(s, sizeof(s), test_data[i].h, test_data[i].hlen);
+    if (slen != strlen(test_data[i].s) || strcmp(s, test_data[i].s))
+    {
+      puts("FAIL");
+      status = 1;
+      if (!slen)
+	slen = strlen(s);
+      printf("    Got %d bytes: %s\n", (int)slen, s);
+    }
+    else
+      puts("PASS");
+  }
+
+ /*
+  * Test random 64k blob representing a worst-case Kerberos ticket...
+  */
+
+  CUPS_SRAND(time(NULL));
+
+  for (i = 0; i < (int)sizeof(data); i ++)
+    data[i] = i/* (unsigned char)CUPS_RAND() */;
+
+  strlcpy(base64, "Negotiate ", sizeof(base64));
+  httpEncode64_2(base64 + 10, sizeof(base64) - 10, (char *)data, sizeof(data));
+
+  fputs("_http2HuffmanEncode(kerberos ticket): ", stdout);
+  fflush(stdout);
+
+  hufflen = _http2HuffmanEncode(huffdata, sizeof(huffdata), base64);
+  slen    = strlen(base64);
+  printf("PASS (%d bytes, %d%% of original %d bytes)\n", (int)hufflen, (int)(100 * hufflen / slen), (int)slen);
+
+  fputs("_http2HuffmanDecode(kerberos ticket): ", stdout);
+  fflush(stdout);
+
+  slen = _http2HuffmanDecode(s, sizeof(s), huffdata, hufflen);
+  if (slen != strlen(base64) || strcmp(s, base64))
+  {
+    const char	*sptr, *bptr;
+
+    puts("FAIL");
+    status = 1;
+
+    for (sptr = s, bptr = base64; *sptr && *bptr; sptr ++, bptr ++)
+      if (*sptr != *bptr)
+        break;
+
+    if (!slen)
+      slen = strlen(s);
+    printf("    Got %d bytes, expected %d bytes\n", (int)slen, (int)strlen(base64));
+    printf("    Difference starting at offset %d: %s\n", (int)(sptr - s), sptr);
+    printf("    Expected: %s\n", bptr);
+  }
+  else
+    puts("PASS");
+
+  puts("\nBenchmarks:\n");
+
+#define TESTENCODE 25000
+  time(&start);
+  for (i = 0; i < TESTENCODE; i ++)
+    hufflen = _http2HuffmanEncode(huffdata, sizeof(huffdata), base64);
+  time(&end);
+
+  slen = strlen(base64);
+  printf("    _http2HuffmanEncode: %.1f MB/second\n", (double)slen * TESTENCODE / (end - start) / 1024 / 1024);
+
+#define TESTDECODE 2500
+  time(&start);
+  for (i = 0; i < TESTDECODE; i ++)
+    _http2HuffmanDecode(s, sizeof(s), huffdata, hufflen);
+  time(&end);
+
+  printf("    _http2HuffmanDecode: %.1f MB/second\n", (double)hufflen * TESTDECODE / (end - start) / 1024 / 1024);
+
+  return (status);
+}
+
+
+/*
+ * 'printhex()' - Print a string as hex characters.
+ */
+
+static void
+printhex(const unsigned char *data,	/* I - String */
+         size_t              len)	/* I - Length */
+{
+  while (len > 0)
+  {
+    printf("%02X", *data & 255);
+    data ++;
+    len --;
+  }
+
+  putchar('\n');
+}
+
+
+/*
+ * End of "$Id: testhuffman.c 11992 2014-07-03 13:54:10Z msweet $".
+ */
diff --git a/cups/testi18n.c b/cups/testi18n.c
index e478428bd2..cbf9109d81 100644
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testi18n.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Internationalization test for CUPS.
  *
@@ -610,5 +610,5 @@ print_utf8(const char	     *msg,	/* I - Message String */
 
 
 /*
- * End of "$Id$"
+ * End of "$Id: testi18n.c 11984 2014-07-02 13:16:59Z msweet $"
  */
diff --git a/cups/testipp.c b/cups/testipp.c
index 2540ff4829..716072d17e 100644
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testipp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * IPP test program for CUPS.
  *
@@ -1051,5 +1051,5 @@ write_cb(_ippdata_t   *data,		/* I - Data */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testipp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/testlang.c b/cups/testlang.c
index cc7b4f699e..50011d34a3 100644
--- a/cups/testlang.c
+++ b/cups/testlang.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testlang.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   Localization test program for CUPS.
  *
@@ -153,5 +153,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testlang.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testoptions.c b/cups/testoptions.c
index 6c939e8c36..0a8a9b2db3 100644
--- a/cups/testoptions.c
+++ b/cups/testoptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testoptions.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Option unit test program for CUPS.
  *
@@ -177,5 +177,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testoptions.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testppd.c b/cups/testppd.c
index b211d1d75a..a0e1111437 100644
--- a/cups/testppd.c
+++ b/cups/testppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testppd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD test program for CUPS.
  *
@@ -1171,5 +1171,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testppd.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testpwg.c b/cups/testpwg.c
index 582c8deb13..2aaea7f9d0 100644
--- a/cups/testpwg.c
+++ b/cups/testpwg.c
@@ -572,5 +572,5 @@ test_ppd_cache(_ppd_cache_t *pc,	/* I - PWG mapping data */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testpwg.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/testsnmp.c b/cups/testsnmp.c
index 66e2d76ee6..8473c0297f 100644
--- a/cups/testsnmp.c
+++ b/cups/testsnmp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testsnmp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * SNMP test program for CUPS.
  *
@@ -293,5 +293,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testsnmp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/thread-private.h b/cups/thread-private.h
index 67dbe54184..3559c1add8 100644
--- a/cups/thread-private.h
+++ b/cups/thread-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: thread-private.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Private threading definitions for CUPS.
  *
@@ -96,5 +96,5 @@ extern int	_cupsThreadCreate(_cups_thread_func_t func, void *arg);
 #endif /* !_CUPS_THREAD_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: thread-private.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/thread.c b/cups/thread.c
index c9c5cfb493..3f430b65f1 100644
--- a/cups/thread.c
+++ b/cups/thread.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: thread.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Threading primitives for CUPS.
  *
@@ -323,5 +323,5 @@ _cupsThreadCreate(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: thread.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index e29dd31860..474c1c692d 100644
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: tls-gnutls.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * TLS support code for CUPS using GNU TLS.
  *
@@ -1341,5 +1341,5 @@ _httpTLSWrite(http_t     *http,		/* I - Connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: tls-gnutls.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index 25be327d18..f0d2d7cc6b 100644
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: tls-sspi.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * TLS support for CUPS on Windows using the Security Support Provider
  * Interface (SSPI).
@@ -2427,5 +2427,5 @@ http_sspi_verify(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: tls-sspi.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/tls.c b/cups/tls.c
index 3f88df2c62..ef106e9a50 100644
--- a/cups/tls.c
+++ b/cups/tls.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: tls.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * TLS routines for CUPS.
  *
@@ -108,5 +108,5 @@ httpSaveCredentials(const char *path, cups_array_t *credentials, const char *com
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: tls.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/tlscheck.c b/cups/tlscheck.c
index e78bf28c62..70f0729f62 100644
--- a/cups/tlscheck.c
+++ b/cups/tlscheck.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: tlscheck.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * TLS check program for CUPS.
  *
@@ -746,5 +746,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: tlscheck.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/transcode.c b/cups/transcode.c
index 11d4f7f7c1..4664e3763e 100644
--- a/cups/transcode.c
+++ b/cups/transcode.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: transcode.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Transcoding support for CUPS.
  *
@@ -716,5 +716,5 @@ cupsUTF32ToUTF8(
 
 
 /*
- * End of "$Id$"
+ * End of "$Id: transcode.c 13138 2016-03-15 14:59:54Z msweet $"
  */
diff --git a/cups/transcode.h b/cups/transcode.h
index cafea33c56..da95d0cd69 100644
--- a/cups/transcode.h
+++ b/cups/transcode.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: transcode.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Transcoding definitions for CUPS.
  *
@@ -77,5 +77,5 @@ extern int	cupsUTF32ToUTF8(cups_utf8_t *dest,
 
 
 /*
- * End of "$Id$"
+ * End of "$Id: transcode.h 10996 2013-05-29 11:51:34Z msweet $"
  */
diff --git a/cups/usersys.c b/cups/usersys.c
index 9b3c219b7e..d8aff235fa 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: usersys.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * User, system, and password routines for CUPS.
  *
@@ -1284,5 +1284,5 @@ cups_set_user(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: usersys.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/util.c b/cups/util.c
index 48b5bfa553..fdf8d5cae8 100644
--- a/cups/util.c
+++ b/cups/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: util.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Printing utilities for CUPS.
  *
@@ -966,5 +966,5 @@ cupsStartDocument(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: util.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/cups/versioning.h b/cups/versioning.h
index ff52d6088b..83ee24381b 100644
--- a/cups/versioning.h
+++ b/cups/versioning.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: versioning.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   API versioning definitions for CUPS.
  *
@@ -164,5 +164,5 @@
 #endif /* !_CUPS_VERSIONING_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: versioning.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/data/Makefile b/data/Makefile
index 6bc4a197d3..eddc373b65 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Datafile makefile for CUPS.
 #
@@ -123,5 +123,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/data/epson.h b/data/epson.h
index 13cb1a3464..1b0fe9fe43 100644
--- a/data/epson.h
+++ b/data/epson.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $"
  *
  *   This file contains model number definitions for the CUPS sample
  *   ESC/P driver.
@@ -23,5 +23,5 @@
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: epson.h 624 2008-02-16 00:27:39Z msweet $".
  */
diff --git a/data/hp.h b/data/hp.h
index c700343163..3a5ba3dab6 100644
--- a/data/hp.h
+++ b/data/hp.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $"
  *
  *   This file contains model number definitions for the CUPS sample
  *   HP driver.
@@ -20,5 +20,5 @@
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: hp.h 624 2008-02-16 00:27:39Z msweet $".
  */
diff --git a/data/label.h b/data/label.h
index 4b6fba64ff..38cdc37b53 100644
--- a/data/label.h
+++ b/data/label.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: label.h 624 2008-02-16 00:27:39Z msweet $"
  *
  *   This file contains model number definitions for the CUPS sample
  *   label printer driver.
@@ -24,5 +24,5 @@
 #define INTELLITECH_PCL	0x20		/* Intellitech PCL-based printers */
 
 /*
- * End of "$Id$".
+ * End of "$Id: label.h 624 2008-02-16 00:27:39Z msweet $".
  */
diff --git a/desktop/Makefile b/desktop/Makefile
index 9d786f6f07..c4fdd7679b 100644
--- a/desktop/Makefile
+++ b/desktop/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $"
 #
 #   Desktop makefile for CUPS.
 #
@@ -131,5 +131,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 1725 2009-10-15 18:50:47Z msweet $".
 #
diff --git a/doc/Makefile b/doc/Makefile
index dc454bdcf3..5f2edc3002 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Documentation makefile for CUPS.
 #
diff --git a/everywhere/bonjour-access-tests.test b/everywhere/bonjour-access-tests.test
index 224c67b8c4..ad5eaaeca9 100644
--- a/everywhere/bonjour-access-tests.test
+++ b/everywhere/bonjour-access-tests.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: bonjour-access-tests.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
 #
@@ -38,5 +38,5 @@ FILE-ID "org.pwg.ipp-everywhere.20151009.bonjour"
 }
 
 #
-# End of "$Id$".
+# End of "$Id: bonjour-access-tests.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/bonjour-tests.bat b/everywhere/bonjour-tests.bat
index c2e5ecfefa..0bc5645e2a 100644
--- a/everywhere/bonjour-tests.bat
+++ b/everywhere/bonjour-tests.bat
@@ -1,6 +1,6 @@
 @echo off
 ::
-::  "$Id$"
+::  "$Id: bonjour-tests.bat 13138 2016-03-15 14:59:54Z msweet $"
 ::
 :: IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
 ::
@@ -387,5 +387,5 @@ echo Summary: %total% tests, %pass% passed, %fail% failed, %skip% skipped
 echo Score: %score%%%
 
 ::
-:: End of "$Id$".
+:: End of "$Id: bonjour-tests.bat 13138 2016-03-15 14:59:54Z msweet $".
 ::
diff --git a/everywhere/bonjour-tests.sh b/everywhere/bonjour-tests.sh
index 648ea713b5..8cd5390ab6 100755
--- a/everywhere/bonjour-tests.sh
+++ b/everywhere/bonjour-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  "$Id$"
+#  "$Id: bonjour-tests.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
 #
@@ -340,5 +340,5 @@ echo "Summary: $total tests, $pass passed, $fail failed, $skip skipped"
 echo "Score: ${score}%"
 
 #
-# End of "$Id$".
+# End of "$Id: bonjour-tests.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/bonjour-value-tests.test b/everywhere/bonjour-value-tests.test
index 35d8dd7f75..6b7d09fe51 100644
--- a/everywhere/bonjour-value-tests.test
+++ b/everywhere/bonjour-value-tests.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: bonjour-value-tests.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 5: Bonjour Tests.
 #
@@ -43,5 +43,5 @@ FILE-ID "org.pwg.ipp-everywhere.20151009.bonjour"
 }
 
 #
-# End of "$Id$".
+# End of "$Id: bonjour-value-tests.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/document-tests.bat b/everywhere/document-tests.bat
index 70cd9ef4cb..e3f76b790b 100644
--- a/everywhere/document-tests.bat
+++ b/everywhere/document-tests.bat
@@ -1,6 +1,6 @@
 @echo off
 ::
-::  "$Id$"
+::  "$Id: document-tests.bat 13138 2016-03-15 14:59:54Z msweet $"
 ::
 :: IPP Everywhere Printer Self-Certification Manual 1.0: Section 7: Document Data Tests.
 ::
@@ -24,5 +24,5 @@
 ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 Document Results.plist\"" -I "{}" document-tests.test ";"
 
 ::
-:: End of "$Id$".
+:: End of "$Id: document-tests.bat 13138 2016-03-15 14:59:54Z msweet $".
 ::
diff --git a/everywhere/document-tests.sh b/everywhere/document-tests.sh
index 1dda93cc53..55ffeb8494 100755
--- a/everywhere/document-tests.sh
+++ b/everywhere/document-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  "$Id$"
+#  "$Id: document-tests.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 7: Document Data Tests.
 #
@@ -55,5 +55,5 @@ fi
 $IPPFIND "$1._ipp._tcp.local." -x $IPPTOOL -P "$1 Document Results.plist" -I '{}' document-tests.test \;
 
 #
-# End of "$Id$".
+# End of "$Id: document-tests.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/document-tests.test b/everywhere/document-tests.test
index 3270c161ff..48ed6b1196 100644
--- a/everywhere/document-tests.test
+++ b/everywhere/document-tests.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: document-tests.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 7: Document Data Tests.
 #
@@ -614,5 +614,5 @@ FILE-ID "org.pwg.ipp-everywhere.20151009.document"
 }
 
 #
-# End of "$Id$".
+# End of "$Id: document-tests.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/ipp-tests.bat b/everywhere/ipp-tests.bat
index 32d582b91a..2cb12fabf0 100644
--- a/everywhere/ipp-tests.bat
+++ b/everywhere/ipp-tests.bat
@@ -1,6 +1,6 @@
 @echo off
 ::
-::  "$Id$"
+::  "$Id: ipp-tests.bat 13138 2016-03-15 14:59:54Z msweet $"
 ::
 :: IPP Everywhere Printer Self-Certification Manual 1.0: Section 6: IPP Tests.
 ::
@@ -24,5 +24,5 @@
 ippfind "%1._ipp._tcp.local." -x ipptool -P "\"%1 IPP Results.plist\"" -I "{}" ipp-tests.test ";"
 
 ::
-:: End of "$Id$".
+:: End of "$Id: ipp-tests.bat 13138 2016-03-15 14:59:54Z msweet $".
 ::
diff --git a/everywhere/ipp-tests.sh b/everywhere/ipp-tests.sh
index ec521d1efd..0aa790b30e 100755
--- a/everywhere/ipp-tests.sh
+++ b/everywhere/ipp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  "$Id$"
+#  "$Id: ipp-tests.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 6: IPP Tests.
 #
@@ -46,5 +46,5 @@ done
 $IPPFIND "$1._ipp._tcp.local." -x $IPPTOOL -P "$1 IPP Results.plist" -I '{}' ipp-tests.test \;
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-tests.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/ipp-tests.test b/everywhere/ipp-tests.test
index f7b1dc8352..ee925b55f3 100644
--- a/everywhere/ipp-tests.test
+++ b/everywhere/ipp-tests.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: ipp-tests.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 # IPP Everywhere Printer Self-Certification Manual 1.0: Section 6: IPP Tests.
 #
@@ -1154,5 +1154,5 @@ DEFINE SUPPLY_REGEX "/^(type\=[A-Za-z]+|(maxcapacity\=([0-9]|\-){0,1})(level\=([
 
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-tests.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/everywhere/make-ippeveselfcert.sh b/everywhere/make-ippeveselfcert.sh
index d696b70c28..7208e7d837 100755
--- a/everywhere/make-ippeveselfcert.sh
+++ b/everywhere/make-ippeveselfcert.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: make-ippeveselfcert.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Make an IPP Everywhere Printer self-certification package.
 #
@@ -68,5 +68,5 @@ rm -r $pkgdir
 echo Done.
 
 #
-# End of "$Id$".
+# End of "$Id: make-ippeveselfcert.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/examples/Makefile b/examples/Makefile
index da08298b38..f4737a64d7 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $"
 #
 #   PPD compiler example makefile for CUPS.
 #
@@ -124,5 +124,5 @@ uninstall:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 3247 2011-05-12 06:22:31Z msweet $".
 #
diff --git a/examples/ppdx.c b/examples/ppdx.c
index 61588cad13..920f8db127 100644
--- a/examples/ppdx.c
+++ b/examples/ppdx.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   Example code for encoding and decoding large amounts of data in a PPD file.
  *   This would typically be used in a driver to save configuration/state
@@ -310,5 +310,5 @@ ppdxWriteData(const char *name,		/* I - Base name of keyword */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppdx.c 3833 2012-05-23 22:51:18Z msweet $".
  */
diff --git a/examples/ppdx.h b/examples/ppdx.h
index 1be6928da1..14f34b3499 100644
--- a/examples/ppdx.h
+++ b/examples/ppdx.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   Header for PPD data encoding example code.
  *
@@ -78,5 +78,5 @@ extern void	ppdxWriteData(const char *name, const void *data,
 #endif /* !_PPDX_H */
 
 /*
- * End of "$Id$".
+ * End of "$Id: ppdx.h 3833 2012-05-23 22:51:18Z msweet $".
  */
diff --git a/examples/testppdx.c b/examples/testppdx.c
index f1c1686880..372f3d5544 100644
--- a/examples/testppdx.c
+++ b/examples/testppdx.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   Test program for PPD data encoding example code.
  *
@@ -113,5 +113,5 @@ main(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testppdx.c 3833 2012-05-23 22:51:18Z msweet $".
  */
diff --git a/examples/testppdx.ppd b/examples/testppdx.ppd
index 179b1ec6c8..2e58df66df 100644
--- a/examples/testppdx.ppd
+++ b/examples/testppdx.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id$"
+*% "$Id: testppdx.ppd 3833 2012-05-23 22:51:18Z msweet $"
 *%
 *% Test PPD file for data encoding example.
 *%
@@ -109,7 +109,7 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id$".
+*% End of "$Id: testppdx.ppd 3833 2012-05-23 22:51:18Z msweet $".
 *%
 *EXData0000: "eNqlVm1v2zYQ/hz/ipvWznLgl6T7siXrgCJ2AANBEyQpNmAtAlqiLG4SKZBU7LTIf9/dUW9Og32ZAFsieffcc88dKS2OR3AM0Zt1+ibCJxoA3EvnobJma0UJmbFwc7OEVHgBUicmVXoLci/KqpCAQznvHC9MWSmc3Smfn3WzdG2TBGYGPCJXVbqH2fIBQR+Wq5vb1cWH+9XyfRTBbNs"
 *EXData0001: "GcwTaG6zIqkrh7evgzDVk1Xb3MO7k9N3sHmCDxWRWeuk53KfSxf4paC087ZOvDLaTcF54WUptcdnoVO0KavaS9um7EBYCT6XAQhnK2n9E5hsEIc9yQ6XvUw8RkEelzKVVhQI2TAMEIXYzQGWClmoTU002L1GgmwVIpraF0ozXYoOGUkZXa0vVh/vVnO/91FA2+UqycHlpi5SyMWjhI0"
diff --git a/filter/Makefile b/filter/Makefile
index ab22a5ddd0..aeed21c30b 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Filter makefile for CUPS.
 #
@@ -404,5 +404,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/filter/commandtops.c b/filter/commandtops.c
index 3f76915651..d960dc8a37 100644
--- a/filter/commandtops.c
+++ b/filter/commandtops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: commandtops.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * PostScript command filter for CUPS.
  *
@@ -521,5 +521,5 @@ report_levels(ppd_file_t *ppd,		/* I - PPD file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: commandtops.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/filter/common.c b/filter/common.c
index 3d45a20378..998d51c630 100644
--- a/filter/common.c
+++ b/filter/common.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: common.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Common filter routines for CUPS.
  *
@@ -520,5 +520,5 @@ WriteTextComment(const char *name,	/* I - Comment name ("Title", etc.) */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: common.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/filter/common.h b/filter/common.h
index bbaf99eed0..9693ce8d38 100644
--- a/filter/common.h
+++ b/filter/common.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: common.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Common filter definitions for CUPS.
  *
@@ -74,5 +74,5 @@ extern void	WriteTextComment(const char *name, const char *value);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: common.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/filter/error.c b/filter/error.c
index 39cd10391a..9111475baa 100644
--- a/filter/error.c
+++ b/filter/error.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: error.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Raster error handling for CUPS.
  *
@@ -275,5 +275,5 @@ get_error_buffer(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: error.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/gziptoany.c b/filter/gziptoany.c
index 9adc376fab..294bebf385 100644
--- a/filter/gziptoany.c
+++ b/filter/gziptoany.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: gziptoany.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * GZIP/raw pre-filter for CUPS.
  *
@@ -112,5 +112,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: gziptoany.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/interpret.c b/filter/interpret.c
index b38d4eae1a..e1145a17ac 100644
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: interpret.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD command interpreter for CUPS.
  *
@@ -1728,5 +1728,5 @@ DEBUG_stack(const char       *prefix,	/* I - Prefix string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: interpret.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/pstops.c b/filter/pstops.c
index 379740e48f..5388e39a1f 100644
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: pstops.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PostScript filter for CUPS.
  *
@@ -3405,5 +3405,5 @@ write_options(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: pstops.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/raster.c b/filter/raster.c
index 302f72cd50..bd00321259 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: raster.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Raster file routines for CUPS.
  *
@@ -1803,5 +1803,5 @@ cups_write_fd(void          *ctx,	/* I - File descriptor pointer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: raster.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/rasterbench.c b/filter/rasterbench.c
index 96eb3255f1..102e433b33 100644
--- a/filter/rasterbench.c
+++ b/filter/rasterbench.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: rasterbench.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Raster benchmark program for CUPS.
  *
@@ -345,5 +345,5 @@ write_test(int         fd,		/* I - File descriptor to write to */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: rasterbench.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index a59e435e8c..4ccb475210 100644
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: rastertoepson.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * EPSON ESC/P and ESC/P2 filter for CUPS.
  *
@@ -1174,5 +1174,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: rastertoepson.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index 97866c4ddf..2f587a3582 100644
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: rastertohp.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Hewlett-Packard Page Control Language filter for CUPS.
  *
@@ -847,5 +847,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: rastertohp.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c
index 7edef8f649..90e73c2008 100644
--- a/filter/rastertolabel.c
+++ b/filter/rastertolabel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: rastertolabel.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Label printer filter for CUPS.
  *
@@ -1281,5 +1281,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: rastertolabel.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/filter/testraster.c b/filter/testraster.c
index 1382f0b7f9..b0b16db515 100644
--- a/filter/testraster.c
+++ b/filter/testraster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testraster.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Raster test program routines for CUPS.
  *
@@ -1067,5 +1067,5 @@ print_changes(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testraster.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/install-sh b/install-sh
index 41d944e3e2..956458fc80 100755
--- a/install-sh
+++ b/install-sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: install-sh 11025 2013-06-07 01:00:33Z msweet $"
 #
 # Install a program, script, or datafile.
 #
diff --git a/locale/Makefile b/locale/Makefile
index 5de848b658..29dc7f79fb 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Locale file makefile for CUPS.
 #
@@ -204,5 +204,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/locale/checkpo.c b/locale/checkpo.c
index 64563f679a..14e74a2fab 100644
--- a/locale/checkpo.c
+++ b/locale/checkpo.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: checkpo.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Verify that translations in the .po file have the same number and type of
  *   printf-style format strings.
@@ -409,5 +409,5 @@ free_formats(cups_array_t *fmts)	/* I - Array of format strings */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: checkpo.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/locale/po2strings.c b/locale/po2strings.c
index 88f0ef8016..80e9f9aae6 100644
--- a/locale/po2strings.c
+++ b/locale/po2strings.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: po2strings.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Convert a GNU gettext .po file to an Apple .strings file.
  *
@@ -364,5 +364,5 @@ normalize_string(const char *idstr,	/* I - msgid string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: po2strings.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/locale/strings2po.c b/locale/strings2po.c
index 7e714b4b1d..ab37733edb 100644
--- a/locale/strings2po.c
+++ b/locale/strings2po.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: strings2po.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Convert Apple .strings file (UTF-16 BE text file) to GNU gettext .po files.
  *
@@ -173,5 +173,5 @@ write_po(FILE       *po,		/* I - .po file */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: strings2po.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/man/Makefile b/man/Makefile
index c2a1923afa..29b3ed422c 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Man page makefile for CUPS.
 #
@@ -228,5 +228,5 @@ mantohtml:	mantohtml.o ../cups/$(LIBCUPSSTATIC)
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/man/backend.man b/man/backend.man
index 57d76cad41..58007f8723 100644
--- a/man/backend.man
+++ b/man/backend.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: backend.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" Backend man page for CUPS.
 .\"
@@ -201,5 +201,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: backend.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cancel.man b/man/cancel.man
index 75fbf5eaf8..aef0fb472e 100644
--- a/man/cancel.man
+++ b/man/cancel.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cancel.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cancel man page for CUPS.
 .\"
@@ -95,5 +95,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cancel.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/classes.conf.man b/man/classes.conf.man
index 4987d16bf8..ae0b5bfbf7 100644
--- a/man/classes.conf.man
+++ b/man/classes.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: classes.conf.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" classes.conf man page for CUPS.
 .\"
@@ -32,5 +32,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: classes.conf.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index 39a811b042..d7e55df5c7 100644
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: client.conf.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" client.conf man page for CUPS.
 .\"
@@ -82,5 +82,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: client.conf.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cups-config.man b/man/cups-config.man
index 7831c480f5..a29cd48f5d 100644
--- a/man/cups-config.man
+++ b/man/cups-config.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cups-config.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cups-config man page for CUPS.
 .\"
@@ -112,5 +112,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cups-config.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
index 30bd6bb6f3..d9dd579bdb 100644
--- a/man/cups-files.conf.man.in
+++ b/man/cups-files.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cups-files.conf.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cups-files.conf man page for CUPS.
 .\"
@@ -225,5 +225,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cups-files.conf.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index fcd76e08f7..b12faadbca 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cups-lpd.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cups-lpd man page for CUPS.
 .\"
@@ -122,5 +122,5 @@ RFC 2569
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cups-lpd.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man
index 335f6d5a92..4015f70324 100644
--- a/man/cups-snmp.conf.man
+++ b/man/cups-snmp.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cups-snmp.conf.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" snmp.conf man page for CUPS.
 .\"
@@ -65,5 +65,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cups-snmp.conf.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in
index 5ab57251c2..8582041cbb 100644
--- a/man/cups-snmp.man.in
+++ b/man/cups-snmp.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cups-snmp.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" SNMP backend man page for CUPS.
 .\"
@@ -57,5 +57,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cups-snmp.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cups.man b/man/cups.man
index eefe754cc2..8c52c74264 100644
--- a/man/cups.man
+++ b/man/cups.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cups.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cups (intro) man page for CUPS.
 .\"
@@ -143,5 +143,5 @@ PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cups.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsaccept.man b/man/cupsaccept.man
index 0be1e8607e..348d5ac041 100644
--- a/man/cupsaccept.man
+++ b/man/cupsaccept.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsaccept.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" accept/reject man page for CUPS.
 .\"
@@ -90,5 +90,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsaccept.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 28a9098ce8..710f3beefa 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsaddsmb.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsaddsmb man page for CUPS.
 .\"
@@ -127,5 +127,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsaddsmb.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsctl.man b/man/cupsctl.man
index 939546d3db..7107153a6c 100644
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsctl.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsctl man page for CUPS.
 .\"
@@ -102,5 +102,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsctl.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsd-helper.man b/man/cupsd-helper.man
index 2148ec4b88..0c9575273d 100644
--- a/man/cupsd-helper.man
+++ b/man/cupsd-helper.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsd-helper.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsd-helper man page for CUPS.
 .\"
@@ -90,5 +90,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsd-helper.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsd-logs.man b/man/cupsd-logs.man
index 63c6f18625..bef227c576 100644
--- a/man/cupsd-logs.man
+++ b/man/cupsd-logs.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsd-logs.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsd-logs man page for CUPS.
 .\"
@@ -237,5 +237,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsd-logs.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 5cf8c88061..1007bf1df1 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsd.conf.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsd.conf man page for CUPS.
 .\"
@@ -872,5 +872,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsd.conf.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsd.man.in b/man/cupsd.man.in
index 226fc5079f..6c71e9b571 100644
--- a/man/cupsd.man.in
+++ b/man/cupsd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsd.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsd man page for CUPS.
 .\"
@@ -130,5 +130,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2016 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsd.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsenable.man b/man/cupsenable.man
index 3f4458b369..092852ab10 100644
--- a/man/cupsenable.man
+++ b/man/cupsenable.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsenable.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsenable/cupsdisable man page for CUPS.
 .\"
@@ -102,5 +102,5 @@ CUPS Online Help (http://localhost:631/help)
 Copyright \[co] 2007-2015 by Apple Inc.
 
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsenable.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupsfilter.man b/man/cupsfilter.man
index e901ffa406..1621b66562 100644
--- a/man/cupsfilter.man
+++ b/man/cupsfilter.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsfilter.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupsfilter man page for CUPS.
 .\"
@@ -139,5 +139,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsfilter.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
index aed992fc5c..12ee30409b 100644
--- a/man/cupstestdsc.man
+++ b/man/cupstestdsc.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupstestdsc.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupstestdsc man page for CUPS.
 .\"
@@ -47,5 +47,5 @@ Specification, Version 3.0.
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupstestdsc.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/cupstestppd.man b/man/cupstestppd.man
index f50c3d568c..1297eed89a 100644
--- a/man/cupstestppd.man
+++ b/man/cupstestppd.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupstestppd.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" cupstestppd man page for CUPS.
 .\"
@@ -147,5 +147,5 @@ Adobe PostScript Printer Description File Format Specification, Version 4.3.
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupstestppd.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/filter.man b/man/filter.man
index a12058526f..e5c4c6fd2c 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: filter.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" filter man page for CUPS.
 .\"
@@ -221,5 +221,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: filter.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ippfind.man b/man/ippfind.man
index 1afd502b92..e17a03647a 100644
--- a/man/ippfind.man
+++ b/man/ippfind.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ippfind.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ippfind man page for CUPS.
 .\"
@@ -257,5 +257,5 @@ Similarly, to send a PostScript test page to every PostScript printer, run:
 .SH COPYRIGHT
 Copyright \[co] 2013-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ippfind.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ipptool.man b/man/ipptool.man
index 249d871e78..9deb950ebf 100644
--- a/man/ipptool.man
+++ b/man/ipptool.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ipptool.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ipptool man page for CUPS.
 .\"
@@ -244,5 +244,5 @@ RFC 2911 (http://tools.ietf.org/html/rfc2911),
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ipptool.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man
index 3210889b1b..84673a96bf 100644
--- a/man/ipptoolfile.man
+++ b/man/ipptoolfile.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ipptoolfile.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ipptoolfile man page for CUPS.
 .\"
@@ -621,5 +621,5 @@ RFC 2911 (http://tools.ietf.org/html/rfc3911)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ipptoolfile.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lp.man b/man/lp.man
index 4497258713..7de8b8014a 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lp.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lp man page for CUPS.
 .\"
@@ -218,5 +218,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lp.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index c0283f2da4..489257422c 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpadmin.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpadmin man page for CUPS.
 .\"
@@ -213,5 +213,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpadmin.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpc.man b/man/lpc.man
index 8965d216b8..008689e14a 100644
--- a/man/lpc.man
+++ b/man/lpc.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpc.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpc man page for CUPS.
 .\"
@@ -60,5 +60,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpc.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpinfo.man b/man/lpinfo.man
index 664784a781..e150ab079a 100644
--- a/man/lpinfo.man
+++ b/man/lpinfo.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpinfo.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpinfo man page for CUPS.
 .\"
@@ -134,5 +134,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpinfo.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpmove.man b/man/lpmove.man
index c6d540262c..116c0faa26 100644
--- a/man/lpmove.man
+++ b/man/lpmove.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpmove.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpmove man page for CUPS.
 .\"
@@ -78,5 +78,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpmove.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index d93c8b51e1..1848173b50 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpoptions.man.in 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpoptions man page for CUPS.
 .\"
@@ -137,5 +137,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpoptions.man.in 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpq.man b/man/lpq.man
index 6d21b95e66..c061a06d26 100644
--- a/man/lpq.man
+++ b/man/lpq.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpq.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpq man page for CUPS.
 .\"
@@ -68,5 +68,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpq.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpr.man b/man/lpr.man
index b819b3d650..5a28898567 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpr.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpr man page for CUPS.
 .\"
@@ -145,5 +145,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpr.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lprm.man b/man/lprm.man
index 1f46ea0533..3578881108 100644
--- a/man/lprm.man
+++ b/man/lprm.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lprm.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lprm man page for CUPS.
 .\"
@@ -86,5 +86,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lprm.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index 15e78736ca..4f53f71a54 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: lpstat.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" lpstat man page for CUPS.
 .\"
@@ -148,5 +148,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: lpstat.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/mailto.conf.man b/man/mailto.conf.man
index 03c9a65233..24681fd38f 100644
--- a/man/mailto.conf.man
+++ b/man/mailto.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: mailto.conf.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" mailto.conf man page for CUPS.
 .\"
@@ -48,5 +48,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: mailto.conf.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index e9a581af51..661a6a0afa 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: mantohtml.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Man page to HTML conversion program.
  *
@@ -1222,5 +1222,5 @@ strmove(char       *d,			/* I - Destination */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: mantohtml.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/man/mime.convs.man b/man/mime.convs.man
index 06d677a3f0..1c307a4d3f 100644
--- a/man/mime.convs.man
+++ b/man/mime.convs.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: mime.convs.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" mime.convs man page for CUPS.
 .\"
@@ -62,5 +62,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: mime.convs.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/mime.types.man b/man/mime.types.man
index 2af57c9476..11015bcfbf 100644
--- a/man/mime.types.man
+++ b/man/mime.types.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: mime.types.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" mime.types man page for CUPS.
 .\"
@@ -112,5 +112,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: mime.types.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/notifier.man b/man/notifier.man
index 5c5d852905..a4a8a74551 100644
--- a/man/notifier.man
+++ b/man/notifier.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: notifier.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" notifier man page for CUPS.
 .\"
@@ -40,5 +40,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: notifier.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ppdc.man b/man/ppdc.man
index aa50cf584d..2e2b5d34a4 100644
--- a/man/ppdc.man
+++ b/man/ppdc.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ppdc.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ppdc man page for CUPS.
 .\"
@@ -102,5 +102,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ppdc.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ppdcfile.man b/man/ppdcfile.man
index 9d5bc4a3b3..6b2456aad6 100644
--- a/man/ppdcfile.man
+++ b/man/ppdcfile.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ppdcfile.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ppdcfile man page for CUPS.
 .\"
@@ -161,5 +161,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ppdcfile.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ppdhtml.man b/man/ppdhtml.man
index 41311430de..d066703145 100644
--- a/man/ppdhtml.man
+++ b/man/ppdhtml.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ppdhtml.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ppdhtml man page for CUPS.
 .\"
@@ -47,5 +47,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ppdhtml.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ppdi.man b/man/ppdi.man
index 57f5b16caa..5302295f1b 100644
--- a/man/ppdi.man
+++ b/man/ppdi.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ppdi.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ppdi man page for CUPS.
 .\"
@@ -54,5 +54,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ppdi.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ppdmerge.man b/man/ppdmerge.man
index 6051a9acb3..b0b98b11c7 100644
--- a/man/ppdmerge.man
+++ b/man/ppdmerge.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ppdmerge.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ppdmerge man page for CUPS.
 .\"
@@ -50,5 +50,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ppdmerge.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/ppdpo.man b/man/ppdpo.man
index c0c38ff652..f1f31a7baa 100644
--- a/man/ppdpo.man
+++ b/man/ppdpo.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: ppdpo.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" ppdpo man page for CUPS.
 .\"
@@ -54,5 +54,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: ppdpo.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/printers.conf.man b/man/printers.conf.man
index d38843c954..a7ab9549b9 100644
--- a/man/printers.conf.man
+++ b/man/printers.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: printers.conf.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" printers.conf man page for CUPS.
 .\"
@@ -32,5 +32,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: printers.conf.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man
index b659f315df..ed0a2c76ee 100644
--- a/man/subscriptions.conf.man
+++ b/man/subscriptions.conf.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: subscriptions.conf.man 13138 2016-03-15 14:59:54Z msweet $"
 .\"
 .\" subscriptions.conf man page for CUPS.
 .\"
@@ -32,5 +32,5 @@ CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
 Copyright \[co] 2007-2015 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: subscriptions.conf.man 13138 2016-03-15 14:59:54Z msweet $".
 .\"
diff --git a/monitor/Makefile b/monitor/Makefile
index 7ba7c42307..1c3bf6995c 100644
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
 #
 #   Port monitor makefile for CUPS.
 #
@@ -143,5 +143,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
 #
diff --git a/monitor/bcp.c b/monitor/bcp.c
index 885805243a..156dcc324e 100644
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: bcp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * TBCP port monitor for CUPS.
  *
@@ -281,5 +281,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: bcp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index e37635a705..770acdd163 100644
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: tbcp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * TBCP port monitor for CUPS.
  *
@@ -271,5 +271,5 @@ pswrite(const char *buf,		/* I - Buffer to write */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: tbcp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/notifier/Makefile b/notifier/Makefile
index e3d741351c..3206dd075e 100644
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $"
 #
 #   Notifier makefile for CUPS.
 #
@@ -161,5 +161,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 10996 2013-05-29 11:51:34Z msweet $".
 #
diff --git a/notifier/dbus.c b/notifier/dbus.c
index 03a41681e5..3ee0406640 100644
--- a/notifier/dbus.c
+++ b/notifier/dbus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dbus.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * D-Bus notifier for CUPS.
  *
@@ -654,5 +654,5 @@ main(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dbus.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/notifier/mailto.c b/notifier/mailto.c
index 7b2f8a1a2b..724e12be65 100644
--- a/notifier/mailto.c
+++ b/notifier/mailto.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: mailto.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   "mailto" notifier for CUPS.
  *
@@ -642,5 +642,5 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: mailto.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/notifier/rss.c b/notifier/rss.c
index 3f6ca111e3..04acef761c 100644
--- a/notifier/rss.c
+++ b/notifier/rss.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: rss.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * RSS notifier for CUPS.
  *
@@ -735,5 +735,5 @@ xml_escape(const char *s)		/* I - String to escape */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: rss.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/notifier/testnotify.c b/notifier/testnotify.c
index a7b8df4a7e..be3508f4b1 100644
--- a/notifier/testnotify.c
+++ b/notifier/testnotify.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testnotify.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   Test notifier for CUPS.
  *
@@ -123,5 +123,5 @@ print_attributes(ipp_t *ipp,		/* I - IPP request */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testnotify.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index b1172230cc..5d35926fd7 100644
--- a/packaging/cups.list.in
+++ b/packaging/cups.list.in
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: cups.list.in 13138 2016-03-15 14:59:54Z msweet $"
 #
 # ESP Package Manager (EPM) file list for CUPS.
 #
@@ -733,5 +733,5 @@ f 0444 root sys $XINETD/cups-lpd scheduler/cups-lpd.xinetd
 %subpackage
 
 #
-# End of "$Id$".
+# End of "$Id: cups.list.in 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 46faef2cc2..5151004c46 100644
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: cups.spec.in 13138 2016-03-15 14:59:54Z msweet $"
 #
 # RPM "spec" file for CUPS.
 #
@@ -401,5 +401,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id$".
+# End of "$Id: cups.spec.in 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/ppdc/Makefile b/ppdc/Makefile
index 68bf6b2a41..9bea044b12 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Makefile for the CUPS PPD Compiler.
 #
@@ -388,5 +388,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/ppdc/foo.drv b/ppdc/foo.drv
index 24a7e04bb2..3659905830 100644
--- a/ppdc/foo.drv
+++ b/ppdc/foo.drv
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: foo.drv 3247 2011-05-12 06:22:31Z msweet $"
 //
 //   PPD file compiler test data file for CUPS.
 //
@@ -543,5 +543,5 @@ Attribute cupsIPPReason "com.foo-serious-error/A Serious Error" "http://foo.com/
 
 
 //
-// End of "$Id$".
+// End of "$Id: foo.drv 3247 2011-05-12 06:22:31Z msweet $".
 //
diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx
index 8d0061ba0e..889bc0a0eb 100644
--- a/ppdc/genstrings.cxx
+++ b/ppdc/genstrings.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: genstrings.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // GNU gettext message generator for the CUPS PPD Compiler.
 //
@@ -204,5 +204,5 @@ write_cstring(const char *s)		/* I - String to write */
 
 
 //
-// End of "$Id$".
+// End of "$Id: genstrings.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx
index 688f56c46a..6cc853d713 100644
--- a/ppdc/ppdc-array.cxx
+++ b/ppdc/ppdc-array.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-array.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // Array class for the CUPS PPD Compiler.
 //
@@ -155,5 +155,5 @@ ppdcArray::remove(ppdcShared *d)		// I - Data element
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-array.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx
index 1ea0337a93..4570f106fc 100644
--- a/ppdc/ppdc-attr.cxx
+++ b/ppdc/ppdc-attr.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Attribute class for the CUPS PPD Compiler.
 //
@@ -62,5 +62,5 @@ ppdcAttr::~ppdcAttr()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-attr.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx
index 567163731b..085e676e43 100644
--- a/ppdc/ppdc-catalog.cxx
+++ b/ppdc/ppdc-catalog.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-catalog.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // Shared message catalog class for the CUPS PPD Compiler.
 //
@@ -962,5 +962,5 @@ put_utf16(cups_file_t *fp,		// I - File to write to
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-catalog.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx
index 2c12de2b9c..e9937feb93 100644
--- a/ppdc/ppdc-choice.cxx
+++ b/ppdc/ppdc-choice.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Option choice class for the CUPS PPD Compiler.
 //
@@ -57,5 +57,5 @@ ppdcChoice::~ppdcChoice()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-choice.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx
index 6e6f0241e7..c06097986b 100644
--- a/ppdc/ppdc-constraint.cxx
+++ b/ppdc/ppdc-constraint.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Contraint class for the CUPS PPD Compiler.
 //
@@ -60,5 +60,5 @@ ppdcConstraint::~ppdcConstraint()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-constraint.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx
index f70da00960..2736f61c9a 100644
--- a/ppdc/ppdc-driver.cxx
+++ b/ppdc/ppdc-driver.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-driver.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // PPD file compiler definitions for the CUPS PPD Compiler.
 //
@@ -1326,5 +1326,5 @@ ppdcDriver::write_ppd_file(
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-driver.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index 1f1d9a84e1..0a24827f7f 100644
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $"
 //
 //   File class for the CUPS PPD Compiler.
 //
@@ -106,5 +106,5 @@ ppdcFile::peek()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-file.cxx 3755 2012-03-30 05:59:14Z msweet $".
 //
diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx
index 33994849b8..cc1ae00ff6 100644
--- a/ppdc/ppdc-filter.cxx
+++ b/ppdc/ppdc-filter.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Filter class for the CUPS PPD Compiler.
 //
@@ -56,5 +56,5 @@ ppdcFilter::~ppdcFilter()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-filter.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx
index b6d9bcb2ab..c5dad4d832 100644
--- a/ppdc/ppdc-font.cxx
+++ b/ppdc/ppdc-font.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Shared font class for the CUPS PPD Compiler.
 //
@@ -62,5 +62,5 @@ ppdcFont::~ppdcFont()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-font.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx
index cc0ab280a4..00d0a7cb2c 100644
--- a/ppdc/ppdc-group.cxx
+++ b/ppdc/ppdc-group.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $"
 //
 //   Group class for the CUPS PPD Compiler.
 //
@@ -99,5 +99,5 @@ ppdcGroup::find_option(const char *n)	// I - Name of option
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-group.cxx 3275 2011-05-20 07:26:13Z msweet $".
 //
diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 4794e77151..d41cbb9822 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $"
 //
 //   PPD file import methods for the CUPS PPD Compiler.
 //
@@ -339,5 +339,5 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-import.cxx 3275 2011-05-20 07:26:13Z msweet $".
 //
diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx
index 844028a39c..48afd381a9 100644
--- a/ppdc/ppdc-mediasize.cxx
+++ b/ppdc/ppdc-mediasize.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Shared media size class for the CUPS PPD Compiler.
 //
@@ -81,5 +81,5 @@ ppdcMediaSize::~ppdcMediaSize()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-mediasize.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx
index 11e5e3eaa7..fbbe40c381 100644
--- a/ppdc/ppdc-message.cxx
+++ b/ppdc/ppdc-message.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Shared message class for the CUPS PPD Compiler.
 //
@@ -54,5 +54,5 @@ ppdcMessage::~ppdcMessage()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-message.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx
index e80df3c875..3fdc296add 100644
--- a/ppdc/ppdc-option.cxx
+++ b/ppdc/ppdc-option.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $"
 //
 //   Option class for the CUPS PPD Compiler.
 //
@@ -125,5 +125,5 @@ ppdcOption::set_defchoice(ppdcChoice *c)	// I - Choice
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-option.cxx 3275 2011-05-20 07:26:13Z msweet $".
 //
diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h
index 2bf5a24e79..2fea438865 100644
--- a/ppdc/ppdc-private.h
+++ b/ppdc/ppdc-private.h
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-private.h 1992 2010-03-24 14:32:08Z msweet $"
 //
 //   Private definitions for the CUPS PPD Compiler.
 //
@@ -36,5 +36,5 @@
 #endif // !_PPDC_PRIVATE_H_
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-private.h 1992 2010-03-24 14:32:08Z msweet $".
 //
diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx
index 90625f423d..244e34f42b 100644
--- a/ppdc/ppdc-profile.cxx
+++ b/ppdc/ppdc-profile.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Color profile class for the CUPS PPD Compiler.
 //
@@ -61,5 +61,5 @@ ppdcProfile::~ppdcProfile()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-profile.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx
index 0c99c08597..e6b6167a10 100644
--- a/ppdc/ppdc-shared.cxx
+++ b/ppdc/ppdc-shared.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $"
 //
 //   Shared data class for the CUPS PPD Compiler.
 //
@@ -84,5 +84,5 @@ ppdcShared::retain()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-shared.cxx 1556 2009-06-10 19:02:58Z msweet $".
 //
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 988e9dd222..f5084a9599 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-source.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // Source class for the CUPS PPD Compiler.
 //
@@ -3803,5 +3803,5 @@ ppdcSource::write_file(const char *f)	// I - File to write
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-source.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx
index 706bd138c6..b6e3512138 100644
--- a/ppdc/ppdc-string.cxx
+++ b/ppdc/ppdc-string.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-string.cxx 3933 2012-10-01 03:01:10Z msweet $"
 //
 //   Shared string class for the CUPS PPD Compiler.
 //
@@ -60,5 +60,5 @@ ppdcString::~ppdcString()
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-string.cxx 3933 2012-10-01 03:01:10Z msweet $".
 //
diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx
index 22a175ad44..d60ef72fa4 100644
--- a/ppdc/ppdc-variable.cxx
+++ b/ppdc/ppdc-variable.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Variable class for the CUPS PPD Compiler.
 //
@@ -67,5 +67,5 @@ ppdcVariable::set_value(const char *v)
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc-variable.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx
index 67d3b66901..322f6c315a 100644
--- a/ppdc/ppdc.cxx
+++ b/ppdc/ppdc.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // PPD file compiler main entry for the CUPS PPD Compiler.
 //
@@ -459,5 +459,5 @@ usage(void)
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h
index c940e00a06..0aad12558b 100644
--- a/ppdc/ppdc.h
+++ b/ppdc/ppdc.h
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdc.h 3755 2012-03-30 05:59:14Z msweet $"
 //
 //   Definitions for the CUPS PPD Compiler.
 //
@@ -529,5 +529,5 @@ class ppdcSource			//// Source File
 #endif // !_PPDC_H_
 
 //
-// End of "$Id$".
+// End of "$Id: ppdc.h 3755 2012-03-30 05:59:14Z msweet $".
 //
diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx
index 881187636c..43291e1630 100644
--- a/ppdc/ppdhtml.cxx
+++ b/ppdc/ppdhtml.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdhtml.cxx 13138 2016-03-15 14:59:54Z msweet $"
 //
 // PPD to HTML utility for the CUPS PPD Compiler.
 //
@@ -187,5 +187,5 @@ usage(void)
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdhtml.cxx 13138 2016-03-15 14:59:54Z msweet $".
 //
diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx
index a411bfef54..cbc728b90c 100644
--- a/ppdc/ppdi.cxx
+++ b/ppdc/ppdi.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $"
 //
 //   PPD file import utility for the CUPS PPD Compiler.
 //
@@ -138,5 +138,5 @@ usage(void)
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdi.cxx 3071 2011-03-23 00:05:29Z msweet $".
 //
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 8c4863e11f..fad69df058 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdmerge.cxx 11984 2014-07-02 13:16:59Z msweet $"
 //
 // PPD file merge utility for the CUPS PPD Compiler.
 //
@@ -369,5 +369,5 @@ usage(void)
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdmerge.cxx 11984 2014-07-02 13:16:59Z msweet $".
 //
diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx
index 132d4593e0..2662d42269 100644
--- a/ppdc/ppdpo.cxx
+++ b/ppdc/ppdpo.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: ppdpo.cxx 13138 2016-03-15 14:59:54Z msweet $"
 //
 // PPD file message catalog program for the CUPS PPD Compiler.
 //
@@ -258,5 +258,5 @@ usage(void)
 
 
 //
-// End of "$Id$".
+// End of "$Id: ppdpo.cxx 13138 2016-03-15 14:59:54Z msweet $".
 //
diff --git a/ppdc/sample.drv b/ppdc/sample.drv
index 89c75fe0d7..bed24e8f5a 100644
--- a/ppdc/sample.drv
+++ b/ppdc/sample.drv
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: sample.drv 13138 2016-03-15 14:59:54Z msweet $"
 //
 // Driver info file for CUPS-supplied PPDs.
 //
@@ -1168,5 +1168,5 @@ Version "2.1"
 }
 
 //
-// End of "$Id$".
+// End of "$Id: sample.drv 13138 2016-03-15 14:59:54Z msweet $".
 //
diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx
index a9e2e86556..0943dcc481 100644
--- a/ppdc/testcatalog.cxx
+++ b/ppdc/testcatalog.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id$"
+// "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $"
 //
 //   Test program for message catalog class.
 //
@@ -59,5 +59,5 @@ main(int  argc,				// I - Number of command-line arguments
 
 
 //
-// End of "$Id$".
+// End of "$Id: testcatalog.cxx 1378 2009-04-08 03:17:45Z msweet $".
 //
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 14c8f1ab9c..e1dee90faa 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Scheduler Makefile for CUPS.
 #
@@ -552,5 +552,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/scheduler/auth.c b/scheduler/auth.c
index 171dccb052..4e6304a942 100644
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: auth.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Authorization routines for the CUPS scheduler.
  *
@@ -2211,5 +2211,5 @@ to64(char          *s,			/* O - Output string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: auth.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/auth.h b/scheduler/auth.h
index fe11d46558..cb75d930af 100644
--- a/scheduler/auth.h
+++ b/scheduler/auth.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: auth.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Authorization definitions for the CUPS scheduler.
  *
@@ -143,5 +143,5 @@ extern cupsd_location_t	*cupsdNewLocation(const char *location);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: auth.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/banners.c b/scheduler/banners.c
index 77ae797ae1..631a891af8 100644
--- a/scheduler/banners.c
+++ b/scheduler/banners.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: banners.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Banner routines for the CUPS scheduler.
  *
@@ -220,5 +220,5 @@ free_banners(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: banners.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/banners.h b/scheduler/banners.h
index fb933aaae4..19ab6f71f8 100644
--- a/scheduler/banners.h
+++ b/scheduler/banners.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: banners.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Banner definitions for the CUPS scheduler.
  *
@@ -41,5 +41,5 @@ extern void		cupsdLoadBanners(const char *d);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: banners.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/cert.c b/scheduler/cert.c
index 892a5fde18..dca7a19da5 100644
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cert.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Authentication certificate routines for the CUPS scheduler.
  *
@@ -451,5 +451,5 @@ ctcompare(const char *a,		/* I - First string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cert.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/cert.h b/scheduler/cert.h
index f2dc637bf0..063c5de7ab 100644
--- a/scheduler/cert.h
+++ b/scheduler/cert.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cert.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Authentication certificate definitions for the CUPS scheduler.
  *
@@ -49,5 +49,5 @@ extern void		cupsdInitCerts(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cert.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/classes.c b/scheduler/classes.c
index 12d6ae2eba..4b1c2bce86 100644
--- a/scheduler/classes.c
+++ b/scheduler/classes.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: classes.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Printer class routines for the CUPS scheduler.
  *
@@ -806,5 +806,5 @@ cupsdSaveAllClasses(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: classes.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/classes.h b/scheduler/classes.h
index b24b7de117..bc0196e211 100644
--- a/scheduler/classes.h
+++ b/scheduler/classes.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: classes.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Printer class definitions for the CUPS scheduler.
  *
@@ -31,5 +31,5 @@ extern void		cupsdSaveAllClasses(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: classes.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/client.c b/scheduler/client.c
index d5611147c3..545f08cbf7 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: client.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Client routines for the CUPS scheduler.
  *
@@ -4082,5 +4082,5 @@ write_pipe(cupsd_client_t *con)		/* I - Client connection */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: client.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/client.h b/scheduler/client.h
index afe8d3ac3f..6af7a60df3 100644
--- a/scheduler/client.h
+++ b/scheduler/client.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: client.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Client definitions for the CUPS scheduler.
  *
@@ -148,5 +148,5 @@ extern int	cupsdStartTLS(cupsd_client_t *con);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: client.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/colorman.c b/scheduler/colorman.c
index 8926212c45..856d9151f6 100644
--- a/scheduler/colorman.c
+++ b/scheduler/colorman.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: colorman.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Color management routines for the CUPS scheduler.
  *
@@ -1519,5 +1519,5 @@ colord_unregister_printer(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: colorman.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/colorman.h b/scheduler/colorman.h
index e912a92a34..3360fd4e3e 100644
--- a/scheduler/colorman.h
+++ b/scheduler/colorman.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $"
  *
  *   Color management definitions for the CUPS scheduler.
  *
@@ -24,5 +24,5 @@ extern void	cupsdUnregisterColor(cupsd_printer_t *p);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: colorman.h 3833 2012-05-23 22:51:18Z msweet $".
  */
diff --git a/scheduler/conf.c b/scheduler/conf.c
index c913351438..73e21e54fd 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: conf.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Configuration routines for the CUPS scheduler.
  *
@@ -4247,5 +4247,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: conf.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/conf.h b/scheduler/conf.h
index 55ab2bdc96..555f34a589 100644
--- a/scheduler/conf.h
+++ b/scheduler/conf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: conf.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Configuration file definitions for the CUPS scheduler.
  *
@@ -300,5 +300,5 @@ extern int	cupsdWriteErrorLog(int level, const char *message);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: conf.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c
index 73e93da0b8..e951ee5261 100644
--- a/scheduler/cups-deviced.c
+++ b/scheduler/cups-deviced.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups-deviced.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Device scanning mini-daemon for CUPS.
  *
@@ -793,5 +793,5 @@ start_backend(const char *name,		/* I - Backend to run */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-deviced.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx
index 46ed9cffdf..6588038018 100644
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups-driverd.cxx 13138 2016-03-15 14:59:54Z msweet $"
  *
  * PPD/driver support for CUPS.
  *
@@ -2931,5 +2931,5 @@ regex_string(const char *s)		/* I - String to compare */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-driverd.cxx 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c
index c774450568..7b12814337 100644
--- a/scheduler/cups-exec.c
+++ b/scheduler/cups-exec.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups-exec.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Sandbox helper for CUPS.
  *
@@ -202,5 +202,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-exec.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c
index 798ee0588e..ebd8305247 100644
--- a/scheduler/cups-lpd.c
+++ b/scheduler/cups-lpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cups-lpd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Line Printer Daemon interface for CUPS.
  *
@@ -1629,5 +1629,5 @@ smart_gets(char *s,			/* I - Pointer to line buffer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cups-lpd.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in
index 4099196e6e..c50e893eb3 100644
--- a/scheduler/cups.sh.in
+++ b/scheduler/cups.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: cups.sh.in 11342 2013-10-18 20:36:01Z msweet $"
 #
 # Startup/shutdown script for CUPS.
 #
@@ -200,5 +200,5 @@ exit 0
 
 
 #
-# End of "$Id$".
+# End of "$Id: cups.sh.in 11342 2013-10-18 20:36:01Z msweet $".
 #
diff --git a/scheduler/cups.xml.in b/scheduler/cups.xml.in
index 211c086b7f..ac6358509b 100644
--- a/scheduler/cups.xml.in
+++ b/scheduler/cups.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
-    $Id$
+    $Id: cups.xml.in 2309 2010-07-08 20:45:48Z msweet $
 
     Service manifest for CUPS.
 
diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h
index 2d8247f699..f0b705431b 100644
--- a/scheduler/cupsd.h
+++ b/scheduler/cupsd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupsd.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Main header file for the CUPS scheduler.
  *
@@ -229,5 +229,5 @@ extern void		cupsdStopServer(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupsd.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c
index 66ba874a95..3e7b678676 100644
--- a/scheduler/cupsfilter.c
+++ b/scheduler/cupsfilter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupsfilter.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Filtering program for CUPS.
  *
@@ -1501,5 +1501,5 @@ usage(const char *opt)			/* I - Incorrect option, if any */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupsfilter.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 71a002cd12..0ee2a197f5 100644
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dirsvc.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Directory services routines for the CUPS scheduler.
  *
@@ -1823,5 +1823,5 @@ update_smb(int onoff)			/* I - 1 = turn on, 0 = turn off */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dirsvc.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h
index 22f3f9c285..1326f8abab 100644
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: dirsvc.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Directory services definitions for the CUPS scheduler.
  *
@@ -80,5 +80,5 @@ extern void	cupsdUpdateDNSSDName(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: dirsvc.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/env.c b/scheduler/env.c
index d5c154fcde..4585d8f210 100644
--- a/scheduler/env.c
+++ b/scheduler/env.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: env.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Environment management routines for the CUPS scheduler.
  *
@@ -265,5 +265,5 @@ find_env(const char *name)		/* I - Variable name */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: env.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/file.c b/scheduler/file.c
index 210243641d..34391f2b86 100644
--- a/scheduler/file.c
+++ b/scheduler/file.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: file.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * File functions for the CUPS scheduler.
  *
@@ -447,5 +447,5 @@ overwrite_data(int        fd,		/* I - File descriptor */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: file.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/filter.c b/scheduler/filter.c
index d1446f6543..eec96119b8 100644
--- a/scheduler/filter.c
+++ b/scheduler/filter.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: filter.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   File type conversion routines for CUPS.
  *
@@ -500,5 +500,5 @@ mime_find_filters(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: filter.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index 6ccdc68895..921b63a437 100644
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipp.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * IPP routines for the CUPS scheduler.
  *
@@ -11403,5 +11403,5 @@ validate_user(cupsd_job_t    *job,	/* I - Job */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipp.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/job.c b/scheduler/job.c
index b18c7ee199..dbd4b4f30a 100644
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: job.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Job management routines for the CUPS scheduler.
  *
@@ -5371,5 +5371,5 @@ update_job_attrs(cupsd_job_t *job,	/* I - Job to update */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: job.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/job.h b/scheduler/job.h
index 32e2fd7473..c54b630fb5 100644
--- a/scheduler/job.h
+++ b/scheduler/job.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: job.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Print job definitions for the CUPS scheduler.
  *
@@ -180,5 +180,5 @@ extern void		cupsdUpdateJobs(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: job.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/listen.c b/scheduler/listen.c
index b55d918b01..5d2e5d603c 100644
--- a/scheduler/listen.c
+++ b/scheduler/listen.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: listen.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Server listening routines for the CUPS scheduler.
  *
@@ -302,5 +302,5 @@ cupsdStopListening(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: listen.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/log.c b/scheduler/log.c
index b48b7a740c..018ff5f3b8 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: log.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Log file routines for the CUPS scheduler.
  *
@@ -1509,5 +1509,5 @@ format_log_line(const char *message,	/* I - Printf-style format string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: log.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/mime-private.h b/scheduler/mime-private.h
index c448e5ac8a..078953dbc4 100644
--- a/scheduler/mime-private.h
+++ b/scheduler/mime-private.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: mime-private.h 3411 2011-09-07 22:31:27Z msweet $"
  *
  *   Private MIME type/conversion database definitions for CUPS.
  *
@@ -41,5 +41,5 @@ extern void	_mimeError(mime_t *mime, const char *format, ...)
 #endif /* !_CUPS_MIME_PRIVATE_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: mime-private.h 3411 2011-09-07 22:31:27Z msweet $".
  */
diff --git a/scheduler/mime.c b/scheduler/mime.c
index 56181501a6..aec1ff24e7 100644
--- a/scheduler/mime.c
+++ b/scheduler/mime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: mime.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * MIME database file routines for CUPS.
  *
@@ -935,5 +935,5 @@ mime_load_types(mime_t     *mime,	/* I - MIME database */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: mime.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/mime.h b/scheduler/mime.h
index 3d61d2e1e2..ddd3283842 100644
--- a/scheduler/mime.h
+++ b/scheduler/mime.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: mime.h 11272 2013-09-10 19:15:36Z msweet $"
  *
  *   MIME type/conversion database definitions for CUPS.
  *
@@ -161,5 +161,5 @@ extern void		mimeSetErrorCallback(mime_t *mime, mime_error_cb_t cb,
 #endif /* !_CUPS_MIME_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: mime.h 11272 2013-09-10 19:15:36Z msweet $".
  */
diff --git a/scheduler/network.c b/scheduler/network.c
index 350f4e3e90..33efa94138 100644
--- a/scheduler/network.c
+++ b/scheduler/network.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: network.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Network interface functions for the CUPS scheduler.
  *
@@ -298,5 +298,5 @@ compare_netif(cupsd_netif_t *a,		/* I - First network interface */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: network.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/network.h b/scheduler/network.h
index c7a6aa0c39..411a6d2026 100644
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: network.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Network interface definitions for the CUPS scheduler.
  *
@@ -48,5 +48,5 @@ extern void		cupsdNetIFUpdate(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: network.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/policy.c b/scheduler/policy.c
index b36095ff63..aa5a03340f 100644
--- a/scheduler/policy.c
+++ b/scheduler/policy.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: policy.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Policy routines for the CUPS scheduler.
  *
@@ -503,5 +503,5 @@ hash_op(cupsd_location_t *op)		/* I - Operation */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: policy.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/policy.h b/scheduler/policy.h
index 361271f2b0..8af88f5565 100644
--- a/scheduler/policy.h
+++ b/scheduler/policy.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: policy.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Policy definitions for the CUPS scheduler.
  *
@@ -59,5 +59,5 @@ extern cups_array_t	*cupsdGetPrivateAttrs(cupsd_policy_t *p,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: policy.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/printers.c b/scheduler/printers.c
index 2841adc29f..e7eb68e45f 100644
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: printers.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Printer routines for the CUPS scheduler.
  *
@@ -5083,5 +5083,5 @@ write_xml_string(cups_file_t *fp,	/* I - File to write to */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: printers.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/printers.h b/scheduler/printers.h
index 6c12cf8c45..2eb3689739 100644
--- a/scheduler/printers.h
+++ b/scheduler/printers.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: printers.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Printer definitions for the CUPS scheduler.
  *
@@ -196,5 +196,5 @@ extern void		cupsdWritePrintcap(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: printers.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/process.c b/scheduler/process.c
index 2587bde187..2c3c54fe17 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: process.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Process management routines for the CUPS scheduler.
  *
@@ -890,5 +890,5 @@ cupsd_requote(char       *dst,		/* I - Destination buffer */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: process.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/quotas.c b/scheduler/quotas.c
index 9f0b6c0a33..ae8b88f470 100644
--- a/scheduler/quotas.c
+++ b/scheduler/quotas.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: quotas.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Quota routines for the CUPS scheduler.
  *
@@ -240,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1,	/* I - First quota record */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: quotas.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/select.c b/scheduler/select.c
index d302db0af8..4230e22b48 100644
--- a/scheduler/select.c
+++ b/scheduler/select.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: select.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Select abstraction functions for the CUPS scheduler.
  *
@@ -930,5 +930,5 @@ find_fd(int fd)				/* I - File descriptor */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: select.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/server.c b/scheduler/server.c
index e53a5c11f4..773ccf6ba5 100644
--- a/scheduler/server.c
+++ b/scheduler/server.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: server.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   Server start/stop routines for the CUPS scheduler.
  *
@@ -183,5 +183,5 @@ cupsdStopServer(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: server.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c
index 1c2bd74e61..290fd25d85 100644
--- a/scheduler/statbuf.c
+++ b/scheduler/statbuf.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: statbuf.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Status buffer routines for the CUPS scheduler.
  *
@@ -324,5 +324,5 @@ cupsdStatBufUpdate(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: statbuf.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h
index 212acdf18c..68bf206052 100644
--- a/scheduler/statbuf.h
+++ b/scheduler/statbuf.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: statbuf.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Status buffer definitions for the CUPS scheduler.
  *
@@ -45,5 +45,5 @@ extern char		*cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel,
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: statbuf.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c
index ff14f45b04..cfa0089e89 100644
--- a/scheduler/subscriptions.c
+++ b/scheduler/subscriptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: subscriptions.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Subscription routines for the CUPS scheduler.
  *
@@ -1617,5 +1617,5 @@ cupsd_update_notifier(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: subscriptions.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h
index eac866956c..867a1c6e95 100644
--- a/scheduler/subscriptions.h
+++ b/scheduler/subscriptions.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: subscriptions.h 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Subscription definitions for the CUPS scheduler.
  *
@@ -162,5 +162,5 @@ extern void	cupsdStopAllNotifiers(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: subscriptions.h 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index b78bbf196a..2ca5f54737 100644
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: sysman.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * System management functions for the CUPS scheduler.
  *
@@ -1072,5 +1072,5 @@ sysUpdateNames(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: sysman.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/sysman.h b/scheduler/sysman.h
index e3497ed0eb..e29d9a2046 100644
--- a/scheduler/sysman.h
+++ b/scheduler/sysman.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: sysman.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * System management definitions for the CUPS scheduler.
  *
@@ -62,5 +62,5 @@ extern void	cupsdStopSystemMonitor(void);
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: sysman.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c
index ecfdb197b1..0a1b2e3ba9 100644
--- a/scheduler/testlpd.c
+++ b/scheduler/testlpd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testlpd.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * cups-lpd test program for CUPS.
  *
@@ -535,5 +535,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testlpd.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/testmime.c b/scheduler/testmime.c
index 176e23767e..b8cc1eca4d 100644
--- a/scheduler/testmime.c
+++ b/scheduler/testmime.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testmime.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * MIME test program for CUPS.
  *
@@ -519,5 +519,5 @@ type_dir(mime_t     *mime,		/* I - MIME database */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testmime.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c
index dfd984b156..18f829f5a8 100644
--- a/scheduler/testspeed.c
+++ b/scheduler/testspeed.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testspeed.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Scheduler speed test for CUPS.
  *
@@ -376,5 +376,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testspeed.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/testsub.c b/scheduler/testsub.c
index 56bc3a42c2..9f62897940 100644
--- a/scheduler/testsub.c
+++ b/scheduler/testsub.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: testsub.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Scheduler notification tester for CUPS.
  *
@@ -505,5 +505,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: testsub.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/type.c b/scheduler/type.c
index 5300d7e7d6..928aa3b600 100644
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: type.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * MIME typing routines for CUPS.
  *
@@ -1279,5 +1279,5 @@ mime_patmatch(const char *s,		/* I - String to match against */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: type.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/scheduler/util.c b/scheduler/util.c
index ae6182fd7c..93509aaef0 100644
--- a/scheduler/util.c
+++ b/scheduler/util.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: util.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Mini-daemon utility functions for CUPS.
  *
@@ -455,5 +455,5 @@ cupsdSendIPPTrailer(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: util.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/scheduler/util.h b/scheduler/util.h
index c6bdf22267..92f40a36cb 100644
--- a/scheduler/util.h
+++ b/scheduler/util.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: util.h 11984 2014-07-02 13:16:59Z msweet $"
  *
  * Mini-daemon utility definitions for CUPS.
  *
@@ -67,5 +67,5 @@ extern void		cupsdSendIPPTrailer(void);
 #endif /* !_CUPSD_UTIL_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: util.h 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/systemv/Makefile b/systemv/Makefile
index a073d91a77..6b395e4a83 100644
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $"
 #
 # System V commands makefile for CUPS.
 #
@@ -279,5 +279,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $".
 #
diff --git a/systemv/cancel.c b/systemv/cancel.c
index cb5d4f9e53..b06823f41e 100644
--- a/systemv/cancel.c
+++ b/systemv/cancel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cancel.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  *   "cancel" command for CUPS.
  *
@@ -383,5 +383,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cancel.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c
index 784138ee2f..67a682cc4b 100644
--- a/systemv/cupsaccept.c
+++ b/systemv/cupsaccept.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupsaccept.c 2873 2010-11-30 03:16:24Z msweet $"
  *
  *   "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for
  *   CUPS.
@@ -235,5 +235,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupsaccept.c 2873 2010-11-30 03:16:24Z msweet $".
  */
diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c
index dfce0022f7..48c99aebf6 100644
--- a/systemv/cupsaddsmb.c
+++ b/systemv/cupsaddsmb.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupsaddsmb.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   "cupsaddsmb" command for CUPS.
  *
@@ -295,5 +295,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupsaddsmb.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index 0cd2a59d78..09d66eab0f 100644
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupsctl.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   Scheduler control program for CUPS.
  *
@@ -223,5 +223,5 @@ usage(const char *opt)			/* I - Option character/string */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupsctl.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c
index de024c7ed6..5e2c809500 100644
--- a/systemv/cupstestdsc.c
+++ b/systemv/cupstestdsc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: cupstestdsc.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   DSC test program for CUPS.
  *
@@ -438,5 +438,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: cupstestdsc.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/systemv/lp.c b/systemv/lp.c
index 9e895d4d64..9a2cc3f446 100644
--- a/systemv/lp.c
+++ b/systemv/lp.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lp.c 11984 2014-07-02 13:16:59Z msweet $"
  *
  * "lp" command for CUPS.
  *
@@ -758,5 +758,5 @@ set_job_attrs(const char    *command,	/* I - Command name */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lp.c 11984 2014-07-02 13:16:59Z msweet $".
  */
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index cff71b695f..b629b090f7 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpadmin.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * "lpadmin" command for CUPS.
  *
@@ -1599,5 +1599,5 @@ validate_name(const char *name)		/* I - Name to check */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpadmin.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c
index acfe50108d..681661514d 100644
--- a/systemv/lpinfo.c
+++ b/systemv/lpinfo.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpinfo.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   "lpinfo" command for CUPS.
  *
@@ -494,5 +494,5 @@ show_models(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpinfo.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/systemv/lpmove.c b/systemv/lpmove.c
index 54424894f1..aff9d6d514 100644
--- a/systemv/lpmove.c
+++ b/systemv/lpmove.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpmove.c 10996 2013-05-29 11:51:34Z msweet $"
  *
  *   "lpmove" command for CUPS.
  *
@@ -209,5 +209,5 @@ move_job(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpmove.c 10996 2013-05-29 11:51:34Z msweet $".
  */
diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c
index df7c2d63d0..7044eea2f7 100644
--- a/systemv/lpoptions.c
+++ b/systemv/lpoptions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpoptions.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Printer option program for CUPS.
  *
@@ -548,5 +548,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpoptions.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/systemv/lpstat.c b/systemv/lpstat.c
index 7bfadeb12b..05efc99581 100644
--- a/systemv/lpstat.c
+++ b/systemv/lpstat.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: lpstat.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * "lpstat" command for CUPS.
  *
@@ -2026,5 +2026,5 @@ show_scheduler(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: lpstat.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/templates/Makefile b/templates/Makefile
index 503fe6e1b8..92d671d740 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $"
 #
 # Template makefile for CUPS.
 #
@@ -200,5 +200,5 @@ uninstall-langbundle:
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 11984 2014-07-02 13:16:59Z msweet $".
 #
diff --git a/test/4.1-requests.test b/test/4.1-requests.test
index 097d0fcd84..ab75c987aa 100644
--- a/test/4.1-requests.test
+++ b/test/4.1-requests.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: 4.1-requests.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Verify that the server requires the following attributes:
 #
@@ -155,5 +155,5 @@
 	STATUS server-error-version-not-supported
 }
 #
-# End of "$Id$"
+# End of "$Id: 4.1-requests.test 11398 2013-11-06 20:11:11Z msweet $"
 #
diff --git a/test/4.2-cups-printer-ops.test b/test/4.2-cups-printer-ops.test
index 241238281c..2233b78bd4 100644
--- a/test/4.2-cups-printer-ops.test
+++ b/test/4.2-cups-printer-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: 4.2-cups-printer-ops.test 11984 2014-07-02 13:16:59Z msweet $"
 #
 #   Verify that the CUPS printer operations work.
 #
@@ -324,5 +324,5 @@
 }
 
 #
-# End of "$Id$"
+# End of "$Id: 4.2-cups-printer-ops.test 11984 2014-07-02 13:16:59Z msweet $"
 #
diff --git a/test/4.3-job-ops.test b/test/4.3-job-ops.test
index 1e372ccbc8..fbfa3b958c 100644
--- a/test/4.3-job-ops.test
+++ b/test/4.3-job-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: 4.3-job-ops.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Verify that the IPP job operations work.
 #
@@ -326,5 +326,5 @@
 }
 
 #
-# End of "$Id$"
+# End of "$Id: 4.3-job-ops.test 11398 2013-11-06 20:11:11Z msweet $"
 #
diff --git a/test/4.4-subscription-ops.test b/test/4.4-subscription-ops.test
index 57a767ac5e..e0a18a3653 100644
--- a/test/4.4-subscription-ops.test
+++ b/test/4.4-subscription-ops.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: 4.4-subscription-ops.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Verify that the CUPS subscription operations work.
 #
@@ -149,5 +149,5 @@
 }
 
 #
-# End of "$Id$"
+# End of "$Id: 4.4-subscription-ops.test 11398 2013-11-06 20:11:11Z msweet $"
 #
diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 5568f4ca03..5fb60722be 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.1-lpadmin.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Test the lpadmin command.
 #
@@ -68,5 +68,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.1-lpadmin.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh
index f1957a8b2a..3797ab08ec 100644
--- a/test/5.2-lpc.sh
+++ b/test/5.2-lpc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.2-lpc.sh 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Test the lpc command.
 #
@@ -27,5 +27,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.2-lpc.sh 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh
index 03087d2ccf..8c9491a381 100644
--- a/test/5.3-lpq.sh
+++ b/test/5.3-lpq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.3-lpq.sh 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Test the lpq command.
 #
@@ -27,5 +27,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.3-lpq.sh 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index ace5b8a942..e70bfaa4dd 100644
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.4-lpstat.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Test the lpstat command.
 #
@@ -39,5 +39,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.4-lpstat.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index 94e2b3cb6e..0a53f442e0 100644
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.5-lp.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Test the lp command.
 #
@@ -95,5 +95,5 @@ echo ""
 
 
 #
-# End of "$Id$".
+# End of "$Id: 5.5-lp.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 7298792f65..21f4bef021 100644
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.6-lpr.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Test the lpr command.
 #
@@ -82,5 +82,5 @@ echo ""
 ./waitjobs.sh
 
 #
-# End of "$Id$".
+# End of "$Id: 5.6-lpr.sh 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 482052d863..fd89569e29 100644
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.7-lprm.sh 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Test the lprm command.
 #
@@ -43,5 +43,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.7-lprm.sh 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index 11f599cd37..321b75b83a 100644
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.8-cancel.sh 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Test the cancel command.
 #
@@ -53,5 +53,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.8-cancel.sh 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index adb041b0ad..416ac58259 100644
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: 5.9-lpinfo.sh 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Test the lpinfo command.
 #
@@ -51,5 +51,5 @@ fi
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: 5.9-lpinfo.sh 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/Makefile b/test/Makefile
index aef5c1b32a..a5f32809bc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   IPP test makefile for CUPS.
 #
@@ -281,5 +281,5 @@ include Dependencies
 
 
 #
-# End of "$Id$".
+# End of "$Id: Makefile 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/cancel-current-job.test b/test/cancel-current-job.test
index be621b2ec7..1c7476945c 100644
--- a/test/cancel-current-job.test
+++ b/test/cancel-current-job.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: cancel-current-job.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Cancel the currently printing job.
 #
@@ -61,5 +61,5 @@
 
 
 #
-# End of "$Id$".
+# End of "$Id: cancel-current-job.test 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/create-printer-subscription.test b/test/create-printer-subscription.test
index 2482af8841..79c892b752 100644
--- a/test/create-printer-subscription.test
+++ b/test/create-printer-subscription.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: create-printer-subscription.test 11984 2014-07-02 13:16:59Z msweet $"
 #
 # Create a printer subscription.
 #
@@ -71,5 +71,5 @@
 
 
 #
-# End of "$Id$"
+# End of "$Id: create-printer-subscription.test 11984 2014-07-02 13:16:59Z msweet $"
 #
diff --git a/test/get-completed-jobs.test b/test/get-completed-jobs.test
index 51ef0719c3..fec365342c 100644
--- a/test/get-completed-jobs.test
+++ b/test/get-completed-jobs.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: get-completed-jobs.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Get list of completed jobs.
 #
@@ -47,5 +47,5 @@
 
 
 #
-# End of "$Id$".
+# End of "$Id: get-completed-jobs.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/get-jobs.test b/test/get-jobs.test
index 19fb65fa3a..4df62084db 100644
--- a/test/get-jobs.test
+++ b/test/get-jobs.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: get-jobs.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   Get list of not-completed jobs.
 #
@@ -49,5 +49,5 @@
 
 
 #
-# End of "$Id$".
+# End of "$Id: get-jobs.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/get-notifications.test b/test/get-notifications.test
index 8019cec167..874d214340 100644
--- a/test/get-notifications.test
+++ b/test/get-notifications.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: get-notifications.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   Get subscription events.
 #
@@ -42,5 +42,5 @@
 
 
 #
-# End of "$Id$"
+# End of "$Id: get-notifications.test 11398 2013-11-06 20:11:11Z msweet $"
 #
diff --git a/test/ipp-1.1.test b/test/ipp-1.1.test
index ffb4ae92f4..89abb60e0d 100644
--- a/test/ipp-1.1.test
+++ b/test/ipp-1.1.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: ipp-1.1.test 13138 2016-03-15 14:59:54Z msweet $"
 #
 #   IPP/1.1 test suite.
 #
@@ -2346,5 +2346,5 @@ DEFINE IPP_URI_SCHEME "/^ipps?://.+$$/"
 
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-1.1.test 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/test/ipp-2.0.test b/test/ipp-2.0.test
index 0ee0e94e3e..370ec4a116 100644
--- a/test/ipp-2.0.test
+++ b/test/ipp-2.0.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: ipp-2.0.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   IPP/2.0 test suite.
 #
@@ -111,5 +111,5 @@ DEFINE MEDIA_REGEX "/^(choice(_((custom|na|asme|roc|oe|roll)_[a-z0-9][-a-z0-9]*_
 
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-2.0.test 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/ipp-2.1.test b/test/ipp-2.1.test
index e8ddae4d11..ca48351215 100644
--- a/test/ipp-2.1.test
+++ b/test/ipp-2.1.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: ipp-2.1.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   IPP/2.1 test suite.
 #
@@ -92,5 +92,5 @@ INCLUDE "ipp-2.0.test"
 
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-2.1.test 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/ipp-2.2.test b/test/ipp-2.2.test
index 3042ec2474..a6eb7a73bb 100644
--- a/test/ipp-2.2.test
+++ b/test/ipp-2.2.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: ipp-2.2.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   IPP/2.2 test suite.
 #
@@ -82,5 +82,5 @@ INCLUDE "ipp-2.1.test"
 
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-2.2.test 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test
index d1e5b2ce37..5bcf6c0795 100644
--- a/test/ipp-everywhere.test
+++ b/test/ipp-everywhere.test
@@ -1,5 +1,5 @@
 #
-# "$Id$"
+# "$Id: ipp-everywhere.test 11398 2013-11-06 20:11:11Z msweet $"
 #
 #   IPP Everywhere test suite.
 #
@@ -9685,5 +9685,5 @@ INCLUDE "ipp-2.0.test"
 
 
 #
-# End of "$Id$".
+# End of "$Id: ipp-everywhere.test 11398 2013-11-06 20:11:11Z msweet $".
 #
diff --git a/test/ippdiscover.c b/test/ippdiscover.c
index 2579002903..cd3540133b 100644
--- a/test/ippdiscover.c
+++ b/test/ippdiscover.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ippdiscover.c 10983 2013-05-13 23:57:32Z msweet $"
  *
  *   ippdiscover command for CUPS.
  *
@@ -825,5 +825,5 @@ usage(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ippdiscover.c 10983 2013-05-13 23:57:32Z msweet $".
  */
diff --git a/test/ippfind.c b/test/ippfind.c
index 10b127a49a..4a37cc0428 100644
--- a/test/ippfind.c
+++ b/test/ippfind.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ippfind.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Utility to find IPP printers via Bonjour/DNS-SD and optionally run
  * commands such as IPP and Bonjour conformance tests.  This tool is
@@ -2843,5 +2843,5 @@ show_version(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ippfind.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/test/ippinfra.c b/test/ippinfra.c
index 77038e345d..d33cf33f60 100644
--- a/test/ippinfra.c
+++ b/test/ippinfra.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ippinfra.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Sample IPP INFRA server for CUPS.
  *
@@ -7121,5 +7121,5 @@ valid_job_attributes(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ippinfra.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/test/ippproxy.c b/test/ippproxy.c
index 176e4039b5..8b8d151606 100644
--- a/test/ippproxy.c
+++ b/test/ippproxy.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ippproxy.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * CUPS Cloud Proxy for HP PCL and IPP Everywhere printers.
  *
@@ -25,5 +25,5 @@ main(int  argc,				/* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ippproxy.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/test/ippserver.c b/test/ippserver.c
index 69e29cd385..179eb52f48 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ippserver.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Sample IPP Everywhere server for CUPS.
  *
@@ -7391,5 +7391,5 @@ valid_job_attributes(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ippserver.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/test/ipptool.c b/test/ipptool.c
index 2988891694..dc4b1d02e0 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: ipptool.c 13138 2016-03-15 14:59:54Z msweet $"
  *
  * ipptool command for CUPS.
  *
@@ -6201,5 +6201,5 @@ with_value_from(
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: ipptool.c 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d8bdffba5c..d0273db810 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: run-stp-tests.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
@@ -1116,5 +1116,5 @@ if test $fail != 0; then
 fi
 
 #
-# End of "$Id$"
+# End of "$Id: run-stp-tests.sh 13138 2016-03-15 14:59:54Z msweet $"
 #
diff --git a/test/testhp.ppd b/test/testhp.ppd
index d90dd587c9..a71994ed5a 100644
--- a/test/testhp.ppd
+++ b/test/testhp.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id$"
+*% "$Id: testhp.ppd 11398 2013-11-06 20:11:11Z msweet $"
 *%
 *% Test HP PPD file for CUPS.
 *%
@@ -184,5 +184,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id$".
+*% End of "$Id: testhp.ppd 11398 2013-11-06 20:11:11Z msweet $".
 *%
diff --git a/test/testps.ppd b/test/testps.ppd
index a200c4a501..6251d06e35 100644
--- a/test/testps.ppd
+++ b/test/testps.ppd
@@ -1,6 +1,6 @@
 *PPD-Adobe: "4.3"
 *%
-*% "$Id$"
+*% "$Id: testps.ppd 11398 2013-11-06 20:11:11Z msweet $"
 *%
 *%   Test PS PPD file for CUPS.
 *%
@@ -179,5 +179,5 @@
 *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
 *Font ZapfDingbats: Special "(001.004S)" Standard ROM
 *%
-*% End of "$Id$".
+*% End of "$Id: testps.ppd 11398 2013-11-06 20:11:11Z msweet $".
 *%
diff --git a/test/waitjobs.sh b/test/waitjobs.sh
index 7a79fb69be..01c581db5d 100755
--- a/test/waitjobs.sh
+++ b/test/waitjobs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: waitjobs.sh 1253 2009-02-25 23:37:25Z msweet $"
 #
 # Script to wait for jobs to complete.
 #
@@ -56,5 +56,5 @@ done
 echo ""
 
 #
-# End of "$Id$".
+# End of "$Id: waitjobs.sh 1253 2009-02-25 23:37:25Z msweet $".
 #
diff --git a/test/xmltotest.c b/test/xmltotest.c
index 8f601cc269..143f24166a 100644
--- a/test/xmltotest.c
+++ b/test/xmltotest.c
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: xmltotest.c 3643 2012-02-13 16:35:48Z msweet $"
  *
  *   IANA XML registration to test file generator for CUPS.
  *
@@ -525,5 +525,5 @@ main(void)
 
 
 /*
- * End of "$Id$".
+ * End of "$Id: xmltotest.c 3643 2012-02-13 16:35:48Z msweet $".
  */
diff --git a/tools/makeipptoolpkg b/tools/makeipptoolpkg
index 331bdbf30a..ab7e9acd19 100755
--- a/tools/makeipptoolpkg
+++ b/tools/makeipptoolpkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: makeipptoolpkg 11207 2013-07-31 18:18:52Z msweet $"
 #
 #   Make an ipptool package for CUPS.
 #
@@ -93,5 +93,5 @@ rm -r $pkgdir
 echo Done.
 
 #
-# End of "$Id$".
+# End of "$Id: makeipptoolpkg 11207 2013-07-31 18:18:52Z msweet $".
 #
diff --git a/tools/makesrcdist b/tools/makesrcdist
index 1400cb24a3..89f10557d1 100755
--- a/tools/makesrcdist
+++ b/tools/makesrcdist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: makesrcdist 13138 2016-03-15 14:59:54Z msweet $"
 #
 # makesrcdist - make a source distribution of CUPS.
 #
@@ -148,5 +148,5 @@ rm -rf cups-$version
 echo "Done - files in $TMPDIR."
 
 #
-# End of "$Id$".
+# End of "$Id: makesrcdist 13138 2016-03-15 14:59:54Z msweet $".
 #
diff --git a/tools/testrpm b/tools/testrpm
index 74d1449e4a..133ba113d6 100755
--- a/tools/testrpm
+++ b/tools/testrpm
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# "$Id$"
+# "$Id: testrpm 11139 2013-07-15 13:22:34Z msweet $"
 #
 # Test script for making RPMs...
 #
@@ -28,5 +28,5 @@ rm -f /usr/src/redhat/SRPMS/cups*.rpm
 rpmbuild -ta $args cups-$fileversion-source.tar.bz2
 
 #
-# End of "$Id$".
+# End of "$Id: testrpm 11139 2013-07-15 13:22:34Z msweet $".
 #
diff --git a/vcnet/config.h b/vcnet/config.h
index 98f26d7bcd..b77a181671 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: config.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Configuration file for CUPS on Windows.
  *
@@ -799,5 +799,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: config.h 13138 2016-03-15 14:59:54Z msweet $".
  */
diff --git a/xcode/config.h b/xcode/config.h
index 704124360a..ea7a8d5059 100644
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -1,5 +1,5 @@
 /*
- * "$Id$"
+ * "$Id: config.h 13138 2016-03-15 14:59:54Z msweet $"
  *
  * Configuration file for CUPS and Xcode.
  *
@@ -738,5 +738,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #endif /* !_CUPS_CONFIG_H_ */
 
 /*
- * End of "$Id$".
+ * End of "$Id: config.h 13138 2016-03-15 14:59:54Z msweet $".
  */