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. Commit By: raeburn Revision: 19000 Changed Files: U trunk/src/kadmin/cli/kadmin.M U trunk/src/kadmin/server/kadmind.M U trunk/src/kdc/krb5kdc.M U trunk/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_util.M