Browse Source

Merge pull request #7260 from jsoref/spelling

Spelling
TW 2 years ago
parent
commit
c8809ab09d

+ 3 - 3
.github/ISSUE_TEMPLATE.md

@@ -5,14 +5,14 @@ Thank you for reporting an issue.
  - Borgbackup documentation: http://borgbackup.readthedocs.io/en/stable/index.html
  - Borgbackup documentation: http://borgbackup.readthedocs.io/en/stable/index.html
  - FAQ: https://borgbackup.readthedocs.io/en/stable/faq.html
  - FAQ: https://borgbackup.readthedocs.io/en/stable/faq.html
  and
  and
- - open issues in Github tracker: https://github.com/borgbackup/borg/issues
+ - open issues in GitHub tracker: https://github.com/borgbackup/borg/issues
   
   
 If you cannot find a similar problem, then create a new issue.
 If you cannot find a similar problem, then create a new issue.
 
 
 Please fill in as much of the template as possible.
 Please fill in as much of the template as possible.
 -->
 -->
 
 
-## Have you checked borgbackup docs, FAQ, and open Github issues?
+## Have you checked borgbackup docs, FAQ, and open GitHub issues?
 
 
 No
 No
 
 
@@ -46,7 +46,7 @@ results and any steps you took to troubleshoot.
 How to run benchmark: http://borgbackup.readthedocs.io/en/stable/usage/benchmark.html
 How to run benchmark: http://borgbackup.readthedocs.io/en/stable/usage/benchmark.html
 
 
 *IMPORTANT* - Please mark logs and text output from terminal commands 
 *IMPORTANT* - Please mark logs and text output from terminal commands 
-or else Github will not display them correctly. 
+or else GitHub will not display them correctly. 
 An example is provided below.
 An example is provided below.
 
 
 Example:
 Example:

+ 1 - 1
docs/changes.rst

@@ -333,7 +333,7 @@ Changes:
     - compression: use the 2 bytes for type and level, #6698
     - compression: use the 2 bytes for type and level, #6698
     - use version 2 for new archives
     - use version 2 for new archives
     - convert timestamps int/bigint -> msgpack.Timestamp, see #2323
     - convert timestamps int/bigint -> msgpack.Timestamp, see #2323
-    - all hardlinks have chunks, maybe chunks_healty, hlid
+    - all hardlinks have chunks, maybe chunks_healthy, hlid
     - remove the zlib type bytes hack
     - remove the zlib type bytes hack
     - make sure items with chunks have precomputed size
     - make sure items with chunks have precomputed size
     - removes the csize element from the tuples in the Item.chunks list
     - removes the csize element from the tuples in the Item.chunks list

+ 1 - 1
docs/changes_1.x.rst

@@ -3371,7 +3371,7 @@ Other changes:
   - kill api page
   - kill api page
   - added FAQ section about backing up root partition
   - added FAQ section about backing up root partition
   - add bountysource badge, #2558
   - add bountysource badge, #2558
-  - create empty docs.txt reequirements, #2694
+  - create empty docs.txt requirements, #2694
   - README: how to help the project
   - README: how to help the project
   - note -v/--verbose requirement on affected options, #2542
   - note -v/--verbose requirement on affected options, #2542
   - document borg init behaviour via append-only borg serve, #2440
   - document borg init behaviour via append-only borg serve, #2440

+ 1 - 1
docs/faq.rst

@@ -1156,7 +1156,7 @@ full when Borg starts a write command like `borg create`, it will abort
 immediately and the repository will stay as-is.
 immediately and the repository will stay as-is.
 
 
 If you run a backup that stops due to a disk running full, Borg will roll back,
 If you run a backup that stops due to a disk running full, Borg will roll back,
-delete the new new segment file and thus freeing disk space automatically. There
+delete the new segment file and thus freeing disk space automatically. There
 may be a checkpoint archive left that has been saved before the disk got full.
 may be a checkpoint archive left that has been saved before the disk got full.
 You can keep it to speed up the next backup or delete it to get back more disk
 You can keep it to speed up the next backup or delete it to get back more disk
 space.
 space.

+ 1 - 1
docs/misc/asciinema/Vagrantfile

