Merge branch 'master' into dev/check_ssh-patches

2 files changed, 3 insertions, 3 deletions

diff --git a/tap/tap.3 b/tap/tap.3
index 4b23c24a..dce85fcd 100644
--- a/tap/tap.3
+++ b/tap/tap.3
@@ -291,7 +291,7 @@ always returns 0.
 .Xc
 .El
 .Pp
-For maximum compatability your test program should return a particular
+For maximum compatibility your test program should return a particular
 exit code.  This is calculated by
 .Fn exit_status
 so it is sufficient to always return from
@@ -309,7 +309,7 @@ directory in the source distribution contains numerous tests of
 functionality, written using
 .Nm .
 Examine them for examples of how to construct test suites.
-.Sh COMPATABILITY
+.Sh COMPATIBILITY
 .Nm
 strives to be compatible with the Perl Test::More and Test::Harness 
 modules.  The test suite verifies that
diff --git a/tap/tap.h b/tap/tap.h
index bd817893..8ee525c8 100644
--- a/tap/tap.h
+++ b/tap/tap.h
@@ -25,7 +25,7 @@
  */
 
 /* '## __VA_ARGS__' is a gcc'ism. C99 doesn't allow the token pasting
-   and requires the caller to add the final comma if they've ommitted
+   and requires the caller to add the final comma if they've omitted
    the optional arguments */
 #ifdef __GNUC__
 # define ok(e, test, ...) ((e) ?                                        \