diff --git a/docs/changes.rst b/docs/changes.rst index 48e77c5de..3253f9d5a 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -588,7 +588,7 @@ Other changes: - add examples for --paths-from-stdin, --paths-from-command, --paths-separator, #5644 - fix typos/grammar - 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 - vagrant: @@ -1217,7 +1217,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. @@ -3230,7 +3230,7 @@ Other changes: cryptohash for dedupe, so people don't worry, #2390 - add hint about chunker params to borg upgrade docs, #2421 - 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" - document pattern denial of service, #2624 - tests: @@ -3970,7 +3970,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: diff --git a/docs/faq.rst b/docs/faq.rst index b500ae469..05f5176bc 100644 --- a/docs/faq.rst +++ b/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 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. @@ -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 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``, - ``--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. If you feel that Borg "freezes" on a file, it could be in the middle of processing a diff --git a/docs/internals/frontends.rst b/docs/internals/frontends.rst index 9e093c6b0..8ff5ff475 100644 --- a/docs/internals/frontends.rst +++ b/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. @@ -465,13 +465,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. diff --git a/setup.cfg b/setup.cfg index abd57d72c..9b3d7b190 100644 --- a/setup.cfg +++ b/setup.cfg @@ -94,7 +94,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 diff --git a/src/borg/compress.pyx b/src/borg/compress.pyx index 190048002..2e0eb4809 100644 --- a/src/borg/compress.pyx +++ b/src/borg/compress.pyx @@ -268,7 +268,7 @@ class LZMA(DecidingCompressor): class ZSTD(DecidingCompressor): """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' diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py index 65fe2a446..0983a271c 100644 --- a/src/borg/testsuite/archiver.py +++ b/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.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', '--consider-checkpoints', self.repository_location)