Load cups into easysw/current.

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

8 files changed, 98 insertions, 44 deletions

diff --git a/man/Makefile b/man/Makefile
index 7599458d8..7976f952c 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $"
+# "$Id: Makefile 5317 2006-03-21 02:35:37Z mike $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -31,6 +31,7 @@ include ../Makedefs
 
 MAN1	=	cancel.$(MAN1EXT) \
 		cups-config.$(MAN1EXT) \
+		cupstestdsc.$(MAN1EXT) \
 		cupstestppd.$(MAN1EXT) \
 		lp.$(MAN1EXT) \
 		lpoptions.$(MAN1EXT) \
@@ -180,5 +181,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 5229 2006-03-05 16:48:12Z mike $".
+# End of "$Id: Makefile 5317 2006-03-21 02:35:37Z mike $".
 #
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index b6cc165b6..6ae23fa6d 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: cupsaddsmb.man.in 5327 2006-03-23 19:53:24Z mike $"
 .\"
 .\"   cupsaddsmb man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,7 +21,7 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH cupsaddsmb 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH cupsaddsmb 8 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
 .SH NAME
 cupsaddsmb \- export printers to samba for windows clients
 .SH SYNOPSIS
@@ -68,9 +68,11 @@ Exports all known printers. Otherwise only the named printers are
 exported.
 .TP 5
 -h cups-server[:port]
+.br
 Specifies a different CUPS server to use.
 .TP 5
 -v
+.br
 Specifies that verbose information should be shown. This is
 useful for debugging SAMBA configuration problems.
 .SH SAMBA CONFIGURATION
@@ -188,5 +190,5 @@ http://www.cups.org/windows/
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 5327 2006-03-23 19:53:24Z mike $".
 .\"
diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in
index 199f148ff..31dad1041 100644
--- 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 5327 2006-03-23 19:53:24Z 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" "23 March 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
@@ -615,5 +607,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 5327 2006-03-23 19:53:24Z mike $".
 .\"
diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man
new file mode 100644
index 000000000..62db95e1f
--- /dev/null
+++ b/man/cupstestdsc.man
@@ -0,0 +1,59 @@
+.\"
+.\" "$Id: cupstestdsc.man 5099 2006-02-13 02:46:10Z mike $"
+.\"
+.\"   cupstestdsc man page for the Common UNIX Printing System (CUPS).
+.\"
+.\"   Copyright 2006 by Easy Software Products.
+.\"
+.\"   These coded instructions, statements, and computer programs are the
+.\"   property of Easy Software Products 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 missing or damaged please contact Easy Software Products
+.\"   at:
+.\"
+.\"       Attn: CUPS Licensing Information
+.\"       Easy Software Products
+.\"       44141 Airport View Drive, Suite 204
+.\"       Hollywood, Maryland 20636 USA
+.\"
+.\"       Voice: (301) 373-9600
+.\"       EMail: cups-info@cups.org
+.\"         WWW: http://www.cups.org
+.\"
+.TH cupstestdsc 1 "Common UNIX Printing System" "20 March 2006" "Easy Software Products"
+.SH NAME
+cupstestdsc \- test conformance of postscript files
+.SH SYNOPSIS
+.B cupstestdsc
+[ -h ] filename.ps [ ...
+.I filenameN.ps
+]
+.br
+.B cupstestdsc
+[ -h ] -
+.SH DESCRIPTION
+\fIcupstestdsc\fR tests the conformance of PostScript files to
+the Adobe PostScript Language Document Structuring Conventions
+Specification version 3.0. The results of testing and any other
+output are sent to the standard output. The second form of the
+command reads PostScript from the standard input.
+.SH LIMITATIONS
+\fIcupstestdsc\fR only validates the DSC comments in a PostScript
+file and does not attempt to validate the PostScript code itself.
+Developers must ensure that the PostScript they generate follows
+the rules defined by Adobe. Specifically, all pages must be
+independent of each other, code outside page descriptions may not
+affect the graphics state (current font, color, transform matrix,
+etc.), and device-specific commands such as setpagedevice should
+not be used.
+.SH SEE ALSO
+http://localhost:631/help
+.br
+Adobe PostScript Language Document Structuring Conventions
+Specification, Version 3.0.
+.SH COPYRIGHT
+Copyright 2006 by Easy Software Products, All Rights Reserved.
+.\"
+.\" End of "$Id$".
+.\"
diff --git a/man/filter.man b/man/filter.man
index 6243bcd6c..d3537d40a 100644
--- a/man/filter.man
+++ b/man/filter.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: filter.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $"
 .\"
 .\"   filter man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,7 +21,7 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH filter 7 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH filter 7 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
 .SH NAME
 filter \- cups file conversion filter interface
 .SH SYNOPSIS
