ran setup.py build_usage

23 files changed, 173 insertions, 52 deletions

diff --git a/docs/usage/break-lock.rst.inc b/docs/usage/break-lock.rst.inc
index 5fa1cda55..756b0d391 100644
--- a/docs/usage/break-lock.rst.inc
+++ b/docs/usage/break-lock.rst.inc
@@ -20,4 +20,4 @@ Description
 
 This command breaks the repository and cache locks.
 Please use carefully and only while no borg process (on any machine) is
-trying to access the Cache or the Repository.
+trying to access the Cache or the Repository.
\ No newline at end of file
diff --git a/docs/usage/change-passphrase.rst.inc b/docs/usage/change-passphrase.rst.inc
index 3bb827a4f..92a82c0db 100644
--- a/docs/usage/change-passphrase.rst.inc
+++ b/docs/usage/change-passphrase.rst.inc
@@ -19,4 +19,4 @@ Description
 ~~~~~~~~~~~
 
 The key files used for repository encryption are optionally passphrase
-protected. This command can be used to change this passphrase.
+protected. This command can be used to change this passphrase.
\ No newline at end of file
diff --git a/docs/usage/check.rst.inc b/docs/usage/check.rst.inc
index 7705471b6..9958603ef 100644
--- a/docs/usage/check.rst.inc
+++ b/docs/usage/check.rst.inc
@@ -86,4 +86,4 @@ repository, decrypting and decompressing it. This is a cryptographic verificatio
 which will detect (accidental) corruption. For encrypted repositories it is
 tamper-resistant as well, unless the attacker has access to the keys.
 
-It is also very slow.
+It is also very slow.
\ No newline at end of file
diff --git a/docs/usage/common-options.rst.inc b/docs/usage/common-options.rst.inc
index fb235b52a..5dadfd52c 100644
--- a/docs/usage/common-options.rst.inc
+++ b/docs/usage/common-options.rst.inc
@@ -12,6 +12,8 @@
         | enable debug output, work on log level DEBUG
     ``--debug-topic TOPIC``
         | enable TOPIC debugging (can be specified multiple times). The logger path is borg.debug.<TOPIC> if TOPIC is not fully qualified.
+    ``--log-json``
+        | Output one JSON object per log line instead of formatted text.
     ``--lock-wait N``
         | wait for the lock, but max. N seconds (default: 1).
     ``--show-version``
@@ -23,7 +25,7 @@
     ``--umask M``
         | set umask to M (local and remote, default: 0077)
     ``--remote-path PATH``
-        | set remote path to executable (default: "borg")
+        | use PATH as borg executable on the remote (default: "borg")
     ``--remote-ratelimit rate``
         | set remote network upload rate limit in kiByte/s (default: 0=unlimited)
     ``--consider-part-files``
diff --git a/docs/usage/create.rst.inc b/docs/usage/create.rst.inc
index 6b34278d1..97e053066 100644
--- a/docs/usage/create.rst.inc
+++ b/docs/usage/create.rst.inc
@@ -25,6 +25,8 @@ optional arguments
         | output verbose list of items (files, dirs, ...)
     ``--filter STATUSCHARS``
         | only display items with the given status characters
+    ``--json``
+        | output stats as JSON (implies --stats)
 
 `Common options`_
     |
@@ -39,11 +41,15 @@ Exclusion options
     ``--exclude-if-present NAME``
         | exclude directories that are tagged by containing a filesystem object with the given NAME
     ``--keep-exclude-tags``, ``--keep-tag-files``
-        | keep tag objects (i.e.: arguments to --exclude-if-present) in otherwise excluded caches/directories
+        | if tag objects are specified with --exclude-if-present, don't omit the tag objects themselves from the backup archive
+    ``--pattern PATTERN``
+        | include/exclude paths matching PATTERN
+    ``--patterns-from PATTERNFILE``
+        | read include/exclude patterns from PATTERNFILE, one per line
 
 Filesystem options
     ``-x``, ``--one-file-system``
