Load cups into easysw/current.

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

4 files changed, 114 insertions, 11 deletions

diff --git a/man/Makefile b/man/Makefile
index 7976f952c..d41bb0efd 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5317 2006-03-21 02:35:37Z mike $"
+# "$Id: Makefile 5428 2006-04-18 20:45:30Z mike $"
 #
 #   Man page makefile for the Common UNIX Printing System (CUPS).
 #
@@ -42,6 +42,7 @@ MAN1	=	cancel.$(MAN1EXT) \
 		lpstat.$(MAN1EXT)
 MAN5	=	classes.conf.$(MAN5EXT) \
 		client.conf.$(MAN5EXT) \
+		cups-snmp.conf.$(MAN5EXT) \
 		cupsd.conf.$(MAN5EXT) \
 		mime.convs.$(MAN5EXT) \
 		mime.types.$(MAN5EXT) \
@@ -181,5 +182,5 @@ mantohtml:	mantohtml.o
 
 
 #
-# End of "$Id: Makefile 5317 2006-03-21 02:35:37Z mike $".
+# End of "$Id: Makefile 5428 2006-04-18 20:45:30Z mike $".
 #
diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in
index 7529f2d9b..14cd8258d 100644
--- a/man/cups-lpd.man.in
+++ b/man/cups-lpd.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cups-lpd.man.in 5279 2006-03-11 13:40:45Z mike $"
+.\" "$Id: cups-lpd.man.in 5455 2006-04-24 13:49:59Z mike $"
 .\"
 .\"   cups-lpd man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,12 +21,12 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH cups-lpd 8 "Common UNIX Printing System" "11 March 2006" "Easy Software Products"
+.TH cups-lpd 8 "Common UNIX Printing System" "24 April 2006" "Easy Software Products"
 .SH NAME
 cups-lpd \- receive print jobs and report printer status to lpd clients
 .SH SYNOPSIS
 .B cups-lpd
