diff --git a/docs/internals/data-structures.rst b/docs/internals/data-structures.rst index 9e94fe261..c5928fda4 100644 --- a/docs/internals/data-structures.rst +++ b/docs/internals/data-structures.rst @@ -374,7 +374,7 @@ needs to be handled. Lastly, cache_ invalidation is handled by noting which feature flags were and which were not understood while manipulating a cache. -This allows one to detect whether the cache needs to be invalidated, +This allows borg to detect whether the cache needs to be invalidated, i.e. rebuilt from scratch. See `Cache feature flags`_ below. The *config* key stores the feature flags enabled on a repository: @@ -1022,7 +1022,7 @@ Before feeding the checksum algorithm any data, the file name (i.e. without any is mixed into the checksum, since the name encodes the context of the data for Borg. The various indices used by Borg have separate header and main data parts. -IntegrityCheckedFile allows one to checksum them independently, which avoids +IntegrityCheckedFile allows borg to checksum them independently, which avoids even reading the data when the header is corrupted. When a part is signalled, the length of the part name is mixed into the checksum state first (encoded as an ASCII string via `%10d` printf format), then the name of the part diff --git a/docs/man/borg-key-import.1 b/docs/man/borg-key-import.1 index d150b7606..1bd11cf40 100644 --- a/docs/man/borg-key-import.1 +++ b/docs/man/borg-key-import.1 @@ -35,8 +35,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] borg [common options] key import [options] [REPOSITORY] [PATH] .SH DESCRIPTION .sp -This command allows one to restore a key previously backed up with the -export command. +This command restores a key previously backed up with the export command. .sp If the \fB\-\-paper\fP option is given, the import will be an interactive process in which each line is checked for plausibility before diff --git a/docs/usage/key_import.rst.inc b/docs/usage/key_import.rst.inc index 9c4f4eea3..691de2847 100644 --- a/docs/usage/key_import.rst.inc +++ b/docs/usage/key_import.rst.inc @@ -54,9 +54,8 @@ borg key import Description ~~~~~~~~~~~ -This command allows one to restore a key previously backed up with the -export command. +This command restores a key previously backed up with the export command. If the ``--paper`` option is given, the import will be an interactive process in which each line is checked for plausibility before -proceeding to the next line. For this format PATH must not be given. \ No newline at end of file +proceeding to the next line. For this format PATH must not be given. diff --git a/src/borg/archiver.py b/src/borg/archiver.py index a9c173b63..8a3acbdc4 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -2650,8 +2650,7 @@ class Archiver: help='Create an html file suitable for printing and later type-in or qr scan') key_import_epilog = process_epilog(""" - This command allows one to restore a key previously backed up with the - export command. + This command restores a key previously backed up with the export command. If the ``--paper`` option is given, the import will be an interactive process in which each line is checked for plausibility before