From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 2 Feb 2015 18:35:00 +0000 (+0000)
Subject: Add note that ServerKeychain is a directory of files on most platforms.
X-Git-Tag: v2.2b1~357
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08c7d54404377593f01f05cbbe583bc36035a477;p=thirdparty%2Fcups.git

Add note that ServerKeychain is a directory of files on most platforms.


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

diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in
index 4c9b64799e..24e25b9b25 100644
--- a/man/cups-files.conf.man.in
+++ b/man/cups-files.conf.man.in
@@ -3,7 +3,7 @@
 .\"
 .\" cups-files.conf man page for CUPS.
 .\"
-.\" Copyright 2007-2014 by Apple Inc.
+.\" Copyright 2007-2015 by Apple Inc.
 .\" Copyright 1997-2006 by Easy Software Products.
 .\"
 .\" These coded instructions, statements, and computer programs are the
@@ -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-files.conf 5 "CUPS" "29 January 2015" "Apple Inc."
+.TH cups-files.conf 5 "CUPS" "2 February 2015" "Apple Inc."
 .SH NAME
 cups\-files.conf \- file and directory configuration file for cups
 .SH DESCRIPTION
@@ -173,6 +173,7 @@ The default is "/usr/lib/cups" or "/usr/libexec/cups" depending on the platform.
 \fBServerKeychain \fIpath\fR
 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.
 .\"#ServerRoot
 .TP 5
 \fBServerRoot \fIdirectory\fR