Fix lpoptions man page (Issue #5286)

diff --git a/CHANGES.md b/CHANGES.md
index b96bab55e01cd85214cc19c143c6e3dac6346f65..b7ec2c1b33595472ddfa26c27acce27a908994bc 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.8 - 2018-04-09
+CHANGES - 2.2.8 - 2018-04-10
 ============================
 
 
@@ -10,6 +10,7 @@ Changes in CUPS v2.2.8
 - The `ipptool` program no longer checks for duplicate attributes when running
   in list or CSV mode (Issue #5278)
 - Fixed builds without PAM (Issue #5283)
+- Fixed `lpoptions` man page (Issue #5286)
 - The `cupsCreateJob`, `cupsPrintFile2`, and `cupsPrintFiles2` APIs did not use
   the supplied HTTP connection (Issue #5288)
 - Fixed another crash in the scheduler when adding an IPP Everywhere printer

diff --git a/doc/help/man-lpoptions.html b/doc/help/man-lpoptions.html
index e4eaf714e857e74c87c86f70bc8cac49dbc47c83..e8213c43bde84dc9554de7cc9d5e4e7e2ea1b568 100644 (file)
--- a/doc/help/man-lpoptions.html
+++ b/doc/help/man-lpoptions.html
@@ -14,9 +14,6 @@ lpoptions - display or set printer options and defaults
 [
 <b>-E</b>
 ] [
-<b>-U</b>
-<i>username</i>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ]
 <b>-d </b><i>destination</i>[<b>/</b><i>instance</i>]
@@ -28,9 +25,6 @@ lpoptions - display or set printer options and defaults
 [
 <b>-E</b>
 ] [
-<b>-U</b>
-<i>username</i>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
 <b>-p </b><i>destination</i>[<b>/</b><i>instance</i>]
@@ -41,9 +35,6 @@ lpoptions - display or set printer options and defaults
 [
 <b>-E</b>
 ] [
-<b>-U</b>
-<i>username</i>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ] [
 <b>-p </b><i>destination</i>[<b>/</b><i>instance</i>]
@@ -55,9 +46,6 @@ lpoptions - display or set printer options and defaults
 [
 <b>-E</b>
 ] [
-<b>-U</b>
-<i>username</i>
-] [
 <b>-h </b><i>server</i>[<b>:</b><i>port</i>]
 ]
 <b>-x </b><i>destination</i>[<b>/</b><i>instance</i>]
@@ -78,8 +66,6 @@ Otherwise, the per-user defaults are managed in the <i>~/.cups/lpoptions</i> fil
 <dl class="man">
 <dt><b>-E</b>
 <dd style="margin-left: 5.0em">Enables encryption when communicating with the CUPS server.
-<dt><b>-U </b><i>username</i>
-<dd style="margin-left: 5.0em">Uses an alternate username.
 <dt><b>-d </b><i>destination</i>[<b>/</b><i>instance</i>]
 <dd style="margin-left: 5.0em">Sets the user default printer to <i>destination</i>.
 If <i>instance</i> is supplied then that particular instance is used.
@@ -119,7 +105,7 @@ The <b>lpoptions</b> command is unique to CUPS.
 <a href="man-lprm.html?TOPIC=Man+Pages"><b>lprm</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 &copy; 2007-2017 by Apple Inc.
+Copyright &copy; 2007-2018 by Apple Inc.
 
 </body>
 </html>

diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in
index 2aab12f45db220dd1a80b1ff35e6cc20448a4abb..3e63b5ce51c7a0284d100ecb7779e7a3b1ee9ab0 100644 (file)
--- a/man/lpoptions.man.in
+++ b/man/lpoptions.man.in
@@ -1,8 +1,8 @@
 .\"
 .\" lpoptions man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
-.\" Copyright 1997-2006 by Easy Software Products.
+.\" Copyright © 2007-2018 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
@@ -10,7 +10,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 lpoptions 1 "CUPS" "12 June 2014" "Apple Inc."
+.TH lpoptions 1 "CUPS" "10 April 2018" "Apple Inc."
 .SH NAME
 lpoptions \- display or set printer options and defaults
 .SH SYNOPSIS
@@ -18,9 +18,6 @@ lpoptions \- display or set printer options and defaults
 [
 .B \-E
 ] [
-.B \-U
-.I username
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ]
 \fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
@@ -32,9 +29,6 @@ lpoptions \- display or set printer options and defaults
 [
 .B \-E
 ] [
-.B \-U
-.I username
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
 \fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
@@ -45,9 +39,6 @@ lpoptions \- display or set printer options and defaults
 [
 .B \-E
 ] [
-.B \-U
-.I username
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ] [
 \fB\-p \fIdestination\fR[\fB/\fIinstance\fR]
@@ -59,9 +50,6 @@ lpoptions \- display or set printer options and defaults
 [
 .B \-E
 ] [
-.B \-U
-.I username
-] [
 \fB\-h \fIserver\fR[\fB:\fIport\fR]
 ]
 \fB\-x \fIdestination\fR[\fB/\fIinstance\fR]
@@ -86,9 +74,6 @@ Otherwise, the per-user defaults are managed in the \fI~/.cups/lpoptions\fR file
 .B \-E
 Enables encryption when communicating with the CUPS server.
 .TP 5
-\fB\-U \fIusername\fR
-Uses an alternate username.
-.TP 5
 \fB\-d \fIdestination\fR[\fB/\fIinstance\fR]
 Sets the user default printer to \fIdestination\fR.
 If \fIinstance\fR is supplied then that particular instance is used.
@@ -133,4 +118,4 @@ The \fBlpoptions\fR command is unique to CUPS.
 .BR lprm (1),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2017 by Apple Inc.
+Copyright \[co] 2007-2018 by Apple Inc.