python setup.py build_usage

12 files changed, 64 insertions, 41 deletions

diff --git a/docs/usage/check.rst.inc b/docs/usage/check.rst.inc
index 7e021838e..047da6b28 100644
--- a/docs/usage/check.rst.inc
+++ b/docs/usage/check.rst.inc
@@ -18,7 +18,7 @@ optional arguments
     ``--archives-only``
         | only perform archives checks
     ``--verify-data``
-        | perform cryptographic archive data integrity verification (conflicts with --repository-only)
+        | perform cryptographic archive data integrity verification (conflicts with ``--repository-only``)
     ``--repair``
         | attempt to repair any inconsistencies found
     ``--save-space``
@@ -29,7 +29,9 @@ optional arguments
 
 filters
     ``-P``, ``--prefix``
-        | only consider archive names starting with this prefix
+        | only consider archive names starting with this prefix.
+    ``-a``, ``--glob-archives``
+        | only consider archive names matching the glob. sh: rules apply, see "borg help patterns". ``--prefix`` and ``--glob-archives`` are mutually exclusive.
     ``--sort-by``
         | Comma-separated list of sorting keys; valid keys are: timestamp, name, id; default is: timestamp
     ``--first N``
@@ -54,7 +56,7 @@ First, the underlying repository data files are checked:
   stored in the segments.
 - If you use a remote repo server via ssh:, the repo check is executed on the
   repo server without causing significant network traffic.
-- The repository check can be skipped using the --archives-only option.
+- The repository check can be skipped using the ``--archives-only`` option.
 
 Second, the consistency and correctness of the archive metadata is verified:
 
@@ -76,9 +78,9 @@ Second, the consistency and correctness of the archive metadata is verified:
   decryption and this is always done client-side, because key access will be
   required).
 - The archive checks can be time consuming, they can be skipped using the
-  --repository-only option.
+  ``--repository-only`` option.
 
