First half of the changes for Issue #4960, Issue #4961, and Issue #4962 - add

[thirdparty/cups.git] / doc / help / man-cups-files.conf.html

diff --git a/doc/help/man-cups-files.conf.html b/doc/help/man-cups-files.conf.html
index 75c923343ae7d389d5e4702fcd14830190c6ddfc..7dfcd211db6be775a0ee0b20594483a69229b70a 100644 (file)
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -38,12 +38,16 @@ The server name may be included in filenames using the string "%s", for example:
 The default is "/var/log/cups/access_log".
 <dt><a name="ConfigFilePerm"></a><b>ConfigFilePerm </b><i>mode</i>
 <dd style="margin-left: 5.0em">Specifies the permissions for all configuration files that the scheduler writes.
-The default is "0644" on OS X and "0640" on all other operating systems.
+The default is "0644" on macOS and "0640" on all other operating systems.
 </dl>
 <p><b>Note:</b> The permissions for the <i>printers.conf</i> file are currently masked to only allow access from the scheduler user (typically root).
 This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system.
 There is no way to disable this security feature.
 <dl class="man">
+<dt><a name="CreateSelfSignedCerts"></a><b>CreateSelfSignedCerts yes</b>
+<dd style="margin-left: 5.0em"><dt><b>CreateSelfSignedCerts no</b>
+<dd style="margin-left: 5.0em">Specifies whether the scheduler automatically creates self-signed certificates for client connections using TLS.
+The default is yes.
 <dt><a name="DataDir"></a><b>DataDir </b><i>path</i>
 <dd style="margin-left: 5.0em">Specifies the directory where data files can be found.
 The default is usually "/usr/share/cups".
@@ -122,14 +126,14 @@ The default is "/var/spool/cups".
 <dd style="margin-left: 5.0em"><dt><b>Sandboxing strict</b>
 <dd style="margin-left: 5.0em">Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler.
 The default is "strict".
-This directive is currently only used/supported on OS X.
+This directive is currently only used/supported on macOS.
 <dt><a name="ServerBin"></a><b>ServerBin </b><i>directory</i>
 <dd style="margin-left: 5.0em">Specifies the directory containing the backends, CGI programs, filters, helper programs, notifiers, and port monitors.
 The default is "/usr/lib/cups" or "/usr/libexec/cups" depending on the platform.
 <dt><a name="ServerKeychain"></a><b>ServerKeychain </b><i>path</i>
 <dd style="margin-left: 5.0em">Specifies the location of TLS certificates and private keys.
-The default is "/Library/Keychains/System.keychain" on OS X and "/etc/cups/ssl" on all other operating systems.
-OS X uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys.
+The default is "/Library/Keychains/System.keychain" on macOS and "/etc/cups/ssl" on all other operating systems.
+macOS uses its keychain database to store certificates and keys while other platforms use separate files in the specified directory, *.crt for PEM-encoded certificates and *.key for PEM-encoded private keys.
 <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".