-[ -o
+[ -n ] [ -o
 .I option=value
 ]
 .SH DESCRIPTION
@@ -68,6 +68,12 @@ named \fI/etc/xinetd.d/cups\fR containing the following lines:
 .fi
 .SH OPTIONS
 .TP 5
+-n
+.br
+Disables reverse address lookups; normally \fIcups-lpd\fR will
+try to discover the hostname of the client via a reverse DNS
+lookup.
+.TP 5
 -o name=value
 .br
 Inserts options for all print queues. Most often this is used to
@@ -117,5 +123,5 @@ http://localhost:631/help
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cups-lpd.man.in 5279 2006-03-11 13:40:45Z mike $".
+.\" End of "$Id: cups-lpd.man.in 5455 2006-04-24 13:49:59Z mike $".
 .\"
diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man
new file mode 100644
index 000000000..a0ad520e5
--- /dev/null
+++ b/man/cups-snmp.conf.man
@@ -0,0 +1,77 @@
+.\"
+.\" "$Id$"
+.\"
+.\"   snmp.conf 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 snmp.conf 5 "Common UNIX Printing System" "18 April 2006" "Easy Software Products"
+.SH NAME
+snmp.conf \- snmp configuration file for cups
+.SH DESCRIPTION
+The \fIsnmp.conf\fR file configures the CUPS SNMP printer
+discovery backend and is  normally located in the \fI/etc/cups\fR
+directory. Each line in the file can be a configuration
+directive, a blank line, or a comment. Comment lines start with
+the # character.
+.LP
+The SNMP backend uses the SNMPv1 protocol to discover network
+printers, collecting information from the Host MIB along with
+intelligent port probes to determine the correct device URI and
+make and model for each printer. Future versions of CUPS will
+likely support the new Port Monitor MIB as well.
+.SH DIRECTIVES
+The following directives are understood by the SNMP backend.
+Consult the on-line help for detailed descriptions:
+.TP 5
+Address @IF(\fIname\fR)
+.TP 5
+Address @LOCAL
+.TP 5
+Address \fIaddress\fR
+.br
+Sends SNMP broadcast queries to the specified address(es). The
+default address is "@LOCAL" which broadcasts to all LAN
+interfaces.
+.TP 5
+Community \fIname\fR
+.br
+Specifies a SNMP community to query. The default community is
+"public".
+.TP 5
+DebugLevel \fIN\fR
+.br
+Sets the debug logging level to \fIN\fR; 0 disables debug
+logging, 1 enables basic logging, 2 displays SNMP values, and 3
+displays raw hex data.
+.TP 5
+HostNameLookups on
+.TP 5
+HostNameLookups off
+.br
+Specifies whether the addresses of printers should be converted
+to hostnames or left as numeric IP addresses. The default is
+"off".
+.SH SEE ALSO
+http://localhost:631/help
+.SH COPYRIGHT
+Copyright 2006 by Easy Software Products, All Rights Reserved.
+.\"
+.\" End of "$Id$".
+.\"
diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in
index 6ae23fa6d..054ee9798 100644
--- a/man/cupsaddsmb.man.in
+++ b/man/cupsaddsmb.man.in
@@ -1,5 +1,5 @@
 .\"
-.\" "$Id: cupsaddsmb.man.in 5327 2006-03-23 19:53:24Z mike $"
+.\" "$Id: cupsaddsmb.man.in 5445 2006-04-20 18:25:40Z mike $"
 .\"
 .\"   cupsaddsmb man page for the Common UNIX Printing System (CUPS).
 .\"
@@ -21,9 +21,10 @@
 .\"       EMail: cups-info@cups.org
 .\"         WWW: http://www.cups.org
 .\"
-.TH cupsaddsmb 8 "Common UNIX Printing System" "23 March 2006" "Easy Software Products"
+.TH cupsaddsmb 8 "Common UNIX Printing System" "19 April 2006" "Easy Software Products"
 .SH NAME
 cupsaddsmb \- export printers to samba for windows clients
+
 .SH SYNOPSIS
 .B cupsaddsmb
 [ -H
@@ -42,12 +43,14 @@ cupsaddsmb \- export printers to samba for windows clients
 ] [ -h
 .I cups-server[:port]
 ] [ -v ] printer [ ... printer ]
+
 .SH DESCRIPTION
 \fIcupsaddsmb\fR exports printers to the SAMBA software (version
 2.2.0 or higher) for use with Windows clients. Depending on the
 SAMBA configuration, you may need to provide a password to
 export the printers. This program requires the Windows printer
 driver files described below.
+
 .SH OPTIONS
 \fIcupsaddsmb\fR supports the following options:
 .TP 5
@@ -75,6 +78,7 @@ Specifies a different CUPS server to use.
 .br
 Specifies that verbose information should be shown. This is
 useful for debugging SAMBA configuration problems.
+
 .SH SAMBA CONFIGURATION
 \fIcupsaddsmb\fR uses the new RPC-based printing support in
 SAMBA 2.2.x to provide printer drivers and PPD files to Windows
@@ -136,6 +140,10 @@ Once you have extracted the driver files, copy them to the
     pscript.ntf
     pscript5.dll
 .fi
+.LP
+\fBNote:\fR Unlike Windows, case is significant - make sure that
+you use the lowercase filenames shown above, otherwise
+\fIcupsaddsmb\fR will fail to export the drivers.
 
 .SH CUPS POSTSCRIPT DRIVERS FOR WINDOWS
 \fIcupsaddsmb\fR can use the CUPS v6 PostScript printer driver
@@ -162,6 +170,10 @@ Once you have extracted the driver files, copy them to the
     pscript.ntf
     pscript5.dll
 .fi
+.LP
+\fBNote:\fR Unlike Windows, case is significant - make sure that
+you use the lowercase filenames shown above, otherwise
+\fIcupsaddsmb\fR will fail to export the drivers.
 
 .SH ADOBE POSTSCRIPT DRIVERS FOR WINDOWS 95, 98, AND ME
 \fIcupsaddsmb\fR can use the Adobe PostScript printer driver for
@@ -171,8 +183,9 @@ Adobe web site (http://www.adobe.com).
 The Adobe driver does not support the page-label, job-billing, or
 job-hold-until options.
 .LP
-Once you have extracted the driver files, copy them to the
-\fI@CUPS_DATADIR@/drivers\fR directory exactly as named below:
+Once you have installed the driver on a Windows system, copy the
+following files to the \fI@CUPS_DATADIR@/drivers\fR directory
+exactly as named below:
 .nf
 
     [Windows 95, 98, and Me]
@@ -182,13 +195,19 @@ Once you have extracted the driver files, copy them to the
     ICONLIB.DLL
     PSMON.DLL
 .fi
+.LP
+\fBNote:\fR Unlike Windows, case is significant - make sure that
+you use the UPPERCASE filenames shown above, otherwise
+\fIcupsaddsmb\fR will fail to export the drivers.
+
 .SH SEE ALSO
 \fIsmbd(8)\fR, \fIsmb.conf(5)\fR,
 http://localhost:631/help
 .br
 http://www.cups.org/windows/
+
 .SH COPYRIGHT
 Copyright 1997-2006 by Easy Software Products, All Rights Reserved.
 .\"
-.\" End of "$Id: cupsaddsmb.man.in 5327 2006-03-23 19:53:24Z mike $".
+.\" End of "$Id: cupsaddsmb.man.in 5445 2006-04-20 18:25:40Z mike $".
 .\"