17 files changed, 21 insertions, 18 deletions

diff --git a/tools/regression/README b/tools/regression/README
index d29ff11a62b66..4879a6508d827 100644
--- a/tools/regression/README
+++ b/tools/regression/README
@@ -37,7 +37,7 @@ test name.  For example,
 A test may be flagged as 'todo'.  This indicates that you expect the test
 to fail (perhaps because the necessary functionality hasn't been written
 yet).  'todo' tests are expected to fail, so when they start working the
-test framework can alert you to this happy occurence.  Flag these tests 
+test framework can alert you to this happy occurrence.  Flag these tests 
 with a '# TODO' comment after the test name
 
     not ok 1 - infiniteloop # TODO write test for an infinite loop
diff --git a/tools/regression/bin/sh/builtins/cd1.0 b/tools/regression/bin/sh/builtins/cd1.0
index 8c695364133fc..bc5108e6be3b4 100644
--- a/tools/regression/bin/sh/builtins/cd1.0
+++ b/tools/regression/bin/sh/builtins/cd1.0
@@ -7,7 +7,7 @@ T=$(mktemp -d sh-test.XXXXXX)
 
 chmod 0 $T
 if [ `id -u` -ne 0 ]; then
-	# Root can always cd, irregardless of directory permissions.
+	# Root can always cd, regardless of directory permissions.
 	cd -L $T 2>/dev/null && exit 1
 	[ "$PWD" = "$P" ]
 	[ "$(pwd)" = "$P" ]
