Remove all of the Subversion keywords from various source files.

21 files changed, 92 insertions, 236 deletions

diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh
index 5568f4ca0..07f1d5aa0 100644
--- a/test/5.1-lpadmin.sh
+++ b/test/5.1-lpadmin.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# "$Id$"
-#
 # Test the lpadmin command.
 #
 # Copyright 2007-2013 by Apple Inc.
@@ -66,7 +64,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh
index f1957a8b2..857e885a4 100644
--- a/test/5.2-lpc.sh
+++ b/test/5.2-lpc.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lpc command.
 #
-#   Test the lpc command.
+# Copyright 2007 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LPC Test"
@@ -25,7 +23,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh
index 03087d2cc..4c0e84968 100644
--- a/test/5.3-lpq.sh
+++ b/test/5.3-lpq.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lpq command.
 #
-#   Test the lpq command.
+# Copyright 2007 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LPQ Test"
@@ -25,7 +23,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh
index ace5b8a94..5092dbe98 100644
--- a/test/5.4-lpstat.sh
+++ b/test/5.4-lpstat.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lpstat command.
 #
-#   Test the lpstat command.
+# Copyright 2007-2011 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LPSTAT Test"
@@ -37,7 +35,3 @@ else
 	echo "    PASSED ($server)"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh
index 94e2b3cb6..71fc41800 100644
--- a/test/5.5-lp.sh
+++ b/test/5.5-lp.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lp command.
 #
-#   Test the lp command.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2014 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LP Default Test"
@@ -92,8 +90,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh
index 7298792f6..d3280d2bb 100644
--- a/test/5.6-lpr.sh
+++ b/test/5.6-lpr.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lpr command.
 #
-#   Test the lpr command.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2014 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LPR Default Test"
@@ -80,7 +78,3 @@ fi
 echo ""
 
 ./waitjobs.sh
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh
index 482052d86..e456ec083 100644
--- a/test/5.7-lprm.sh
+++ b/test/5.7-lprm.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lprm command.
 #
-#   Test the lprm command.
+# Copyright 2007-2011 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LPRM Current Test"
@@ -41,7 +39,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh
index 11f599cd3..28bc0fea1 100644
--- a/test/5.8-cancel.sh
+++ b/test/5.8-cancel.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the cancel command.
 #
-#   Test the cancel command.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "Cancel Destination Test"
@@ -51,7 +49,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh
index adb041b0a..9cf6cebfa 100644
--- a/test/5.9-lpinfo.sh
+++ b/test/5.9-lpinfo.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 #
-# "$Id$"
+# Test the lpinfo command.
 #
-#   Test the lpinfo command.
+# Copyright 2007-2011 by Apple Inc.
+# Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2011 by Apple Inc.
-#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 echo "LPINFO Devices Test"
@@ -49,7 +47,3 @@ else
 	echo "    PASSED"
 fi
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/Makefile b/test/Makefile
index aef5c1b32..4922d6ae9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# IPP test makefile for CUPS.
 #
-#   IPP test makefile for CUPS.
+# Copyright 2007-2014 by Apple Inc.
+# Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
-#   Copyright 2007-2014 by Apple Inc.
-#   Copyright 1997-2006 by Easy Software Products, all rights reserved.
-#
-#   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/".
+# 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/".
 #
 
 include ../Makedefs
@@ -278,8 +276,3 @@ xmltotest: xmltotest.o ../cups/$(LIBUPSSTATIC)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#
diff --git a/test/ippdiscover.c b/test/ippdiscover.c
index 257900290..6067d9db5 100644
--- a/test/ippdiscover.c
+++ b/test/ippdiscover.c
@@ -1,21 +1,16 @@
 /*
- * "$Id$"
+ * ippdiscover command for CUPS.
  *
- *   ippdiscover command for CUPS.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
- *
- *   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.
- *
- * Contents:
+ * 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.
  */
 
 
@@ -822,8 +817,3 @@ usage(void)
 
   exit(0);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/test/ippfind.c b/test/ippfind.c
index 10b127a49..b4a0ce291 100644
--- a/test/ippfind.c
+++ b/test/ippfind.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Utility to find IPP printers via Bonjour/DNS-SD and optionally run
  * commands such as IPP and Bonjour conformance tests.  This tool is
  * inspired by the UNIX "find" command, thus its name.
@@ -2840,8 +2838,3 @@ show_version(void)
 
   exit(IPPFIND_EXIT_TRUE);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/test/ippinfra.c b/test/ippinfra.c
index 77038e345..ebd26c171 100644
--- a/test/ippinfra.c
+++ b/test/ippinfra.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Sample IPP INFRA server for CUPS.
  *
  * Copyright 2010-2014 by Apple Inc.
