From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Mon, 30 May 2016 23:11:07 +0000 (-0400)
Subject: Mirror fix from master.
X-Git-Tag: release-2.1.4~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91480df95e2e09097de20d8fd1bdd02ed14396a5;p=thirdparty%2Fcups.git

Mirror fix from master.
---

diff --git a/doc/help/man-cupsctl.html b/doc/help/man-cupsctl.html
index 6ab47db2fc..34e66de238 100644
--- a/doc/help/man-cupsctl.html
+++ b/doc/help/man-cupsctl.html
@@ -45,15 +45,15 @@ The following options are recognized:
 <dd style="margin-left: 5.0em">Specifies an alternate username to use when authenticating with the scheduler.
 <dt><b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 <dd style="margin-left: 5.0em">Specifies the server address.
-<dt><b>--fR[fBno-fR]fBdebug-logging</b>
+<dt><b>--</b>[<b>no-</b>]<b>debug-logging</b>
 <dd style="margin-left: 5.0em">Enables (disables) debug logging to the <i>error_log</i> file.
-<dt><b>--fR[fBno-fR]fBremote-admin</b>
+<dt><b>--</b>[<b>no-</b>]<b>remote-admin</b>
 <dd style="margin-left: 5.0em">Enables (disables) remote administration.
-<dt><b>--fR[fBno-fR]fBremote-any</b>
+<dt><b>--</b>[<b>no-</b>]<b>remote-any</b>
 <dd style="margin-left: 5.0em">Enables (disables) printing from any address, e.g., the Internet.
-<dt><b>--fR[fBno-fR]fBshare-printers</b>
+<dt><b>--</b>[<b>no-</b>]<b>share-printers</b>
 <dd style="margin-left: 5.0em">Enables (disables) sharing of local printers with other computers.
-<dt><b>--fR[fBno-fR]fBuser-cancel-any</b>
+<dt><b>--</b>[<b>no-</b>]<b>user-cancel-any</b>
 <dd style="margin-left: 5.0em">Allows (prevents) users to cancel jobs owned by others.
 </dl>
 <h2 class="title"><a name="EXAMPLES">Examples</a></h2>
diff --git a/man/cupsctl.man b/man/cupsctl.man
index 47ac9e2aeb..1c14d6e9f1 100644
--- a/man/cupsctl.man
+++ b/man/cupsctl.man
@@ -3,7 +3,7 @@
 .\"
 .\" cupsctl man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2016 by Apple Inc.
 .\" Copyright 2007 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -12,7 +12,7 @@
 .\" 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 cupsctl 8 "CUPS" "11 June 2014" "Apple Inc."
+.TH cupsctl 8 "CUPS" "30 May 2016" "Apple Inc."
 .SH NAME
 cupsctl \- configure cupsd.conf options
 .SH SYNOPSIS
@@ -54,19 +54,19 @@ Specifies an alternate username to use when authenticating with the scheduler.
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 Specifies the server address.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBdebug\-logging
+\fB\-\-\fR[\fBno\-\fR]\fBdebug\-logging\fR
 Enables (disables) debug logging to the \fIerror_log\fR file.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBremote\-admin
+\fB\-\-\fR[\fBno\-\fR]\fBremote\-admin\fR
 Enables (disables) remote administration.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBremote\-any
+\fB\-\-\fR[\fBno\-\fR]\fBremote\-any\fR
 Enables (disables) printing from any address, e.g., the Internet.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBshare\-printers
+\fB\-\-\fR[\fBno\-\fR]\fBshare\-printers\fR
 Enables (disables) sharing of local printers with other computers.
 .TP 5
-.B \-\-\fR[\fBno\-\fR]\fBuser\-cancel\-any
+\fB\-\-\fR[\fBno\-\fR]\fBuser\-cancel\-any\fR
 Allows (prevents) users to cancel jobs owned by others.
 .SH EXAMPLES
 Display the current settings: