瀏覽代碼

Fix typos (#6688)

fix typos

Co-authored-by: Thomas Waldmann <tw@waldmann-edv.de>
Andrea Gelmini 3 年之前
父節點
當前提交
c79fd61b5c
共有 6 個文件被更改,包括 12 次插入12 次删除
  1. 4 4
      docs/changes.rst
  2. 2 2
      docs/faq.rst
  3. 3 3
      docs/internals/frontends.rst
  4. 1 1
      setup.cfg
  5. 1 1
      src/borg/compress.pyx
  6. 1 1
      src/borg/testsuite/archiver.py

+ 4 - 4
docs/changes.rst

@@ -588,7 +588,7 @@ Other changes:
   - add examples for --paths-from-stdin, --paths-from-command, --paths-separator, #5644
   - add examples for --paths-from-stdin, --paths-from-command, --paths-separator, #5644
   - fix typos/grammar
   - fix typos/grammar
   - update docs for dev environment installation instructions
   - update docs for dev environment installation instructions
-  - recomend running tests only on installed versions for setup
+  - recommend running tests only on installed versions for setup
   - add badge with current status of package
   - add badge with current status of package
 - vagrant:
 - vagrant:
 
 
@@ -1217,7 +1217,7 @@ Other changes:
   - use macFUSE (not osxfuse) for Apple M1 compatibility
   - use macFUSE (not osxfuse) for Apple M1 compatibility
   - update docs for dev environment installation instructions, #5643
   - update docs for dev environment installation instructions, #5643
   - fix grammar in faq
   - 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
   - add link back to git-installation
   - remove /var/cache exclusion in example commands, #5625.
   - remove /var/cache exclusion in example commands, #5625.
     This is generally a poor idea and shouldn't be promoted through examples.
     This is generally a poor idea and shouldn't be promoted through examples.
@@ -3230,7 +3230,7 @@ Other changes:
     cryptohash for dedupe, so people don't worry, #2390
     cryptohash for dedupe, so people don't worry, #2390
   - add hint about chunker params to borg upgrade docs, #2421
   - add hint about chunker params to borg upgrade docs, #2421
   - clarify borg upgrade docs, #2436
   - clarify borg upgrade docs, #2436
-  - quickstart: delete problematic BORG_PASSPRHASE use, #2623
+  - quickstart: delete problematic BORG_PASSPHRASE use, #2623
   - faq: specify "using inline shell scripts"
   - faq: specify "using inline shell scripts"
   - document pattern denial of service, #2624
   - document pattern denial of service, #2624
 - tests:
 - tests:
@@ -3970,7 +3970,7 @@ Bug fixes:
   Makes --cache-only idempotent: it won't fail if the cache is already deleted.
   Makes --cache-only idempotent: it won't fail if the cache is already deleted.
 - fixed borg create --one-file-system erroneously traversing into other
 - fixed borg create --one-file-system erroneously traversing into other
   filesystems (if starting fs device number was 0), #873
   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:
 Other changes:
 
 

+ 2 - 2
docs/faq.rst

@@ -733,7 +733,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
 ``borg info``, ``borg list``, ``borg extract`` and ``borg mount`` should work
 just fine without it.
 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``.
 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
 This should be safe for repositories that are only used from one user account
 on one machine.
 on one machine.
@@ -953,7 +953,7 @@ If you feel your Borg backup is too slow somehow, here is what you can do:
   from the beginning each time, but it is still faster then as it does not store
   from the beginning each time, but it is still faster then as it does not store
   data into the repo which it already has there from last checkpoint.
   data into the repo which it already has there from last checkpoint.
 - If you don’t need additional file attributes, you can disable them with ``--noflags``,
 - If you don’t need additional file attributes, you can disable them with ``--noflags``,
-  ``--noacls``, ``--noxattrs``. This can lead to noticable performance improvements
+  ``--noacls``, ``--noxattrs``. This can lead to noticeable performance improvements
   when your backup consists of many small files.
   when your backup consists of many small files.
 
 
 If you feel that Borg "freezes" on a file, it could be in the middle of processing a
 If you feel that Borg "freezes" on a file, it could be in the middle of processing a

+ 3 - 3
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
 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.
 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
 (for example) create a backup archive just invoke :ref:`borg_create`, give commandline parameters/options
 as needed and parse JSON output from borg.
 as needed and parse JSON output from borg.
 
 
@@ -465,13 +465,13 @@ changes:
     A list of *Change* objects describing the changes made to the item in the two archives. For example,
     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.
     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.
 If a 'property' is not required for the type of change, it is not output.
 The possible properties of a *Change* object are:
 The possible properties of a *Change* object are:
 
 
 type:
 type:
   The **type** property is always present. It identifies the type of change and will be one of these values:
   The **type** property is always present. It identifies the type of change and will be one of these values:
-  
+
   - *modified* - file contents changed.
   - *modified* - file contents changed.
   - *added* - the file was added.
   - *added* - the file was added.
   - *removed* - the file was removed.
   - *removed* - the file was removed.

+ 1 - 1
setup.cfg

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

+ 1 - 1
src/borg/compress.pyx

@@ -268,7 +268,7 @@ class LZMA(DecidingCompressor):
 class ZSTD(DecidingCompressor):
 class ZSTD(DecidingCompressor):
     """zstd compression / decompression (pypi: zstandard, gh: python-zstandard)"""
     """zstd compression / decompression (pypi: zstandard, gh: python-zstandard)"""
     # This is a NOT THREAD SAFE implementation.
     # 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.
     # It should work flawlessly as long as borg will call ONLY ONE compression job at time.
     ID = b'\x03\x00'
     ID = b'\x03\x00'
     name = 'zstd'
     name = 'zstd'

+ 1 - 1
src/borg/testsuite/archiver.py

@@ -2101,7 +2101,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
         self.assert_not_in('test3.checkpoint', output)
         self.assert_not_in('test3.checkpoint', output)
         self.assert_not_in('test3.checkpoint.1', output)
         self.assert_not_in('test3.checkpoint.1', output)
         self.assert_in('test4.checkpoint', 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('create', self.repository_location + '::test5', src_dir)
         self.cmd('prune', self.repository_location, '--keep-daily=2')
         self.cmd('prune', self.repository_location, '--keep-daily=2')
         output = self.cmd('list', '--consider-checkpoints', self.repository_location)
         output = self.cmd('list', '--consider-checkpoints', self.repository_location)