-        | stay in same file system, do not cross mount points
+        | stay in the same file system and do not store mount points of other file systems
     ``--numeric-owner``
         | only store numeric user and group identifiers
     ``--noatime``
@@ -73,9 +79,12 @@ Description
 ~~~~~~~~~~~
 
 This command creates a backup archive containing all files found while recursively
-traversing all paths specified. When giving '-' as path, borg will read data
-from standard input and create a file 'stdin' in the created archive from that
-data.
+traversing all paths specified. Paths are added to the archive as they are given,
+that means if relative paths are desired, the command has to be run from the correct
+directory.
+
+When giving '-' as path, borg will read data from standard input and create a
+file 'stdin' in the created archive from that data.
 
 The archive will consume almost no disk space for files or parts of files that
 have already been stored in other archives.
@@ -92,6 +101,11 @@ not provide correct inode information the --ignore-inode flag can be used. This
 potentially decreases reliability of change detection, while avoiding always reading
 all files on these file systems.
 
+The mount points of filesystems or filesystem snapshots should be the same for every
+creation of a new archive to ensure fast operation. This is because the file cache that
+is used to determine changed files quickly uses absolute filenames.
+If this is not possible, consider creating a bind mount to a stable location.
+
 See the output of the "borg help patterns" command for more help on exclude patterns.
 See the output of the "borg help placeholders" command for more help on placeholders.
 
@@ -102,6 +116,15 @@ exclude foo/.bundler/gems. In borg it will not, you need to use --exclude
 '\*/.bundler/gems' to get the same effect. See ``borg help patterns`` for
 more information.
 
+In addition to using ``--exclude`` patterns, it is possible to use
+``--exclude-if-present`` to specify the name of a filesystem object (e.g. a file
+or folder name) which, when contained within another folder, will prevent the
+containing folder from being backed up.  By default, the containing folder and
+all of its contents will be omitted from the backup.  If, however, you wish to
+only include the objects specified by ``--exclude-if-present`` in your backup,
+and not include any other contents of the containing folder, this can be enabled
+through using the ``--keep-exclude-tags`` option.
+
 Item flags
 ++++++++++
 
diff --git a/docs/usage/delete.rst.inc b/docs/usage/delete.rst.inc
index 2a685e885..5c1361a27 100644
--- a/docs/usage/delete.rst.inc
+++ b/docs/usage/delete.rst.inc
@@ -20,7 +20,7 @@ optional arguments
     ``-c``, ``--cache-only``
         | delete only the local cache for the given repository
     ``--force``
-        | force deletion of corrupted archives
+        | force deletion of corrupted archives, use --force --force in case --force does not work.
     ``--save-space``
         | work slower, but using less space
 
@@ -42,4 +42,4 @@ Description
 
 This command deletes an archive from the repository or the complete repository.
 Disk space is reclaimed accordingly. If you delete the complete repository, the
-local cache for it (if any) is also deleted.
+local cache for it (if any) is also deleted.
\ No newline at end of file
diff --git a/docs/usage/diff.rst.inc b/docs/usage/diff.rst.inc
index 1c245cf2a..65d5afe67 100644
--- a/docs/usage/diff.rst.inc
+++ b/docs/usage/diff.rst.inc
@@ -17,10 +17,6 @@ positional arguments
         paths of items inside the archives to compare; patterns are supported
 
 optional arguments
-    ``-e PATTERN``, ``--exclude PATTERN``
-        | exclude paths matching PATTERN
-    ``--exclude-from EXCLUDEFILE``
-        | read exclude patterns from EXCLUDEFILE, one per line
     ``--numeric-owner``
         | only consider numeric user and group identifiers
     ``--same-chunker-params``
@@ -31,6 +27,22 @@ optional arguments
 `Common options`_
     |
 
