From d5d64778011d98ee8a3be43cba76b3c471082dbc Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 19 Aug 2018 09:03:02 -0400 Subject: [PATCH] Update lpadmin man page (Issue #5369) --- CHANGES.md | 3 ++- doc/help/man-cups-files.conf.html | 6 ++++++ doc/help/man-cupsd.conf.html | 4 ---- doc/help/man-lpadmin.html | 4 +++- man/lpadmin.man | 7 +++++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1a35080209..f82326d1fd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,10 +1,11 @@ -CHANGES - 2.3b6 - 2018-08-18 +CHANGES - 2.3b6 - 2018-08-19 ============================ Changes in CUPS v2.3b6 ---------------------- - Localization update (Issue #5339, Issue #5348, Issue #5362) +- Documenation 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 131c33f013..6144a165ce 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -115,6 +115,9 @@

Directives

The default is "/var/log/cups/page_log". +
PassEnv variable [ ... variable ] +
Passes the specified environment variable(s) to child processes. +Note: the standard CUPS filter and backend environment variables cannot be overridden using this directive.
RemoteRoot username
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 @@

Directives

ServerRoot directory
Specifies the directory containing the server configuration files. The default is "/etc/cups". +
SetEnv variable value +
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.
StateDir directory
Specifies the directory to use for PID and local certificate files. The default is "/var/run/cups" or "/etc/cups" depending on the platform. diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 0fff92d2e4..62700a5b87 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -227,8 +227,6 @@

Top-level Directives

MultipleOperationTimeout seconds
Specifies the maximum amount of time to allow between files in a multiple file print job. The default is "300" (5 minutes). -
PassEnv variable [ ... variable ] -
Passes the specified environment variable(s) to child processes.
<Policy name> ... </Policy>
Specifies access control for the named policy.
Port number @@ -280,8 +278,6 @@

Top-level Directives

command. "Full" reports "CUPS 2.0.0 (UNAME) IPP/2.0". The default is "Minimal". -
SetEnv variable value -
Set the specified environment variable to be passed to child processes.
SSLListen ipv4-address:port
SSLListen [ipv6-address]:port
SSLListen *:port diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index a4563304ef..42c0f7ebcb 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -143,7 +143,8 @@

Options

-D "info"
Provides a textual description of the destination.
-E -
Enables the destination and accepts jobs; this is the same as running the +
When specified before the -d, -p, or -x 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 cupsaccept(8) and cupsenable(8) @@ -170,6 +171,7 @@

Conforming To

Notes

The CUPS version of lpadmin does not support all of the System V or Solaris printing system configuration options. Interface scripts are not supported for security reasons. +

The double meaning of the -E option is an unfortunate historical oddity.

Example

Create an IPP Everywhere print queue: 
diff --git a/man/lpadmin.man b/man/lpadmin.man
index 63a5e7ded4..f870d816e2 100644
--- a/man/lpadmin.man
+++ b/man/lpadmin.man
@@ -6,7 +6,7 @@
 .\"
 .\" Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
 .\"
-.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
@@ -173,7 +173,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)
@@ -200,6 +201,8 @@ This differs from the System V version which requires the root user to execute t
 .SH NOTES
 The CUPS version of \fBlpadmin\fR does not support all of the System V or Solaris printing system configuration options.
 Interface scripts are not supported for security reasons.
+.PP
+The double meaning of the \fB\-E\fR option is an unfortunate historical oddity.
 .SH EXAMPLE
 Create an IPP Everywhere print queue:
 .nf