krb5 commit [krb5-1.12]: Document multi-component profile paths

[Tom Yu]

https://github.com/krb5/krb5/commit/ab1304e120112bf73cbd867410b08a2bcff6beb8
commit ab1304e120112bf73cbd867410b08a2bcff6beb8
Author: Greg Hudson <ghudson at mit.edu>
Date:   Thu Oct 23 15:06:13 2014 -0400

    Document multi-component profile paths
    
    In env_variables.rst and krb5_conf.rst, document that KRB5_CONFIG can
    contain multiple colon-separated pathnames.
    
    (cherry picked from commit 28dc817d2a065f5e0ab73377350a0529b2f4aa48)
    
    ticket: 8302 (new)
    version_fixed: 1.12.5
    status: resolved

 doc/admin/conf_files/krb5_conf.rst |    4 +++-
 doc/admin/env_variables.rst        |    5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/admin/conf_files/krb5_conf.rst b/doc/admin/conf_files/krb5_conf.rst
index 149993a..a1f0160 100644
--- a/doc/admin/conf_files/krb5_conf.rst
+++ b/doc/admin/conf_files/krb5_conf.rst
@@ -9,7 +9,9 @@ realms of interest, defaults for the current realm and for Kerberos
 applications, and mappings of hostnames onto Kerberos realms.
 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**.
+environment variable **KRB5_CONFIG**.  Multiple colon-separated
+filenames may be specified in **KRB5_CONFIG**; all files which are
+present will be read.
 
 
 Structure
diff --git a/doc/admin/env_variables.rst b/doc/admin/env_variables.rst
index e85d54d..0c146d3 100644
--- a/doc/admin/env_variables.rst
+++ b/doc/admin/env_variables.rst
@@ -4,8 +4,9 @@ Environment variables
 The following environment variables can be used during runtime:
 
 **KRB5_CONFIG**
-    Main Kerberos configuration file.  (See :ref:`mitK5defaults` for
-    the default name.)
+    Main Kerberos configuration file.  Multiple filenames can be
+    specified, separated by a colon; all files which are present will
+    be read.  (See :ref:`mitK5defaults` for the default path.)
 
 **KRB5_KDC_PROFILE**
     KDC configuration file.  (See :ref:`mitK5defaults` for the default