Merge pull request #6699 from KN4CK3R/backport-6688-1.1

Backport Fix typos (#6688)

docs/changes.rst

@@ -466,7 +466,7 @@ Other changes:
   - use macFUSE (not osxfuse) for Apple M1 compatibility
   - update docs for dev environment installation instructions, #5643
   - fix grammar in faq
-  - recomend running tests only on installed versions for setup
+  - recommend running tests only on installed versions for setup
   - add link back to git-installation
   - remove /var/cache exclusion in example commands, #5625.
     This is generally a poor idea and shouldn't be promoted through examples.
@@ -2925,7 +2925,7 @@ Bug fixes:
   Makes --cache-only idempotent: it won't fail if the cache is already deleted.
 - fixed borg create --one-file-system erroneously traversing into other
   filesystems (if starting fs device number was 0), #873
-- workround a bug in Linux fadvise FADV_DONTNEED, #907
+- workaround a bug in Linux fadvise FADV_DONTNEED, #907
 
 Other changes:
 

docs/faq.rst

@@ -700,7 +700,7 @@ Since the nonce is not necessary to read the data that is already encrypted,
 ``borg info``, ``borg list``, ``borg extract`` and ``borg mount`` should work
 just fine without it.
 
-If the the nonce file stored in the repo is lost, but you still have your local copy,
+If the nonce file stored in the repo is lost, but you still have your local copy,
 borg will recreate the repository nonce file the next time you run ``borg create``.
 This should be safe for repositories that are only used from one user account
 on one machine.

docs/internals/frontends.rst

@@ -10,7 +10,7 @@ Borg does not have a public API on the Python level. That does not keep you from
 but does mean that there are no release-to-release guarantees on what you might find in that package, not
 even for point releases (1.1.x), and there is no documentation beyond the code and the internals documents.
 
-Borg does on the other hand provide an API on a command-line level. In other words, a frontend should to
+Borg does on the other hand provide an API on a command-line level. In other words, a frontend should
 (for example) create a backup archive just invoke :ref:`borg_create`, give commandline parameters/options
 as needed and parse JSON output from borg.
 
@@ -464,13 +464,13 @@ changes:
     A list of *Change* objects describing the changes made to the item in the two archives. For example,
     there will be two changes if the contents of a file are changed, and its ownership are changed.
 
-The *Change* object can contain a number of properties depending on the type of change that occured. 
+The *Change* object can contain a number of properties depending on the type of change that occurred.
 If a 'property' is not required for the type of change, it is not output.
 The possible properties of a *Change* object are:
 
 type:
   The **type** property is always present. It identifies the type of change and will be one of these values:
-  
+
   - *modified* - file contents changed.
   - *added* - the file was added.
   - *removed* - the file was removed.

setup.cfg

@@ -24,7 +24,7 @@ markers =
 #   E722 do not use bare except
 #   E731 do not assign a lambda expression, use def
 #   E741 ambiguous variable name
-#   F401 import unsused
+#   F401 import unused
 #   F403 from ... import * used, unable to detect undefined names
 #   F405 undefined or defined from star imports
 #   F811 redef of unused var

src/borg/compress.pyx

@@ -203,7 +203,7 @@ class LZMA(CompressorBase):
 class ZSTD(CompressorBase):
     """zstd compression / decompression (pypi: zstandard, gh: python-zstandard)"""
     # This is a NOT THREAD SAFE implementation.
-    # Only ONE python context must to be created at a time.
+    # Only ONE python context must be created at a time.
     # It should work flawlessly as long as borg will call ONLY ONE compression job at time.
     ID = b'\x03\x00'
     name = 'zstd'

src/borg/testsuite/archiver.py

@@ -2008,7 +2008,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
         self.assert_not_in('test3.checkpoint', output)
         self.assert_not_in('test3.checkpoint.1', output)
         self.assert_in('test4.checkpoint', output)
-        # now we supercede the latest checkpoint by a successful backup:
+        # now we supersede the latest checkpoint by a successful backup:
         self.cmd('create', self.repository_location + '::test5', src_dir)
         self.cmd('prune', self.repository_location, '--keep-daily=2')
         output = self.cmd('list', self.repository_location)