diff --git a/tools/regression/fifo/fifo_io/fifo_io.c b/tools/regression/fifo/fifo_io/fifo_io.c
index 96ef9b4543c47..4d3c54e8b2f4e 100644
--- a/tools/regression/fifo/fifo_io/fifo_io.c
+++ b/tools/regression/fifo/fifo_io/fifo_io.c
@@ -395,7 +395,7 @@ timed_read(int fd, void *data, size_t len, ssize_t *read_lenp,
  *
  * We use a timeout of 5 seconds, concluding that in 5 seconds either all I/O
  * that can take place will, and that if we reach the end of the timeout,
- * then blocking has occured.
+ * then blocking has occurred.
  *
  * We assume that the buffer size on a fifo is <512K, and as such, that
  * writing that much data without an active reader will result in blocking.
diff --git a/tools/regression/file/dup/dup.c b/tools/regression/file/dup/dup.c
index d6dd0ffd313fe..b0d9af2fa9ff5 100644
--- a/tools/regression/file/dup/dup.c
+++ b/tools/regression/file/dup/dup.c
@@ -104,7 +104,7 @@ main(int __unused argc, char __unused *argv[])
 	 * Normally dup and dup2 will clear the close-on-exec
 	 * flag on the new fd (which appears to be an implementation
 	 * mistake from start and not some planned behavior).
-	 * In todays implementations of dup and dup2 we have to make
+	 * In today's implementations of dup and dup2 we have to make
 	 * an effort to really clear that flag.  But all tested
 	 * implementations of dup2 have another tweak.  If we
 	 * dup2(old, new) when old == new, the syscall short-circuits
diff --git a/tools/regression/kthread/kld/kthrdlk.c b/tools/regression/kthread/kld/kthrdlk.c
index 6485c11d7c096..67825b6daf194 100644
--- a/tools/regression/kthread/kld/kthrdlk.c
+++ b/tools/regression/kthread/kld/kthrdlk.c
@@ -164,7 +164,7 @@ kthrdlk_done(void)
 	while (test_thrcnt != 0) {
 		ret = mtx_sleep(&global_condvar, &test_global_lock, 0, "waiting thrs end", 30 * hz);
 		if (ret == EWOULDBLOCK) {
-			panic("some threads not die! remaing: %d", test_thrcnt);
+			panic("some threads not die! remaining: %d", test_thrcnt);
 			break;
 		}
 	}
diff --git a/tools/regression/lib/libc/nss/README b/tools/regression/lib/libc/nss/README
index ba0373d92ace1..bf329131efb8e 100644
--- a/tools/regression/lib/libc/nss/README
+++ b/tools/regression/lib/libc/nss/README
@@ -5,7 +5,7 @@ A brief how-to
 
 Each nsswitch regression test does 2 kinds of actions:
 1. It runs a series of queries and tests the correctness of results.
-   There are 2 basic criterias which are used for that:
+   There are 2 basic criteria which are used for that:
       - numbers must be in the correct range
       - certain pointers should not be NULL
 
diff --git a/tools/regression/nfsmmap/Makefile b/tools/regression/nfsmmap/Makefile
index c731d428f7c16..9597256942298 100644
--- a/tools/regression/nfsmmap/Makefile
+++ b/tools/regression/nfsmmap/Makefile
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
 SUBDIR= test1 test2
 
 .include <bsd.subdir.mk>
diff --git a/tools/regression/nfsmmap/README b/tools/regression/nfsmmap/README
index 81c4ad5fe3ac4..055ed652ecd63 100644
--- a/tools/regression/nfsmmap/README
+++ b/tools/regression/nfsmmap/README
@@ -1,3 +1,4 @@
+$FreeBSD$
 These tests are intended to make sure that NFS's use of the
 b_{valid,dirty}{off,end} fields of struct buf is consistent with the
 VM system's use of the underlying VM pages.
@@ -17,4 +18,4 @@ Test2:
 	should first write out the dirty range and then read the rest
 	of the page.  This is currently broken since the vnode_pager
 	doesn't use the original buf for its i/o and therefore the
-	information in b_dirtyoff, b_dirtyend is not avalable.
+	information in b_dirtyoff, b_dirtyend is not available.
diff --git a/tools/regression/pjdfstest/tests/chown/00.t b/tools/regression/pjdfstest/tests/chown/00.t
index 36b1fe71db6a6..a3ccbac6db256 100644
--- a/tools/regression/pjdfstest/tests/chown/00.t
+++ b/tools/regression/pjdfstest/tests/chown/00.t
@@ -296,7 +296,7 @@ for type in regular dir fifo block char socket symlink; do
 	fi
 done
 
-# successfull chown(2) call (except uid and gid equal to -1) updates ctime.
+# successful chown(2) call (except uid and gid equal to -1) updates ctime.
 for type in regular dir fifo block char socket symlink; do
 	if [ "${type}" != "symlink" ]; then
 		create_file ${type} ${n0}
diff --git a/tools/regression/priv/priv_cred.c b/tools/regression/priv/priv_cred.c
index 6e060cff40aec..2fd0e2c0befd2 100644
--- a/tools/regression/priv/priv_cred.c
+++ b/tools/regression/priv/priv_cred.c
@@ -31,7 +31,7 @@
 
 /*
  * Confirm that various UID/GID/etc-related system calls require root
- * privilege in the absense of any saved/real/etc variations in the
+ * privilege in the absence of any saved/real/etc variations in the
  * credential.  It would be nice to also check cases where those bits of the
  * credential are more interesting.
  *
diff --git a/tools/regression/security/open_to_operation/open_to_operation.c b/tools/regression/security/open_to_operation/open_to_operation.c
index 358e118b53729..38af3c674efd0 100644
--- a/tools/regression/security/open_to_operation/open_to_operation.c
+++ b/tools/regression/security/open_to_operation/open_to_operation.c
@@ -796,7 +796,7 @@ check_write(const char *testname, write_fn fn, const char *path,
 		} else {
 			if (!((mode & O_ACCMODE) == O_WRONLY ||
 			    (mode & O_ACCMODE) == O_RDWR))
-				notok_mode(testname, "write suceeded", mode);
+				notok_mode(testname, "write succeeded", mode);
 			else
 				ok_mode(testname, "write succeeded", mode);
 		}
@@ -880,7 +880,7 @@ check_read(const char *testname, read_fn fn, const char *path,
 		} else {
 			if (!((mode & O_ACCMODE) == O_RDONLY ||
 			    (mode & O_ACCMODE) == O_RDWR))
-				notok_mode(testname, "read suceeded", mode);
+				notok_mode(testname, "read succeeded", mode);
 			else
 				ok_mode(testname, "read succeeded", mode);
 		}
diff --git a/tools/regression/usr.bin/env/regress-sb.rb b/tools/regression/usr.bin/env/regress-sb.rb
index b692ef2e87f95..f6333aa67c6e7 100644
--- a/tools/regression/usr.bin/env/regress-sb.rb
+++ b/tools/regression/usr.bin/env/regress-sb.rb
@@ -341,7 +341,7 @@ class RGTestOptions
 	#   for test data.  Format of all recognized values should be:
 	#		[%-object.value-%]
 	#   which is hopefully distinctive-enough that they will never
-	#   conflict with any naturally-occuring string.  Also note that
+	#   conflict with any naturally-occurring string.  Also note that
 	#   we only match the specific values that we recognize, and not
 	#   "just anything" that matches the general pattern.  There are
 	#   no blanks in the recognized values, but I use an x-tended
diff --git a/tools/regression/usr.bin/make/README b/tools/regression/usr.bin/make/README
index 6c577ad498820..32b4ddc5168be 100644
--- a/tools/regression/usr.bin/make/README
+++ b/tools/regression/usr.bin/make/README
@@ -8,7 +8,7 @@ output for '^not ok'.
 
 ----------------------------------------------------------------------------
 
-The rest of this file is intented for developers.
+The rest of this file is intended for developers.
 
 The tests are invoked via the test.sh script or prove(1) from p5-Test-Harness.
 Tests are normally executed in a special test directory that is built under
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/Makefile b/tools/regression/usr.bin/make/variables/modifier_M/Makefile
index f8f6d3f870ce3..34d4cd44a95bf 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/Makefile
+++ b/tools/regression/usr.bin/make/variables/modifier_M/Makefile
@@ -12,7 +12,7 @@ test1:
 	@echo "all files: ${FILES}"
 	@echo "cfiles: ${FILES:M*.c}"
 	@echo "hfiles: ${FILES:M*.h}"
-	@echo "grammer and lexer: ${FILES:M*.[ly]}"
+	@echo "grammar and lexer: ${FILES:M*.[ly]}"
 	@echo "man page: ${FILES:M*.[1-9]}"
 	@echo "utility files: ${FILES:Mutil.?}"
 	@echo "m files: ${FILES:Mm*}"
diff --git a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1 b/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
index e00d5a7f7c8a1..b29e6df102338 100644
--- a/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
+++ b/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
@@ -1,7 +1,7 @@
 all files: main.c globals.h  util.c util.h  map.c map.h  parser.y lexer.l  cmdman.1 format.5
 cfiles: main.c util.c map.c
 hfiles: globals.h util.h map.h
-grammer and lexer: parser.y lexer.l
+grammar and lexer: parser.y lexer.l
 man page: cmdman.1 format.5
 utility files: util.c util.h
 m files: main.c map.c map.h
diff --git a/tools/regression/usr.bin/sed/math.sed b/tools/regression/usr.bin/sed/math.sed
index cdd18d6d532b4..8c8de375dbfb7 100644
--- a/tools/regression/usr.bin/sed/math.sed
+++ b/tools/regression/usr.bin/sed/math.sed
@@ -57,7 +57,7 @@ x
 	s//\1(\2)/
 	b loop
 }
-# pull any burried exponents
+# pull any buried exponents
 /^\(.*[^0-9]\)\([0-9][0-9]*^[0-9][0-9]*\)$/{
 	s//\1(\2)/
 	b loop
diff --git a/tools/regression/usr.sbin/newsyslog/regress.sh b/tools/regression/usr.sbin/newsyslog/regress.sh
index dd1679630ea40..70c424016c9a7 100755
--- a/tools/regression/usr.sbin/newsyslog/regress.sh
+++ b/tools/regression/usr.sbin/newsyslog/regress.sh
@@ -70,8 +70,8 @@ cknt()
 	fi
 }
 
-# Check if a file is there, depending of if it's suposed to or not -
-# basically how many log files we are suposed to keep vs. how many we
+# Check if a file is there, depending of if it's supposed to or not -
+# basically how many log files we are supposed to keep vs. how many we
 # actually keep.
 ckntfe()
 {