Merge pull request #6609 from ThomasWaldmann/docs-table-formatting-master

init: docs table formatting fixed (master)

docs/usage/init.rst.inc

@@ -134,27 +134,27 @@ in the upper part of the table, in the lower part is the old and/or unsafe(r) st
 
 .. nanorst: inline-fill
 
-+---------------------------------+---------------+---------------+------------------+-------+
-|**mode (* = keyfile or repokey)**|**ID-Hash**    |**Encryption** |**Authentication**|**V>=**|
-+---------------------------------+---------------+---------------+------------------+-------+
-| ``*-blake2-chacha20-poly1305``  | BLAKE2b       | CHACHA20      | POLY1305         | 1.3   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| ``*-chacha20-poly1305``         | HMAC-SHA-256  | CHACHA20      | POLY1305         | 1.3   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| ``*-blake2-aes-ocb``            | BLAKE2b       | AES256-OCB    | AES256-OCB       | 1.3   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| ``*-aes-ocb``                   | HMAC-SHA-256  | AES256-OCB    | AES256-OCB       | 1.3   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| ``*-blake2``                    | BLAKE2b       | AES256-CTR    | BLAKE2b          | 1.1   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| ``*``                           | HMAC-SHA-256  | AES256-CTR    | HMAC-SHA256      | any   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| authenticated-blake2            | BLAKE2b       | none          | BLAKE2b          | 1.1   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| authenticated                   | HMAC-SHA-256  | none          | HMAC-SHA256      | 1.1   |
-+---------------------------------+---------------+---------------+------------------+-------+
-| none                            | SHA-256       | none          | none             | any   |
-+---------------------------------+---------------+---------------+------------------+-------+
++-----------------------------------+--------------+----------------+--------------------+---------+
+| Mode (K = keyfile or repokey)     | ID-Hash      | Encryption     | Authentication     | V >=    |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| K-blake2-chacha20-poly1305        | BLAKE2b      | CHACHA20       | POLY1305           | 1.3     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| K-chacha20-poly1305               | HMAC-SHA-256 | CHACHA20       | POLY1305           | 1.3     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| K-blake2-aes-ocb                  | BLAKE2b      | AES256-OCB     | AES256-OCB         | 1.3     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| K-aes-ocb                         | HMAC-SHA-256 | AES256-OCB     | AES256-OCB         | 1.3     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| K-blake2                          | BLAKE2b      | AES256-CTR     | BLAKE2b            | 1.1     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| K                                 | HMAC-SHA-256 | AES256-CTR     | HMAC-SHA256        | any     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| authenticated-blake2              | BLAKE2b      | none           | BLAKE2b            | 1.1     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| authenticated                     | HMAC-SHA-256 | none           | HMAC-SHA256        | 1.1     |
++-----------------------------------+--------------+----------------+--------------------+---------+
+| none                              | SHA-256      | none           | none               | any     |
++-----------------------------------+--------------+----------------+--------------------+---------+
 
 .. nanorst: inline-replace
 

src/borg/archiver.py

@@ -4303,27 +4303,27 @@ class Archiver:
 
         .. nanorst: inline-fill
 
-        +---------------------------------+---------------+---------------+------------------+-------+
-        |**mode (* = keyfile or repokey)**|**ID-Hash**    |**Encryption** |**Authentication**|**V>=**|
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | ``*-blake2-chacha20-poly1305``  | BLAKE2b       | CHACHA20      | POLY1305         | 1.3   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | ``*-chacha20-poly1305``         | HMAC-SHA-256  | CHACHA20      | POLY1305         | 1.3   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | ``*-blake2-aes-ocb``            | BLAKE2b       | AES256-OCB    | AES256-OCB       | 1.3   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | ``*-aes-ocb``                   | HMAC-SHA-256  | AES256-OCB    | AES256-OCB       | 1.3   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | ``*-blake2``                    | BLAKE2b       | AES256-CTR    | BLAKE2b          | 1.1   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | ``*``                           | HMAC-SHA-256  | AES256-CTR    | HMAC-SHA256      | any   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | authenticated-blake2            | BLAKE2b       | none          | BLAKE2b          | 1.1   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | authenticated                   | HMAC-SHA-256  | none          | HMAC-SHA256      | 1.1   |
-        +---------------------------------+---------------+---------------+------------------+-------+
-        | none                            | SHA-256       | none          | none             | any   |
-        +---------------------------------+---------------+---------------+------------------+-------+
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | Mode (K = keyfile or repokey)     | ID-Hash      | Encryption     | Authentication     | V >=    |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | K-blake2-chacha20-poly1305        | BLAKE2b      | CHACHA20       | POLY1305           | 1.3     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | K-chacha20-poly1305               | HMAC-SHA-256 | CHACHA20       | POLY1305           | 1.3     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | K-blake2-aes-ocb                  | BLAKE2b      | AES256-OCB     | AES256-OCB         | 1.3     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | K-aes-ocb                         | HMAC-SHA-256 | AES256-OCB     | AES256-OCB         | 1.3     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | K-blake2                          | BLAKE2b      | AES256-CTR     | BLAKE2b            | 1.1     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | K                                 | HMAC-SHA-256 | AES256-CTR     | HMAC-SHA256        | any     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | authenticated-blake2              | BLAKE2b      | none           | BLAKE2b            | 1.1     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | authenticated                     | HMAC-SHA-256 | none           | HMAC-SHA256        | 1.1     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
+        | none                              | SHA-256      | none           | none               | any     |
+        +-----------------------------------+--------------+----------------+--------------------+---------+
 
         .. nanorst: inline-replace