Merge pull request #2641 from Gelma/master

Fix typos

docs/changes.rst

@@ -936,7 +936,7 @@ Other changes:
 
 - avoid previous_location mismatch, #1741
 
-  due to the changed canonicalization for relative pathes in PR #1711 / #1655
+  due to the changed canonicalization for relative paths in PR #1711 / #1655
   (implement /./ relpath hack), there would be a changed repo location warning
   and the user would be asked if this is ok. this would break automation and
   require manual intervention, which is unwanted.
@@ -983,8 +983,8 @@ Bug fixes:
   (this seems not to get triggered in 1.0.x, but was discovered in master)
 - hashindex: fix iterators (always raise StopIteration when exhausted)
   (this seems not to get triggered in 1.0.x, but was discovered in master)
-- enable relative pathes in ssh:// repo URLs, via /./relpath hack, #1655
-- allow repo pathes with colons, #1705
+- enable relative paths in ssh:// repo URLs, via /./relpath hack, #1655
+- allow repo paths with colons, #1705
 - update changed repo location immediately after acceptance, #1524
 - fix debug get-obj / delete-obj crash if object not found and remote repo,
   #1684
@@ -1063,7 +1063,7 @@ Security fixes:
   working in e.g. /path/client13 or /path/client1000.
 
   As this could accidentally lead to major security/privacy issues depending on
-  the pathes you use, the behaviour was changed to be a strict directory match.
+  the paths you use, the behaviour was changed to be a strict directory match.
   That means --restrict-to-path /path/client1 (with or without trailing slash
   does not make a difference) now uses /path/client1/ internally (note the
   trailing slash here!) for matching and allows precisely that path AND any
@@ -1071,7 +1071,7 @@ Security fixes:
   but not /path/client13 or /path/client1000.
 
   If you willingly used the undocumented (dangerous) previous behaviour, you
-  may need to rearrange your --restrict-to-path pathes now. We are sorry if
+  may need to rearrange your --restrict-to-path paths now. We are sorry if
   that causes work for you, but we did not want a potentially dangerous
   behaviour in the software (not even using a for-backwards-compat option).
 
@@ -1151,7 +1151,7 @@ Bug fixes:
 - fix repo lock deadlocks (related to lock upgrade), #1220
 - catch unpacker exceptions, resync, #1351
 - fix borg break-lock ignoring BORG_REPO env var, #1324
