Remove all of the Subversion keywords from various source files.

31 files changed, 151 insertions, 448 deletions

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 68bf6b2a4..f693fc4ec 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # Makefile for the CUPS PPD Compiler.
 #
 # Copyright 2007-2015 by Apple Inc.
@@ -385,8 +383,3 @@ libcupsppdc.a:	$(LIBOBJS)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#
diff --git a/ppdc/api-ppdc.header b/ppdc/api-ppdc.header
index 418686560..e237c44b3 100644
--- a/ppdc/api-ppdc.header
+++ b/ppdc/api-ppdc.header
@@ -1,6 +1,4 @@
 <!--
-  "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $"
-
   PPD Compiler API header for CUPS.
 
   Copyright 2009 by Apple Inc.
diff --git a/ppdc/api-ppdc.shtml b/ppdc/api-ppdc.shtml
index e305dcb9d..769731b5a 100644
--- a/ppdc/api-ppdc.shtml
+++ b/ppdc/api-ppdc.shtml
@@ -1,6 +1,4 @@
 <!--
-  "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $"
-
   PPD Compiler API introduction for CUPS.
 
   Copyright 2009 by Apple Inc.
diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx
index 8d0061ba0..709b083c1 100644
--- a/ppdc/genstrings.cxx
+++ b/ppdc/genstrings.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // GNU gettext message generator for the CUPS PPD Compiler.
 //
 // This program is used to generate a dummy source file containing all of
@@ -201,8 +199,3 @@ write_cstring(const char *s)		/* I - String to write */
   }
   puts("\");");
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx
index 688f56c46..d56b92a33 100644
--- a/ppdc/ppdc-array.cxx
+++ b/ppdc/ppdc-array.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Array class for the CUPS PPD Compiler.
 //
 // Copyright 2007-2014 by Apple Inc.
@@ -152,8 +150,3 @@ ppdcArray::remove(ppdcShared *d)		// I - Data element
   if (i < count)
     memmove(data + i, data + i + 1, (size_t)(count - i) * sizeof(ppdcShared *));
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx
index 1ea0337a9..996e986ab 100644
--- a/ppdc/ppdc-attr.cxx
+++ b/ppdc/ppdc-attr.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Attribute class for the CUPS PPD Compiler.
 //
-//   Attribute class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcAttr::ppdcAttr()   - Create an attribute.
-//   ppdcAttr::~ppdcAttr()  - Destroy an attribute.
+// 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/".
 //
 
 //
@@ -59,8 +52,3 @@ ppdcAttr::~ppdcAttr()
   text->release();
   value->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx
index 567163731..854b58de0 100644
--- a/ppdc/ppdc-catalog.cxx
+++ b/ppdc/ppdc-catalog.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Shared message catalog class for the CUPS PPD Compiler.
 //
 // Copyright 2007-2014 by Apple Inc.
