Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / cups / usersys.c

diff --git a/cups/usersys.c b/cups/usersys.c
index c8d2b286460fe108f5c5a8b4f67cc51bac2a9979..8e4be955992cf682c97220a3b5050b140027968d 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: usersys.c 7337 2008-02-22 04:44:04Z mike $"
  *
  *   User, system, and password routines for the Common UNIX Printing
  *   System (CUPS).
@@ -54,7 +54,7 @@ static cups_file_t    *cups_open_client_conf(void);
  * 'cupsEncryption()' - Get the default encryption settings.
  *
  * The default encryption setting comes from the CUPS_ENCRYPTION
- * environment variable, then the ~/.cupsrc file, and finally the
+ * environment variable, then the ~/.cups/client.conf file, and finally the
  * /etc/cups/client.conf file. If not set, the default is
  * @code HTTP_ENCRYPT_IF_REQUESTED@.
  */
@@ -503,5 +503,5 @@ cups_open_client_conf(void)
 
 
 /*
- * End of "$Id: usersys.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: usersys.c 7337 2008-02-22 04:44:04Z mike $".
  */