-- files cache performance fixes (fixes unneccessary re-reading/chunking/
+- files cache performance fixes (fixes unnecessary re-reading/chunking/
   hashing of unmodified files for some use cases):
 
   - fix unintended file cache eviction, #1430
@@ -1434,7 +1434,7 @@ Bug fixes:
 - add overflow and range checks for 1st (special) uint32 of the hashindex
   values, switch from int32 to uint32.
 - fix so that refcount will never overflow, but just stick to max. value after
-  a overflow would have occured.
+  a overflow would have occurred.
 - borg delete: fix --cache-only for broken caches, #874
 
   Makes --cache-only idempotent: it won't fail if the cache is already deleted.

docs/installation.rst

@@ -47,7 +47,7 @@ Repository File System
   - link - when upgrading an Attic repo in-place
   - listdir, stat
   - fsync on files and directories to ensure data is written onto storage media
-    (some file systems do not support fsync on directories, which Borg accomodates for)
+    (some file systems do not support fsync on directories, which Borg accommodates for)
 
 :ref:`data-structures` contains additional information about how |project_name|
 manages data.

docs/man/borg-patterns.1

@@ -166,7 +166,7 @@ the backup roots (starting points) and patterns for inclusion/exclusion. A
 root path starts with the prefix \fIR\fP, followed by a path (a plain path, not a
 file pattern). An include rule starts with the prefix +, an exclude rule starts
 with the prefix \-, both followed by a pattern.
-Inclusion patterns are useful to include pathes that are contained in an excluded
+Inclusion patterns are useful to include paths that are contained in an excluded
 path. The first matching pattern is used so if an include pattern matches before
 an exclude pattern, the file is backed up.
 .sp

docs/man/borg.1

@@ -205,7 +205,7 @@ Note: you may also prepend a \fBfile://\fP to a filesystem path to get URL style
 .sp
 \fBssh://user@host:port/path/to/repo\fP \- same, alternative syntax, port can be given
 .sp
-\fBRemote repositories with relative pathes\fP can be given using this syntax:
+\fBRemote repositories with relative paths\fP can be given using this syntax:
 .sp
 \fBuser@host:path/to/repo\fP \- path relative to current directory
 .sp
@@ -216,7 +216,7 @@ Note: you may also prepend a \fBfile://\fP to a filesystem path to get URL style
 Note: giving \fBuser@host:/./path/to/repo\fP or \fBuser@host:/~/path/to/repo\fP or
 \fBuser@host:/~other/path/to/repo\fP is also supported, but not required here.
 .sp
-\fBRemote repositories with relative pathes, alternative syntax with port\fP:
+\fBRemote repositories with relative paths, alternative syntax with port\fP:
 .sp
 \fBssh://user@host:port/./path/to/repo\fP \- path relative to current directory
 .sp
@@ -439,7 +439,7 @@ this with some hardware \-\- independent of the software used. We don\(aqt
 know a list of affected hardware.
 .sp
 If you are suspicious whether your Borg repository is still consistent
-and readable after one of the failures mentioned above occured, run
+and readable after one of the failures mentioned above occurred, run
 \fBborg check \-\-verify\-data\fP to make sure it is consistent.
 .SS Units
 .sp

docs/usage/help.rst.inc

@@ -118,7 +118,7 @@ the backup roots (starting points) and patterns for inclusion/exclusion. A
 root path starts with the prefix `R`, followed by a path (a plain path, not a
 file pattern). An include rule starts with the prefix +, an exclude rule starts
 with the prefix -, both followed by a pattern.
-Inclusion patterns are useful to include pathes that are contained in an excluded
+Inclusion patterns are useful to include paths that are contained in an excluded
 path. The first matching pattern is used so if an include pattern matches before
 an exclude pattern, the file is backed up.
 

docs/usage_general.rst.inc

@@ -19,7 +19,7 @@ Note: you may also prepend a ``file://`` to a filesystem path to get URL style.
 ``ssh://user@host:port/path/to/repo`` - same, alternative syntax, port can be given
 
 
-**Remote repositories with relative pathes** can be given using this syntax:
+**Remote repositories with relative paths** can be given using this syntax:
 
 ``user@host:path/to/repo`` - path relative to current directory
 
@@ -31,7 +31,7 @@ Note: giving ``user@host:/./path/to/repo`` or ``user@host:/~/path/to/repo`` or
 ``user@host:/~other/path/to/repo`` is also supported, but not required here.
 
 
-**Remote repositories with relative pathes, alternative syntax with port**:
+**Remote repositories with relative paths, alternative syntax with port**:
 
 ``ssh://user@host:port/./path/to/repo`` - path relative to current directory
 
@@ -231,7 +231,7 @@ this with some hardware -- independent of the software used. We don't
 know a list of affected hardware.
 
 If you are suspicious whether your Borg repository is still consistent
-and readable after one of the failures mentioned above occured, run
+and readable after one of the failures mentioned above occurred, run
 ``borg check --verify-data`` to make sure it is consistent.
 
 Units

src/borg/algorithms/crc32_slice_by_8.c

@@ -23,7 +23,7 @@ uint32_t crc32_4x8bytes(const void* data, size_t length, uint32_t previousCrc32)
 /// zlib's CRC32 polynomial
 const uint32_t Polynomial = 0xEDB88320;
 
-/// swap endianess
+/// swap endianness
 #if defined (__SVR4) && defined (__sun)
 #include <sys/isa_defs.h>
 #endif

src/borg/archiver.py

@@ -245,7 +245,7 @@ def do_init(self, args, repository):
                 'By default repositories initialized with this version will produce security\n'
                 'errors if written to with an older version (up to and including Borg 1.0.8).\n'
                 '\n'
-                'If you want to use these older versions, you can disable the check by runnning:\n'
+                'If you want to use these older versions, you can disable the check by running:\n'
                 'borg upgrade --disable-tam \'%s\'\n'
                 '\n'
                 'See https://borgbackup.readthedocs.io/en/stable/changes.html#pre-1-0-9-manifest-spoofing-vulnerability '
@@ -1947,7 +1947,7 @@ def do_break_lock(self, args, repository):
         root path starts with the prefix `R`, followed by a path (a plain path, not a
         file pattern). An include rule starts with the prefix +, an exclude rule starts
         with the prefix -, both followed by a pattern.
-        Inclusion patterns are useful to include pathes that are contained in an excluded
+        Inclusion patterns are useful to include paths that are contained in an excluded
         path. The first matching pattern is used so if an include pattern matches before
         an exclude pattern, the file is backed up.
 

src/borg/constants.py

@@ -15,7 +15,7 @@
 # this is the set of keys that are always present in archives:
 REQUIRED_ARCHIVE_KEYS = frozenset(['version', 'name', 'items', 'cmdline', 'time', ])
 
-# default umask, overriden by --umask, defaults to read/write only for owner
+# default umask, overridden by --umask, defaults to read/write only for owner
 UMASK_DEFAULT = 0o077
 
 CACHE_TAG_NAME = 'CACHEDIR.TAG'

src/borg/crypto/nonces.py

@@ -50,7 +50,7 @@ def commit_repo_nonce_reservation(self, next_unreserved, start_nonce):
     def ensure_reservation(self, nonce_space_needed):
         # Nonces may never repeat, even if a transaction aborts or the system crashes.
         # Therefore a part of the nonce space is reserved before any nonce is used for encryption.
-        # As these reservations are commited to permanent storage before any nonce is used, this protects
+        # As these reservations are committed to permanent storage before any nonce is used, this protects
         # against nonce reuse in crashes and transaction aborts. In that case the reservation still
         # persists and the whole reserved space is never reused.
         #

src/borg/helpers.py

@@ -46,7 +46,7 @@
 
 '''
 The global exit_code variable is used so that modules other than archiver can increase the program exit code if a
-warning or error occured during their operation. This is different from archiver.exit_code, which is only accessible
+warning or error occurred during their operation. This is different from archiver.exit_code, which is only accessible
 from the archiver object.
 '''
 exit_code = EXIT_SUCCESS
@@ -145,7 +145,7 @@ def check_extension_modules():
 class Archives(abc.MutableMapping):
     """
     Nice wrapper around the archives dict, making sure only valid types/values get in
-    and we can deal with str keys (and it internally encodes to byte keys) and eiter
+    and we can deal with str keys (and it internally encodes to byte keys) and either
     str timestamps or datetime timestamps.
     """
     def __init__(self):
@@ -830,7 +830,7 @@ class Location:
         (?P<proto>file)://                                  # file://
         """ + file_path_re + optional_archive_re, re.VERBOSE)  # servername/path, path or path::archive
 
-    # note: scp_re is also use for local pathes
+    # note: scp_re is also use for local paths
     scp_re = re.compile(r"""
         (
             """ + optional_user_re + r"""                   # user@  (optional)
@@ -979,7 +979,7 @@ def decode_dict(d, keys, encoding='utf-8', errors='surrogateescape'):
 
 def prepare_dump_dict(d):
     def decode_bytes(value):
-        # this should somehow be reversable later, but usual strings should
+        # this should somehow be reversible later, but usual strings should
         # look nice and chunk ids should mostly show in hex. Use a special
         # inband signaling character (ASCII DEL) to distinguish between
         # decoded and hex mode.

src/borg/remote.py

@@ -354,7 +354,7 @@ def open(self, path, create=False, lock_wait=None, lock=True, exclusive=None, ap
         path_with_sep = os.path.join(path, '')  # make sure there is a trailing slash (os.sep)
         if self.restrict_to_paths:
             # if --restrict-to-path P is given, we make sure that we only operate in/below path P.
-            # for the prefix check, it is important that the compared pathes both have trailing slashes,
+            # for the prefix check, it is important that the compared paths both have trailing slashes,
             # so that a path /foobar will NOT be accepted with --restrict-to-path /foo option.
             for restrict_to_path in self.restrict_to_paths:
                 restrict_to_path_with_sep = os.path.join(os.path.realpath(restrict_to_path), '')  # trailing slash

src/borg/repository.py

@@ -1222,7 +1222,7 @@ def get_fd(self, segment):
             return fd
 
     def close_segment(self):
-        # set self._write_fd to None early to guard against reentry from error handling code pathes:
+        # set self._write_fd to None early to guard against reentry from error handling code paths:
         fd, self._write_fd = self._write_fd, None
         if fd is not None:
             self.segment += 1