@@ -959,8 +957,3 @@ put_utf16(cups_file_t *fp,		// I - File to write to
 
   return (-1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx
index 2c12de2b9..80448cc9e 100644
--- a/ppdc/ppdc-choice.cxx
+++ b/ppdc/ppdc-choice.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Option choice class for the CUPS PPD Compiler.
 //
-//   Option choice class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcChoice::ppdcChoice()  - Create a new option choice.
-//   ppdcChoice::~ppdcChoice() - Destroy an option choice.
+// 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/".
 //
 
 //
@@ -54,8 +47,3 @@ ppdcChoice::~ppdcChoice()
   text->release();
   code->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx
index 6e6f0241e..57fbe8428 100644
--- a/ppdc/ppdc-constraint.cxx
+++ b/ppdc/ppdc-constraint.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Contraint class for the CUPS PPD Compiler.
 //
-//   Contraint class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcConstraint::ppdcConstraint()  - Create a constraint.
-//   ppdcConstraint::~ppdcConstraint() - Destroy a constraint.
+// 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/".
 //
 
 //
@@ -57,8 +50,3 @@ ppdcConstraint::~ppdcConstraint()
   option2->release();
   choice2->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx
index f70da0096..6d1596343 100644
--- a/ppdc/ppdc-driver.cxx
+++ b/ppdc/ppdc-driver.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // PPD file compiler definitions for the CUPS PPD Compiler.
 //
 // Copyright 2007-2014 by Apple Inc.
@@ -1323,8 +1321,3 @@ ppdcDriver::write_ppd_file(
 
   return (0);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index 1f1d9a84e..4bbe86dd3 100644
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -1,23 +1,14 @@
 //
-// "$Id$"
+// File class for the CUPS PPD Compiler.
 //
-//   File class for the CUPS PPD Compiler.
+// Copyright 2007-2010 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2010 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcFile::ppdcFile()  - Create (open) a file.
-//   ppdcFile::~ppdcFile() - Delete (close) a file.
-//   ppdcFile::get()       - Get a character from a file.
-//   ppdcFile::peek()      - Look at the next character from a file.
+// 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/".
 //
 
 //
@@ -103,8 +94,3 @@ ppdcFile::peek()
   // Otherwise return the next character without advancing...
   return (cupsFilePeekChar(fp));
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx
index 33994849b..ff3e8bc11 100644
--- a/ppdc/ppdc-filter.cxx
+++ b/ppdc/ppdc-filter.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Filter class for the CUPS PPD Compiler.
 //
-//   Filter class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcFilter::ppdcFilter()  - Create a filter.
-//   ppdcFilter::~ppdcFilter() - Destroy a filter.
+// 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/".
 //
 
 //
@@ -53,8 +46,3 @@ ppdcFilter::~ppdcFilter()
   mime_type->release();
   program->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx
index b6d9bcb2a..39e2552d5 100644
--- a/ppdc/ppdc-font.cxx
+++ b/ppdc/ppdc-font.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Shared font class for the CUPS PPD Compiler.
 //
-//   Shared font class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcFont::ppdcFont()   - Create a shared font.
-//   ppdcFont::~ppdcFont()  - Destroy a shared font.
+// 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/".
 //
 
 //
@@ -59,8 +52,3 @@ ppdcFont::~ppdcFont()
   version->release();
   charset->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx
index cc0ab280a..af9000a92 100644
--- a/ppdc/ppdc-group.cxx
+++ b/ppdc/ppdc-group.cxx
@@ -1,22 +1,14 @@
 //
-// "$Id$"
+// Group class for the CUPS PPD Compiler.
 //
-//   Group class for the CUPS PPD Compiler.
+// Copyright 2007-2011 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2011 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcGroup::ppdcGroup()   - Copy a new group.
-//   ppdcGroup::~ppdcGroup()  - Destroy a group.
-//   ppdcGroup::find_option() - Find an option in a group.
+// 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/".
 //
 
 //
@@ -96,8 +88,3 @@ ppdcGroup::find_option(const char *n)	// I - Name of option
 
   return (0);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx
index 4794e7715..2b36c6bd7 100644
--- a/ppdc/ppdc-import.cxx
+++ b/ppdc/ppdc-import.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// PPD file import methods for the CUPS PPD Compiler.
 //
-//   PPD file import methods for the CUPS PPD Compiler.
+// Copyright 2007-2011 by Apple Inc.
+// Copyright 2002-2006 by Easy Software Products.
 //
-//   Copyright 2007-2011 by Apple Inc.
-//   Copyright 2002-2006 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/".
-//
-// Contents:
-//
-//   ppdcSource::import_ppd() - Import a PPD file.
-//   ppd_gets()               - Get a line from a PPD file.
+// 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/".
 //
 
 //
@@ -336,8 +329,3 @@ ppdcSource::import_ppd(const char *f)	// I - Filename
 
   return (1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx
index 844028a39..bc0720265 100644
--- a/ppdc/ppdc-mediasize.cxx
+++ b/ppdc/ppdc-mediasize.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Shared media size class for the CUPS PPD Compiler.
 //
-//   Shared media size class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcMediaSize::ppdcMediaSize()  - Create a new media size.
-//   ppdcMediaSize::~ppdcMediaSize() - Destroy a media size.
+// 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/".
 //
 
 //
@@ -78,8 +71,3 @@ ppdcMediaSize::~ppdcMediaSize()
   size_code->release();
   region_code->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx
index 11e5e3eaa..1e85d505d 100644
--- a/ppdc/ppdc-message.cxx
+++ b/ppdc/ppdc-message.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Shared message class for the CUPS PPD Compiler.
 //
-//   Shared message class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcMessage::ppdcMessage()  - Create a shared message.
-//   ppdcMessage::~ppdcMessage() - Destroy a shared message.
+// 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/".
 //
 
 //
@@ -51,8 +44,3 @@ ppdcMessage::~ppdcMessage()
   id->release();
   string->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx
index e80df3c87..8f4d3c0ed 100644
--- a/ppdc/ppdc-option.cxx
+++ b/ppdc/ppdc-option.cxx
@@ -1,23 +1,14 @@
 //
-// "$Id$"
+// Option class for the CUPS PPD Compiler.
 //
-//   Option class for the CUPS PPD Compiler.
+// Copyright 2007-2011 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2011 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcOption::ppdcOption()    - Copy a new option.
-//   ppdcOption::~ppdcOption()   - Destroy an option.
-//   ppdcOption::find_choice()   - Find an option choice.
-//   ppdcOption::set_defchoice() - Set the default choice.
+// 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/".
 //
 
 //
@@ -122,8 +113,3 @@ ppdcOption::set_defchoice(ppdcChoice *c)	// I - Choice
 
   defchoice = c->name;
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h
index 2bf5a24e7..92743ae6b 100644
--- a/ppdc/ppdc-private.h
+++ b/ppdc/ppdc-private.h
@@ -1,15 +1,13 @@
 //
-// "$Id$"
+// Private definitions for the CUPS PPD Compiler.
 //
-//   Private definitions for the CUPS PPD Compiler.
+// Copyright 2009-2010 by Apple Inc.
 //
-//   Copyright 2009-2010 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/".
 //
 
 #ifndef _PPDC_PRIVATE_H_
@@ -34,7 +32,3 @@
 
 
 #endif // !_PPDC_PRIVATE_H_
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx
index 90625f423..976caefc2 100644
--- a/ppdc/ppdc-profile.cxx
+++ b/ppdc/ppdc-profile.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Color profile class for the CUPS PPD Compiler.
 //
-//   Color profile class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcProfile::ppdcProfile()  - Create a color profile.
-//   ppdcProfile::~ppdcProfile() - Destroy a color profile.
+// 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/".
 //
 
 //
@@ -58,8 +51,3 @@ ppdcProfile::~ppdcProfile()
   resolution->release();
   media_type->release();
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx
index 0c99c0859..934aeaa1b 100644
--- a/ppdc/ppdc-shared.cxx
+++ b/ppdc/ppdc-shared.cxx
@@ -1,23 +1,14 @@
 //
-// "$Id$"
+// Shared data class for the CUPS PPD Compiler.
 //
-//   Shared data class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcShared::ppdcShared()  - Create shared data.
-//   ppdcShared::~ppdcShared() - Destroy shared data.
-//   ppdcShared::release()     - Decrement the use count and delete as needed.
-//   ppdcShared::retain()      - Increment the use count for this data.
+// 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/".
 //
 
 //
@@ -81,8 +72,3 @@ ppdcShared::retain()
 
   DEBUG_printf(("%s: %p retain use=%d", class_name(), this, use));
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 988e9dd22..27f5c342d 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // Source class for the CUPS PPD Compiler.
 //
 // Copyright 2007-2014 by Apple Inc.
@@ -3800,8 +3798,3 @@ ppdcSource::write_file(const char *f)	// I - File to write
 
   return (0);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx
index 706bd138c..156ea27cd 100644
--- a/ppdc/ppdc-string.cxx
+++ b/ppdc/ppdc-string.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// Shared string class for the CUPS PPD Compiler.
 //
-//   Shared string class for the CUPS PPD Compiler.
+// Copyright 2007-2012 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2012 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcString::ppdcString()  - Create a shared string.
-//   ppdcString::~ppdcString() - Destroy a shared string.
+// 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/".
 //
 
 //
@@ -57,8 +50,3 @@ ppdcString::~ppdcString()
   if (value)
     delete[] value;
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx
index 22a175ad4..0208a6326 100644
--- a/ppdc/ppdc-variable.cxx
+++ b/ppdc/ppdc-variable.cxx
@@ -1,22 +1,14 @@
 //
-// "$Id$"
+// Variable class for the CUPS PPD Compiler.
 //
-//   Variable class for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   ppdcVariable::ppdcVariable()  - Create a variable.
-//   ppdcVariable::~ppdcVariable() - Destroy a variable.
-//   ppdcVariable::set_value()     - Set the value of a variable.
+// 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/".
 //
 
 //
@@ -64,8 +56,3 @@ ppdcVariable::set_value(const char *v)
   value->release();
   value = new ppdcString(v);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx
index 67d3b6690..bd73c0ee5 100644
--- a/ppdc/ppdc.cxx
+++ b/ppdc/ppdc.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // PPD file compiler main entry for the CUPS PPD Compiler.
 //
 // Copyright 2007-2014 by Apple Inc.
@@ -456,8 +454,3 @@ usage(void)
 
   exit(1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h
index c940e00a0..b36ebbe82 100644
--- a/ppdc/ppdc.h
+++ b/ppdc/ppdc.h
@@ -1,16 +1,14 @@
 //
-// "$Id$"
+// Definitions for the CUPS PPD Compiler.
 //
-//   Definitions for the CUPS PPD Compiler.
+// Copyright 2007-2009 by Apple Inc.
+// Copyright 2002-2007 by Easy Software Products.
 //
-//   Copyright 2007-2009 by Apple Inc.
-//   Copyright 2002-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/".
+// 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/".
 //
 
 #ifndef _PPDC_H_
@@ -527,7 +525,3 @@ class ppdcSource			//// Source File
 
 
 #endif // !_PPDC_H_
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx
index 881187636..416ff2dbf 100644
--- a/ppdc/ppdhtml.cxx
+++ b/ppdc/ppdhtml.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // PPD to HTML utility for the CUPS PPD Compiler.
 //
 // Copyright 2007-2015 by Apple Inc.
@@ -184,8 +182,3 @@ usage(void)
 
   exit(1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx
index a411bfef5..834034006 100644
--- a/ppdc/ppdi.cxx
+++ b/ppdc/ppdi.cxx
@@ -1,21 +1,14 @@
 //
-// "$Id$"
+// PPD file import utility for the CUPS PPD Compiler.
 //
-//   PPD file import utility for the CUPS PPD Compiler.
+// Copyright 2007-2011 by Apple Inc.
+// Copyright 2002-2005 by Easy Software Products.
 //
-//   Copyright 2007-2011 by Apple Inc.
-//   Copyright 2002-2005 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/".
-//
-// Contents:
-//
-//   main()  - Main entry for the PPD import utility.
-//   usage() - Show usage and exit.
+// 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/".
 //
 
 //
@@ -135,8 +128,3 @@ usage(void)
 
   exit(1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 8c4863e11..397f1c3ba 100644
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // PPD file merge utility for the CUPS PPD Compiler.
 //
 // Copyright 2007-2014 by Apple Inc.
@@ -366,8 +364,3 @@ usage(void)
 
   exit(1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx
index 132d4593e..5ebfeaf99 100644
--- a/ppdc/ppdpo.cxx
+++ b/ppdc/ppdpo.cxx
@@ -1,6 +1,4 @@
 //
-// "$Id$"
-//
 // PPD file message catalog program for the CUPS PPD Compiler.
 //
 // Copyright 2007-2015 by Apple Inc.
@@ -255,8 +253,3 @@ usage(void)
 
   exit(1);
 }
-
-
-//
-// End of "$Id$".
-//
diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx
index a9e2e8655..bf046dd3d 100644
--- a/ppdc/testcatalog.cxx
+++ b/ppdc/testcatalog.cxx
@@ -1,19 +1,13 @@
 //
-// "$Id$"
+// Test program for message catalog class.
 //
-//   Test program for message catalog class.
+// Copyright 2008 by Apple Inc.
 //
-//   Copyright 2008 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/".
-//
-// Contents:
-//
-//   main() - Open a message catalog 
+// 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/".
 //
 
 //
@@ -24,7 +18,7 @@
 
 
 //
-// 'main()' - Open a message catalog 
+// 'main()' - Open a message catalog
 //
 
 int					// O - Exit status
@@ -56,8 +50,3 @@ main(int  argc,				// I - Number of command-line arguments
   // Return with no errors.
   return (0);
 }
-
-
-//
-// End of "$Id$".
-//