Merge r18962 to trunk, with minor tweaks; ready to merge to 1.6 branch
authorKen Raeburn <raeburn@mit.edu>
Wed, 20 Dec 2006 21:12:35 +0000 (21:12 +0000)
committerKen Raeburn <raeburn@mit.edu>
Wed, 20 Dec 2006 21:12:35 +0000 (21:12 +0000)
commit8101af84048197bd67be6f030fff6f3dd0b90eec
treea9340ceb6ab381e680ad53f9c684f773eed4bc0c
parentfba30d5e89d7efcd8e6527853f5f3c1554d29035
Merge r18962 to trunk, with minor tweaks; ready to merge to 1.6 branch

Changes fix up some sample names used, remove some options described
from certain commands, and fix filling in man pages.

ticket: 5116

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19000 dc483132-0cff-0310-8789-dd5450dbe970
src/kadmin/cli/kadmin.M
src/kadmin/server/kadmind.M
src/kdc/krb5kdc.M
src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M