Update all references to OS X to macOS.

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

diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index 97b618a5f63e6b64e41411d77bbd9655da524afe..16c1919e34f78119bc2d0e9d42ec6155871cdaee 100644 (file)
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -12,9 +12,9 @@ client.conf - client configuration file for cups
 <h2 class="title"><a name="DESCRIPTION">Description</a></h2>
 The <b>client.conf</b> file configures the CUPS client and is normally located in the <i>/etc/cups</i> and/or <i>~/.cups</i> directories.
 Each line in the file can be a configuration directive, a blank line, or a comment. Comment lines start with the # character.
-<p><b>Note:</b> Starting with OS X 10.7, this file is only used by command-line and X11 applications plus the IPP backend.
-The <b>ServerName</b> directive is not supported on OS X at all.
-Starting with OS X 10.TODO, all applications can access these settings in the <i>/Library/Preferences/org.cups.PrintingPrefs.plist</i> file instead.
+<p><b>Note:</b> Starting with macOS 10.7, this file is only used by command-line and X11 applications plus the IPP backend.
+The <b>ServerName</b> directive is not supported on macOS at all.
+Starting with macOS 10.12, all applications can access these settings in the <i>/Library/Preferences/org.cups.PrintingPrefs.plist</i> file instead.
 See the NOTES section below for more information.
 <h3><a name="DIRECTIVES">Directives</a></h3>
 The following directives are understood by the client. Consult the online help for detailed descriptions:
@@ -37,7 +37,7 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
 <dt><b>ServerName </b><i>hostname-or-ip-address</i>[<i>:port</i>]
 <dd style="margin-left: 5.0em"><dt><b>ServerName </b><i>/domain/socket</i>
 <dd style="margin-left: 5.0em">Specifies the address and optionally the port to use when connecting to the server.
-<b>Note: This directive it not supported on OS X 10.7 or later.</b>
+<b>Note: This directive it not supported on macOS 10.7 or later.</b>
 <dt><b>ServerName </b><i>hostname-or-ip-address</i>[<i>:port</i>]<b>/version=1.1</b>
 <dd style="margin-left: 5.0em">Specifies the address and optionally the port to use when connecting to a server running CUPS 1.3.12 and earlier.
 <dt><b>SSLOptions </b>[<i>AllowDH</i>] [<i>AllowRC4</i>] [<i>AllowSSL3</i>] [<i>DenyTLS1.0</i>]
@@ -60,7 +60,7 @@ The default is "Yes".
 The default is "No".
 </dl>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
-The <b>client.conf</b> file is deprecated on OS X and will no longer be supported in a future version of CUPS.
+The <b>client.conf</b> file is deprecated on macOS and will no longer be supported in a future version of CUPS.
 Configuration settings can instead be viewed or changed using the
 <b>defaults</b>(1)
 command: