diff --git a/appl/dceutils/k5dcecon.c b/appl/dceutils/k5dcecon.c
index 88cdf281f..b8fb2a7ee 100644
--- a/appl/dceutils/k5dcecon.c
+++ b/appl/dceutils/k5dcecon.c
@@ -473,7 +473,7 @@ int k5dcecon(luid, luser, pname)
 
   /*
    * Destroy the Kerberos5 cred cache file.
-   * but dont care aout the return code.
+   * but don't care about the return code.
    */
 
   DEEDEBUG("Destroying the old cache\n");
diff --git a/kuser/klist.c b/kuser/klist.c
index e7fb8998b..3318bac98 100644
--- a/kuser/klist.c
+++ b/kuser/klist.c
@@ -403,7 +403,7 @@ display_tokens(int do_verbose)
 	    continue;
 	t[min(parms.out_size,sizeof(t)-1)] = 0;
 	memcpy(&size_secret_tok, r, sizeof(size_secret_tok));
-	/* dont bother about the secret token */
+	/* don't bother about the secret token */
 	r += size_secret_tok + sizeof(size_secret_tok);
 	if (parms.out_size < (r - t) + sizeof(size_public_tok))
 	    continue;
@@ -413,7 +413,7 @@ display_tokens(int do_verbose)
 	    continue;
 	memcpy(&ct, r, size_public_tok);
 	r += size_public_tok;
-	/* there is a int32_t with length of cellname, but we dont read it */
+	/* there is a int32_t with length of cellname, but we don't read it */
 	r += sizeof(int32_t);
 	cell = r;
 
diff --git a/lib/gssapi/krb5/test_sequence.c b/lib/gssapi/krb5/test_sequence.c
index b0f207270..33a4aac23 100644
--- a/lib/gssapi/krb5/test_sequence.c
+++ b/lib/gssapi/krb5/test_sequence.c
@@ -68,7 +68,7 @@ OM_uint32 pattern6[] = {
     50, 51, 52, 53, 54, 55, 56, 57, 58, 59
 };
 
-/* dont start at 0 */
+/* don't start at 0 */
 OM_uint32 pattern7[] = {
     11, 12, 13
 };
diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c
index 7aa159cbb..56dafae51 100644
--- a/lib/hx509/cms.c
+++ b/lib/hx509/cms.c
@@ -537,7 +537,7 @@ out:
  *
  * @param context A hx509 context.
  * @param flags flags to control the behavior.
- *    - HX509_CMS_EV_NO_KU_CHECK - Dont check KU on certificate
+ *    - HX509_CMS_EV_NO_KU_CHECK - Don't check KU on certificate
  *    - HX509_CMS_EV_ALLOW_WEAK - Allow weak crytpo
  *    - HX509_CMS_EV_ID_NAME - prefer issuer name and serial number
  * @param cert Certificate to encrypt the EnvelopedData encryption key
diff --git a/lib/hx509/print.c b/lib/hx509/print.c
index 4d2c3e2a4..01c275455 100644
--- a/lib/hx509/print.c
+++ b/lib/hx509/print.c
@@ -234,7 +234,7 @@ validate_print(hx509_validate_ctx ctx, int flags, const char *fmt, ...)
 }
 
 /*
- * Dont Care, SHOULD critical, SHOULD NOT critical, MUST critical,
+ * Don't Care, SHOULD critical, SHOULD NOT critical, MUST critical,
  * MUST NOT critical
  */
 enum critical_flag { D_C = 0, S_C, S_N_C, M_C, M_N_C };
diff --git a/lib/kdfs/k5dfspag.c b/lib/kdfs/k5dfspag.c
index 66d291a07..9db2555d0 100644
--- a/lib/kdfs/k5dfspag.c
+++ b/lib/kdfs/k5dfspag.c
@@ -274,7 +274,7 @@ int krb5_dfs_pag(context, flag, principal, luser)
 
    /* test if DFS is running or installed */
    if (krb5_dfs_getpag() == -2)
-     return(0); /* DFS not running, dont try */
+     return(0); /* DFS not running, don't try */
 
   if (pipe(fd) == -1)
      return(0);
@@ -305,7 +305,7 @@ int krb5_dfs_pag(context, flag, principal, luser)
 
   /* parent, wait for child to finish */
 
-  close(fd[1]);  /* dont need this end of pipe */
+  close(fd[1]);  /* don't need this end of pipe */
 
 /* #if defined(sgi) || defined(_sgi) */
   /* wait_status.w_status = 0; */
