From d6e3c7f28e3f01abe336bdb768b181b8ee3e52b7 Mon Sep 17 00:00:00 2001 From: Lorenz Bausch Date: Sat, 7 May 2022 22:23:59 +0200 Subject: [PATCH] Wording: change repo to repository --- cmd/restic/cmd_backup.go | 2 +- cmd/restic/cmd_recover.go | 4 ++-- cmd/restic/global.go | 6 +++--- doc/060_forget.rst | 2 +- doc/cache.rst | 6 +++--- doc/faq.rst | 6 +++--- doc/manual_rest.rst | 8 ++++---- internal/backend/location/location.go | 2 +- internal/repository/repository.go | 4 ++-- internal/ui/backup/text.go | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cmd/restic/cmd_backup.go b/cmd/restic/cmd_backup.go index c9c0d5e91..2f50085fc 100644 --- a/cmd/restic/cmd_backup.go +++ b/cmd/restic/cmd_backup.go @@ -111,7 +111,7 @@ func init() { cmdRoot.AddCommand(cmdBackup) f := cmdBackup.Flags() - f.StringVar(&backupOptions.Parent, "parent", "", "use this parent `snapshot` (default: last snapshot in the repo that has the same target files/directories, and is not newer than the snapshot time)") + f.StringVar(&backupOptions.Parent, "parent", "", "use this parent `snapshot` (default: last snapshot in the repository that has the same target files/directories, and is not newer than the snapshot time)") f.BoolVarP(&backupOptions.Force, "force", "f", false, `force re-reading the target files/directories (overrides the "parent" flag)`) f.StringArrayVarP(&backupOptions.Excludes, "exclude", "e", nil, "exclude a `pattern` (can be specified multiple times)") f.StringArrayVar(&backupOptions.InsensitiveExcludes, "iexclude", nil, "same as --exclude `pattern` but ignores the casing of filenames") diff --git a/cmd/restic/cmd_recover.go b/cmd/restic/cmd_recover.go index 42cabaa68..1eeba54e3 100644 --- a/cmd/restic/cmd_recover.go +++ b/cmd/restic/cmd_recover.go @@ -140,12 +140,12 @@ func runRecover(gopts GlobalOptions) error { var err error treeID, err = repo.SaveTree(ctx, tree) if err != nil { - return errors.Fatalf("unable to save new tree to the repo: %v", err) + return errors.Fatalf("unable to save new tree to the repository: %v", err) } err = repo.Flush(ctx) if err != nil { - return errors.Fatalf("unable to save blobs to the repo: %v", err) + return errors.Fatalf("unable to save blobs to the repository: %v", err) } return nil }) diff --git a/cmd/restic/global.go b/cmd/restic/global.go index 600ee48aa..3d240886d 100644 --- a/cmd/restic/global.go +++ b/cmd/restic/global.go @@ -118,7 +118,7 @@ func init() { f.StringVar(&globalOptions.TLSClientCertKeyFilename, "tls-client-cert", "", "path to a `file` containing PEM encoded TLS client certificate and private key") f.BoolVar(&globalOptions.InsecureTLS, "insecure-tls", false, "skip TLS certificate verification when connecting to the repo (insecure)") f.BoolVar(&globalOptions.CleanupCache, "cleanup-cache", false, "auto remove old cache directories") - f.Var(&globalOptions.Compression, "compression", "compression mode (only available for repo format version 2), one of (auto|off|max)") + f.Var(&globalOptions.Compression, "compression", "compression mode (only available for repository format version 2), one of (auto|off|max)") f.IntVar(&globalOptions.Limits.UploadKb, "limit-upload", 0, "limits uploads to a maximum rate in KiB/s. (default: unlimited)") f.IntVar(&globalOptions.Limits.DownloadKb, "limit-download", 0, "limits downloads to a maximum rate in KiB/s. (default: unlimited)") f.StringSliceVarP(&globalOptions.Options, "option", "o", []string{}, "set extended option (`key=value`, can be specified multiple times)") @@ -470,7 +470,7 @@ func OpenRepository(opts GlobalOptions) (*repository.Repository, error) { id = id[:8] } if !opts.JSON { - Verbosef("repository %v opened (repo version %v) successfully, password is correct\n", id, s.Config().Version) + Verbosef("repository %v opened (repository version %v) successfully, password is correct\n", id, s.Config().Version) } } @@ -712,7 +712,7 @@ func open(s string, gopts GlobalOptions, opts options.Options) (restic.Backend, } if err != nil { - return nil, errors.Fatalf("unable to open repo at %v: %v", location.StripPassword(s), err) + return nil, errors.Fatalf("unable to open repository at %v: %v", location.StripPassword(s), err) } // wrap backend if a test specified an inner hook diff --git a/doc/060_forget.rst b/doc/060_forget.rst index df9491c5e..36de1b2cc 100644 --- a/doc/060_forget.rst +++ b/doc/060_forget.rst @@ -420,7 +420,7 @@ The ``prune`` command accepts the following options: used by your repository, pass ``0`` to this option. * As a size relative to the total repo size (e.g. ``10%``). This means that after prune, at most ``10%`` of the total data stored in the repo may be - unused data. If the repo after prune has a size of 500MB, then at most + unused data. If the repository after prune has a size of 500MB, then at most 50MB may be unused. * If the string ``unlimited`` is passed, there is no limit for partly unused files. This means that as long as some data is still used within diff --git a/doc/cache.rst b/doc/cache.rst index 30b601faf..7b1cabebb 100644 --- a/doc/cache.rst +++ b/doc/cache.rst @@ -7,7 +7,7 @@ The location of the cache directory depends on the operating system and the environment; see :ref:`caching`. Each repository has its own cache sub-directory, consisting of the repository ID -which is chosen at ``init``. All cache directories for different repos are +which is chosen at ``init``. All cache directories for different repositories are independent of each other. Snapshots, Data and Indexes @@ -19,8 +19,8 @@ Snapshot, Data and Index files are cached in the sub-directories ``snapshots``, Expiry ====== -Whenever a cache directory for a repo is used, that directory's modification +Whenever a cache directory for a repository is used, that directory's modification timestamp is updated to the current time. By looking at the modification -timestamps of the repo cache directories it is easy to decide which directories +timestamps of the repository cache directories it is easy to decide which directories are old and haven't been used in a long time. Those are probably stale and can be removed. diff --git a/doc/faq.rst b/doc/faq.rst index bad55708c..6292f2de8 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -51,7 +51,7 @@ looks like this: [0:00] 100.00% 16 / 16 snapshots no errors were found -The message means that there is more data stored in the repo than +The message means that there is more data stored in the repository than strictly necessary. This is uncritical. With high probability this is duplicate data caused by an interrupted backup run or upload operation. In order to clean it up, the command ``restic prune`` can be used. @@ -168,8 +168,8 @@ scheduling algorithm to give it the least favorable niceness (19). The above example makes sure that the system the backup runs on is not slowed down, which is particularly useful for servers. -Creating new repo on a Synology NAS via sftp fails --------------------------------------------------- +Creating new repository on a Synology NAS via sftp fails +-------------------------------------------------------- For using restic with a Synology NAS via sftp, please make sure that the specified path is absolute, it must start with a slash (``/``). diff --git a/doc/manual_rest.rst b/doc/manual_rest.rst index 87f3104a1..fc7f73e51 100644 --- a/doc/manual_rest.rst +++ b/doc/manual_rest.rst @@ -50,7 +50,7 @@ Usage help is available: --cache-dir directory set the cache directory. (default: use system default cache directory) --cleanup-cache auto remove old cache directories -h, --help help for restic - --insecure-tls skip TLS certificate verification when connecting to the repo (insecure) + --insecure-tls skip TLS certificate verification when connecting to the repository (insecure) --json set output mode to JSON for commands that support it --key-hint key key ID of key to try decrypting first (default: $RESTIC_KEY_HINT) --limit-download int limits downloads to a maximum rate in KiB/s. (default: unlimited) @@ -107,7 +107,7 @@ command: --iexclude-file file same as --exclude-file but ignores casing of filenames in patterns --ignore-inode ignore inode number changes when checking for modified files -x, --one-file-system exclude other file systems, don't cross filesystem boundaries and subvolumes - --parent snapshot use this parent snapshot (default: last snapshot in the repo that has the same target files/directories) + --parent snapshot use this parent snapshot (default: last snapshot in the repository that has the same target files/directories) --stdin read backup from stdin --stdin-filename filename filename to use when reading from stdin (default "stdin") --tag tags add tags for the new snapshot in the format `tag[,tag,...]` (can be specified multiple times) (default []) @@ -119,7 +119,7 @@ command: --cacert file file to load root certificates from (default: use system certificates) --cache-dir directory set the cache directory. (default: use system default cache directory) --cleanup-cache auto remove old cache directories - --insecure-tls skip TLS certificate verification when connecting to the repo (insecure) + --insecure-tls skip TLS certificate verification when connecting to the repository (insecure) --json set output mode to JSON for commands that support it --key-hint key key ID of key to try decrypting first (default: $RESTIC_KEY_HINT) --limit-download int limits downloads to a maximum rate in KiB/s. (default: unlimited) @@ -431,7 +431,7 @@ The cache is ephemeral: When a file cannot be read from the cache, it is loaded from the repository. Within the cache directory, there's a sub directory for each repository the -cache was used with. Restic updates the timestamps of a repo directory each +cache was used with. Restic updates the timestamps of a repository directory each time it is used, so by looking at the timestamps of the sub directories of the cache directory it can decide which sub directories are old and probably not needed any more. You can either remove these directories manually, or run a diff --git a/internal/backend/location/location.go b/internal/backend/location/location.go index 43d6fa5a6..daef51d40 100644 --- a/internal/backend/location/location.go +++ b/internal/backend/location/location.go @@ -101,7 +101,7 @@ func Parse(s string) (u Location, err error) { // if s is not a path or contains ":", it's ambiguous if !isPath(s) && strings.ContainsRune(s, ':') { - return Location{}, errors.New("invalid backend\nIf the repo is in a local directory, you need to add a `local:` prefix") + return Location{}, errors.New("invalid backend\nIf the repository is in a local directory, you need to add a `local:` prefix") } u.Scheme = "local" diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 8d3fd9414..84193a4f3 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -725,11 +725,11 @@ func (r *Repository) SearchKey(ctx context.Context, password string, maxKeys int // saves the repository config. func (r *Repository) Init(ctx context.Context, version uint, password string, chunkerPolynomial *chunker.Pol) error { if version > restic.MaxRepoVersion { - return fmt.Errorf("repo version %v too high", version) + return fmt.Errorf("repository version %v too high", version) } if version < restic.MinRepoVersion { - return fmt.Errorf("repo version %v too low", version) + return fmt.Errorf("repository version %v too low", version) } has, err := r.be.Test(ctx, restic.Handle{Type: restic.ConfigFile}) diff --git a/internal/ui/backup/text.go b/internal/ui/backup/text.go index 85408e467..801def0db 100644 --- a/internal/ui/backup/text.go +++ b/internal/ui/backup/text.go @@ -178,7 +178,7 @@ func (b *TextProgress) Finish(snapshotID restic.ID, start time.Time, summary *Su if dryRun { verb = "Would add" } - b.P("%s to the repo: %-5s (%-5s stored)\n", verb, formatBytes(summary.ItemStats.DataSize+summary.ItemStats.TreeSize), formatBytes(summary.ItemStats.DataSizeInRepo+summary.ItemStats.TreeSizeInRepo)) + b.P("%s to the repository: %-5s (%-5s stored)\n", verb, formatBytes(summary.ItemStats.DataSize+summary.ItemStats.TreeSize), formatBytes(summary.ItemStats.DataSizeInRepo+summary.ItemStats.TreeSizeInRepo)) b.P("\n") b.P("processed %v files, %v in %s", summary.Files.New+summary.Files.Changed+summary.Files.Unchanged,