Skip to content

Commit

Permalink
Merge pull request #4539 from tbm/docs
Browse files Browse the repository at this point in the history
Fix typos in docs
  • Loading branch information
rawtaz committed Oct 27, 2023
2 parents 56537fb + aafb806 commit 6be3a8f
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions changelog/0.14.0_2022-08-25/pull-3475
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions doc/030_preparing_a_new_repo.rst
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ Wasabi
************

`Wasabi <https://wasabi.com>`__ 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 <https://console.wasabisys.com>`__.
- Determine the correct Wasabi service URL for your bucket `here <https://wasabi-support.zendesk.com/hc/en-us/articles/360015106031-What-are-the-service-URLs-for-Wasabi-s-different-regions->`__.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/040_backup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/045_working_with_repos.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/050_restore.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/fuse/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/repository/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()}

Expand Down
2 changes: 1 addition & 1 deletion internal/restic/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 6be3a8f

Please sign in to comment.