From: msweet Date: Fri, 23 May 2014 02:45:48 +0000 (+0000) Subject: Update lprm man page for modern markup and "canceled" spelling. X-Git-Tag: v2.2b1~625 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddf95fe678d9272ea850c9804161b3cfdff4a069;p=thirdparty%2Fcups.git Update lprm man page for modern markup and "canceled" spelling. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11893 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index a24cafdbbd..a25435927c 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -17,14 +17,14 @@ The ServerName directive is not supported on OS X at all.

Directives

The following directives are understood by the client. Consult the online help for detailed descriptions:
-
AllowAnyRoot Y -
AllowAnyRoot N +
AllowAnyRoot Yes +
AllowAnyRoot No
Specifies whether to allow TLS with certificates that have not been signed by a trusted Certificate Authority. -The default is "Y". -
AllowExpiredCerts Y -
AllowExpiredCerts N +The default is "Yes". +
AllowExpiredCerts Yes +
AllowExpiredCerts No
Specifies whether to allow TLS with expired certificates. -The default is "Y". +The default is "Yes".
Encryption IfRequested
Encryption Never
Encryption Required @@ -40,6 +40,10 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier.
User name
Specifies the default user name to use for requests. +
ValidateCerts Yes +
ValidateCerts No +
Specifies whether to only allow TLS with certificates whose common name matches the hostname. +The default is "No".

Notes

The client.conf file is deprecated and will no longer be supported in a future version of CUPS. diff --git a/doc/help/man-lprm.html b/doc/help/man-lprm.html index d5769182bd..09b177c75a 100644 --- a/doc/help/man-lprm.html +++ b/doc/help/man-lprm.html @@ -11,47 +11,72 @@ lprm - cancel print jobs

Synopsis

lprm -[ -E ] [ -U +[ +-E +] [ +-U username -] [ -h -server[:port] -] [ -P -destination[/instance] -] [ - ] [ -jobID(s) +] [ +-h +server[:port] +] [ +-P +destination[/instance] +] [ +- +] [ +job-id(s) ]

Description

-lprm cancels print jobs that have been queued for printing. -If no arguments are supplied, the current job on the default -destination is cancelled. You can specify one or more job ID -numbers to cancel those jobs or use the - option to cancel -all jobs. +lprm +cancels print jobs that have been queued for printing. +If no arguments are supplied, the current job on the default destination is canceled. +You can specify one or more job ID numbers to cancel those jobs or use the - option to cancel all jobs.

Options

-The lprm command supports the following options: +The +lprm +command supports the following options:
-
-E -

-Forces encryption when connecting to the server. -
-P destination[/instance] -

-Specifies the destination printer or class. -
-U username -

-Specifies an alternate username. -
-h server[:port] -

-Specifies an alternate server. +
-E +
Forces encryption when connecting to the server. +
-P destination[/instance] +
Specifies the destination printer or class. +
-U username +
Specifies an alternate username. +
-h server[:port] +
Specifies an alternate server.
-

Compatibility

-The CUPS version of lprm is compatible with the standard -Berkeley lprm command. +

Conforming To

+The CUPS version of +lprm +is compatible with the standard Berkeley command of the same name. +

Examples

+Cancel the current job on the default printer: +
+
+    lprm
+
+
+Cancel job 1234: +
+
+    lprm 1234
+
+
+Cancel all jobs: +
+
+    lprm -
+

See Also

-cancel(1), lp(1), lpq(1), lpr(1), -lpstat(1), -
-http://localhost:631/help +cancel(1), +lp(1), +lpq(1), +lpr(1), +lpstat(1), +CUPS Online Help (http://localhost:631/help)

Copyright

-Copyright 2007-2013 by Apple Inc. +Copyright © 2007-2014 by Apple Inc. diff --git a/man/lprm.man b/man/lprm.man index 7f12f7cac0..f5cf98ceac 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,65 +1,90 @@ .\" .\" "$Id$" .\" -.\" lprm man page for CUPS. +.\" lprm man page for CUPS. .\" -.\" Copyright 2007-2013 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright 2007-2014 by Apple Inc. +.\" Copyright 1997-2006 by Easy Software Products. .\" -.\" These coded instructions, statements, and computer programs are the -.\" property of Apple Inc. 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 -.\" file is missing or damaged, see the license at "http://www.cups.org/". +.\" These coded instructions, statements, and computer programs are the +.\" property of Apple Inc. 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 +.\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH lprm 1 "CUPS" "28 August 2009" "Apple Inc." +.TH lprm 1 "CUPS" "22 May 2014" "Apple Inc." .SH NAME lprm \- cancel print jobs .SH SYNOPSIS .B lprm -[ -E ] [ -U +[ +.B \-E +] [ +.B \-U .I username -] [ -h -.I server[:port] -] [ -P -.I destination[/instance] -] [ - ] [ -.I job ID(s) +] [ +.B \-h +.IR server [ :port ] +] [ +.B \-P +.IR destination [ /instance ] +] [ +.B \- +] [ +.I job-id(s) ] .SH DESCRIPTION -\fIlprm\fR cancels print jobs that have been queued for printing. -If no arguments are supplied, the current job on the default -destination is cancelled. You can specify one or more job ID -numbers to cancel those jobs or use the \fI-\fR option to cancel -all jobs. +.B lprm +cancels print jobs that have been queued for printing. +If no arguments are supplied, the current job on the default destination is canceled. +You can specify one or more job ID numbers to cancel those jobs or use the \fI\-\fR option to cancel all jobs. .SH OPTIONS -The \fIlprm\fR command supports the following options: +The +.B lprm +command supports the following options: .TP 5 --E -.br +.B \-E Forces encryption when connecting to the server. .TP 5 --P destination[/instance] -.br +\fB\-P \fIdestination\fR[\fI/instance\fR] Specifies the destination printer or class. .TP 5 --U username -.br +\fB\-U \fIusername\fR Specifies an alternate username. .TP 5 --h server[:port] -.br +\fB\-h \fIserver\fR[\fI:port\fR] Specifies an alternate server. -.SH COMPATIBILITY -The CUPS version of \fIlprm\fR is compatible with the standard -Berkeley \fIlprm\fR command. +.SH CONFORMING TO +The CUPS version of +.B lprm +is compatible with the standard Berkeley command of the same name. +.SH EXAMPLES +Cancel the current job on the default printer: +.nf + + lprm + +.fi +Cancel job 1234: +.nf + + lprm 1234 + +.fi +Cancel all jobs: +.nf + + lprm \- +.fi .SH SEE ALSO -\fIcancel(1)\fR, \fIlp(1)\fR, \fIlpq(1)\fR, \fIlpr(1)\fR, -\fIlpstat(1)\fR, -.br -http://localhost:631/help +.BR cancel (1), +.BR lp (1), +.BR lpq (1), +.BR lpr (1), +.BR lpstat (1), +CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT -Copyright 2007-2013 by Apple Inc. +Copyright \[co] 2007-2014 by Apple Inc. .\" .\" End of "$Id$". .\"