-The --verify-data option will perform a full integrity verification (as opposed to
+The ``--verify-data`` option will perform a full integrity verification (as opposed to
 checking the CRC32 of the segment) of data, which means reading the data from the
 repository, decrypting and decompressing it. This is a cryptographic verification,
 which will detect (accidental) corruption. For encrypted repositories it is
diff --git a/docs/usage/create.rst.inc b/docs/usage/create.rst.inc
index e253336e1..c97d14484 100644
--- a/docs/usage/create.rst.inc
+++ b/docs/usage/create.rst.inc
@@ -93,7 +93,7 @@ In the archive name, you may use the following placeholders:
 {now}, {utcnow}, {fqdn}, {hostname}, {user} and some others.
 
 To speed up pulling backups over sshfs and similar network file systems which do
-not provide correct inode information the --ignore-inode flag can be used. This
+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.
 
@@ -102,7 +102,7 @@ creation of a new archive to ensure fast operation. This is because the file cac
 is used to determine changed files quickly uses absolute filenames.
 If this is not possible, consider creating a bind mount to a stable location.
 
-The --progress option shows (from left to right) Original, Compressed and Deduplicated
+The ``--progress`` option shows (from left to right) Original, Compressed and Deduplicated
 (O, C and D, respectively), then the Number of files (N) processed so far, followed by
 the currently processed path.
 
@@ -111,8 +111,8 @@ See the output of the "borg help placeholders" command for more help on placehol
 
 .. man NOTES
 
-The --exclude patterns are not like tar. In tar --exclude .bundler/gems will
-exclude foo/.bundler/gems. In borg it will not, you need to use --exclude
+The ``--exclude`` patterns are not like tar. In tar ``--exclude`` .bundler/gems will
+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.
 
diff --git a/docs/usage/delete.rst.inc b/docs/usage/delete.rst.inc
index d8f727f0d..18e9d539d 100644
--- a/docs/usage/delete.rst.inc
+++ b/docs/usage/delete.rst.inc
@@ -27,7 +27,9 @@ optional arguments
 
 filters
     ``-P``, ``--prefix``
-        | only consider archive names starting with this prefix
+        | only consider archive names starting with this prefix.
+    ``-a``, ``--glob-archives``
+        | only consider archive names matching the glob. sh: rules apply, see "borg help patterns". ``--prefix`` and ``--glob-archives`` are mutually exclusive.
     ``--sort-by``
         | Comma-separated list of sorting keys; valid keys are: timestamp, name, id; default is: timestamp
     ``--first N``
diff --git a/docs/usage/diff.rst.inc b/docs/usage/diff.rst.inc
index 53d6467dc..0de6e9090 100644
--- a/docs/usage/diff.rst.inc
+++ b/docs/usage/diff.rst.inc
@@ -58,7 +58,7 @@ are compared, which is very fast.
 
 For archives prior to Borg 1.1 chunk contents are compared by default.
 If you did not create the archives with different chunker params,
-pass --same-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.
\ No newline at end of file
diff --git a/docs/usage/export-tar.rst.inc b/docs/usage/export-tar.rst.inc
index d5f464989..327a0874c 100644
--- a/docs/usage/export-tar.rst.inc
+++ b/docs/usage/export-tar.rst.inc
@@ -42,7 +42,7 @@ This command creates a tarball from an archive.
 
 When giving '-' as the output FILE, Borg will write a tar stream to standard output.
 
-By default (--tar-filter=auto) Borg will detect whether the FILE should be compressed
+By default (``--tar-filter=auto``) Borg will detect whether the FILE should be compressed
 based on its file extension and pipe the tarball through an appropriate filter
 before writing it to FILE:
 
@@ -50,7 +50,7 @@ before writing it to FILE:
 - .tar.bz2: bzip2
 - .tar.xz: xz
 
-Alternatively a --tar-filter program may be explicitly specified. It should
+Alternatively a ``--tar-filter`` program may be explicitly specified. It should
 read the uncompressed tar stream from stdin and write a compressed/filtered
 tar stream to stdout.
 
@@ -61,7 +61,7 @@ BSD flags, ACLs, extended attributes (xattrs), atime and ctime are not exported.
 Timestamp resolution is limited to whole seconds, not the nanosecond resolution
 otherwise supported by Borg.
 
-A --sparse option (as found in borg extract) is not supported.
+A ``--sparse`` option (as found in borg extract) is not supported.
 
 By default the entire archive is extracted but a subset of files and directories
 can be selected by passing a list of ``PATHs`` as arguments.
diff --git a/docs/usage/info.rst.inc b/docs/usage/info.rst.inc
index 4c382f108..879dee144 100644
--- a/docs/usage/info.rst.inc
+++ b/docs/usage/info.rst.inc
@@ -21,7 +21,9 @@ optional arguments
 
 filters
     ``-P``, ``--prefix``
-        | only consider archive names starting with this prefix
+        | only consider archive names starting with this prefix.
+    ``-a``, ``--glob-archives``
+        | only consider archive names matching the glob. sh: rules apply, see "borg help patterns". ``--prefix`` and ``--glob-archives`` are mutually exclusive.
     ``--sort-by``
         | Comma-separated list of sorting keys; valid keys are: timestamp, name, id; default is: timestamp
     ``--first N``
diff --git a/docs/usage/init.rst.inc b/docs/usage/init.rst.inc
index 856af3650..ec99fd663 100644
--- a/docs/usage/init.rst.inc
+++ b/docs/usage/init.rst.inc
@@ -84,7 +84,8 @@ Encryption modes
 
 On modern Intel/AMD CPUs (except very cheap ones), AES is usually
 hardware-accelerated.
-BLAKE2b is faster than SHA256 on Intel/AMD 64-bit CPUs,
+BLAKE2b is faster than SHA256 on Intel/AMD 64-bit CPUs
+(except AMD Ryzen and future CPUs with SHA extensions),
 which makes `authenticated-blake2` faster than `none` and `authenticated`.
 
 On modern ARM CPUs, NEON provides hardware acceleration for SHA256 making it faster
@@ -95,7 +96,7 @@ Hardware acceleration is always used automatically when available.
 `repokey` and `keyfile` use AES-CTR-256 for encryption and HMAC-SHA256 for
 authentication in an encrypt-then-MAC (EtM) construction. The chunk ID hash
 is HMAC-SHA256 as well (with a separate key).
-These modes are compatible with borg 1.0.x.
+These modes are compatible with Borg 1.0.x.
 
 `repokey-blake2` and `keyfile-blake2` are also authenticated encryption modes,
 but use BLAKE2b-256 instead of HMAC-SHA256 for authentication. The chunk ID
@@ -105,7 +106,7 @@ These modes are new and *not* compatible with Borg 1.0.x.
 `authenticated` mode uses no encryption, but authenticates repository contents
 through the same HMAC-SHA256 hash as the `repokey` and `keyfile` modes (it uses it
 as the chunk ID hash). The key is stored like `repokey`.
-This mode is new and *not* compatible with borg 1.0.x.
+This mode is new and *not* compatible with Borg 1.0.x.
 
 `authenticated-blake2` is like `authenticated`, but uses the keyed BLAKE2b-256 hash
 from the other blake2 modes.
diff --git a/docs/usage/key_import.rst.inc b/docs/usage/key_import.rst.inc
index 86ab25b6a..c6b9b5ea4 100644
--- a/docs/usage/key_import.rst.inc
+++ b/docs/usage/key_import.rst.inc
@@ -16,7 +16,7 @@ positional arguments
 
 optional arguments
     ``--paper``
-        | interactively import from a backup done with --paper
+        | interactively import from a backup done with ``--paper``
 
 :ref:`common_options`
     |
diff --git a/docs/usage/list.rst.inc b/docs/usage/list.rst.inc
index a56cbecde..3c9d27e96 100644
--- a/docs/usage/list.rst.inc
+++ b/docs/usage/list.rst.inc
@@ -21,16 +21,18 @@ optional arguments
         | specify format for file listing
         |                                 (default: "{mode} {user:6} {group:6} {size:8d} {isomtime} {path}{extra}{NL}")
     ``--json``
-        | Only valid for listing repository contents. 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 "barchive" key is therefore not available.
+        | Only valid for listing repository contents. 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 "barchive" key is therefore not available.
     ``--json-lines``
-        | Only valid for listing archive contents. Format output as JSON Lines. 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.
+        | Only valid for listing archive contents. Format output as JSON Lines. 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.
 
 :ref:`common_options`
     |
 
 filters
     ``-P``, ``--prefix``
-        | only consider archive names starting with this prefix
+        | only consider archive names starting with this prefix.
+    ``-a``, ``--glob-archives``
+        | only consider archive names matching the glob. sh: rules apply, see "borg help patterns". ``--prefix`` and ``--glob-archives`` are mutually exclusive.
     ``--sort-by``
         | Comma-separated list of sorting keys; valid keys are: timestamp, name, id; default is: timestamp
     ``--first N``
@@ -63,7 +65,7 @@ See the "borg help patterns" command for more help on exclude patterns.
 
 .. man NOTES
 
-The following keys are available for --format:
+The following keys are available for ``--format``:
 
  - NEWLINE: OS dependent line separator
  - NL: alias of NEWLINE
@@ -108,12 +110,20 @@ Keys for listing archive files:
  - isoctime
  - isoatime
 
+ - blake2b
+ - blake2s
  - md5
  - sha1
  - sha224
  - sha256
  - sha384
+ - sha3_224
+ - sha3_256
+ - sha3_384
+ - sha3_512
  - sha512
+ - shake_128
+ - shake_256
 
  - archiveid
  - archivename
diff --git a/docs/usage/mount.rst.inc b/docs/usage/mount.rst.inc
index bfb0a24cb..dd0138383 100644
--- a/docs/usage/mount.rst.inc
+++ b/docs/usage/mount.rst.inc
@@ -25,7 +25,9 @@ optional arguments
 
 filters
     ``-P``, ``--prefix``
-        | only consider archive names starting with this prefix
+        | only consider archive names starting with this prefix.
+    ``-a``, ``--glob-archives``
+        | only consider archive names matching the glob. sh: rules apply, see "borg help patterns". ``--prefix`` and ``--glob-archives`` are mutually exclusive.
     ``--sort-by``
         | Comma-separated list of sorting keys; valid keys are: timestamp, name, id; default is: timestamp
     ``--first N``
@@ -54,7 +56,7 @@ supported by borg:
 - versions: when used with a repository mount, this gives a merged, versioned
   view of the files in the archives. EXPERIMENTAL, layout may change in future.
 - allow_damaged_files: by default damaged files (where missing chunks were
-  replaced with runs of zeros by borg check --repair) are not readable and
+  replaced with runs of zeros by borg check ``--repair``) are not readable and
   return EIO (I/O error). Set this option to read such files.
 
 The BORG_MOUNT_DATA_CACHE_ENTRIES environment variable is meant for advanced users
