diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/Makefile | 11 | ||||
| -rw-r--r-- | man/accept.man | 20 | ||||
| -rw-r--r-- | man/lp.man | 32 | ||||
| -rw-r--r-- | man/lpmove.man | 46 | ||||
| -rw-r--r-- | man/lpq.man | 19 | ||||
| -rw-r--r-- | man/lpr.man | 20 | ||||
| -rw-r--r-- | man/lprm.man | 20 | ||||
| -rw-r--r-- | man/lpstat.man | 20 |
8 files changed, 114 insertions, 74 deletions
diff --git a/man/Makefile b/man/Makefile index 0e93a080e..fbd5715cb 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 4868 2005-12-05 16:59:11Z mike $" +# "$Id: Makefile 4950 2006-01-19 16:07:57Z mike $" # # Man page makefile for the Common UNIX Printing System (CUPS). # @@ -69,7 +69,14 @@ all: $(MAN1) $(MAN5) $(MAN8) html # clean: + $(RM) mantohtml mantohtml.o $(RM) $(MAN1) $(MAN5) $(MAN8) + for file in $(MAN1); do \ + $(RM) ../doc/help/man-`basename $$file .$(MAN1EXT)`.html; \ + done + for file in $(MAN8); do \ + $(RM) ../doc/help/man-`basename $$file .$(MAN8EXT)`.html; \ + done # @@ -127,5 +134,5 @@ mantohtml: mantohtml.o # -# End of "$Id: Makefile 4868 2005-12-05 16:59:11Z mike $". +# End of "$Id: Makefile 4950 2006-01-19 16:07:57Z mike $". # diff --git a/man/accept.man b/man/accept.man index fa28a6d06..999199dde 100644 --- a/man/accept.man +++ b/man/accept.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: accept.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: accept.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" accept/reject man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,7 +21,7 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH accept 8 "Common UNIX Printing System" "23 January 2001" "Easy Software Products" +.TH accept 8 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME accept/reject \- accept/reject jobs sent to a destination .SH SYNOPSIS @@ -29,8 +29,10 @@ accept/reject \- accept/reject jobs sent to a destination destination(s) .br .B reject -[ -E ] [ -h -.I server +[ -E ] [ -U +.I username +] [ -h +.I hostname[:port] ] [ -r .I reason ] @@ -51,10 +53,10 @@ from the System V versions which require the root user to execute these commands. .SH SEE ALSO cancel(1), disable(8), enable(8), lp(1), lpadmin(8), lpstat(1), -CUPS Software Administrators Manual, -http://localhost:631/documentation.html +.br +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: accept.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: accept.man 4948 2006-01-19 03:23:41Z mike $". .\" diff --git a/man/lp.man b/man/lp.man index 65562ee5a..f8faf3f82 100644 --- a/man/lp.man +++ b/man/lp.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: lp.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: lp.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" lp/cancel man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,17 +21,19 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH lp 1 "Common UNIX Printing System" "1 May 2003" "Easy Software Products" +.TH lp 1 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME lp \- print files .br cancel \- cancel jobs .SH SYNOPSIS .B lp -[ -E ] [ \-c ] [ \-d +[ -E ] [ -U +.I username +] [ \-c ] [ \-d .I destination ] [ \-h -.I server +.I hostname[:port] ] [ \-m ] [ \-n .I num-copies [ \-o @@ -49,8 +51,10 @@ cancel \- cancel jobs ] .br .B lp -[ -E ] [ \-c ] [ \-h -.I server +[ -E ] [ -U +.I username +] [ \-c ] [ \-h +.I hostname[:port] ] [ \-i .I job-id ] [ \-n @@ -68,8 +72,10 @@ cancel \- cancel jobs ] .br .B cancel -[ \-a ] [ -h -.I server +[ -E ] [ -U +.I username +] [ \-a ] [ -h +.I hostname:port ] [ -u .I username ] [ @@ -172,10 +178,10 @@ jobs via the \fI-u\fR option should password-protect the /jobs location in \fIcupsd.conf(5)\fR. .SH SEE ALSO lpstat(1), -CUPS Software Users Manual, -http://localhost:631/documentation.html +.br +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lp.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: lp.man 4948 2006-01-19 03:23:41Z mike $". .\" diff --git a/man/lpmove.man b/man/lpmove.man index 30bd1d52c..2c462c027 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: lpmove.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: lpmove.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" lpmove man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,33 +21,47 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH lpmove 8 "Common UNIX Printing System" "23 January 2001" "Easy Software Products" +.TH lpmove 8 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME -lpmove \- move a job to a new destination +lpmove \- move a job or all jobs to a new destination .SH SYNOPSIS .B lpmove -[ -E ] +[ -E ] [ -h +.I hostname[:port] +] [ -U +.I username +] .I job destination +.br +.B lpmove +[ -E ] [ -h +.I hostname[:port] +] [ -U +.I username +] +.I source destination .SH DESCRIPTION -\fBlpmove\fR moves the specified \fIjob\fR to \fIdestination\fR. \fIjob\fR -can be the job ID number or the old destination and job ID: +\fBlpmove\fR moves the specified \fIjob\fR or all jobs from +\fIsource\fR to \fIdestination\fR. \fIjob\fR can be the job ID +number or the old destination and job ID: .br .nf lpmove 123 newprinter lpmove oldprinter-123 newprinter .fi -.LP +.SH OPTIONS The \fI-E\fR option forces encryption when connecting to the server. -.SH COMPATIBILITY -The System V version of this command also allows moving of all jobs from one -queue to another. This functionality is currently not supported by CUPS. +.LP +The \fI-U\fR option specifies an alternate username. +.LP +The \fI-h\fR option specifies an alternate server. .SH SEE ALSO -cancel(1), lp(1), -CUPS Software Users Manual, -http://localhost:631/documentation.html +cancel(1), lp(1) +.br +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpmove.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: lpmove.man 4948 2006-01-19 03:23:41Z mike $". .\" diff --git a/man/lpq.man b/man/lpq.man index 2c668fed1..812faf4c5 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: lpq.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: lpq.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" lpq man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,12 +21,16 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH lpq 1 "Common UNIX Printing System" "13 February 2001" "Easy Software Products" +.TH lpq 1 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME lpq \- show printer queue status .SH SYNOPSIS .B lpq -[ -E ] [ \-P +[ -E ] [ -U +.I username +] [ -h +.I hostname[:port] +] [ \-P .I dest ] [ \-a ] [ \-l ] [ .I +interval @@ -48,10 +52,9 @@ The \fI-l\fR option requests a more verbose (long) reporting format. .SH SEE ALSO cancel(1), lp(1), lpr(1), lprm(1), lpstat(1) .br -CUPS Software Users Manual, -http://localhost:631/documentation.html +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpq.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: lpq.man 4948 2006-01-19 03:23:41Z mike $". .\" diff --git a/man/lpr.man b/man/lpr.man index a66cdfe4d..e6c14ea0e 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: lpr.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: lpr.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" lpr man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,15 +21,17 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH lpr 1 "Common UNIX Printing System" "16 December 2004" "Easy Software Products" +.TH lpr 1 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME lpr \- print files .SH SYNOPSIS .B lpr -[ -E ] [ \-P -.I destination +[ -E ] [ -H +.I hostname[:port] ] [ \-U .I username +] [ \-P +.I destination ] [ \-# .I num-copies [ \-l ] [ \-o @@ -98,10 +100,10 @@ The "c", "d", "f", "g", "i", "m", "n", "t", "v", and "w" options are not supported by CUPS and will produce a warning message if used. .SH SEE ALSO cancel(1), lp(1), lpstat(1), -CUPS Software Users Manual, -http://localhost:631/documentation.html +.br +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpr.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: lpr.man 4948 2006-01-19 03:23:41Z mike $". .\" diff --git a/man/lprm.man b/man/lprm.man index b4b02cfe5..92d05b5e6 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: lprm.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: lprm.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" lprm man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,12 +21,16 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH lprm 1 "Common UNIX Printing System" "16 December 2004" "Easy Software Products" +.TH lprm 1 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME lprm \- cancel print jobs .SH SYNOPSIS .B lprm -[ -E ] [ -P +[ -E ] [ -U +.I username +] [ -h +.I hostname[:port] +] [ -P .I destination ] [ - ] [ .I job ID(s) @@ -45,10 +49,10 @@ The CUPS version of \fIlprm\fR is compatible with the standard Berkeley \fIlprm\fR command. .SH SEE ALSO cancel(1), lp(1), lpstat(1), lpr(1), -CUPS Software Users Manual, -http://localhost:631/documentation.html +.br +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lprm.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: lprm.man 4948 2006-01-19 03:23:41Z mike $". .\" diff --git a/man/lpstat.man b/man/lpstat.man index 6170c012e..45934918e 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,9 +1,9 @@ .\" -.\" "$Id: lpstat.man 4493 2005-02-18 02:09:53Z mike $" +.\" "$Id: lpstat.man 4948 2006-01-19 03:23:41Z mike $" .\" .\" lpstat man page for the Common UNIX Printing System (CUPS). .\" -.\" Copyright 1997-2005 by Easy Software Products. +.\" Copyright 1997-2006 by Easy Software Products. .\" .\" These coded instructions, statements, and computer programs are the .\" property of Easy Software Products and are protected by Federal @@ -21,13 +21,15 @@ .\" EMail: cups-info@cups.org .\" WWW: http://www.cups.org .\" -.TH lpstat 1 "Common UNIX Printing System" "3 January 2005" "Easy Software Products" +.TH lpstat 1 "Common UNIX Printing System" "18 January 2006" "Easy Software Products" .SH NAME lpstat \- print cups status information .SH SYNOPSIS .B lpstat -[ -E ] [ -h -.I server +[ -E ] [ -U +.I username +] [ -h +.I hostname[:port] ] [ -l ] [ -W .I which-jobs ] [ -a [ @@ -131,10 +133,10 @@ The "-h" and "-W" options are unique to CUPS. The Solaris "-f", "-P", and "-S" options are silently ignored. .SH SEE ALSO cancel(1), lp(1), -CUPS Software Users Manual, -http://localhost:631/documentation.html +.br +http://localhost:631/help .SH COPYRIGHT -Copyright 1993-2005 by Easy Software Products, All Rights Reserved. +Copyright 1993-2006 by Easy Software Products, All Rights Reserved. .\" -.\" End of "$Id: lpstat.man 4493 2005-02-18 02:09:53Z mike $". +.\" End of "$Id: lpstat.man 4948 2006-01-19 03:23:41Z mike $". .\" |