+Exclusion options
+    ``-e PATTERN``, ``--exclude PATTERN``
+        | exclude paths matching PATTERN
+    ``--exclude-from EXCLUDEFILE``
+        | read exclude patterns from EXCLUDEFILE, one per line
+    ``--exclude-caches``
+        | exclude directories that contain a CACHEDIR.TAG file (http://www.brynosaurus.com/cachedir/spec.html)
+    ``--exclude-if-present NAME``
+        | exclude directories that are tagged by containing a filesystem object with the given NAME
+    ``--keep-exclude-tags``, ``--keep-tag-files``
+        | if tag objects are specified with --exclude-if-present, don't omit the tag objects themselves from the backup archive
+    ``--pattern PATTERN``
+        | include/exclude paths matching PATTERN
+    ``--patterns-from PATTERNFILE``
+        | read include/exclude patterns from PATTERNFILE, one per line
+
 Description
 ~~~~~~~~~~~
 
@@ -49,4 +61,4 @@ If you did not create the archives with different chunker params,
 pass --same-chunker-params.
 Note that the chunker params changed from Borg 0.xx to 1.0.
 
-See the output of the "borg help patterns" command for more help on exclude patterns.
+See the output of the "borg help patterns" command for more help on exclude patterns.
\ No newline at end of file
diff --git a/docs/usage/extract.rst.inc b/docs/usage/extract.rst.inc
index 682eaa3a9..704c7c647 100644
--- a/docs/usage/extract.rst.inc
+++ b/docs/usage/extract.rst.inc
@@ -25,6 +25,10 @@ optional arguments
         | exclude paths matching PATTERN
     ``--exclude-from EXCLUDEFILE``
         | read exclude patterns from EXCLUDEFILE, one per line
+    ``--pattern PATTERN``
+        | include/exclude paths matching PATTERN
+    ``--patterns-from PATTERNFILE``
+        | read include/exclude patterns from PATTERNFILE, one per line
     ``--numeric-owner``
         | only obey numeric user and group identifiers
     ``--strip-components NUMBER``
@@ -49,4 +53,4 @@ See the output of the "borg help patterns" command for more help on exclude patt
 
 By using ``--dry-run``, you can do all extraction steps except actually writing the
 output data: reading metadata and data chunks from the repo, checking the hash/hmac,
-decrypting, decompressing.
+decrypting, decompressing.
\ No newline at end of file
diff --git a/docs/usage/help.rst.inc b/docs/usage/help.rst.inc
index a4a11c4fa..dc2072d61 100644
--- a/docs/usage/help.rst.inc
+++ b/docs/usage/help.rst.inc
@@ -6,8 +6,9 @@ borg help patterns
 ~~~~~~~~~~~~~~~~~~
 
 
-Exclusion patterns support four separate styles, fnmatch, shell, regular
-expressions and path prefixes. By default, fnmatch is used. If followed
+File patterns support these styles: fnmatch, shell, regular expressions,
+path prefixes and path full-matches. By default, fnmatch is used for
+`--exclude` patterns and shell-style is used for `--pattern`. If followed
 by a colon (':') the first two characters of a pattern are used as a
 style selector. Explicit style selection is necessary when a
 non-default style is desired or when the desired pattern starts with
@@ -15,12 +16,12 @@ two alphanumeric characters followed by a colon (i.e. `aa:something/*`).
 
 `Fnmatch <https://docs.python.org/3/library/fnmatch.html>`_, selector `fm:`
 
-    This is the default style.  These patterns use a variant of shell
-    pattern syntax, with '*' matching any number of characters, '?'
-    matching any single character, '[...]' matching any single
-    character specified, including ranges, and '[!...]' matching any
-    character not specified. For the purpose of these patterns, the
-    path separator ('\' for Windows and '/' on other systems) is not
+    This is the default style for --exclude and --exclude-from.
+    These patterns use a variant of shell pattern syntax, with '*' matching
+    any number of characters, '?' matching any single character, '[...]'
+    matching any single character specified, including ranges, and '[!...]'
+    matching any character not specified. For the purpose of these patterns,
+    the path separator ('\' for Windows and '/' on other systems) is not
     treated specially. Wrap meta-characters in brackets for a literal
     match (i.e. `[?]` to match the literal character `?`). For a path
     to match a pattern, it must completely match from start to end, or
@@ -31,6 +32,7 @@ two alphanumeric characters followed by a colon (i.e. `aa:something/*`).
 
 Shell-style patterns, selector `sh:`
 
+    This is the default style for --pattern and --patterns-from.
     Like fnmatch patterns these are similar to shell patterns. The difference
     is that the pattern may include `**/` for matching zero or more directory
     levels, `*` for matching zero or more arbitrary characters with the
@@ -47,11 +49,27 @@ Regular expressions, selector `re:`
     regular expression syntax is described in the `Python documentation for
     the re module <https://docs.python.org/3/library/re.html>`_.
 
-Prefix path, selector `pp:`
+Path prefix, selector `pp:`
 
     This pattern style is useful to match whole sub-directories. The pattern
     `pp:/data/bar` matches `/data/bar` and everything therein.
 
+Path full-match, selector `pf:`
+
+    This pattern style is useful to match whole paths.
+    This is kind of a pseudo pattern as it can not have any variable or
+    unspecified parts - the full, precise path must be given.
+    `pf:/data/foo.txt` matches `/data/foo.txt` only.
+
+    Implementation note: this is implemented via very time-efficient O(1)
+    hashtable lookups (this means you can have huge amounts of such patterns
+    without impacting performance much).
+    Due to that, this kind of pattern does not respect any context or order.
+    If you use such a pattern to include a file, it will always be included
+    (if the directory recursion encounters it).
+    Other include/exclude patterns that would normally match will be ignored.
+    Same logic applies for exclude.
+
 Exclusions can be passed via the command line option `--exclude`. When used
 from within a shell the patterns should be quoted to protect them from
 expansion.
@@ -93,6 +111,40 @@ Examples::
     EOF
     $ borg create --exclude-from exclude.txt backup /
 
+
+A more general and easier to use way to define filename matching patterns exists
+with the `--pattern` and `--patterns-from` options. Using these, you may specify
+the backup roots (starting points) and patterns for inclusion/exclusion. A
+root path starts with the prefix `R`, followed by a path (a plain path, not a
+file pattern). An include rule starts with the prefix +, an exclude rule starts
+with the prefix -, both followed by a pattern.
+Inclusion patterns are useful to include pathes that are contained in an excluded
+path. The first matching pattern is used so if an include pattern matches before
+an exclude pattern, the file is backed up.
+
+Note that the default pattern style for `--pattern` and `--patterns-from` is
+shell style (`sh:`), so those patterns behave similar to rsync include/exclude
+patterns. The pattern style can be set via the `P` prefix.
+
+Patterns (`--pattern`) and excludes (`--exclude`) from the command line are
+considered first (in the order of appearance). Then patterns from `--patterns-from`
+are added. Exclusion patterns from `--exclude-from` files are appended last.
+
+An example `--patterns-from` file could look like that::
+
+    # "sh:" pattern style is the default, so the following line is not needed:
+    P sh
+    R /
+    # can be rebuild
+    - /home/*/.cache
+    # they're downloads for a reason
+    - /home/*/Downloads
+    # susan is a nice person
+    # include susans home
+    + /home/susan
+    # don't backup the other home directories
+    - /home/*
+
 .. _borg_placeholders:
 
 borg help placeholders
@@ -156,17 +208,17 @@ borg help compression
 ~~~~~~~~~~~~~~~~~~~~~
 
 
-Compression is off by default, if you want some, you have to specify what you want.
+Compression is lz4 by default. If you want something else, you have to specify what you want.
 
 Valid compression specifiers are:
 
 none
 
-    Do not compress. (default)
+    Do not compress.
 
 lz4
 
-    Use lz4 compression. High speed, low compression.
+    Use lz4 compression. High speed, low compression. (default)
 
 zlib[,L]
 
diff --git a/docs/usage/info.rst.inc b/docs/usage/info.rst.inc
index be61637eb..4926b6407 100644
--- a/docs/usage/info.rst.inc
+++ b/docs/usage/info.rst.inc
@@ -12,6 +12,10 @@ positional arguments
     REPOSITORY_OR_ARCHIVE
         archive or repository to display information about
 
+optional arguments
+    ``--json``
+        | format output as JSON
+
 `Common options`_
     |
 
@@ -37,4 +41,4 @@ are meaning different things:
 This archive / deduplicated size = amount of data stored ONLY for this archive
                                  = unique chunks of this archive.
 All archives / deduplicated size = amount of data stored in the repo
-                                 = all chunks in the repository.
+                                 = all chunks in the repository.
\ No newline at end of file
diff --git a/docs/usage/init.rst.inc b/docs/usage/init.rst.inc
index 9fb3264a8..9e858d22c 100644
--- a/docs/usage/init.rst.inc
+++ b/docs/usage/init.rst.inc
@@ -97,4 +97,4 @@ hardware-accelerated. BLAKE2b is faster than SHA256 on Intel/AMD 64bit CPUs,
 which makes `authenticated` faster than `none`.
 
 On modern ARM CPUs, NEON provides hardware acceleration for SHA256 making it faster
-than BLAKE2b-256 there.
+than BLAKE2b-256 there.
\ No newline at end of file
diff --git a/docs/usage/key_change-passphrase.rst.inc b/docs/usage/key_change-passphrase.rst.inc
index cbc0d9e6d..c34fd002b 100644
--- a/docs/usage/key_change-passphrase.rst.inc
+++ b/docs/usage/key_change-passphrase.rst.inc
@@ -19,4 +19,4 @@ Description
 ~~~~~~~~~~~
 
 The key files used for repository encryption are optionally passphrase
-protected. This command can be used to change this passphrase.
+protected. This command can be used to change this passphrase.
\ No newline at end of file
diff --git a/docs/usage/key_export.rst.inc b/docs/usage/key_export.rst.inc
index f251d4307..3013b8d2f 100644
--- a/docs/usage/key_export.rst.inc
+++ b/docs/usage/key_export.rst.inc
@@ -17,6 +17,8 @@ positional arguments
 optional arguments
     ``--paper``
         | Create an export suitable for printing and later type-in
+    ``--qr-html``
+        | Create an html file suitable for printing and later type-in or qr scan
 
 `Common options`_
     |
@@ -40,4 +42,4 @@ data backup.
 For repositories using the repokey encryption the key is saved in the
 repository in the config file. A backup is thus not strictly needed,
 but guards against the repository becoming inaccessible if the file
-is damaged for some reason.
+is damaged for some reason.
\ No newline at end of file
diff --git a/docs/usage/key_import.rst.inc b/docs/usage/key_import.rst.inc
index c8c2a0a85..c92bc9cd2 100644
--- a/docs/usage/key_import.rst.inc
+++ b/docs/usage/key_import.rst.inc
@@ -29,4 +29,4 @@ 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.
+proceeding to the next line. For this format PATH must not be given.
\ No newline at end of file
diff --git a/docs/usage/key_migrate-to-repokey.rst.inc b/docs/usage/key_migrate-to-repokey.rst.inc
index 0e82f28c2..66629bdbb 100644
--- a/docs/usage/key_migrate-to-repokey.rst.inc
+++ b/docs/usage/key_migrate-to-repokey.rst.inc
@@ -33,4 +33,4 @@ use, but you may also use a different one.
 
 After migrating to repokey mode, you can change the passphrase at any time.
 But please note: the secrets will always stay the same and they could always
-be derived from your (old) passphrase-mode passphrase.
+be derived from your (old) passphrase-mode passphrase.
\ No newline at end of file
diff --git a/docs/usage/list.rst.inc b/docs/usage/list.rst.inc
index d3a4485f7..ee14a108c 100644
--- a/docs/usage/list.rst.inc
+++ b/docs/usage/list.rst.inc
@@ -20,10 +20,8 @@ optional arguments
     ``--format``, ``--list-format``
         | specify format for file listing
         |                                 (default: "{mode} {user:6} {group:6} {size:8d} {isomtime} {path}{extra}{NL}")
-    ``-e PATTERN``, ``--exclude PATTERN``
-        | exclude paths matching PATTERN
-    ``--exclude-from EXCLUDEFILE``
-        | read exclude patterns from EXCLUDEFILE, one per line
+    ``--json``
+        | format output as JSON. The form of --format is ignored, but keys used in it are added to the JSON output. Some keys are always present. Note: JSON can only represent text. A "bpath" key is therefore not available.
 
 `Common options`_
     |
@@ -38,6 +36,22 @@ filters
     ``--last N``
         | consider last N archives after other filters were applied
 
+Exclusion options
+    ``-e PATTERN``, ``--exclude PATTERN``
+        | exclude paths matching PATTERN
+    ``--exclude-from EXCLUDEFILE``
+        | read exclude patterns from EXCLUDEFILE, one per line
+    ``--exclude-caches``
+        | exclude directories that contain a CACHEDIR.TAG file (http://www.brynosaurus.com/cachedir/spec.html)
+    ``--exclude-if-present NAME``
+        | exclude directories that are tagged by containing a filesystem object with the given NAME
+    ``--keep-exclude-tags``, ``--keep-tag-files``
+        | if tag objects are specified with --exclude-if-present, don't omit the tag objects themselves from the backup archive
+    ``--pattern PATTERN``
+        | include/exclude paths matching PATTERN
+    ``--patterns-from PATTERNFILE``
+        | read include/exclude patterns from PATTERNFILE, one per line
+
 Description
 ~~~~~~~~~~~
 
@@ -45,6 +59,8 @@ This command lists the contents of a repository or an archive.
 
 See the "borg help patterns" command for more help on exclude patterns.
 
+.. man NOTES
+
 The following keys are available for --format:
 
  - NEWLINE: OS dependent line separator
@@ -57,7 +73,7 @@ The following keys are available for --format:
 
 Keys for listing repository archives:
 
- - archive: archive name interpreted as text (might be missing non-text characters, see barchive)
+ - archive, name: archive name interpreted as text (might be missing non-text characters, see barchive)
  - barchive: verbatim archive name, can contain any character except NUL
  - time: time of creation of the archive
  - id: internal ID of the archive
@@ -78,6 +94,8 @@ Keys for listing archive files:
 
  - size
  - csize: compressed size
+ - dsize: deduplicated size
+ - dcsize: deduplicated compressed size
  - num_chunks: number of chunks in this file
  - unique_chunks: number of unique chunks in this file
 
diff --git a/docs/usage/mount.rst.inc b/docs/usage/mount.rst.inc
index e15f25afa..e7e60ce27 100644
--- a/docs/usage/mount.rst.inc
+++ b/docs/usage/mount.rst.inc
@@ -67,4 +67,4 @@ Unmounting in these cases could cause an active rsync or similar process
 to unintentionally delete data.
 
 When running in the foreground ^C/SIGINT unmounts cleanly, but other
-signals or crashes do not.
+signals or crashes do not.
\ No newline at end of file
diff --git a/docs/usage/prune.rst.inc b/docs/usage/prune.rst.inc
index b6a0052c3..c09b9885d 100644
--- a/docs/usage/prune.rst.inc
+++ b/docs/usage/prune.rst.inc
@@ -87,4 +87,4 @@ negative number of archives to keep means that there is no limit.
 
 The "--keep-last N" option is doing the same as "--keep-secondly N" (and it will
 keep the last N archives under the assumption that you do not create more than one
-backup archive in the same second).
+backup archive in the same second).
\ No newline at end of file
diff --git a/docs/usage/recreate.rst.inc b/docs/usage/recreate.rst.inc
index 93f7f414f..0e37696b3 100644
--- a/docs/usage/recreate.rst.inc
+++ b/docs/usage/recreate.rst.inc
@@ -37,9 +37,13 @@ Exclusion options
     ``--exclude-caches``
         | exclude directories that contain a CACHEDIR.TAG file (http://www.brynosaurus.com/cachedir/spec.html)
     ``--exclude-if-present NAME``
-        | exclude directories that are tagged by containing a filesystem object with                                          the given NAME
+        | exclude directories that are tagged by containing a filesystem object with the given NAME
     ``--keep-exclude-tags``, ``--keep-tag-files``
-        | keep tag objects (i.e.: arguments to --exclude-if-present) in otherwise                                          excluded caches/directories
+        | if tag objects are specified with --exclude-if-present, don't omit the tag objects themselves from the backup archive
+    ``--pattern PATTERN``
+        | include/exclude paths matching PATTERN
+    ``--patterns-from PATTERNFILE``
+        | read include/exclude patterns from PATTERNFILE, one per line
 
 Archive options
     ``--target TARGET``
@@ -66,9 +70,9 @@ Recreate the contents of existing archives.
 
 This is an *experimental* feature. Do *not* use this on your only backup.
 
---exclude, --exclude-from and PATH have the exact same semantics
-as in "borg create". If PATHs are specified the resulting archive
-will only contain files from these PATHs.
+--exclude, --exclude-from, --exclude-if-present, --keep-exclude-tags, and PATH
+have the exact same semantics as in "borg create". If PATHs are specified the
+resulting archive will only contain files from these PATHs.
 
 Note that all paths in an archive are relative, therefore absolute patterns/paths
 will *not* match (--exclude, --exclude-from, --compression-from, PATHs).
@@ -97,4 +101,4 @@ With --target the original archive is not replaced, instead a new archive is cre
 When rechunking space usage can be substantial, expect at least the entire
 deduplicated size of the archives using the previous chunker params.
 When recompressing expect approx. (throughput / checkpoint-interval) in space usage,
-assuming all chunks are recompressed.
+assuming all chunks are recompressed.
\ No newline at end of file
diff --git a/docs/usage/rename.rst.inc b/docs/usage/rename.rst.inc
index 3cff5a8a4..6e53d2450 100644
--- a/docs/usage/rename.rst.inc
+++ b/docs/usage/rename.rst.inc
@@ -22,4 +22,4 @@ Description
 
 This command renames an archive in the repository.
 
-This results in a different archive ID.
+This results in a different archive ID.
\ No newline at end of file
diff --git a/docs/usage/serve.rst.inc b/docs/usage/serve.rst.inc
index 351af5e42..628ff399f 100644
--- a/docs/usage/serve.rst.inc
+++ b/docs/usage/serve.rst.inc
@@ -20,4 +20,4 @@ optional arguments
 Description
 ~~~~~~~~~~~
 
-This command starts a repository server process. This command is usually not used manually.
+This command starts a repository server process. This command is usually not used manually.
\ No newline at end of file
diff --git a/docs/usage/umount.rst.inc b/docs/usage/umount.rst.inc
index 28c5f8f0f..f99c1d46a 100644
--- a/docs/usage/umount.rst.inc
+++ b/docs/usage/umount.rst.inc
@@ -21,4 +21,4 @@ Description
 This command un-mounts a FUSE filesystem that was mounted with ``borg mount``.
 
 This is a convenience wrapper that just calls the platform-specific shell
-command - usually this is either umount or fusermount -u.
+command - usually this is either umount or fusermount -u.
\ No newline at end of file
diff --git a/docs/usage/with-lock.rst.inc b/docs/usage/with-lock.rst.inc
index c77eb2f60..407bda72b 100644
--- a/docs/usage/with-lock.rst.inc
+++ b/docs/usage/with-lock.rst.inc
@@ -31,4 +31,4 @@ code as borg's return code.
 
 Note: if you copy a repository with the lock held, the lock will be present in
       the copy, obviously. Thus, before using borg on the copy, you need to
-      use "borg break-lock" on it.
+      use "borg break-lock" on it.
\ No newline at end of file