diff --git a/docs/usage/prune.rst.inc b/docs/usage/prune.rst.inc
index fb23c7fc4..e9c860510 100644
--- a/docs/usage/prune.rst.inc
+++ b/docs/usage/prune.rst.inc
@@ -37,14 +37,18 @@ optional arguments
         | number of monthly archives to keep
     ``-y``, ``--keep-yearly``
         | number of yearly archives to keep
-    ``-P``, ``--prefix``
-        | only consider archive names starting with this prefix
     ``--save-space``
         | work slower, but using less space
 
 :ref:`common_options`
     |
 
+filters
+    ``-P``, ``--prefix``
+        | only consider archive names starting with this prefix.
+    ``-a``, ``--glob-archives``
+        | only consider archive names matching the glob. sh: rules apply, see "borg help patterns". ``--prefix`` and ``--glob-archives`` are mutually exclusive.
+
 Description
 ~~~~~~~~~~~
 
@@ -55,7 +59,7 @@ automated backup scripts wanting to keep a certain number of historic backups.
 Also, prune automatically removes checkpoint archives (incomplete archives left
 behind by interrupted backup runs) except if the checkpoint is the latest
 archive (and thus still needed). Checkpoint archives are not considered when
-comparing archive counts against the retention limits (--keep-X).
+comparing archive counts against the retention limits (``--keep-X``).
 
 If a prefix is set with -P, then only archives that start with the prefix are
 considered for deletion and only those archives count towards the totals
