diff --git a/cmd/arcstat/arcstat.py b/cmd/arcstat/arcstat.py index aa54ee87a7..85c83ccc44 100755 --- a/cmd/arcstat/arcstat.py +++ b/cmd/arcstat/arcstat.py @@ -280,7 +280,7 @@ def init(): "outfile", "help", "verbose", - "seperator", + "separator", "columns" ] ) @@ -299,7 +299,7 @@ def init(): hflag = True if opt in ('-v', '--verbose'): vflag = True - if opt in ('-s', '--seperator'): + if opt in ('-s', '--separator'): sep = arg i += 1 if opt in ('-f', '--columns'): diff --git a/cmd/dbufstat/dbufstat.py b/cmd/dbufstat/dbufstat.py index 517477b210..5e2217a545 100755 --- a/cmd/dbufstat/dbufstat.py +++ b/cmd/dbufstat/dbufstat.py @@ -529,7 +529,7 @@ def main(): "help", "infile", "outfile", - "seperator", + "separator", "types", "verbose", "extended", @@ -555,7 +555,7 @@ def main(): ofile = arg if opt in ('-r', '--raw'): raw += 1 - if opt in ('-s', '--seperator'): + if opt in ('-s', '--separator'): sep = arg if opt in ('-t', '--types'): tflag = True diff --git a/contrib/initramfs/scripts/zfs.in b/contrib/initramfs/scripts/zfs.in index d51ae1ea03..c0755a371a 100644 --- a/contrib/initramfs/scripts/zfs.in +++ b/contrib/initramfs/scripts/zfs.in @@ -478,7 +478,7 @@ destroy_fs() echo "Message: $ZFS_STDERR" echo "Error: $ZFS_ERROR" echo "" - echo "Failed to destroy '$fs'. Please make sure that '$fs' is not availible." + echo "Failed to destroy '$fs'. Please make sure that '$fs' is not available." echo "Hint: Try: zfs destroy -Rfn $fs" echo "If this dryrun looks good, then remove the 'n' from '-Rfn' and try again." /bin/sh diff --git a/man/man8/zpool.8 b/man/man8/zpool.8 index 084b075e76..b5fbc068e7 100644 --- a/man/man8/zpool.8 +++ b/man/man8/zpool.8 @@ -729,7 +729,7 @@ man page. In order to enable this property each host must set a unique hostid. See .Xr genhostid 1 .Xr zgenhostid 8 -.Xr spl-module-paramters 5 +.Xr spl-module-parameters 5 for additional details. The default value is .Sy off . .It Sy version Ns = Ns Ar version diff --git a/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh index 4d5fbb9ff5..875d2f7c78 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_001_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh index e0655248de..6b97e2a407 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_002_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "tar cf $TESTDIR/tar$$.tar $BNAME" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $NONZFS_TESTDIR $SUMA $SUMB "tar xf $TESTDIR/tar$$.tar" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to UFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh index 904a2b1a04..dd0baeaa9b 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_003_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "tar cf $NONZFS_TESTDIR/tar$$.tar $BNAME" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "tar xvf $NONZFS_TESTDIR/tar$$.tar" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "UFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh index 6d33dd5b32..00a6cc172a 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_004_pos.ksh @@ -67,7 +67,7 @@ cd $cwd (( $? != 0 )) && log_untested "Could not change directory to $cwd" migrate_cpio $TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh index a41b19b5fa..4386596f77 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_005_pos.ksh @@ -67,7 +67,7 @@ cd $cwd (( $? != 0 )) && log_untested "Could not change directory to $cwd" migrate_cpio $NONZFS_TESTDIR "$TESTDIR/cpio$$.cpio" $SUMA $SUMB -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to UFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh index 5b444421a3..9b5c9166ed 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_006_pos.ksh @@ -67,7 +67,7 @@ cd $cwd (( $? != 0 )) && log_untested "Could not change directory to $cwd" migrate_cpio $TESTDIR "$NONZFS_TESTDIR/cpio$$.cpio" $SUMA $SUMB -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh index c3197052ce..0d136550f7 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_007_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh index 2e51eef369..f62b1f33a3 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_008_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$TESTDIR/dd$$.dd" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $NONZFS_TESTDIR $SUMA $SUMB "dd if=$TESTDIR/dd$$.dd obs=128k of=$BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh index 7749494e58..907be39eb4 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_009_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "dd if=$BNAME obs=128k of=$NONZFS_TESTDIR/dd$$.dd" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "dd if=$NONZFS_TESTDIR/dd$$.dd obs=128k of=$BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh index a11ab72dff..e80dd67cdc 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_010_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to ZFS fs" -log_pass "Successully migrated test file from ZFS fs to ZFS fs". +log_pass "Successfully migrated test file from ZFS fs to ZFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh index 17e1c78f98..2d7ecb45ea 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_011_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $TESTDIR/cp$$.cp" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $NONZFS_TESTDIR $SUMA $SUMB "cp $TESTDIR/cp$$.cp $BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "ZFS fs to UFS fs" -log_pass "Successully migrated test file from ZFS fs to UFS fs". +log_pass "Successfully migrated test file from ZFS fs to UFS fs". diff --git a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh index 823dabeae4..fd9c454916 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh @@ -60,7 +60,7 @@ prepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp" (( $? != 0 )) && log_fail "Unable to create src archive" migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME" -(( $? != 0 )) && log_fail "Uable to successfully migrate test file from" \ +(( $? != 0 )) && log_fail "Unable to successfully migrate test file from" \ "UFS fs to ZFS fs" -log_pass "Successully migrated test file from UFS fs to ZFS fs". +log_pass "Successfully migrated test file from UFS fs to ZFS fs".