aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Gelmini <[email protected]>2019-09-03 03:17:39 +0200
committerBrian Behlendorf <[email protected]>2019-09-02 18:17:39 -0700
commita57c82fc50bced77b7f409595130091360533012 (patch)
tree693148ff4e0173d6a22b881d6f913d003c08eae4
parentc6e457dffb24bdc3efaea73b99480d2cf6567128 (diff)
Fix typos
Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Richard Laager <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Andrea Gelmini <[email protected]> Closes #9251
-rw-r--r--.github/CONTRIBUTING.md2
-rwxr-xr-xscripts/kmodtool6
-rw-r--r--tests/README.md2
-rw-r--r--tests/test-runner/bin/Makefile.am2
-rwxr-xr-xtests/test-runner/bin/test-runner.py4
-rw-r--r--tests/test-runner/man/test-runner.14
6 files changed, 10 insertions, 10 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 004711ae7..2b47d458c 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -51,7 +51,7 @@ configure option should be set. This will enable additional correctness
checks and all the ASSERTs to help quickly catch potential issues.
In addition, there are numerous utilities and debugging files which
-provide visibility in to the inner workings of ZFS. The most useful
+provide visibility into the inner workings of ZFS. The most useful
of these tools are discussed in detail on the [debugging ZFS wiki
page](https://github.com/zfsonlinux/zfs/wiki/Debugging).
diff --git a/scripts/kmodtool b/scripts/kmodtool
index a632dd046..a05b0078b 100755
--- a/scripts/kmodtool
+++ b/scripts/kmodtool
@@ -397,7 +397,7 @@ print_rpmtemplate ()
# and print it and some other required stuff as macro
print_rpmtemplate_header
- # now print the packages itselfs
+ # now print the packages
for kernel in ${kernel_versions_to_build_for} ; do
local kernel_verrelarch=${kernel%%${kernels_known_variants}}
@@ -489,7 +489,7 @@ while [ "${1}" ] ; do
--obsolete-name)
shift
if [[ ! "${1}" ]] ; then
- error_out 2 "Please provide the name of the kmod to obsolte together with --obsolete-name" >&2
+ error_out 2 "Please provide the name of the kmod to obsolete together with --obsolete-name" >&2
fi
obsolete_name="${1}"
shift
@@ -497,7 +497,7 @@ while [ "${1}" ] ; do
--obsolete-version)
shift
if [[ ! "${1}" ]] ; then
- error_out 2 "Please provide the version of the kmod to obsolte together with --obsolete-version" >&2
+ error_out 2 "Please provide the version of the kmod to obsolete together with --obsolete-version" >&2
fi
obsolete_version="${1}"
shift
diff --git a/tests/README.md b/tests/README.md
index 7b3768c29..b2c7f99c7 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -78,7 +78,7 @@ The following zfs-tests.sh options are supported:
when test-runner exists. This is useful when the results of
a specific test need to be preserved for further analysis.
- -f Use sparse files directly instread of loopback devices for
+ -f Use sparse files directly instead of loopback devices for
the testing. When running in this mode certain tests will
be skipped which depend on real block devices.
diff --git a/tests/test-runner/bin/Makefile.am b/tests/test-runner/bin/Makefile.am
index 30c564e55..e1ae21548 100644
--- a/tests/test-runner/bin/Makefile.am
+++ b/tests/test-runner/bin/Makefile.am
@@ -3,7 +3,7 @@ dist_pkgdata_SCRIPTS = \
test-runner.py \
zts-report.py
#
-# These scripts are compatibile with both Python 2.6 and 3.4. As such the
+# These scripts are compatible with both Python 2.6 and 3.4. As such the
# python 3 shebang can be replaced at install time when targeting a python
# 2 system. This allows us to maintain a single version of the source.
#
diff --git a/tests/test-runner/bin/test-runner.py b/tests/test-runner/bin/test-runner.py
index 4d4fd96ad..bf2c77c18 100755
--- a/tests/test-runner/bin/test-runner.py
+++ b/tests/test-runner/bin/test-runner.py
@@ -307,7 +307,7 @@ class Cmd(object):
This function is responsible for writing all output. This includes
the console output, the logfile of all results (with timestamped
merged stdout and stderr), and for each test, the unmodified
- stdout/stderr/merged in it's own file.
+ stdout/stderr/merged in its own file.
"""
logname = getpwuid(os.getuid()).pw_name
@@ -716,7 +716,7 @@ class TestRun(object):
def setup_logging(self, options):
"""
- This funtion creates the output directory and gets a file object
+ This function creates the output directory and gets a file object
for the logfile. This function must be called before write_log()
can be used.
"""
diff --git a/tests/test-runner/man/test-runner.1 b/tests/test-runner/man/test-runner.1
index 31cd41245..95255073b 100644
--- a/tests/test-runner/man/test-runner.1
+++ b/tests/test-runner/man/test-runner.1
@@ -103,7 +103,7 @@ The file has one section named "DEFAULT," which contains configuration option
names and their values in "name = value" format. The values in this section
apply to all the subsequent sections, unless they are also specified there, in
which case the default is overridden. The remaining section names are the
-absolute pathnames of files and direcotries, describing tests and test groups
+absolute pathnames of files and directories, describing tests and test groups
respectively. The legal option names are:
.sp
.ne 2
@@ -248,7 +248,7 @@ Run \fIscript\fR after any test or test group.
\fB-q\fR
.ad
.RS 6n
-Print only the results sumary to the standard output.
+Print only the results summary to the standard output.
.RE
.ne 2