@@ -68,14 +72,14 @@ If you have multiple sequences of archives with different data sets (e.g.
 from different machines) in one shared repository, use one prune call per
 data set that matches only the respective archives using the -P option.
 
-The "--keep-within" option takes an argument of the form "<int><char>",
-where char is "H", "d", "w", "m", "y". For example, "--keep-within 2d" means
+The ``--keep-within`` option takes an argument of the form "<int><char>",
+where char is "H", "d", "w", "m", "y". For example, ``--keep-within 2d`` means
 to keep all archives that were created within the past 48 hours.
 "1m" is taken to mean "31d". The archives kept with this option do not
 count towards the totals specified by any other options.
 
 A good procedure is to thin out more and more the older your backups get.
-As an example, "--keep-daily 7" means to keep the latest backup on each day,
+As an example, ``--keep-daily 7`` means to keep the latest backup on each day,
 up to 7 most recent days with backups (days without backups do not count).
 The rules are applied from secondly to yearly, and backups selected by previous
 rules do not count towards those of later rules. The time that each backup
@@ -83,6 +87,6 @@ starts is used for pruning purposes. Dates and times are interpreted in
 the local timezone, and weeks go from Monday to Sunday. Specifying a
 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
+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).
\ No newline at end of file
diff --git a/docs/usage/recreate.rst.inc b/docs/usage/recreate.rst.inc
index fff3578a0..26bbdb383 100644
--- a/docs/usage/recreate.rst.inc
+++ b/docs/usage/recreate.rst.inc
@@ -37,7 +37,7 @@ 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``
-        | if tag objects are specified with --exclude-if-present, don't omit the tag objects themselves from the backup archive
+        | if tag objects are specified with ``--exclude-if-present``, don't omit the tag objects themselves from the backup archive
     ``--pattern PATTERN``
         | experimental: include/exclude paths matching PATTERN
     ``--patterns-from PATTERNFILE``
@@ -55,9 +55,9 @@ Archive options
     ``-C COMPRESSION``, ``--compression COMPRESSION``
         | select compression algorithm, see the output of the "borg help compression" command for details.
     ``--recompress``
-        | recompress data chunks according to --compression if "if-different". When "always", chunks that are already compressed that way are not skipped, but compressed again. Only the algorithm is considered for "if-different", not the compression level (if any).
+        | recompress data chunks according to ``--compression`` if `if-different`. When `always`, chunks that are already compressed that way are not skipped, but compressed again. Only the algorithm is considered for `if-different`, not the compression level (if any).
     ``--chunker-params PARAMS``
-        | specify the chunker parameters (CHUNK_MIN_EXP, CHUNK_MAX_EXP, HASH_MASK_BITS, HASH_WINDOW_SIZE) or "default" to use the current defaults. default: 19,23,21,4095
+        | specify the chunker parameters (CHUNK_MIN_EXP, CHUNK_MAX_EXP, HASH_MASK_BITS, HASH_WINDOW_SIZE) or `default` to use the current defaults. default: 19,23,21,4095
 
 Description
 ~~~~~~~~~~~
@@ -66,33 +66,33 @@ Recreate the contents of existing archives.
 
 This is an *experimental* feature. Do *not* use this on your only backup.
 
---exclude, --exclude-from, --exclude-if-present, --keep-exclude-tags, and PATH
+``--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, PATHs).
+will *not* match (``--exclude``, ``--exclude-from``, PATHs).
 
---recompress allows to change the compression of existing data in archives.
+``--recompress`` allows to change the compression of existing data in archives.
 Due to how Borg stores compressed size information this might display
 incorrect information for archives that were not recreated at the same time.
 There is no risk of data loss by this.
 
---chunker-params will re-chunk all files in the archive, this can be
+``--chunker-params`` will re-chunk all files in the archive, this can be
 used to have upgraded Borg 0.xx or Attic archives deduplicate with
 Borg 1.x archives.
 
 **USE WITH CAUTION.**
 Depending on the PATHs and patterns given, recreate can be used to permanently
 delete files from archives.
-When in doubt, use "--dry-run --verbose --list" to see how patterns/PATHS are
+When in doubt, use ``--dry-run --verbose --list`` to see how patterns/PATHS are
 interpreted.
 
 The archive being recreated is only removed after the operation completes. The
 archive that is built during the operation exists at the same time at
 "<ARCHIVE>.recreate". The new archive will have a different archive ID.
 
-With --target the original archive is not replaced, instead a new archive is created.
+With ``--target`` the original archive is not replaced, instead a new archive is created.
 
 When rechunking space usage can be substantial, expect at least the entire
 deduplicated size of the archives using the previous chunker params.