@@ -7118,8 +7116,3 @@ valid_job_attributes(
 
   return (valid);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/test/ippinfra.man b/test/ippinfra.man
index 46ac84e40..fed576de5 100644
--- a/test/ippinfra.man
+++ b/test/ippinfra.man
@@ -1,6 +1,4 @@
 .\"
-.\" "$Id$"
-.\"
 .\" ippinfra man page for CUPS.
 .\"
 .\" Copyright 2014 by Apple Inc.
@@ -98,6 +96,3 @@ Specify a proxy username of "foo" and password of "bar":
 PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 .SH COPYRIGHT
 Copyright \[co] 2007-2014 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
diff --git a/test/ippproxy.c b/test/ippproxy.c
index 176e4039b..dd0d58b62 100644
--- a/test/ippproxy.c
+++ b/test/ippproxy.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CUPS Cloud Proxy for HP PCL and IPP Everywhere printers.
  *
  * Copyright 2014 by Apple Inc.
@@ -22,8 +20,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/test/ippproxy.man b/test/ippproxy.man
index 1d46c9afe..aa1116ea8 100644
--- a/test/ippproxy.man
+++ b/test/ippproxy.man
@@ -1,6 +1,4 @@
 .\"
-.\" "$Id$"
-.\"
 .\" ippproxy man page for CUPS.
 .\"
 .\" Copyright 2014 by Apple Inc.
@@ -54,6 +52,3 @@ with an infrastructure URI of "ipps://host.example.com/ipp/print" and a local UR
 PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 .SH COPYRIGHT
 Copyright \[co] 2007-2014 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
diff --git a/test/ippserver.c b/test/ippserver.c
index bb60f43bc..8f58c9a71 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Sample IPP Everywhere server for CUPS.
  *
  * Copyright 2010-2015 by Apple Inc.
@@ -7388,8 +7386,3 @@ valid_job_attributes(
 
   return (valid);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/test/ippserver.man b/test/ippserver.man
index a5c1c1c59..ad156b6b2 100644
--- a/test/ippserver.man
+++ b/test/ippserver.man
@@ -1,6 +1,4 @@
 .\"
-.\" "$Id$"
-.\"
 .\" ippserver man page for CUPS.
 .\"
 .\" Copyright 2014 by Apple Inc.
@@ -167,6 +165,3 @@ command whenever a job is sent to the server:
 PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp)
 .SH COPYRIGHT
 Copyright \[co] 2007-2014 by Apple Inc.
-.\"
-.\" End of "$Id$".
-.\"
diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index d8bdffba5..475894d4f 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# "$Id$"
-#
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
 #
@@ -1114,7 +1112,3 @@ if test $fail != 0; then
 
 	exit 1
 fi
-
-#
-# End of "$Id$"
-#
diff --git a/test/waitjobs.sh b/test/waitjobs.sh
index 7a79fb69b..dee7b1b9b 100755
--- a/test/waitjobs.sh
+++ b/test/waitjobs.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# "$Id$"
-#
 # Script to wait for jobs to complete.
 #
 #   Copyright 2008-2009 by Apple Inc.
@@ -54,7 +52,3 @@ while test $timeout -gt 0; do
 done
 
 echo ""
-
-#
-# End of "$Id$".
-#
diff --git a/test/xmltotest.c b/test/xmltotest.c
index 8f601cc26..dfc644919 100644
--- a/test/xmltotest.c
+++ b/test/xmltotest.c
@@ -1,37 +1,25 @@
 /*
- * "$Id$"
+ * IANA XML registration to test file generator for CUPS.
  *
- *   IANA XML registration to test file generator for CUPS.
+ * Copyright 2011-2012 by Apple Inc.
  *
- *   Copyright 2011-2012 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/".
  *
- *   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.
+ * This file is subject to the Apple OS-Developed Software exception.
  *
  * Usage:
  *
  *   ./xmltotest [--ref standard] {--job|--printer} [XML file/URL] >file.test
  *
- *   If not specified, loads the XML registrations from:
- *
- *     http://www.iana.org/assignments/ipp-registrations/ipp-registrations.xml
+ * If not specified, loads the XML registrations from:
  *
- *   "Standard" is of the form "rfcNNNN" or "pwgNNNN.N".
+ *   http://www.iana.org/assignments/ipp-registrations/ipp-registrations.xml
  *
- * Contents:
- *
- *   main()	    - Process command-line arguments.
- *   compare_reg()  - Compare two registrations.
- *   load_xml()     - Load the XML registration file or URL.
- *   match_xref()   - Compare the xref against the named standard.
- *   new_reg()	    - Create a new registration record.
- *   usage()	    - Show usage message.
- *   write_expect() - Write an EXPECT test for an attribute.
+ * "Standard" is of the form "rfcNNNN" or "pwgNNNN.N".
  */
 
 
@@ -522,8 +510,3 @@ main(void)
   return (1);
 }
 #endif /* HAVE_MXML */
-
-
-/*
- * End of "$Id$".
- */