diff --git a/cmd/restic/cmd_prune.go b/cmd/restic/cmd_prune.go index ad306858b..115f48557 100644 --- a/cmd/restic/cmd_prune.go +++ b/cmd/restic/cmd_prune.go @@ -641,7 +641,7 @@ func getUsedBlobs(gopts GlobalOptions, repo restic.Repository, ignoreSnapshots r err = restic.FindUsedBlobs(ctx, repo, snapshotTrees, usedBlobs, bar) if err != nil { if repo.Backend().IsNotExist(err) { - return nil, errors.Fatal("unable to load a tree from the repo: " + err.Error()) + return nil, errors.Fatal("unable to load a tree from the repository: " + err.Error()) } return nil, err diff --git a/cmd/restic/global.go b/cmd/restic/global.go index 3d240886d..41f6bfb0e 100644 --- a/cmd/restic/global.go +++ b/cmd/restic/global.go @@ -116,7 +116,7 @@ func init() { f.BoolVar(&globalOptions.NoCache, "no-cache", false, "do not use a local cache") f.StringSliceVar(&globalOptions.RootCertFilenames, "cacert", nil, "`file` to load root certificates from (default: use system certificates)") 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.InsecureTLS, "insecure-tls", false, "skip TLS certificate verification when connecting to the repository (insecure)") f.BoolVar(&globalOptions.CleanupCache, "cleanup-cache", false, "auto remove old cache directories") 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)") diff --git a/doc/030_preparing_a_new_repo.rst b/doc/030_preparing_a_new_repo.rst index 13c0347ad..f0da69d28 100644 --- a/doc/030_preparing_a_new_repo.rst +++ b/doc/030_preparing_a_new_repo.rst @@ -583,7 +583,7 @@ store data there. First, you need to install and `configure`_ rclone. The general backend specification format is ``rclone::``, the ``:`` component will be directly passed to rclone. When you configure a remote named ``foo``, you can then call restic as follows to -initiate a new repository in the path ``bar`` in the repo: +initiate a new repository in the path ``bar`` in the remote ``foo``: .. code-block:: console diff --git a/doc/040_backup.rst b/doc/040_backup.rst index dbc65b51d..18af542b0 100644 --- a/doc/040_backup.rst +++ b/doc/040_backup.rst @@ -191,7 +191,7 @@ Dry Runs ******** You can perform a backup in dry run mode to see what would happen without -modifying the repo. +modifying the repository. - ``--dry-run``/``-n`` Report what would be done, without writing to the repository @@ -202,7 +202,7 @@ Combined with ``--verbose``, you can see a list of changes: $ restic -r /srv/restic-repo backup ~/work --dry-run -vv | grep "added" modified /plan.txt, saved in 0.000s (9.110 KiB added) modified /archive.tar.gz, saved in 0.140s (25.542 MiB added) - Would be added to the repo: 25.551 MiB + Would be added to the repository: 25.551 MiB Excluding Files *************** diff --git a/doc/045_working_with_repos.rst b/doc/045_working_with_repos.rst index d34b09c08..1bef0a666 100644 --- a/doc/045_working_with_repos.rst +++ b/doc/045_working_with_repos.rst @@ -309,7 +309,7 @@ Upgrading must be done explicitly as a newer repository version increases the minimum restic version required to access the repository. For example the repository format version 2 is only readable using restic 0.14.0 or newer. -Upgrading to repo version 2 is a two step process: first run +Upgrading to repository version 2 is a two step process: first run ``migrate upgrade_repo_v2`` which will check the repository integrity and then upgrade the repository version. Repository problems must be corrected before the migration will be possible. After the migration is complete, run diff --git a/doc/050_restore.rst b/doc/050_restore.rst index 279397e83..c7f6c0f28 100644 --- a/doc/050_restore.rst +++ b/doc/050_restore.rst @@ -96,7 +96,7 @@ the data directly. This can be achieved by using the `dump` command, like this: If you have saved multiple different things into the same repo, the ``latest`` snapshot may not be the right one. For example, consider the following -snapshots in a repo: +snapshots in a repository: .. code-block:: console diff --git a/doc/060_forget.rst b/doc/060_forget.rst index 36de1b2cc..a4205de75 100644 --- a/doc/060_forget.rst +++ b/doc/060_forget.rst @@ -418,8 +418,8 @@ The ``prune`` command accepts the following options: * As an absolute size (e.g. ``200M``). If you want to minimize the space 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 + * As a size relative to the total repository size (e.g. ``10%``). This means that + after prune, at most ``10%`` of the total data stored in the repository may be 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 diff --git a/doc/manual_rest.rst b/doc/manual_rest.rst index fc7f73e51..9ba22a546 100644 --- a/doc/manual_rest.rst +++ b/doc/manual_rest.rst @@ -425,7 +425,7 @@ message. The command line parameter ``--cache-dir`` or the environment variable ``$RESTIC_CACHE_DIR`` can be used to override the default cache location. The parameter ``--no-cache`` disables the cache entirely. In this case, all data -is loaded from the repo. +is loaded from the repository. The cache is ephemeral: When a file cannot be read from the cache, it is loaded from the repository.