diff --git a/ChangeLog b/ChangeLog index de240ae..5fb1f7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +47,7 @@ btrbk-0.32.1 btrbk-0.32.0 * MIGRATION - - If timestamp_format is not configured, explicitely set + - If timestamp_format is not configured, explicitly set "timestamp_format short" to revert old behavior. - Update ssh_filter_btrbk.sh on remote hosts. * Change default for timestamp_format to "long". @@ -81,7 +81,7 @@ btrbk-0.31.2 * MIGRATION - Update ssh_filter_btrbk.sh on remote hosts. * ssh_filter_btrbk.sh: Fix security vulnerability. - Specialy crafted commands may be executed without being propely + Specially crafted commands may be executed without being properly checked. Applies to remote hosts filtering ssh commands using ssh_filter_btrbk.sh in authorized_keys. * Warn if no subvolume defined in config (close #378). @@ -248,7 +248,7 @@ btrbk-0.27.0 - Allow snapshot_dir to be a mountpoint. - Search complete target tree for correlated subvolumes. - Include snapshots from all mountpoints as candidates (disabled - due to uptream bug: github.com/kdave/btrfs-progs/issues/96). + due to upstream bug: github.com/kdave/btrfs-progs/issues/96). - Read /proc/self/mountinfo instead of /proc/self/mounts. - Always read /proc/self/mountinfo. - Resolve realpath using readlink(1). @@ -319,7 +319,7 @@ btrbk-0.25.0 * Allow trailing comments in btrbk.conf (close #129). * Bugfix: rate limiting must be done after compression (close #134). * raw_target_encrypt: Always set "gpg --no-random-seed-file": - prevents creation of "~/.gnupg/random_seed" with slight perfomance + prevents creation of "~/.gnupg/random_seed" with slight performance penalty. btrbk-0.24.0 diff --git a/btrbk b/btrbk index 54e971e..3b4de57 100755 --- a/btrbk +++ b/btrbk @@ -706,7 +706,7 @@ sub stream_buffer_cmd_text($) # NOTE: mbuffer takes defaults from /etc/mbuffer.rc my @cmd = ( "mbuffer" ); - push @cmd, ( "-v", "1" ); # disable warnings (they arrive asynchronously and cant be caught) + push @cmd, ( "-v", "1" ); # disable warnings (they arrive asynchronously and can't be caught) push @cmd, "-q" unless($progress); push @cmd, ( "-s", $blocksize ) if($blocksize); push @cmd, ( "-m", lc($bufsize) ) if($bufsize); @@ -1797,7 +1797,7 @@ sub btrfs_send_to_file($$$;$$) }; } else { - die "Usupported encryption type (raw_target_encrypt)"; + die "Unsupported encryption type (raw_target_encrypt)"; } } @@ -2160,7 +2160,7 @@ sub read_extentmap_cache($) read($fh, $buf, 24 + 8 * 2); # read header my ($v, $gen, $time) = unpack('a24Q{node}{gen}) { @@ -2290,7 +2290,7 @@ sub aio_extentmap($) if($_->[3] & IO::AIO::FIEMAP_EXTENT_DATA_INLINE()) { $inline_count++; next if($ignore_inline); - WARN_ONCE "Ambigous inline region [$_->[1] .. $_->[1] + $_->[2] - 1] for $file" if((($_->[1] != 0) || ($_->[2] != 4096))); + WARN_ONCE "Ambiguous inline region [$_->[1] .. $_->[1] + $_->[2] - 1] for $file" if((($_->[1] != 0) || ($_->[2] != 4096))); } push @range, [ $_->[1], $_->[1] + $_->[2] - 1 ]; } @@ -3106,7 +3106,7 @@ sub _vinfo_subtree_list # if $vinfo_parent->{NODE_SUBDIR} is set, vinfo_parent->{PATH} does # not point to a subvolume directly, but to "/NODE_SUBDIR". - # skip nodes wich are not in NODE_SUBDIR, or strip NODE_SUBDIR from from rel_path. + # skip nodes which are not in NODE_SUBDIR, or strip NODE_SUBDIR from from rel_path. my $node_subdir_filter = ($depth == 0) ? $vinfo_parent->{NODE_SUBDIR} : undef; foreach my $node (@{$tree->{SUBTREE}}) { my $rel_path = $node->{REL_PATH}; @@ -4270,7 +4270,7 @@ sub parse_config_line($$$;@) target_type => $target_type, url => $url_prefix . $path, }; - # NOTE: target sections are propagated to the apropriate SUBSECTION in _config_propagate_target() + # NOTE: target sections are propagated to the appropriate SUBSECTION in _config_propagate_target() $cur->{TARGET} //= []; push(@{$cur->{TARGET}}, $target); $cur = $target; diff --git a/contrib/cron/btrbk-mail b/contrib/cron/btrbk-mail index 1d620cf..1dc3d22 100755 --- a/contrib/cron/btrbk-mail +++ b/contrib/cron/btrbk-mail @@ -35,7 +35,7 @@ rsync_opt[example_data]="-az --delete --inplace --numeric-ids --acls --xattrs" # Enable all rsync declarations (all indices of rsync_src array) #rsync_enable=${!rsync_src[@]} -# Explicitely enable rsync declarations (whitespace-separated list) +# Explicitly enable rsync declarations (whitespace-separated list) #rsync_enable="example_data" rsync_enable= diff --git a/contrib/crypt/kdf_pbkdf2.py b/contrib/crypt/kdf_pbkdf2.py index 16a4edf..74fa9cc 100755 --- a/contrib/crypt/kdf_pbkdf2.py +++ b/contrib/crypt/kdf_pbkdf2.py @@ -54,7 +54,7 @@ salt_hex = "".join(["{:02x}".format(x) for x in salt]) dk_hex = "".join(["{:02x}".format(x) for x in dk]) print("KEY=" + dk_hex); -print("algoritm=pbkdf2_hmac"); +print("algorithm=pbkdf2_hmac"); print("hash_name=" + hash_name); print("salt=" + salt_hex); print("iterations=" + str(iterations)); diff --git a/contrib/tools/btrbk_restore_raw.py b/contrib/tools/btrbk_restore_raw.py index aa75d1d..225765a 100755 --- a/contrib/tools/btrbk_restore_raw.py +++ b/contrib/tools/btrbk_restore_raw.py @@ -196,7 +196,7 @@ def main(): parser.add_argument('restore_dir', help="target directory for restored subvolumes" " (path argument for \"btrfs receive\")") parser.add_argument('-n', '--dry-run', action='store_true', - help="print commmands that would be executed") + help="print commands that would be executed") parser.add_argument('--ignore-missing', action='store_true', help="do not fail on missing parent snapshots") diff --git a/doc/btrbk.1.asciidoc b/doc/btrbk.1.asciidoc index 04ed75f..a980b3b 100644 --- a/doc/btrbk.1.asciidoc +++ b/doc/btrbk.1.asciidoc @@ -143,7 +143,7 @@ as "first backup of the day". space-separated, quoted key=value pairs (machine readable). + If set to "col:", prints only the specified (comma-separated -list). Header lines are ommitted if the "h:" modifier is present. +list). Header lines are omitted if the "h:" modifier is present. Columns prefixed with "-" are collapsed if empty. Columns postfixed with ":RALIGN" are right-aligned. diff --git a/doc/lsbtr.1.asciidoc b/doc/lsbtr.1.asciidoc index de0786f..1a96b96 100644 --- a/doc/lsbtr.1.asciidoc +++ b/doc/lsbtr.1.asciidoc @@ -67,7 +67,7 @@ OPTIONS space-separated key="value" pairs (machine readable). + If set to "col:", prints only the specified (comma-separated -list). Header lines are ommitted if the "h:" modifier is present. +list). Header lines are omitted if the "h:" modifier is present. Columns prefixed with "-" are collapsed if empty. Columns postfixed with ":RALIGN" are right-aligned. diff --git a/doc/upgrade_to_v0.23.0.md b/doc/upgrade_to_v0.23.0.md index 540255a..7302d4d 100644 --- a/doc/upgrade_to_v0.23.0.md +++ b/doc/upgrade_to_v0.23.0.md @@ -76,7 +76,7 @@ This states: ### Upgrade "resume_missing" -If you have a line: "resume_missing yes" somwhere in your config, +If you have a line: "resume_missing yes" somewhere in your config, simply remove it. btrbk always resumes missing backups. If you have "resume_missing no", you can imitate this behaviour by