diff --git a/README.md b/README.md index a003b48..4378863 100644 --- a/README.md +++ b/README.md @@ -518,7 +518,7 @@ incremental chain alive. * `/mnt/btr_pool/data.20150101 === /mnt/btr_backup/data.20150101` * **parent_uuid** relationship: "is-snapshot-of" - + a.parent_uuid = b.uuid * Present on subvolumes created by `btrfs subvolume snapshot` or diff --git a/doc/btrbk.conf.5.asciidoc b/doc/btrbk.conf.5.asciidoc index d738327..0289e96 100644 --- a/doc/btrbk.conf.5.asciidoc +++ b/doc/btrbk.conf.5.asciidoc @@ -130,7 +130,7 @@ Note that using ``long-iso'' has implications on the scheduling, see *snapshot_dir* :: Directory in which the btrfs snapshots are created, relative to '' of the 'volume' section. Note that btrbk does - not autmatically create this directory, and the snapshot creation + not automatically create this directory, and the snapshot creation will fail if it is not present. *snapshot_name* :: @@ -167,7 +167,7 @@ not be certain about this, such operations are disallowed in *noauto* yes|no:: If set, the context is skipped by all btrbk actions unless - explicitely enabled by a matching btrbk '' command line + explicitly enabled by a matching btrbk '' command line argument (e.g. "btrbk run myfilter"). @@ -328,7 +328,7 @@ constraints. second (locally, on uncompressed send stream). A suffix of "k", "m", "g", or "t" can be added to denote kilobytes (*1024), megabytes, and so on. Defaults to ``no''. Note that 'rate_limit' - implicitely adds a stream buffer (see 'stream_buffer' option + implicitly adds a stream buffer (see 'stream_buffer' option above). *rate_limit_remote* |no:: @@ -484,7 +484,7 @@ Caveats: btrbk with different local time on the clients, in order to make sure the backups from all the remote hosts are preserved for "midnight", and not at "00:00 UTC" (which would be "14:00" in - Honolulu). If you want this behaviour, do NOT use "timestamp_format + Honolulu). If you want this behavior, do NOT use "timestamp_format long-iso". * If "timestamp_format long-iso" is set, running btrbk from different diff --git a/ssh_filter_btrbk.sh b/ssh_filter_btrbk.sh index 1e7ffcd..bfdb2cb 100755 --- a/ssh_filter_btrbk.sh +++ b/ssh_filter_btrbk.sh @@ -161,7 +161,7 @@ while [[ "$#" -ge 1 ]]; do shift done -# NOTE: subvolume queries no NOT affected by "--restrict-path": +# NOTE: subvolume queries are NOT affected by "--restrict-path": # btrbk also calls show/list on the mount point of the subvolume allow_exact_cmd "${sudo_prefix}btrfs subvolume (show|list)( ${option_match})* ${file_match}"; allow_cmd "${sudo_prefix}readlink" # used to resolve mountpoints