diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c
index 55a514a6d..df9dad01d 100644
--- a/lib/krb5/config_file.c
+++ b/lib/krb5/config_file.c
@@ -642,8 +642,6 @@ krb5_config_get_string (krb5_context context,
  *
  * @param context A Kerberos 5 context.
  * @param c a configuration section, or NULL to use the section from context
- * @param def_value the default value to return if no configuration
- *        found in the database.
  * @param args a va_list of arguments
  *
  * @return NULL if configuration string not found, a string otherwise
@@ -889,7 +887,7 @@ krb5_config_vget_bool  (krb5_context context,
  * @param c a configuration section, or NULL to use the section from context
  * @param def_value the default value to return if no configuration
  *        found in the database.
- * @param args a va_list of arguments
+ * @param ... a list of names, terminated with NULL.
  *
  * @return TRUE or FALSE
  *
@@ -919,7 +917,7 @@ krb5_config_get_bool_default (krb5_context context,
  *
  * @param context A Kerberos 5 context.
  * @param c a configuration section, or NULL to use the section from context
- * @param args a va_list of arguments
+ * @param ... a list of names, terminated with NULL.
  *
  * @return TRUE or FALSE
  *
diff --git a/lib/krb5/kuserok.c b/lib/krb5/kuserok.c
index a555e9d96..6a951844a 100644
--- a/lib/krb5/kuserok.c
+++ b/lib/krb5/kuserok.c
@@ -210,7 +210,7 @@ match_local_principals(krb5_context context,
  * anyone).
  *
  * Note that if the file exists, no implicit access rights are given
- * to user@LOCALREALM.
+ * to user@@LOCALREALM.
  *
  * Optionally, a set of files may be put in ~/.k5login.d (a
  * directory), in which case they will all be checked in the same
diff --git a/lib/krb5/store.c b/lib/krb5/store.c
index 38fd16bb1..6e1374adf 100644
--- a/lib/krb5/store.c
+++ b/lib/krb5/store.c
@@ -680,7 +680,7 @@ krb5_ret_data(krb5_storage *sp,
  * plus the string itself (not padded).
  *
  * @param sp the storage buffer to write to
- * @param data the buffer to store.
+ * @param s the string to store.
  *
  * @return 0 on success, a Kerberos 5 error code on failure.
  *
@@ -872,7 +872,7 @@ krb5_ret_stringnl(krb5_storage *sp,
  * Write a principal block to storage.
  *
  * @param sp the storage buffer to write to
- * @param principal the principal block to write.
+ * @param p the principal block to write.
  *
  * @return 0 on success, a Kerberos 5 error code on failure.
  *