From: Tom Yu <tlyu@mit.edu>
Date: Mon, 14 Dec 2015 20:34:47 +0000 (-0500)
Subject: Update man pages
X-Git-Tag: krb5-1.12.5-final~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0d1de7a5f7cf4d333b5f97b08b75156d3169342;p=thirdparty%2Fkrb5.git

Update man pages
---

diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
index a30947b9a9..b06d2f910e 100644
--- a/src/man/krb5.conf.man
+++ b/src/man/krb5.conf.man
@@ -37,7 +37,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
 \fB/etc\fP\&.  You can override the default location by setting the
-environment variable \fBKRB5_CONFIG\fP\&.
+environment variable \fBKRB5_CONFIG\fP\&.  Multiple colon\-separated
+filenames may be specified in \fBKRB5_CONFIG\fP; all files which are
+present will be read.
 .SH STRUCTURE
 .sp
 The krb5.conf file is set up in the style of a Windows INI file.
diff --git a/src/man/ksu.man b/src/man/ksu.man
index 1afbcad290..42a88bb7b7 100644
--- a/src/man/ksu.man
+++ b/src/man/ksu.man
@@ -37,7 +37,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 [ \fB\-n\fP \fItarget_principal_name\fP ]
 [ \fB\-c\fP \fIsource_cache_name\fP ]
 [ \fB\-k\fP ]
-[ \fB\-D\fP ]
 [ \fB\-r\fP time ]
 [ \fB\-pf\fP ]
 [ \fB\-l\fP \fIlifetime\fP ]
@@ -269,9 +268,6 @@ Do not delete the target cache upon termination of the target
 shell or a command (\fB\-e\fP command).  Without \fB\-k\fP, ksu deletes
 the target cache.
 .TP
-.B \fB\-D\fP
-Turn on debug mode.
-.TP
 .B \fB\-z\fP
 Restrict the copy of tickets from the source cache to the target
 cache to only the tickets where client == the target principal