<rdar://problem/15939788> Improve CUPS sandboxing

[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 3e30a9d98d5a47b35105bae38aeeebf3db1e48e8..b6d3afecdb8f27d4953d39876efa5e6a910d3256 100644 (file)
--- a/doc/help/man-cups-files.conf.html
+++ b/doc/help/man-cups-files.conf.html
@@ -119,21 +119,26 @@ accesses.
 <dd>Specifies the directory to store print jobs and other HTTP request
 data.
 </dd>
-<dt>ServerBin directory
+<dt>Sandboxing off
 </dt>
 <dd></dd>
-<dd>Specifies the directory where backends, CGIs, daemons, and filters may
-be found.
+<dt>Sandboxing relaxed
+</dt>
+<dd></dd>
+<dt>Sandboxing strict
+</dt>
+<dd>Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler. The default is "strict". (OS X only)
 </dd>
-<dt>ServerCertificate filename
+<dt>ServerBin directory
 </dt>
 <dd></dd>
-<dd>Specifies the encryption certificate to use.
+<dd>Specifies the directory where backends, CGIs, daemons, and filters may
+be found.
 </dd>
-<dt>ServerKey filename
+<dt>ServerKeychain path
 </dt>
 <dd></dd>
-<dd>Specifies the encryption key to use.
+<dd>Specifies the location of TLS certificates and private keys.
 </dd>
 <dt>ServerRoot directory
 </dt>
@@ -171,7 +176,7 @@ or state files. The default is No.
 <br>
 <a href='http://localhost:631/help'>http://localhost:631/help</a>
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
-Copyright 2007-2013 by Apple Inc.
+Copyright 2007-2014 by Apple Inc.
 
 </body>
 </html>