From 6266ba889193d87383329490434b575e192f9211 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:21:16 -0500 Subject: [PATCH 1/8] spelling: github Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .github/ISSUE_TEMPLATE.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index e20150c80..455c8535b 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -5,14 +5,14 @@ Thank you for reporting an issue. - Borgbackup documentation: http://borgbackup.readthedocs.io/en/stable/index.html - FAQ: https://borgbackup.readthedocs.io/en/stable/faq.html 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. 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 @@ -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 *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. Example: From 6e7f593b98e6f6358d34ee2c814c1de261a8575a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 09:35:49 -0500 Subject: [PATCH 2/8] spelling: healthy Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- docs/changes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changes.rst b/docs/changes.rst index 86ab174d1..bb9c5f863 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -333,7 +333,7 @@ Changes: - compression: use the 2 bytes for type and level, #6698 - use version 2 for new archives - 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 - make sure items with chunks have precomputed size - removes the csize element from the tuples in the Item.chunks list From a26c1d99d92011a8b5c853fc731de4fcb4832d45 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 08:41:52 -0500 Subject: [PATCH 3/8] spelling: new Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- docs/faq.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.rst b/docs/faq.rst index 45d088559..3a73d7240 100644 --- a/docs/faq.rst +++ b/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. 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. You can keep it to speed up the next backup or delete it to get back more disk space. From c9848e98149e1684469e4a7693b029bc5504b7af Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 00:22:34 -0500 Subject: [PATCH 4/8] spelling: nonexistent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/borg/repository.py | 2 +- src/borg/testsuite/archiver/diff_cmd.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/borg/repository.py b/src/borg/repository.py index 94fb6f9be..30494ef75 100644 --- a/src/borg/repository.py +++ b/src/borg/repository.py @@ -749,7 +749,7 @@ class Repository: try: compact_working_space += self.io.segment_size(segment) - free 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 logger.debug("check_free_space: Few segments, not requiring a full free segment") compact_working_space = min(compact_working_space, full_segment_size) diff --git a/src/borg/testsuite/archiver/diff_cmd.py b/src/borg/testsuite/archiver/diff_cmd.py index d8015f512..91c35a351 100644 --- a/src/borg/testsuite/archiver/diff_cmd.py +++ b/src/borg/testsuite/archiver/diff_cmd.py @@ -116,7 +116,7 @@ class ArchiverTestCase(ArchiverTestCaseBase): if are_hardlinks_supported(): 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 # The inode has two links and both of them are deleted. They should @@ -198,7 +198,7 @@ class ArchiverTestCase(ArchiverTestCaseBase): if are_hardlinks_supported(): 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) # The inode has two links and both of them are deleted. They should From f41cf1c25f1cf27218c4e25c1ae5845432e98dd8 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 09:35:50 -0500 Subject: [PATCH 5/8] spelling: requirements Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- docs/changes_1.x.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changes_1.x.rst b/docs/changes_1.x.rst index 0be20b82e..3dae2a7bb 100644 --- a/docs/changes_1.x.rst +++ b/docs/changes_1.x.rst @@ -3371,7 +3371,7 @@ Other changes: - kill api page - added FAQ section about backing up root partition - add bountysource badge, #2558 - - create empty docs.txt reequirements, #2694 + - create empty docs.txt requirements, #2694 - README: how to help the project - note -v/--verbose requirement on affected options, #2542 - document borg init behaviour via append-only borg serve, #2440 From a3af1ffc32109c1ff6f83d36c95be71d8ddc19ca Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 11:24:04 -0500 Subject: [PATCH 6/8] spelling: trade-offs Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- src/borg/manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borg/manifest.py b/src/borg/manifest.py index bd27acb4e..807a550d1 100644 --- a/src/borg/manifest.py +++ b/src/borg/manifest.py @@ -148,7 +148,7 @@ class Manifest: class Operation(enum.Enum): # 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 - # 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 # below. From 0958d94791de43b6ca123fc32688c2808d3080c8 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 08:42:02 -0500 Subject: [PATCH 7/8] spelling: vagrant Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- docs/misc/asciinema/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/misc/asciinema/Vagrantfile b/docs/misc/asciinema/Vagrantfile index 73d88249a..75a25c6c9 100644 --- a/docs/misc/asciinema/Vagrantfile +++ b/docs/misc/asciinema/Vagrantfile @@ -15,7 +15,7 @@ Vagrant.configure("2") do |config| SHELL config.vm.provision "record basic usage", type: "shell", inline: <<-SHELL # `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 rm -r /media/backup/borgdemo || true rm -r ~/.ssh/ || true From a205c4273bb98b5a184a3aebfd38715965864a1a Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 Jan 2023 09:35:51 -0500 Subject: [PATCH 8/8] spelling: zstandard Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- scripts/shell_completions/zsh/_borg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/shell_completions/zsh/_borg b/scripts/shell_completions/zsh/_borg index 0f77c3a51..8d9a70399 100644 --- a/scripts/shell_completions/zsh/_borg +++ b/scripts/shell_completions/zsh/_borg @@ -1504,7 +1504,7 @@ _borg_compression() { 'lz4:very high speed, very low compression' ) local -a havelvl=( - 'zstd:("zstandart")' + 'zstd:("zstandard")' 'zlib:("gz") medium speed, medium compression' 'lzma:("xz") low speed, high compression' )