diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d6b1445b..32a143900 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,7 +81,7 @@ All notable changes to this project will be documented in this file. - [**breaking**] copy: Use config profile as target ([#1131](https://github.com/rustic-rs/rustic/pull/1131)) -- backup: Add option `stdin-command` +- backup: Add option `stdin-command` ([rustic_core](https://github.com/rustic-rs/rustic_core/releases/tag/rustic_core-v0.3.0)) - Add list indexpacks and list indexcontent commands ([#1254](https://github.com/rustic-rs/rustic/pull/1254)) @@ -245,7 +245,7 @@ All notable changes to this project will be documented in this file. - Show diff statistics ([#1178](https://github.com/rustic-rs/rustic/issues/1178)) -### Documentaton +### Documentation - Update configuration README ([#1088](https://github.com/rustic-rs/rustic/issues/1088)) @@ -408,7 +408,7 @@ All notable changes to this project will be documented in this file. - New global configuration paths are available, located at `/etc/rustic/*.toml` or `%PROGRAMDATA%/rustic/config/*.toml`, depending on your platform. - REST backend: Now allows to use custom TLS root certificates. -- Environment variables for programms called by rustic can now be set in the +- Environment variables for programs called by rustic can now be set in the config files. - Creation of new keys now enforces confirmation of entered key. This helps to prevent mistype of passwords during the initial entry @@ -968,7 +968,7 @@ All notable changes to this project will be documented in this file. - prune: Repacking is now parallel. - New commands repair index/snapshots. - Better support for using latest as snapshot. -- UI/progress bars: Added support for env variable RUSTIC_PROGRESS_INTERVALL. +- UI/progress bars: Added support for env variable RUSTIC_PROGRESS_INTERVAL. - Simplified the code in some places. ### Other Changes @@ -1273,7 +1273,7 @@ self-update. Please download the binaries manually instead. ### Prune - Add waiting options -- Remove unneded pack files from cache and add option --cache-only +- Remove unneeded pack files from cache and add option --cache-only - Repack packs which are too small or too large ### Restore @@ -1443,7 +1443,7 @@ self-update. Please download the binaries manually instead. ### Prune -- Do not recover uneccessarily +- Do not recover unnecessarily ## [0.2.0-rc1] - 2022-06-04 diff --git a/config/README.md b/config/README.md index 08920c6b8..b996e794a 100644 --- a/config/README.md +++ b/config/README.md @@ -203,7 +203,7 @@ can be overwritten in the source-specific configuration, see below. | ignore-inode | If true, ignore file inode for the backup. | false | | --ignore-inode | | init | If true, initialize repository if it doesn't exist, yet. | false | | --init | | json | If true, returns output of the command as json. | false | | --json | -| label | Set label fot the snapshot. | Not set | | --label | +| label | Set label for the snapshot. | Not set | | --label | | no-require-git | (with git-ignore:) Apply .git-ignore files even if they are not in a git repository. | false | | --no-require-git | | no-scan | Don't scan the backup source for its size (disables ETA). | false | | --no-scan | | one-file-system | If true, only backs up files from the same filesystem as the source. | false | | --one-file-system | @@ -219,7 +219,7 @@ can be overwritten in the source-specific configuration, see below. These external commands are run before and after each backup, respectively. -**Note**: Global hooks and repository hooks are run additionaly. +**Note**: Global hooks and repository hooks are run additionally. See [Global Hooks](#global-hooks-globalhooks). diff --git a/config/full.toml b/config/full.toml index a23e719cf..903748373 100644 --- a/config/full.toml +++ b/config/full.toml @@ -19,7 +19,7 @@ check-index = false # Global hooks: The given commands are called for every command [global.hooks] run-before = [ - # long form giving command and args explicitely and allow to specify failure behavior + # long form giving command and args explicitly and allow to specify failure behavior { command = "echo", args = ["before"], on-failure = "warn" }, # allowed values for on-failure: "error" (default), "warn", "ignore" ] # Default: [] run-after = ["echo after"] # Run after if successful, short version, default: [] @@ -190,9 +190,9 @@ keep-yearly = 10 keep-within = "0s" keep-within-daily = "0 seconds" keep-within-weekly = "2 months" -keep-withing-monthly = "1 year" -keep-withing-quarter-yearly = "0 year" -keep-withing-half-yearly = "1 year" +keep-within-monthly = "1 year" +keep-within-quarter-yearly = "0 year" +keep-within-half-yearly = "1 year" keep-within-yearly = "10 years" [copy] diff --git a/config/services/s3_aws.toml b/config/services/s3_aws.toml index a16770f24..e0b94e5d0 100644 --- a/config/services/s3_aws.toml +++ b/config/services/s3_aws.toml @@ -7,7 +7,7 @@ password = "password" # Other options can be given here - note that opendal also support reading config from env files or AWS config dirs, see the opendal S3 docu [repository.options] -access_key_id = "xxx" # this can be ommited, when AWS config is used -secret_access_key = "xxx" # this can be ommited, when AWS config is used +access_key_id = "xxx" # this can be omitted, when AWS config is used +secret_access_key = "xxx" # this can be omitted, when AWS config is used bucket = "bucket_name" root = "/path/to/repo" diff --git a/src/application.rs b/src/application.rs index 028783cc9..cd43fa7a3 100644 --- a/src/application.rs +++ b/src/application.rs @@ -72,7 +72,7 @@ impl Application for RusticApp { &mut self, command: &Self::Cmd, ) -> Result>>, FrameworkError> { - // we only ue the terminal component + // we only use the terminal component let terminal = Terminal::new(self.term_colors(command)); Ok(vec![Box::new(terminal)]) diff --git a/src/commands/ls.rs b/src/commands/ls.rs index 89e442576..380bca6db 100644 --- a/src/commands/ls.rs +++ b/src/commands/ls.rs @@ -69,7 +69,7 @@ impl Runnable for LsCmd { } } -/// Sumary of a ls command +/// Summary of a ls command /// /// This struct is used to print a summary of the ls command. #[derive(Default)] diff --git a/src/commands/tui/ls.rs b/src/commands/tui/ls.rs index 2956fa141..6012dc2ce 100644 --- a/src/commands/tui/ls.rs +++ b/src/commands/tui/ls.rs @@ -245,7 +245,7 @@ impl<'a, P: ProgressBars, S: IndexedFull> Snapshot<'a, P, S> { .any(|p| Path::new(p).is_absolute()); let path = self.path.join(node.name()); let path = path.display(); - let default_targt = if is_absolute { + let default_target = if is_absolute { format!("/{path}") } else { format!("{path}") @@ -254,7 +254,7 @@ impl<'a, P: ProgressBars, S: IndexedFull> Snapshot<'a, P, S> { self.repo, node.clone(), format!("{}:/{path}", self.snapshot.id), - &default_targt, + &default_target, ); self.current_screen = CurrentScreen::Restore(restore); }