From b51fe2fb6973d5ece7f07f1d216d71cc68b5f0fe Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Thu, 26 Oct 2023 14:22:44 +0800 Subject: [PATCH 1/3] Format option correctly --- doc/050_restore.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/050_restore.rst b/doc/050_restore.rst index ed2ddfd40..56f6458ed 100644 --- a/doc/050_restore.rst +++ b/doc/050_restore.rst @@ -106,7 +106,7 @@ Restic supports storage and preservation of hard links. However, since hard links exist in the scope of a filesystem by definition, restoring hard links from a fuse mount should be done by a program that preserves hard links. A program that does so is ``rsync``, used with the option ---hard-links. +``--hard-links``. .. note:: ``restic mount`` is mostly useful if you want to restore just a few files out of a snapshot, or to check which files are contained in a snapshot. From 41e6a02bcc25a7002cc9cd469e9370444a70f7f6 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Thu, 26 Oct 2023 14:27:19 +0800 Subject: [PATCH 2/3] Fix typos --- doc/030_preparing_a_new_repo.rst | 4 ++-- doc/040_backup.rst | 2 +- doc/045_working_with_repos.rst | 2 +- internal/fuse/file.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/030_preparing_a_new_repo.rst b/doc/030_preparing_a_new_repo.rst index d7d6c55b6..5ff26934a 100644 --- a/doc/030_preparing_a_new_repo.rst +++ b/doc/030_preparing_a_new_repo.rst @@ -331,7 +331,7 @@ Wasabi ************ `Wasabi `__ is a low cost Amazon S3 conformant object storage provider. -Due to it's S3 conformance, Wasabi can be used as a storage provider for a restic repository. +Due to its S3 conformance, Wasabi can be used as a storage provider for a restic repository. - Create a Wasabi bucket using the `Wasabi Console `__. - Determine the correct Wasabi service URL for your bucket `here `__. @@ -822,7 +822,7 @@ To make this work we can employ the help of the ``setgid`` permission bit available on Linux and most other Unix systems. This permission bit makes newly created directories inherit both the group owner (gid) and setgid bit from the parent directory. Setting this bit requires root but since it -propagates down to any new directories we only have to do this priviledged +propagates down to any new directories we only have to do this privileged setup once: .. code-block:: console diff --git a/doc/040_backup.rst b/doc/040_backup.rst index a3b280476..c917c3c29 100644 --- a/doc/040_backup.rst +++ b/doc/040_backup.rst @@ -146,7 +146,7 @@ change detection rule based on file metadata to determine whether a file is likely unchanged since a previous backup. If it is, the file is not scanned again. -The previous backup snapshot, called "parent" snaphot in restic terminology, +The previous backup snapshot, called "parent" snapshot in restic terminology, is determined as follows. By default restic groups snapshots by hostname and backup paths, and then selects the latest snapshot in the group that matches the current backup. You can change the selection criteria using the diff --git a/doc/045_working_with_repos.rst b/doc/045_working_with_repos.rst index 55f17bfc9..3f6b1090e 100644 --- a/doc/045_working_with_repos.rst +++ b/doc/045_working_with_repos.rst @@ -337,7 +337,7 @@ over 5 separate invocations: $ restic -r /srv/restic-repo check --read-data-subset=4/5 $ restic -r /srv/restic-repo check --read-data-subset=5/5 -Use ``--read-data-subset=x%`` to check a randomly choosen subset of the +Use ``--read-data-subset=x%`` to check a randomly chosen subset of the repository pack files. It takes one parameter, ``x``, the percentage of pack files to check as an integer or floating point number. This will not guarantee to cover all available pack files after sufficient runs, but it is diff --git a/internal/fuse/file.go b/internal/fuse/file.go index aec39273a..2fedf30bf 100644 --- a/internal/fuse/file.go +++ b/internal/fuse/file.go @@ -143,7 +143,7 @@ func (f *openFile) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.R // the methods being called are responsible for appropriate synchronization. // // However, no lock needed here as getBlobAt can be called conurrently - // (blobCache has it's own locking) + // (blobCache has its own locking) for i := startContent; remainingBytes > 0 && i < len(f.cumsize)-1; i++ { blob, err := f.getBlobAt(ctx, i) if err != nil { From aafb806a8c600f40caac157e7217ec6379a12cc5 Mon Sep 17 00:00:00 2001 From: "Leo R. Lundgren" Date: Fri, 27 Oct 2023 18:56:00 +0200 Subject: [PATCH 3/3] doc: Correct two typos --- CHANGELOG.md | 2 +- changelog/0.14.0_2022-08-25/pull-3475 | 4 ++-- internal/repository/repository.go | 2 +- internal/restic/repository.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b92853c1..5ff46a72f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1492,7 +1492,7 @@ Details Restic did not support limiting the IO concurrency / number of connections for accessing repositories stored using the local or SFTP backends. The number of connections is now limited - as for other backends, and can be configured via the the `-o local.connections=2` and `-o + as for other backends, and can be configured via the `-o local.connections=2` and `-o sftp.connections=5` options. This ensures that restic does not overwhelm the backend with concurrent IO operations. diff --git a/changelog/0.14.0_2022-08-25/pull-3475 b/changelog/0.14.0_2022-08-25/pull-3475 index 9932ae632..e79432faf 100644 --- a/changelog/0.14.0_2022-08-25/pull-3475 +++ b/changelog/0.14.0_2022-08-25/pull-3475 @@ -3,7 +3,7 @@ Enhancement: Allow limiting IO concurrency for local and SFTP backend Restic did not support limiting the IO concurrency / number of connections for accessing repositories stored using the local or SFTP backends. The number of connections is now limited as for other backends, and can be configured via the -the `-o local.connections=2` and `-o sftp.connections=5` options. This ensures -that restic does not overwhelm the backend with concurrent IO operations. +`-o local.connections=2` and `-o sftp.connections=5` options. This ensures that +restic does not overwhelm the backend with concurrent IO operations. https://github.com/restic/restic/pull/3475 diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 8ec3c598e..d034911c5 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -829,7 +829,7 @@ func (r *Repository) List(ctx context.Context, t restic.FileType, fn func(restic } // ListPack returns the list of blobs saved in the pack id and the length of -// the the pack header. +// the pack header. func (r *Repository) ListPack(ctx context.Context, id restic.ID, size int64) ([]restic.Blob, uint32, error) { h := restic.Handle{Type: restic.PackFile, Name: id.String()} diff --git a/internal/restic/repository.go b/internal/restic/repository.go index a651f9906..60e57f38a 100644 --- a/internal/restic/repository.go +++ b/internal/restic/repository.go @@ -39,7 +39,7 @@ type Repository interface { List(ctx context.Context, t FileType, fn func(ID, int64) error) error // ListPack returns the list of blobs saved in the pack id and the length of - // the the pack header. + // the pack header. ListPack(context.Context, ID, int64) ([]Blob, uint32, error) LoadBlob(context.Context, BlobType, ID, []byte) ([]byte, error)