Update documentation.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11887 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/doc/help/man-client.conf.html b/doc/help/man-client.conf.html
index a25435927cbec4879baf9efff5a80e137d804c1c..a24cafdbbdfa3abeeec84e669314e73c4a4c4f55 100644 (file)
--- a/doc/help/man-client.conf.html
+++ b/doc/help/man-client.conf.html
@@ -17,14 +17,14 @@ The <b>ServerName</b> directive is not supported on OS X at all.
 <h3><a name="DIRECTIVES">Directives</a></h3>
 The following directives are understood by the client. Consult the online help for detailed descriptions:
 <dl class="man">
-<dt><b>AllowAnyRoot Yes</b>
-<dd style="margin-left: 5.0em"><dt><b>AllowAnyRoot No</b>
+<dt><b>AllowAnyRoot Y</b>
+<dd style="margin-left: 5.0em"><dt><b>AllowAnyRoot N</b>
 <dd style="margin-left: 5.0em">Specifies whether to allow TLS with certificates that have not been signed by a trusted Certificate Authority.
-The default is "Yes".
-<dt><b>AllowExpiredCerts Yes</b>
-<dd style="margin-left: 5.0em"><dt><b>AllowExpiredCerts No</b>
+The default is "Y".
+<dt><b>AllowExpiredCerts Y</b>
+<dd style="margin-left: 5.0em"><dt><b>AllowExpiredCerts N</b>
 <dd style="margin-left: 5.0em">Specifies whether to allow TLS with expired certificates.
-The default is "Yes".
+The default is "Y".
 <dt><b>Encryption IfRequested</b>
 <dd style="margin-left: 5.0em"><dt><b>Encryption Never</b>
 <dd style="margin-left: 5.0em"><dt><b>Encryption Required</b>
@@ -40,10 +40,6 @@ CUPS adds the remote hostname ("name@server.example.com") for you. The default n
 <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>User </b><i>name</i>
 <dd style="margin-left: 5.0em">Specifies the default user name to use for requests.
-<dt><b>ValidateCerts Yes</b>
-<dd style="margin-left: 5.0em"><dt><b>ValidateCerts No</b>
-<dd style="margin-left: 5.0em">Specifies whether to only allow TLS with certificates whose common name matches the hostname.
-The default is "No".
 </dl>
 <h2 class="title"><a name="NOTES">Notes</a></h2>
 The <b>client.conf</b> file is deprecated and will no longer be supported in a future version of CUPS.

diff --git a/doc/help/man-ipptool.html b/doc/help/man-ipptool.html
index d3d351dc2345c265dec8ca926c9ddecb1049a1a1..fc6ac1b7028017f3ff34930491b955499af2b073 100644 (file)
--- a/doc/help/man-ipptool.html
+++ b/doc/help/man-ipptool.html
@@ -30,6 +30,9 @@ ipptool - perform internet printing protocol requests
 ] [
 <b>-L</b>
 ] [
+<b>-P</b>
+<i>filename.plist</i>
+] [
 <b>-S</b>
 ] [
 <b>-T</b>
@@ -108,6 +111,8 @@ must connect to the printer or server using IPv6.
 will continue past errors.
 <dt><b>-L</b>
 <dd style="margin-left: 5.0em">Specifies that requests should be sent using the HTTP/1.0 "Content-Length:" header, which is required for conformance by all versions of IPP. The default is to use "Transfer-Encoding: chunked" for requests with attached files and "Content-Length:" for requests without attached files.
+<dt><b>-P</b><i> filename.plist</i>
+<dd style="margin-left: 5.0em">Specifies that the test results should be written to the named XML (Apple plist) file in addition to the plain text report. This option is incompatible with the <b>-i</b> (interval) and <b>-n</b> (repeat-count) options.
 <dt><b>-S</b>
 <dd style="margin-left: 5.0em">Forces (dedicated) TLS encryption when connecting to the server.
 <dt><b>-T</b><i> seconds</i>

diff --git a/doc/help/man-ipptoolfile.html b/doc/help/man-ipptoolfile.html
index 882c129671e43e2eb4f684d1eb97fe5c854888ff..3fffb25f11d85f8fe1c4c083a5dc4bf87c8c8721 100644 (file)
--- a/doc/help/man-ipptoolfile.html
+++ b/doc/help/man-ipptoolfile.html
@@ -144,6 +144,8 @@ will ignore errors and continue with subsequent tests.
 <dd style="margin-left: 5.0em">Specifies the human-readable name of the test.
 <dt><b>OPERATION </b><i>operation-code</i>
 <dd style="margin-left: 5.0em">Specifies the operation to be performed.
+<dt><b>PAUSE "</b><i>message</i><b>"</b>
+<dd style="margin-left: 5.0em">Displays the provided message and waits for the user to press a key to continue.
 <dt><b>REQUEST-ID </b><i>number</i>
 <dd style="margin-left: 5.0em"><dt><b>REQUEST-ID random</b>
 <dd style="margin-left: 5.0em">Specifies the request-id value to use in the request, either an integer or the word "random" to use a randomly generated value (the default).