From: msweet Date: Mon, 21 Apr 2014 11:49:06 +0000 (+0000) Subject: Save documentation changes. X-Git-Tag: v2.2b1~662 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9988e18ecb55d83f640ebfe16ebcfa1e851e3f4;p=thirdparty%2Fcups.git Save documentation changes. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11822 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/doc/help/man-cupsd-helper.html b/doc/help/man-cupsd-helper.html new file mode 100644 index 0000000000..ecdb2ac8fa --- /dev/null +++ b/doc/help/man-cupsd-helper.html @@ -0,0 +1,84 @@ + + + + + + cupsd-helper(8) + + +

cupsd-helper(8)

+

Name

+cupsd-helper - cupsd helper programs +

Synopsis

+cups-deviced +request-id +limit +user-id +options +
+cups-driverd +cat +ppd-name +
+cups-driverd +list +request_id +limit +options +
+cups-exec +sandbox-profile +[ +-g +group-id +] [ +-n +nice-value +] [ +-u +user-id +] +/path/to/program +argv0 +... +argvN +

Description

+The cupsd-helper programs perform long-running operations on behalf of the scheduler, +cupsd(8). +The cups-deviced helper program runs each CUPS +backend(7) +with no arguments in order to discover the available printers. +

The cups-driverd helper program lists all available printer drivers, a subset of "matching" printer drivers, or a copy of a specific driver PPD file. +

The cups-exec helper program runs backends, filters, and other programs. On OS X these programs are run in a secure sandbox. +

Files

+The cups-driverd program looks for PPD and driver information files in the following directories: +
+
+    /Library/Printers
+    /opt/share/ppd
+    /System/Library/Printers
+    /usr/local/share/ppd
+    /usr/share/cups/drv
+    /usr/share/cups/model
+    /usr/share/ppd
+
+

PPD files can be compressed using the +gzip(1) +program or placed in compressed +tar(1) +archives to further reduce their size. +

Driver information files must conform to the format defined in +ppdcfile(5). +

See Also

+backend(7), +cups(1), +cupsd(8), +cupsd.conf(5), +filter(7), +ppdcfile(5), +CUPS Online Help (http://localhost:631/help) +

Copyright

+Copyright © 2007-2014 by Apple Inc. + + + diff --git a/man/client.conf.man.in b/man/client.conf.man.in index 4930e12c24..9affb57350 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -12,7 +12,7 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH client.conf 5 "CUPS" "15 April 2014" "Apple Inc." +.TH client.conf 5 "CUPS" "16 April 2014" "Apple Inc." .SH NAME client.conf \- client configuration file for cups (deprecated) .SH DESCRIPTION @@ -24,6 +24,18 @@ The \fBServerName\fR directive is not supported on OS X at all. .SS DIRECTIVES The following directives are understood by the client. Consult the online help for detailed descriptions: .TP 5 +\fBAllowAnyRoot Y\fR +.TP 5 +\fBAllowAnyRoot N\fR +Specifies whether to allow TLS with certificates that have not been signed by a trusted Certificate Authority. +The default is "Y". +.TP 5 +\fBAllowExpiredCerts Y\fR +.TP 5 +\fBAllowExpiredCerts N\fR +Specifies whether to allow TLS with expired certificates. +The default is "Y". +.TP 5 \fBEncryption IfRequested\fR .TP 5 \fBEncryption Never\fR diff --git a/man/cups.man b/man/cups.man index 87845d058d..5d621f8cb2 100644 --- a/man/cups.man +++ b/man/cups.man @@ -12,7 +12,7 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH cups 1 "CUPS" "4 March 2014" "Apple Inc." +.TH cups 1 "CUPS" "16 April 2014" "Apple Inc." .SH NAME cups \- a standards-based, open source printing system .SH DESCRIPTION @@ -78,9 +78,6 @@ The directory where data files can be found. .B CUPS_ENCRYPTION The default level of encryption (Always, IfRequested, Never, Required). .TP 5 -.B CUPS_EXPIREDROOT -Whether to allow expired X.509 certificate roots (Y or N). -.TP 5 .B CUPS_EXPIREDCERTS Whether to allow expired X.509 certificates (Y or N). .TP 5