Remove all of the Subversion keywords from various source files.

19 files changed, 64 insertions, 228 deletions

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index f1f0a4302..eb136728a 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,6 +1,4 @@
 #
-# "$Id$"
-#
 # CGI makefile for CUPS.
 #
 # Copyright 2007-2014 by Apple Inc.
@@ -350,8 +348,3 @@ testtemplate:	testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#
diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index e3123986e..c44a42706 100644
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Administration CGI for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -4274,8 +4272,3 @@ get_printer_ppd(const char *uri,	/* I - Printer URI */
   else
     return (NULL);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h
index 1f9690273..3bae75046 100644
--- a/cgi-bin/cgi-private.h
+++ b/cgi-bin/cgi-private.h
@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * Private CGI definitions for CUPS.
  *
- *   Private CGI definitions for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-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/".
+ * 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/".
  */
 
 /*
@@ -29,8 +27,3 @@
  */
 
 #define CUPS_PAGE_MAX	100		/* Maximum items per page */
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h
index 61eb7fc75..9604f97a2 100644
--- a/cgi-bin/cgi.h
+++ b/cgi-bin/cgi.h
@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * CGI support library definitions for CUPS.
  *
- *   CGI support library definitions for CUPS.
+ * Copyright 2007-2010 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2010 by Apple Inc.
- *   Copyright 1997-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/".
+ * 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 _CUPS_CGI_H_
@@ -113,7 +111,3 @@ extern const char	*cgiText(const char *message);
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_CGI_H_ */
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c
index 2685e66a3..7c4ac9d25 100644
--- a/cgi-bin/classes.c
+++ b/cgi-bin/classes.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Class status CGI for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -543,8 +541,3 @@ show_class(http_t     *http,		/* I - Connection to server */
 
    cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c
index 42b4ab910..60cda8754 100644
--- a/cgi-bin/help-index.c
+++ b/cgi-bin/help-index.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Online help index routines for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -1303,8 +1301,3 @@ help_sort_words(help_word_t *w1,	/* I - Second word */
 
   return (_cups_strcasecmp(w1->text, w2->text));
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h
index 41d8d93db..5fb1ac1f5 100644
--- a/cgi-bin/help-index.h
+++ b/cgi-bin/help-index.h
@@ -1,16 +1,14 @@
 /*
- * "$Id$"
+ * Online help index definitions for CUPS.
  *
- *   Online help index definitions for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2011 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/".
+ * 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 _CUPS_HELP_INDEX_H_
@@ -81,7 +79,3 @@ extern help_index_t	*helpSearchIndex(help_index_t *hi, const char *query,
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_HELP_INDEX_H_ */
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index 215c98bc4..314be87e8 100644
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -1,20 +1,14 @@
 /*
- * "$Id$"
+ * Online help CGI for CUPS.
  *
- *   Online help CGI for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-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:
- *
- *   main() - Main entry for CGI.
+ * 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/".
  */
 
 /*
@@ -390,8 +384,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/html.c b/cgi-bin/html.c
index 9db5438eb..e10e2d6a6 100644
--- a/cgi-bin/html.c
+++ b/cgi-bin/html.c
@@ -1,26 +1,14 @@
 /*
- * "$Id$"
+ * HTML support functions for CUPS.
  *
- *   HTML support functions for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 1997-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:
- *
- *   cgiEndHTML()           - End a HTML page.
- *   cgiEndMultipart()      - End the delivery of a multipart web page.
- *   cgiFormEncode()        - Encode a string as a form variable.
- *   cgiStartHTML()         - Start a HTML page.
- *   cgiStartMultipart()    - Start a multipart delivery of a web page.
- *   cgiSupportsMultipart() - Does the browser support multi-part documents?
- *   cgi_null_passwd()      - Return a NULL password for authentication.
+ * 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/".
  */
 
 /*
@@ -232,8 +220,3 @@ cgi_null_passwd(const char *prompt)	/* I - Prompt string (unused) */
 
   return (NULL);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index 4b43e9cc0..3e2f68c59 100644
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI <-> IPP variable routines for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -1547,8 +1545,3 @@ cgiText(const char *message)		/* I - Message */
 
   return (_cupsLangString(language, message));
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index 35f913ca3..a0d7c4b22 100644
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Job status CGI for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -201,8 +199,3 @@ do_job_op(http_t      *http,		/* I - HTTP connection */
 
   cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c
index 4aee5d9a4..97e130fc6 100644
--- a/cgi-bin/makedocset.c
+++ b/cgi-bin/makedocset.c
@@ -1,30 +1,18 @@
 /*
- * "$Id$"
+ * Xcode documentation set generator.
  *
- *   Xcode documentation set generator.
+ * Copyright 2007-2012 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2012 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/".
+ * 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/".
  *
  * Usage:
  *
  *   makedocset directory *.tokens
- *
- * Contents:
- *
- *   main()                   - Test the help index code.
- *   compare_html()           - Compare the titles of two HTML files.
- *   compare_sections()       - Compare the names of two help sections.
- *   compare_sections_files() - Compare the number of files and section names.
- *   write_index()            - Write an index file for the CUPS help.
- *   write_info()             - Write the Info.plist file.
- *   write_nodes()            - Write the Nodes.xml file.
  */
 
 /*
@@ -479,8 +467,3 @@ write_nodes(const char   *path,		/* I - File to write */
 
   cupsFileClose(fp);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c
index c713c68f4..7d2d5d6be 100644
--- a/cgi-bin/printers.c
+++ b/cgi-bin/printers.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Printer status CGI for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -563,8 +561,3 @@ show_printer(http_t     *http,		/* I - Connection to server */
 
    cgiEndHTML();
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/search.c b/cgi-bin/search.c
index b475d9600..95efb3632 100644
--- a/cgi-bin/search.c
+++ b/cgi-bin/search.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * Search routines for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -368,8 +366,3 @@ cgiFreeSearch(void *search)		/* I - Search context */
 {
   regfree((regex_t *)search);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/template.c b/cgi-bin/template.c
index 532544174..c7d2144f8 100644
--- a/cgi-bin/template.c
+++ b/cgi-bin/template.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI template function.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -683,8 +681,3 @@ cgi_puturi(const char *s,		/* I - String to output */
     s ++;
   }
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c
index ca0158298..fe58bab8a 100644
--- a/cgi-bin/testcgi.c
+++ b/cgi-bin/testcgi.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI test program for CUPS.
  *
  * Copyright 2007-2014 by Apple Inc.
@@ -62,8 +60,3 @@ main(void)
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c
index ce1b94b01..1fbe9063b 100644
--- a/cgi-bin/testhi.c
+++ b/cgi-bin/testhi.c
@@ -1,21 +1,14 @@
 /*
- * "$Id$"
+ * Help index test program for CUPS.
  *
- *   Help index test program for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   Copyright 2007-2011 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/".
- *
- * Contents:
- *
- *   main()       - Test the help index code.
- *   list_nodes() - List nodes in an array...
+ * 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/".
  */
 
 /*
@@ -106,8 +99,3 @@ list_nodes(const char   *title,		/* I - Title string */
     printf(" (%d words)\n", cupsArrayCount(node->words));
   }
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c
index 02c017365..046af47d9 100644
--- a/cgi-bin/testtemplate.c
+++ b/cgi-bin/testtemplate.c
@@ -1,20 +1,14 @@
 /*
- * "$Id$"
+ * CGI template test program for CUPS.
  *
- *   CGI template test program for CUPS.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 2006 by Easy Software Products.
  *
- *   Copyright 2007-2011 by Apple Inc.
- *   Copyright 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:
- *
- *   main() - Test the template code.
+ * 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 +90,3 @@ main(int  argc,				/* I - Number of command-line arguments */
 
   return (0);
 }
-
-
-/*
- * End of "$Id$".
- */
diff --git a/cgi-bin/var.c b/cgi-bin/var.c
index 3935508fc..6d02e1079 100644
--- a/cgi-bin/var.c
+++ b/cgi-bin/var.c
@@ -1,6 +1,4 @@
 /*
- * "$Id$"
- *
  * CGI form variable and array functions for CUPS.
  *
  * Copyright 2007-2015 by Apple Inc.
@@ -1294,8 +1292,3 @@ cgi_unlink_file(void)
     form_file = NULL;
   }
 }
-
-
-/*
- * End of "$Id$".
- */