summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2019-12-11 11:14:42 -0500
committerGreg Hudson <ghudson@mit.edu>2019-12-11 12:11:37 -0500
commita1f67dea30b56209d231b401549d4275e488b49a (patch)
tree7f91bcc6db3facbf44ccad757e64a1f7947e251e
parentf312eb055329627bebebb1e2f43c500af40cb54e (diff)
downloadkrb5-a1f67dea30b56209d231b401549d4275e488b49a.tar.gz
Update man pages
-rw-r--r--src/man/kadmind.man2
-rw-r--r--src/man/kdb5_ldap_util.man2
-rw-r--r--src/man/kdc.conf.man2
-rw-r--r--src/man/kinit.man2
-rw-r--r--src/man/krb5.conf.man24
-rw-r--r--src/man/krb5kdc.man2
6 files changed, 10 insertions, 24 deletions
diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index f624b013f..1db5d3254 100644
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "KADMIND" "8" " " "1.18" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.17" "MIT Kerberos"
.SH NAME
kadmind \- KADM5 administration server
.
diff --git a/src/man/kdb5_ldap_util.man b/src/man/kdb5_ldap_util.man
index 0522de404..36d4eb631 100644
--- a/src/man/kdb5_ldap_util.man
+++ b/src/man/kdb5_ldap_util.man
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "KDB5_LDAP_UTIL" "8" " " "1.18" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.17" "MIT Kerberos"
.SH NAME
kdb5_ldap_util \- Kerberos configuration utility
.
diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index 742764aba..95184e0fc 100644
--- a/src/man/kdc.conf.man
+++ b/src/man/kdc.conf.man
@@ -487,7 +487,7 @@ specified multiple times. New in release 1.17.
(List of \fIkey\fP:\fIsalt\fP strings.) Specifies the default key/salt
combinations of principals for this realm. Any principals created
through kadmin(1) will have keys of these types. The
-default value for this tag is \fBaes256\-cts\-hmac\-sha1\-96:normal aes128\-cts\-hmac\-sha1\-96:normal des3\-cbc\-sha1:normal arcfour\-hmac\-md5:normal\fP\&. For lists of
+default value for this tag is \fBaes256\-cts\-hmac\-sha1\-96:normal aes128\-cts\-hmac\-sha1\-96:normal\fP\&. For lists of
possible values, see \fI\%Keysalt lists\fP\&.
.UNINDENT
.SS [dbdefaults]
diff --git a/src/man/kinit.man b/src/man/kinit.man
index a3dcfe26c..a2c14c787 100644
--- a/src/man/kinit.man
+++ b/src/man/kinit.man
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "KINIT" "1" " " "1.18" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.17" "MIT Kerberos"
.SH NAME
kinit \- obtain and cache Kerberos ticket-granting ticket
.
diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
index d431dce75..03861881c 100644
--- a/src/man/krb5.conf.man
+++ b/src/man/krb5.conf.man
@@ -76,25 +76,11 @@ fubar = {
.UNINDENT
.UNINDENT
.sp
-Placing a \(aq*\(aq at the end of a line indicates that this is the \fIfinal\fP
-value for the tag. This means that neither the remainder of this
-configuration file nor any other configuration file will be checked
-for any other values for this tag.
-.sp
-For example, if you have the following lines:
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-foo = bar*
-foo = baz
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-then the second value of \fBfoo\fP (\fBbaz\fP) would never be read.
+Placing a \(aq*\(aq after the closing bracket of a section name indicates
+that the section is \fIfinal\fP, meaning that if the same section appears
+within a later file specified in \fBKRB5_CONFIG\fP, it will be ignored.
+A subsection can be marked as final by placing a \(aq*\(aq after either the
+tag name or the closing brace.
.sp
The krb5.conf file can include other files using either of the
following directives at the beginning of a line:
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index 062880c93..d08d7da75 100644
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "KRB5KDC" "8" " " "1.18" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.17" "MIT Kerberos"
.SH NAME
krb5kdc \- Kerberos V5 KDC
.