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 a24cafdbbdfa3abeeec84e669314e73c4a4c4f55..a25435927cbec4879baf9efff5a80e137d804c1c 100644 (file)
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -17,14 +17,14 @@ The <b>ServerName</b> directive is not supported on OS X at all.
 <h3><a name="DIRECTIVES">Directives</a></h3>
 The following directives are understood by the client. Consult the online help for detailed descriptions:
 <dl class="man">
-<dt><b>AllowAnyRoot Y</b>
-<dd style="margin-left: 5.0em"><dt><b>AllowAnyRoot N</b>
+<dt><b>AllowAnyRoot Yes</b>
+<dd style="margin-left: 5.0em"><dt><b>AllowAnyRoot No</b>
 <dd style="margin-left: 5.0em">Specifies whether to allow TLS with certificates that have not been signed by a trusted Certificate Authority.
-The default is "Y".
-<dt><b>AllowExpiredCerts Y</b>
-<dd style="margin-left: 5.0em"><dt><b>AllowExpiredCerts N</b>
+The default is "Yes".
+<dt><b>AllowExpiredCerts Yes</b>
+<dd style="margin-left: 5.0em"><dt><b>AllowExpiredCerts No</b>
 <dd style="margin-left: 5.0em">Specifies whether to allow TLS with expired certificates.
-The default is "Y".
+The default is "Yes".
 <dt><b>Encryption IfRequested</b>
 <dd style="margin-left: 5.0em"><dt><b>Encryption Never</b>
 <dd style="margin-left: 5.0em"><dt><b>Encryption Required</b>
@@ -40,6 +40,10 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
 <dd style="margin-left: 5.0em">Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier.
 <dt><b>User </b><i>name</i>
 <dd style="margin-left: 5.0em">Specifies the default user name to use for requests.
+<dt><b>ValidateCerts Yes</b>
+<dd style="margin-left: 5.0em"><dt><b>ValidateCerts No</b>
+<dd style="margin-left: 5.0em">Specifies whether to only allow TLS with certificates whose common name matches the hostname.
+The default is "No".
 </dl>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The <b>client.conf</b> 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 d5769182bd7e87d706291720b55060de00249afb..09b177c75a33f62fc2b80874f7afff674fc92b65 100644 (file)
--- a/doc/help/man-lprm.html
+++ b/doc/help/man-lprm.html
@@ -11,47 +11,72 @@
 lprm - cancel print jobs
 <h2 class="title"><a name="SYNOPSIS">Synopsis</a></h2>
 <b>lprm</b>
-[ -E ] [ -U
+[
+<b>-E</b>
+] [
+<b>-U</b>
 <i>username</i>
-] [ -h
-<i>server[:port]</i>
-] [ -P
-<i>destination[/instance]</i>
-] [ - ] [
-<i>job</i><i>ID(s)</i>
+] [
+<b>-h</b>
+<i>server</i>[<i>:port</i>]
+] [
+<b>-P</b>
+<i>destination</i>[<i>/instance</i>]
+] [
+<b>-</b>
+] [
+<i>job-id(s)</i>
 ]
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
-<i>lprm</i> 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 <i>-</i> option to cancel
-all jobs.
+<b>lprm</b>
+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 <i>-</i> option to cancel all jobs.
 <h2 class="title"><a name="OPTIONS">Options</a></h2>
-The <i>lprm</i> command supports the following options:
+The
+<b>lprm</b>
+command supports the following options:
 <dl class="man">
-<dt>-E
-<dd style="margin-left: 5.0em"><br>
-Forces encryption when connecting to the server.
-<dt>-P destination[/instance]
-<dd style="margin-left: 5.0em"><br>
-Specifies the destination printer or class.
-<dt>-U username
-<dd style="margin-left: 5.0em"><br>
-Specifies an alternate username.
-<dt>-h server[:port]
-<dd style="margin-left: 5.0em"><br>
-Specifies an alternate server.
+<dt><b>-E</b>
+<dd style="margin-left: 5.0em">Forces encryption when connecting to the server.
+<dt><b>-P </b><i>destination</i>[<i>/instance</i>]
+<dd style="margin-left: 5.0em">Specifies the destination printer or class.
+<dt><b>-U </b><i>username</i>
+<dd style="margin-left: 5.0em">Specifies an alternate username.
+<dt><b>-h </b><i>server</i>[<i>:port</i>]
+<dd style="margin-left: 5.0em">Specifies an alternate server.
 </dl>
-<h2 class="title"><a name="COMPATIBILITY">Compatibility</a></h2>
-The CUPS version of <i>lprm</i> is compatible with the standard
-Berkeley <i>lprm</i> command.
+<h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
+The CUPS version of
+<b>lprm</b>
+is compatible with the standard Berkeley command of the same name.
+<h2 class="title"><a name="EXAMPLES">Examples</a></h2>
+Cancel the current job on the default printer:
+<pre class="man">
+
+    lprm
+
+</pre>
+Cancel job 1234:
+<pre class="man">
+
+    lprm 1234
+
+</pre>
+Cancel all jobs:
+<pre class="man">
+
+    lprm -
+</pre>
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
-<i>cancel(1)</i>, <i>lp(1)</i>, <i>lpq(1)</i>, <i>lpr(1)</i>,
-<i>lpstat(1)</i>,
-<br>
-<a href="http://localhost:631/help">http://localhost:631/help</a>
+<a href="man-cancel.html?TOPIC=Man+Pages"><b>cancel</b>(1),</a>
+<a href="man-lp.html?TOPIC=Man+Pages"><b>lp</b>(1),</a>
+<a href="man-lpq.html?TOPIC=Man+Pages"><b>lpq</b>(1),</a>
+<a href="man-lpr.html?TOPIC=Man+Pages"><b>lpr</b>(1),</a>
+<a href="man-lpstat.html?TOPIC=Man+Pages"><b>lpstat</b>(1),</a>
+CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help</a>)
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright 2007-2013 by Apple Inc.
+Copyright &copy; 2007-2014 by Apple Inc.
 
 </body>
 </html>

diff --git a/man/lprm.man b/man/lprm.man
index 7f12f7cac053e6ba0d29ea2dce6f939ed655e354..f5cf98ceaca48b404a3834681c1d15c25545e88a 100644 (file)
--- 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$".
 .\"