Skip to content

Commit 3f9ad88

Browse files
manual fixes
sometimes the AI got it wrong. also some other fixes.
1 parent 2a25764 commit 3f9ad88

File tree

17 files changed

+22
-22
lines changed

17 files changed

+22
-22
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Main features
9090
* FreeBSD
9191
* OpenBSD and NetBSD (no xattrs/ACLs support or binaries yet)
9292
* Cygwin (experimental, no binaries yet)
93-
* Windows Subsystem for Linux (WSL) on Windows 10 (experimental)
93+
* Windows Subsystem for Linux (WSL) on Windows 10/11 (experimental)
9494

9595
**Free and Open Source Software**
9696
* security and functionality can be audited independently

docs/deployment/automated-local.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ modify it to suit your needs (e.g. more backup sets, dumping databases etc.).
104104
# Create backups
105105
#
106106
107-
# Options for Borg create
107+
# Options for borg create
108108
BORG_OPTS="--stats --one-file-system --compression lz4 --checkpoint-interval 86400"
109109
110110
# Set BORG_PASSPHRASE or BORG_PASSCOMMAND somewhere around here, using export,

docs/deployment/pull-backup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ completely in every aspect from such a backup.
5454

5555
.. warning::
5656

57-
The chroot method was chosen to get the right user and group name-ID
57+
The chroot method was chosen to get the right user and group name-id
5858
mappings, assuming they only come from files (/etc/passwd and group).
5959
This assumption might be wrong, e.g. if users/groups also come from
6060
ldap or other providers.

docs/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ by deleting/pruning archives. This mechanism is not bullet-proof in some
4949
circumstances [1]_.
5050

5151
If you *really* run out of disk space, it can be hard or impossible to free space,
52-
because Borg needs free space to operateeven to delete backup
52+
because Borg needs free space to operateeven to delete backup
5353
archives.
5454

5555
You can use some monitoring process or just include the free space information

docs/usage/notes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ repository. Make sure that backup client machines only get to access the reposit
320320
``borg serve``.
321321

322322
Ensure that no remote access is possible if the repository is temporarily set to normal mode
323-
for example, regular pruning.
323+
(for example, for regular pruning).
324324

325325
Further protections can be implemented, but are outside of Borg's scope. For example,
326326
file system snapshots or wrapping ``borg serve`` to set special permissions or ACLs on

scripts/borg.exe.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ exe = EXE(pyz,
5151
console=True)
5252

5353
# Build a directory-based binary in addition to a packed
54-
# single-file. This allows one to easily look at all included
54+
# single file. This allows one to easily look at all included
5555
# files (e.g., without having to strace or halt the built binary
5656
# and introspect /tmp). Also avoids unpacking all libraries when
5757
# running the app, which is better for app signing on various operating systems.

src/borg/archiver.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4507,13 +4507,13 @@ def define_borg_mount(parser):
45074507
reduce problems with manual input. The ``--qr-html`` option creates a printable
45084508
HTML template with a QR code and a copy of the ``--paper``-formatted key.
45094509
4510-
For repositories using key file encryption the key is saved locally
4510+
For repositories using keyfile encryption the key is saved locally
45114511
on the system that is capable of doing backups. To guard against loss
45124512
of this key, the key needs to be backed up independently of the main
45134513
data backup.
45144514
45154515
For repositories using repokey encryption, the key is saved in the
4516-
repository's config file. A backup is thus not strictly needed,
4516+
repository in the config file. A backup is thus not strictly needed,
45174517
but it guards against the repository becoming inaccessible if the file
45184518
is damaged for some reason.
45194519
@@ -4551,7 +4551,7 @@ def define_borg_mount(parser):
45514551
process in which each line is checked for plausibility before
45524552
proceeding to the next line. For this format, PATH must not be provided.
45534553
4554-
For repositories using key file encryption, the key file which ``borg key
4554+
For repositories using keyfile encryption, the key file which ``borg key
45554555
import`` writes to depends on several factors. If the ``BORG_KEY_FILE``
45564556
environment variable is set and non-empty, ``borg key import`` creates
45574557
or overwrites the file named by ``$BORG_KEY_FILE``. Otherwise, ``borg
@@ -5073,7 +5073,7 @@ def define_borg_mount(parser):
50735073
the first backup after the conversion takes longer than expected
50745074
due to the cache re-sync.
50755075
5076-
The upgrade should be able to resume if interrupted, although it
5076+
Upgrade should be able to resume if interrupted, although it
50775077
will still iterate over all segments. If you want to start
50785078
from scratch, use ``borg delete`` over the copied repository to
50795079
make sure the cache files are also removed::

src/borg/chunker.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def dread(offset, size, fd=None, fh=-1):
5858
data = os.read(fh, size)
5959
if hasattr(os, 'posix_fadvise'):
6060
# UNIX-only and, in case of block sizes that are not a multiple of the
61-
# system's page size, it is better used with a bug-fixed Linux kernel >= 4.6.0,
61+
# system's page size, it is better used with a bug-fixed Linux kernel > 4.6.0,
6262
# see comment/workaround in _chunker.c and borgbackup issue #907.
6363
os.posix_fadvise(fh, offset, len(data), os.POSIX_FADV_DONTNEED)
6464
return data

src/borg/crypto/file_integrity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def hash_filename(self, filename=None):
153153
# Hash the name of the file, but only the basename, i.e. not the path.
154154
# In Borg the name itself encodes the context (e.g., index.N, cache, files),
155155
# while the path doesn't matter, and moving e.g. a repository or cache directory is supported.
156-
# Changing the name, however, implies a change of context that is not permissible.
156+
# Changing the name, however, imbues a change of context that is not permissible.
157157
# While Borg does not use anything except ASCII in these file names, it's important to use
158158
# the same encoding everywhere for portability. Using os.fsencode() would be wrong.
159159
filename = os.path.basename(filename or self.path)

src/borg/crypto/key.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class PasscommandFailure(Error):
4747

4848

4949
class PassphraseWrong(Error):
50-
"""Passphrase supplied via BORG_PASSPHRASE, by BORG_PASSCOMMAND, or via BORG_PASSPHRASE_FD is incorrect."""
50+
"""Passphrase supplied in BORG_PASSPHRASE, by BORG_PASSCOMMAND, or via BORG_PASSPHRASE_FD is incorrect."""
5151
exit_mcode = 52
5252

5353

0 commit comments

Comments
 (0)