diff --git a/tests/can/check-can.in b/tests/can/check-can.in
index e168f97ef..50d01b8d8 100644
--- a/tests/can/check-can.in
+++ b/tests/can/check-can.in
@@ -41,7 +41,7 @@ env_setup="@env_setup@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 ./test_can TEST.H5L.SE heim-0.8 || exit 1
diff --git a/tests/db/add-modify-delete.in b/tests/db/add-modify-delete.in
index 278a63596..7f3a81908 100644
--- a/tests/db/add-modify-delete.in
+++ b/tests/db/add-modify-delete.in
@@ -41,7 +41,7 @@ EGREP="@EGREP@"
 default_db_type=@default_db_type@
 db_type=${1:-${default_db_type}}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ./have-db || exit 77
 
 R=EXAMPLE.ORG
diff --git a/tests/db/check-aliases.in b/tests/db/check-aliases.in
index dbef36dfb..5601905e4 100644
--- a/tests/db/check-aliases.in
+++ b/tests/db/check-aliases.in
@@ -41,7 +41,7 @@ db_type=${1:-${default_db_type}}
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/db/loaddump-db.in b/tests/db/loaddump-db.in
index 472580aa9..00d81861c 100644
--- a/tests/db/loaddump-db.in
+++ b/tests/db/loaddump-db.in
@@ -37,7 +37,7 @@
 srcdir="@srcdir@"
 objdir="@objdir@"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ./have-db || exit 77
 
 R=EXAMPLE.ORG
diff --git a/tests/gss/check-basic.in b/tests/gss/check-basic.in
index c8064c010..bd219b5e0 100644
--- a/tests/gss/check-basic.in
+++ b/tests/gss/check-basic.in
@@ -40,7 +40,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/gss/check-context.in b/tests/gss/check-context.in
index 32f19d141..ba06aaa02 100644
--- a/tests/gss/check-context.in
+++ b/tests/gss/check-context.in
@@ -40,7 +40,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in
index c7b7d6f53..de806b597 100644
--- a/tests/gss/check-gssmask.in
+++ b/tests/gss/check-gssmask.in
@@ -40,7 +40,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/gss/check-ntlm.in b/tests/gss/check-ntlm.in
index 5398b595b..6e03b012f 100644
--- a/tests/gss/check-ntlm.in
+++ b/tests/gss/check-ntlm.in
@@ -40,7 +40,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/gss/check-spnego.in b/tests/gss/check-spnego.in
index 7202da538..e2982d4f7 100644
--- a/tests/gss/check-spnego.in
+++ b/tests/gss/check-spnego.in
@@ -40,7 +40,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-canon.in b/tests/kdc/check-canon.in
index ef5d8275e..0bb5a413f 100644
--- a/tests/kdc/check-canon.in
+++ b/tests/kdc/check-canon.in
@@ -33,7 +33,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 # (krb5_kt_get_entry() is tested in another test)
 ${have_db} || exit 77
 
diff --git a/tests/kdc/check-cc.in b/tests/kdc/check-cc.in
index 6e0258947..1543db4f8 100644
--- a/tests/kdc/check-cc.in
+++ b/tests/kdc/check-cc.in
@@ -43,7 +43,7 @@ unset KRB5CCNAME
 
 testfailed="echo test failed; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-delegation.in b/tests/kdc/check-delegation.in
index 5fa19adba..865794616 100644
--- a/tests/kdc/check-delegation.in
+++ b/tests/kdc/check-delegation.in
@@ -36,7 +36,7 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-des.in b/tests/kdc/check-des.in
index 301baa6ed..d45b119df 100644
--- a/tests/kdc/check-des.in
+++ b/tests/kdc/check-des.in
@@ -39,7 +39,7 @@ testfailed="echo test failed; cat messages.log; exit 1"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
index d31ba323c..1623783eb 100644
--- a/tests/kdc/check-digest.in
+++ b/tests/kdc/check-digest.in
@@ -40,7 +40,7 @@ testfailed="echo test failed; cat messages.log; exit 1"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-fast.in b/tests/kdc/check-fast.in
index 96c00c319..4d3577c55 100644
--- a/tests/kdc/check-fast.in
+++ b/tests/kdc/check-fast.in
@@ -42,7 +42,7 @@ export KRB5_CONFIG
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-hdb-mitdb.in b/tests/kdc/check-hdb-mitdb.in
index 13559d9c9..e9de58799 100644
--- a/tests/kdc/check-hdb-mitdb.in
+++ b/tests/kdc/check-hdb-mitdb.in
@@ -42,7 +42,7 @@ export KRB5_CONFIG
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no ldap support compile in, disable test
+# If there is no ldap support compiled in, disable test
 if ${kdc} --builtin-hdb | grep mit-db > /dev/null ; then
     :
 else
