Merge changes from CUPS 1.4svn-r7961.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@969 a1ca3aef-8c08-0410-bb20-df032aa958be

11 files changed, 39 insertions, 25 deletions

diff --git a/man/Makefile b/man/Makefile
index 0f686af4f..5c626c8b6 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 7601 2008-05-20 21:08:08Z mike $"
+# "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -230,5 +230,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 7601 2008-05-20 21:08:08Z mike $".
+# End of "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $".
 #
diff --git a/man/backend.man b/man/backend.man
index b4ba42516..17dd8d309 100644
--- a/man/backend.man
+++ b/man/backend.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: backend.man 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: backend.man 7810 2008-07-29 01:11:15Z mike $"
 .\"
 .\"   Backend man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -181,5 +181,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: backend.man 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: backend.man 7810 2008-07-29 01:11:15Z mike $".
 .\"
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index 54ad4b6ba..59d72453c 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-lpd.man.in 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: cups-lpd.man.in 7835 2008-08-09 06:37:04Z mike $"
 .\"
 .\"   cups-lpd man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -120,5 +120,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id: cups-lpd.man.in 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: cups-lpd.man.in 7835 2008-08-09 06:37:04Z mike $".
 .\"
diff --git a/man/cupsaccept.man b/man/cupsaccept.man
index 36457e351..01ed7261c 100644
--- a/man/cupsaccept.man
+++ b/man/cupsaccept.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id$"
+.\" "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $"
 .\"
 .\"   accept/reject man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -75,5 +75,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007 by Apple Inc.
 .\"
-.\" End of "$Id$".
+.\" End of "$Id: cupsaccept.man 7930 2008-09-10 22:25:54Z mike $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index b3137f74f..06f3ccdaf 100644
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 7645 2008-06-16 17:21:10Z mike $"
+.\" "$Id: cupsd.conf.man.in 7935 2008-09-11 01:54:11Z mike $"
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -210,6 +210,12 @@ BrowseTimeout seconds
 Specifies the maximum interval between printer information updates before
 remote printers will be removed from the list of available printers.
 .TP 5
+BrowseWebIF Yes
+.TP 5
+BrowseWebIF No
+.br
+Specifies whether the CUPS web interface is advertised via DNS-SD.
+.TP 5
 Browsing Yes
 .TP 5
 Browsing No
@@ -636,6 +642,12 @@ SSLListen
 .br
 Listens on the specified address and port for encrypted connections.
 .TP 5
+SSLOptions None
+.TP 5
+SSLOptions NoEmptyFragments
+.br
+Sets SSL/TLS protocol options for encrypted connections.
+.TP 5
 SSLPort
 .br
 Listens on the specified port for encrypted connections.
@@ -664,5 +676,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 7645 2008-06-16 17:21:10Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 7935 2008-09-11 01:54:11Z mike $".
 .\"
diff --git a/man/cupsfilter.man b/man/cupsfilter.man
index a2d5c087d..7ffa91221 100644
--- a/man/cupsfilter.man
+++ b/man/cupsfilter.man
@@ -1,9 +1,9 @@
 .\"
-.\" "$Id: cupsfilter.man 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: cupsfilter.man 7936 2008-09-11 03:12:59Z mike $"
 .\"
 .\"   cupsfilter man page for the Common UNIX Printing System (CUPS).
 .\"
-.\"   Copyright 2007 by Apple Inc.
+.\"   Copyright 2007-2008 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -11,7 +11,7 @@
 .\"   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/".
 .\"
-.TH cupsfilter 8 "Common UNIX Printing System" "19 October 2007" "Apple Inc."
+.TH cupsfilter 8 "Common UNIX Printing System" "10 September 2008" "Apple Inc."
 .SH NAME
 cupsfilter \- convert a file to another format using cups filters
 .SH SYNOPSIS
@@ -50,6 +50,8 @@ converted.
 -m mime/type
 .br
 Specifies the destination file type. The default file type is application/pdf.
+Use printer/foo to convert to the printer format defined by the filters in the
+PPD file.
 .TP 5
 -n copies
 .br
@@ -74,7 +76,7 @@ This will be addressed in a future CUPS release.
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007 by Apple Inc.
+Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: cupsfilter.man 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: cupsfilter.man 7936 2008-09-11 03:12:59Z mike $".
 .\"
diff --git a/man/lp.man b/man/lp.man
index 0a879b0ca..00ce38dee 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lp.man 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: lp.man 7889 2008-08-29 22:03:35Z mike $"
 .\"
 .\"   lp man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -245,5 +245,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: lp.man 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: lp.man 7889 2008-08-29 22:03:35Z mike $".
 .\"
diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index dd51590fb..66594e281 100644
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpoptions.man.in 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: lpoptions.man.in 7889 2008-08-29 22:03:35Z mike $"
 .\"
 .\"   lpoptions man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -131,5 +131,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: lpoptions.man.in 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: lpoptions.man.in 7889 2008-08-29 22:03:35Z mike $".
 .\"
diff --git a/man/lpr.man b/man/lpr.man
index 82d787969..e91bef0a5 100644
--- a/man/lpr.man
+++ b/man/lpr.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpr.man 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: lpr.man 7889 2008-08-29 22:03:35Z mike $"
 .\"
 .\"   lpr man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -118,5 +118,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: lpr.man 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: lpr.man 7889 2008-08-29 22:03:35Z mike $".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index e0bb5935d..33e519cf9 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpstat.man 7600 2008-05-20 21:06:23Z mike $"
+.\" "$Id: lpstat.man 7921 2008-09-10 15:42:24Z mike $"
 .\"
 .\"   lpstat man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -139,5 +139,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 2007-2008 by Apple Inc.
 .\"
-.\" End of "$Id: lpstat.man 7600 2008-05-20 21:06:23Z mike $".
+.\" End of "$Id: lpstat.man 7921 2008-09-10 15:42:24Z mike $".
 .\"
diff --git a/man/mantohtml.c b/man/mantohtml.c
index 01a475196..60837fa02 100644
--- a/man/mantohtml.c
+++ b/man/mantohtml.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mantohtml.c 7662 2008-06-17 14:34:20Z mike $"
+ * "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $"
  *
  *   Man page to HTML conversion program.
  *
@@ -714,5 +714,5 @@ strmove(char       *d,			/* I - Destination */
 
 
 /*
- * End of "$Id: mantohtml.c 7662 2008-06-17 14:34:20Z mike $".
+ * End of "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $".
  */