Update lpadmin man page (Issue #5369)

diff --git a/CHANGES.md b/CHANGES.md
index 829ea2b9d679958b66d96fde5ccdb5bd58584876..74be08910d42284b937dfb4abf1a66cb82ca4004 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.9 - 2018-08-18
+CHANGES - 2.2.9 - 2018-08-19
 ============================
 
 
@@ -6,6 +6,7 @@ Changes in CUPS v2.2.9
 ----------------------
 
 - Localization changes (Issue #5348, Issue #5362)
+- Documentation updates (Issue #5369)
 - The lpadmin command would create a non-working printer in some error cases
   (Issue #5305)
 - The scheduler would crash if an empty `AccessLog` directive was specified

diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 6dd442ef4d445644cb6a450fe2e998837aaf21f2..6144a165ceb5a688f432bfb140b843212ef0ff11 100644 (file)
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -115,6 +115,9 @@ The server name may be included in filenames using the string "%s", for example:
 
 </pre>
 The default is "/var/log/cups/page_log".
+<dt><a name="PassEnv"></a><b>PassEnv </b><i>variable </i>[ ... <i>variable </i>]
+<dd style="margin-left: 5.0em">Passes the specified environment variable(s) to child processes.
+Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive.
 <dt><a name="RemoteRoot"></a><b>RemoteRoot </b><i>username</i>
 <dd style="margin-left: 5.0em">Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user.
 The default is "remroot".
@@ -136,6 +139,9 @@ macOS uses its keychain database to store certificates and keys while other plat
 <dt><a name="ServerRoot"></a><b>ServerRoot </b><i>directory</i>
 <dd style="margin-left: 5.0em">Specifies the directory containing the server configuration files.
 The default is "/etc/cups".
+<dt><a name="SetEnv"></a><b>SetEnv </b><i>variable value</i>
+<dd style="margin-left: 5.0em">Set the specified environment variable to be passed to child processes.
+Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive.
 <dt><a name="StateDir"></a><b>StateDir </b><i>directory</i>
 <dd style="margin-left: 5.0em">Specifies the directory to use for PID and local certificate files.
 The default is "/var/run/cups" or "/etc/cups" depending on the platform.
@@ -196,7 +202,7 @@ On macOS the Font Book application manages system-installed fonts.
 <a href="man-subscriptions.conf.html?TOPIC=Man+Pages"><b>subscriptions.conf</b>(5),</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/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 9438953872c091d11c8cfad6ee86f7ce2e12ffed..4ba6ecf8f62ff09374de66e1ae14c256932eea19 100644 (file)
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -220,8 +220,6 @@ The default is "1048576" (1MB).
 <dt><a name="MultipleOperationTimeout"></a><b>MultipleOperationTimeout </b><i>seconds</i>
 <dd style="margin-left: 5.0em">Specifies the maximum amount of time to allow between files in a multiple file print job.
 The default is "300" (5 minutes).
-<dt><a name="PassEnv"></a><b>PassEnv </b><i>variable </i>[ ... <i>variable </i>]
-<dd style="margin-left: 5.0em">Passes the specified environment variable(s) to child processes.
 <dt><a name="Policy"></a><b>&lt;Policy </b><i>name</i><b>> </b>... <b>&lt;/Policy></b>
 <dd style="margin-left: 5.0em">Specifies access control for the named policy.
 <dt><a name="Port"></a><b>Port </b><i>number</i>
@@ -273,8 +271,6 @@ command.
 command.
 "Full" reports "CUPS 2.0.0 (UNAME) IPP/2.0".
 The default is "Minimal".
-<dt><a name="SetEnv"></a><b>SetEnv </b><i>variable value</i>
-<dd style="margin-left: 5.0em">Set the specified environment variable to be passed to child processes.
 <dt><a name="SSLListen"></a><b>SSLListen </b><i>ipv4-address</i><b>:</b><i>port</i>
 <dd style="margin-left: 5.0em"><dt><b>SSLListen [</b><i>ipv6-address</i><b>]:</b><i>port</i>
 <dd style="margin-left: 5.0em"><dt><b>SSLListen *:</b><i>port</i>

diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html
index 58c078e7d13381ef1cd3ad2ad0868a01d70a0ccc..c3bfa726229de9a1ca5227ed3b8840054368b885 100644 (file)
--- a/doc/help/man-lpadmin.html
+++ b/doc/help/man-lpadmin.html
@@ -146,7 +146,8 @@ command to get a list of supported device URIs and schemes.
 <dt><b>-D "</b><i>info</i><b>"</b>
 <dd style="margin-left: 5.0em">Provides a textual description of the destination.
 <dt><b>-E</b>
-<dd style="margin-left: 5.0em">Enables the destination and accepts jobs; this is the same as running the
+<dd style="margin-left: 5.0em">When specified before the <b>-d</b>, <b>-p</b>, or <b>-x</b> options, forces the use of TLS encryption on the connection to the scheduler.
+Otherwise, enables the destination and accepts jobs; this is the same as running the
 <a href="man-cupsaccept.html?TOPIC=Man+Pages"><b>cupsaccept</b>(8)</a>
 and
 <a href="man-cupsenable.html?TOPIC=Man+Pages"><b>cupsenable</b>(8)</a>
@@ -161,6 +162,7 @@ Finally, the CUPS version of <b>lpadmin</b> may ask the user for an access passw
 This differs from the System V version which requires the root user to execute this command.
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The CUPS version of <b>lpadmin</b> does not support all of the System V or Solaris printing system configuration options.
+<p>The double meaning of the <b>-E</b> option is an unfortunate historical oddity.
 <h2 class="title"><a name="EXAMPLE">Example</a></h2>
 Create an IPP Everywhere print queue:
 <pre class="man">
@@ -175,7 +177,7 @@ Create an IPP Everywhere print queue:
 <a href="man-lpoptions.html?TOPIC=Man+Pages"><b>lpoptions</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/lpadmin.man b/man/lpadmin.man
index c4f01ecfa45e6dbf58479b057af0aea9cd28818d..4ef709056b52f485ce95555bf7822284db1f8933 100644 (file)
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -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 lpadmin 8 "CUPS" "19 March 2018" "Apple Inc."
+.TH lpadmin 8 "CUPS" "19 August 2018" "Apple Inc."
 .SH NAME
 lpadmin \- configure cups printers and classes
 .SH SYNOPSIS
@@ -182,7 +182,8 @@ command to get a list of supported device URIs and schemes.
 Provides a textual description of the destination.
 .TP 5
 .B \-E
-Enables the destination and accepts jobs; this is the same as running the
+When specified before the \fB\-d\fR, \fB\-p\fR, or \fB\-x\fR options, forces the use of TLS encryption on the connection to the scheduler.
+Otherwise, enables the destination and accepts jobs; this is the same as running the
 .BR cupsaccept (8)
 and
 .BR cupsenable (8)
@@ -197,6 +198,8 @@ Finally, the CUPS version of \fBlpadmin\fR may ask the user for an access passwo
 This differs from the System V version which requires the root user to execute this command.
 .SH NOTES
 The CUPS version of \fBlpadmin\fR does not support all of the System V or Solaris printing system configuration options.
+.PP
+The double meaning of the \fB\-E\fR option is an unfortunate historical oddity.
 .SH EXAMPLE
 Create an IPP Everywhere print queue:
 .nf
@@ -211,4 +214,4 @@ Create an IPP Everywhere print queue:
 .BR lpoptions (1),
 CUPS Online Help (http://localhost:631/help)
 .SH COPYRIGHT
-Copyright \[co] 2007-2017 by Apple Inc.
+Copyright \[co] 2007-2018 by Apple Inc.