From 6bebebe247769df8900bc64e0cbc05ab04fc49b2 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 19 Mar 2018 18:41:46 -0400 Subject: [PATCH] Cleanup man page updates. --- doc/help/man-client.conf.html | 6 ++++-- doc/help/man-cups-files.conf.html | 11 +++++++---- doc/help/man-cupsd.conf.html | 6 ++++-- doc/help/man-lpadmin.html | 1 + man/lpadmin.man | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html index b9791376f6..cdf1a866c5 100644 --- a/doc/help/man-client.conf.html +++ b/doc/help/man-client.conf.html @@ -44,8 +44,10 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
SSLOptions None
Sets encryption options (only in /etc/cups/client.conf). By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. -The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation. -The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. +Security is reduced when Allow options are used. +Security is enhanced when Deny options are used. +The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation (not supported on systems using GNU TLS). +The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients. The AllowSSL3 option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The DenyCBC option disables all CBC cipher suites. The DenyTLS1.0 option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html index 42dae48b37..6dd442ef4d 100644 --- a/doc/help/man-cups-files.conf.html +++ b/doc/help/man-cups-files.conf.html @@ -95,10 +95,6 @@ The kind strings are:
permissions
Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions. -
FileDevice Yes -
FileDevice No -
Specifies whether the file pseudo-device can be used for new printer queues. -The URI "file:///dev/null" is always allowed.
Group group-name-or-number
Specifies the group name or ID that will be used when executing external programs. The default group is operating system specific but is usually "lp" or "nobody". @@ -162,6 +158,13 @@ The default is "lp".

Deprecated Directives

The following directives are deprecated and will be removed from a future version of CUPS:
+
FileDevice Yes +
FileDevice No +
Specifies whether the file pseudo-device can be used for new printer queues. +The URI "file:///dev/null" is always allowed. +File devices cannot be used with "raw" print queues - a PPD file is required. +The specified file is overwritten for every print job. +Writing to directories is not supported.
FontPath directory[:...:directoryN]
Specifies a colon separated list of directories where fonts can be found. On Linux the diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html index 908234855e..fe4902df78 100644 --- a/doc/help/man-cupsd.conf.html +++ b/doc/help/man-cupsd.conf.html @@ -283,8 +283,10 @@ The default is "Minimal".
SSLOptions None
Sets encryption options. By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites. -The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation. -The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones. +Security is reduced when Allow options are used. +Security is enhanced when Deny options are used. +The AllowDH option enables cipher suites using plain Diffie-Hellman key negotiation (not supported on systems using GNU TLS). +The AllowRC4 option enables the 128-bit RC4 cipher suites, which are required for some older clients. The AllowSSL3 option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0. The DenyCBC option disables all CBC cipher suites. The DenyTLS1.0 option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1. diff --git a/doc/help/man-lpadmin.html b/doc/help/man-lpadmin.html index 110a584eb7..58c078e7d1 100644 --- a/doc/help/man-lpadmin.html +++ b/doc/help/man-lpadmin.html @@ -80,6 +80,7 @@ Use the -m option with the lpinfo(8) command to get a list of supported models. The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP device-uri. +Note: The "raw" model is deprecated and will not be supported in a future version of CUPS.
-o cupsIPPSupplies=true
-o cupsIPPSupplies=false
Specifies whether IPP supply level values should be reported. diff --git a/man/lpadmin.man b/man/lpadmin.man index bb12227579..c4f01ecfa4 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -91,7 +91,7 @@ Use the \fI-m\fR option with the .BR lpinfo (8) command to get a list of supported models. The model "raw" clears any existing PPD file and the model "everywhere" queries the printer referred to by the specified IPP \fIdevice-uri\fR. -The "raw" model is deprecated and will not be supported in a future version of CUPS. +Note: The "raw" model is deprecated and will not be supported in a future version of CUPS. .TP 5 \fB\-o cupsIPPSupplies=true\fR .TP 5 -- 2.47.3