@@ -50,7 +50,7 @@ else
     exit 77
 fi
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
index 39be7ef60..6eae00b64 100644
--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -39,11 +39,11 @@ db_type=@db_type@
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 
-# Dont run this test in AFS, since it lacks support for AF_UNIX
+# Don't run this test in AFS, since it lacks support for AF_UNIX
 expr "X`/bin/pwd || pwd`" : "X/afs/.*" > /dev/null 2>/dev/null && exit 77
 
 R=TEST.H5L.SE
@@ -291,7 +291,7 @@ echo "doing changes while slave is down"
 ${kadmin} -l cpw --random-password user@${R} > /dev/null || exit 1
 ${kadmin} -l cpw --random-password user@${R} > /dev/null || exit 1
 
-echo "Makeing a copy of the master log file"
+echo "Making a copy of the master log file"
 cp ${objdir}/current.log ${objdir}/current.log.tmp
 
 # ----------------- checking: checking that master and slaves resyncs
diff --git a/tests/kdc/check-kadmin.in b/tests/kdc/check-kadmin.in
index d40d0ea88..e01a1c349 100644
--- a/tests/kdc/check-kadmin.in
+++ b/tests/kdc/check-kadmin.in
@@ -38,7 +38,7 @@ srcdir="@srcdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index 235113425..962d5468a 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -42,7 +42,7 @@ export KRB5_CONFIG
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-keys.in b/tests/kdc/check-keys.in
index e8aca2684..6784bb51e 100644
--- a/tests/kdc/check-keys.in
+++ b/tests/kdc/check-keys.in
@@ -39,7 +39,7 @@ objdir="."
 
 srcdir="${top_srcdir}/tests/kdc"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-kinit.in b/tests/kdc/check-kinit.in
index e541a844d..35ec6dead 100644
--- a/tests/kdc/check-kinit.in
+++ b/tests/kdc/check-kinit.in
@@ -43,7 +43,7 @@ export KRB5CCNAME
 
 testfailed="echo test failed; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-kpasswdd.in b/tests/kdc/check-kpasswdd.in
index 3711ede01..4f63ce240 100644
--- a/tests/kdc/check-kpasswdd.in
+++ b/tests/kdc/check-kpasswdd.in
@@ -37,12 +37,12 @@ objdir="@objdir@"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 testfailed="echo test failed; cat messages.log; exit \$ec"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in
index 92c515ffb..23947bf5f 100644
--- a/tests/kdc/check-pkinit.in
+++ b/tests/kdc/check-pkinit.in
@@ -39,7 +39,7 @@ testfailed="echo test failed; cat messages.log; exit 1"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-referral.in b/tests/kdc/check-referral.in
index bbb72a349..92240c9ac 100644
--- a/tests/kdc/check-referral.in
+++ b/tests/kdc/check-referral.in
@@ -39,7 +39,7 @@ objdir="@objdir@"
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-tester.in b/tests/kdc/check-tester.in
index 8f1679f50..dba154c29 100644
--- a/tests/kdc/check-tester.in
+++ b/tests/kdc/check-tester.in
@@ -43,7 +43,7 @@ export KRB5_CONFIG
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/kdc/check-uu.in b/tests/kdc/check-uu.in
index c6607fa23..7e819a14a 100644
--- a/tests/kdc/check-uu.in
+++ b/tests/kdc/check-uu.in
@@ -39,7 +39,7 @@ testfailed="echo test failed; cat messages.log; exit 1"
 
 . ${env_setup}
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ${have_db} || exit 77
 
 R=TEST.H5L.SE
diff --git a/tests/ldap/check-ldap.in b/tests/ldap/check-ldap.in
index 3325c5d50..943fb0e7f 100644
--- a/tests/ldap/check-ldap.in
+++ b/tests/ldap/check-ldap.in
@@ -59,7 +59,7 @@ testfailed="echo test failed; exit 1"
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG
 
-# If there is no ldap support compile in, disable test
+# If there is no ldap support compiled in, disable test
 if ${kdc} --builtin-hdb | grep ldap > /dev/null ; then
    :
 else
diff --git a/tests/plugin/check-pac.in b/tests/plugin/check-pac.in
index 7f0a4c326..e201ed429 100644
--- a/tests/plugin/check-pac.in
+++ b/tests/plugin/check-pac.in
@@ -43,7 +43,7 @@ EGREP="@EGREP@"
 
 testfailed="echo test failed; cat messages.log; exit 1"
 
-# If there is no useful db support compile in, disable test
+# If there is no useful db support compiled in, disable test
 ../db/have-db || exit 77
 
 R=TEST.H5L.SE