@@ -15,7 +15,7 @@ Vagrant.configure("2") do |config|
   SHELL
   SHELL
   config.vm.provision "record basic usage", type: "shell", inline: <<-SHELL
   config.vm.provision "record basic usage", type: "shell", inline: <<-SHELL
     # `rm` below allows quick re-exec via:
     # `rm` below allows quick re-exec via:
-    # vagrant vagrant provision --provision-with "record basic usage"
+    # vagrant provision --provision-with "record basic usage"
     # this is useful when testing changes
     # this is useful when testing changes
     rm -r /media/backup/borgdemo || true
     rm -r /media/backup/borgdemo || true
     rm -r ~/.ssh/ || true
     rm -r ~/.ssh/ || true

+ 1 - 1
scripts/shell_completions/zsh/_borg

@@ -1504,7 +1504,7 @@ _borg_compression() {
     'lz4:very high speed, very low compression'
     'lz4:very high speed, very low compression'
   )
   )
   local -a havelvl=(
   local -a havelvl=(
-    'zstd:("zstandart")'
+    'zstd:("zstandard")'
     'zlib:("gz") medium speed, medium compression'
     'zlib:("gz") medium speed, medium compression'
     'lzma:("xz") low speed, high compression'
     'lzma:("xz") low speed, high compression'
   )
   )

+ 1 - 1
src/borg/manifest.py

@@ -148,7 +148,7 @@ class Manifest:
     class Operation(enum.Enum):
     class Operation(enum.Enum):
         # The comments here only roughly describe the scope of each feature. In the end, additions need to be
         # The comments here only roughly describe the scope of each feature. In the end, additions need to be
         # based on potential problems older clients could produce when accessing newer repositories and the
         # based on potential problems older clients could produce when accessing newer repositories and the
-        # tradeofs of locking version out or still allowing access. As all older versions and their exact
+        # trade-offs of locking version out or still allowing access. As all older versions and their exact
         # behaviours are known when introducing new features sometimes this might not match the general descriptions
         # behaviours are known when introducing new features sometimes this might not match the general descriptions
         # below.
         # below.
 
 

+ 1 - 1
src/borg/repository.py

@@ -749,7 +749,7 @@ class Repository:
                     try:
                     try:
                         compact_working_space += self.io.segment_size(segment) - free
                         compact_working_space += self.io.segment_size(segment) - free
                     except FileNotFoundError:
                     except FileNotFoundError:
-                        # looks like self.compact is referring to a non-existent segment file, ignore it.
+                        # looks like self.compact is referring to a nonexistent segment file, ignore it.
                         pass
                         pass
                 logger.debug("check_free_space: Few segments, not requiring a full free segment")
                 logger.debug("check_free_space: Few segments, not requiring a full free segment")
                 compact_working_space = min(compact_working_space, full_segment_size)
                 compact_working_space = min(compact_working_space, full_segment_size)

+ 2 - 2
src/borg/testsuite/archiver/diff_cmd.py

@@ -116,7 +116,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             if are_hardlinks_supported():
             if are_hardlinks_supported():
                 assert "added       2.05 kB input/hardlink_added" in output
                 assert "added       2.05 kB input/hardlink_added" in output
 
 
-            # check if a diff between non-existent and empty new file is found
+            # check if a diff between nonexistent and empty new file is found
             assert "added           0 B input/file_empty_added" in output
             assert "added           0 B input/file_empty_added" in output
 
 
             # The inode has two links and both of them are deleted. They should
             # The inode has two links and both of them are deleted. They should
@@ -198,7 +198,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
             if are_hardlinks_supported():
             if are_hardlinks_supported():
                 assert {"type": "added", "size": 2048} in get_changes("input/hardlink_added", joutput)
                 assert {"type": "added", "size": 2048} in get_changes("input/hardlink_added", joutput)
 
 
-            # check if a diff between non-existent and empty new file is found
+            # check if a diff between nonexistent and empty new file is found
             assert {"type": "added", "size": 0} in get_changes("input/file_empty_added", joutput)
             assert {"type": "added", "size": 0} in get_changes("input/file_empty_added", joutput)
 
 
             # The inode has two links and both of them are deleted. They should
             # The inode has two links and both of them are deleted. They should