Merge changes from CUPS 1.4svn-r7961.

[thirdparty/cups.git] / man / cupsd.conf.man.in

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index b3137f74f3a6e648e321fefca6a98bebf6321b2c..06f3ccdaf9f592be534519f16452cc219fcd0d60 100644 (file)
--- 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 $".
 .\"