From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 23 Oct 2014 19:34:14 +0000 (-0400)
Subject: Document directory names in profile paths
X-Git-Tag: krb5-1.14-alpha1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c12dd592804321f4752ed08e2ec02689aab004c;p=thirdparty%2Fkrb5.git

Document directory names in profile paths

In krb5_conf.rst, document that KRB5_CONFIG can contain directory
names.

ticket: 8030
---

diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
index 7fac36019c..0f398a64e6 100644
--- a/doc/admin/conf_files/krb5_conf.rst
+++ b/doc/admin/conf_files/krb5_conf.rst
@@ -11,7 +11,10 @@ Normally, you should install your krb5.conf file in the directory
 ``/etc``.  You can override the default location by setting the
 environment variable **KRB5_CONFIG**.  Multiple colon-separated
 filenames may be specified in **KRB5_CONFIG**; all files which are
-present will be read.
+present will be read.  Starting in release 1.14, directory names can
+also be specified in **KRB5_CONFIG**; all files within the directory
+whose names consist solely of alphanumeric characters, dashes, or
+underscores will be read.
 
 
 Structure