Load cups into easysw/current.

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

diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 199f148ff5435d49653c246653308113d7d04c56..f17a4dcb3d060466bcdf28d8c3481b5abe296650 100644 (file)
--- a/man/cupsd.conf.man.in
+++ b/man/cupsd.conf.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsd.conf.man.in 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: cupsd.conf.man.in 5638 2006-06-06 20:08:13Z mike $"
 .\"
 .\"   cupsd.conf man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,7 +21,7 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH cupsd.conf 5 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cupsd.conf 5 "Common UNIX Printing System" "6 June 2006" "Easy Software Products"
 .SH NAME
 cupsd.conf \- server configuration file for cups
 .SH DESCRIPTION
@@ -332,16 +332,6 @@ Include filename
 .br
 Includes the named file.
 .TP 5
-KeepAlive Yes
-.TP 5
-KeepAlive No
-.br
-Specifies whether to support HTTP keep-alive connections.
-.TP 5
-KeepAliveTimeout seconds
-.br
-Specifies the amount of time that connections are kept alive.
-.TP 5
 JobRetryInterval seconds
 .br
 Specifies the interval between retries of jobs in seconds.
@@ -350,13 +340,15 @@ JobRetryLimit count
 .br
 Specifies the number of retries that are done for jobs.
 .TP 5
-KeepAlive
+KeepAlive Yes
+.TP 5
+KeepAlive No
 .br
-Specifies whether or not to support HTTP Keep-Alive.
+Specifies whether to support HTTP keep-alive connections.
 .TP 5
-KeepAliveTimeout
+KeepAliveTimeout seconds
 .br
-Specifies the connection timeout for HTTP Keep-Alive.
+Specifies the amount of time that connections are kept alive.
 .TP 5
 <Limit operations> ... </Limit>
 .br
@@ -375,8 +367,10 @@ Specifies the maximum size of any print job request.
 Listen ip-address:port
 .TP 5
 Listen *:port
+.TP 5
+Listen /path/to/domain/socket
 .br
-Listens to the specified address and port.
+Listens to the specified address and port or domain socket path.
 .TP 5
 <Location /path> ... </Location>
 .br
@@ -615,5 +609,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsd.conf.man.in 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: cupsd.conf.man.in 5638 2006-06-06 20:08:13Z mike $".
 .\"