@@ -129,7 +129,7 @@ message to the current \fIErrorLog\fR using the "warning" log level.
 
 .SH ENVIRONMENT VARIABLES
 The following environment variables are defined by the CUPS
-server when executing the backend:
+server when executing the filter:
 
 .TP 5
 CHARSET
@@ -162,10 +162,7 @@ The root directory of the server.
 .TP 5
 DEVICE_URI
 .br
-The device-uri associated with the printer; this is provided for
-shell scripts which may not be able to get the passed argv[0]
-string and for backends that require any authentication
-information which is not included in argv[0].
+The device-uri associated with the printer.
 
 .TP 5
 FINAL_CONTENT_TYPE
@@ -182,7 +179,7 @@ The default language locale (typically C or en).
 PATH
 .br
 The standard execution path for external programs that may be run by
-the backend.
+the filter.
 
 .TP 5
 PPD
@@ -214,7 +211,7 @@ The timezone of the server.
 .TP 5
 USER
 .br
-The user executing the backend, typically root; consult the
+The user executing the filter, typically "lp" or "root"; consult the
 \fIcupsd.conf(5)\fR file for the current setting.
 
 .SH COMPATIBILITY
@@ -229,5 +226,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: filter.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: filter.man 5327 2006-03-23 19:53:24Z mike $".
 .\"
diff --git a/man/lp.man b/man/lp.man
index 41662a1dd..87ff04e67 100644
--- a/man/lp.man
+++ b/man/lp.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lp.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: lp.man 5327 2006-03-23 19:53:24Z mike $"
 .\"
 .\"   lp man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,7 +21,7 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH lp 1 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lp 1 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
 .SH NAME
 lp - print files
 .SH SYNOPSIS
@@ -34,7 +34,7 @@ lp - print files
 .I hostname[:port]
 ] [ -m ] [ -n
 .I num-copies
-[ -o
+] [ -o
 .I option[=value]
 ] [ -q
 .I priority
@@ -57,7 +57,7 @@ lp - print files
 .I job-id
 ] [ -n
 .I num-copies
-[ -o
+] [ -o
 .I option[=value]
 ] [ -q
 .I priority
@@ -248,5 +248,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lp.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: lp.man 5327 2006-03-23 19:53:24Z mike $".
 .\"
diff --git a/man/lpadmin.man b/man/lpadmin.man
index a44627736..28d747053 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpadmin.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: lpadmin.man 5327 2006-03-23 19:53:24Z mike $"
 .\"
 .\"   lpadmin man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,7 +21,7 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH lpadmin 8 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpadmin 8 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -129,8 +129,11 @@ Removes the named \fIprinter\fR from \fIclass\fR.  If the
 resulting class becomes empty it is removed.
 .TP 5
 -u allow:user,user,@group
+.TP 5
 -u deny:user,user,@group
+.TP 5
 -u allow:all
+.TP 5
 -u deny:none
 .br
 Sets user-level access control on a printer. Names starting with
@@ -179,5 +182,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpadmin.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: lpadmin.man 5327 2006-03-23 19:53:24Z mike $".
 .\"
diff --git a/man/lpstat.man b/man/lpstat.man
index d1981c3b9..239b8d5cd 100644
--- a/man/lpstat.man
+++ b/man/lpstat.man
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: lpstat.man 5099 2006-02-13 02:46:10Z mike $"
+.\" "$Id: lpstat.man 5327 2006-03-23 19:53:24Z mike $"
 .\"
 .\"   lpstat man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,7 +21,7 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH lpstat 1 "Common UNIX Printing System" "12 February 2006" "Easy Software Products"
+.TH lpstat 1 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
 .SH NAME
 lpstat \- print cups status information
 .SH SYNOPSIS
@@ -36,7 +36,7 @@ lpstat \- print cups status information
 .I destination(s)
 ] ] [ -c [
 .I class(es)
-] [ -d ] [ -o [
+] ] [ -d ] [ -o [
 .I destination(s)
 ] ] [ -p [
 .I printer(s)
@@ -144,5 +144,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: lpstat.man 5099 2006-02-13 02:46:10Z mike $".
+.\" End of "$Id: lpstat.man 5327 2006-03-23 19:53:24Z mike $".
 .\"