From ed3657d5dbc5fa7724c50fd0c4cf6503cd0896e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 5 Sep 2017 10:25:45 +0200 Subject: [PATCH] man: order fields alphabetically in crypttab(5) They already were mostly ordered alphabetically, but some disorder snuck in. Also, fix formatting. Some options were described using "--" prefixes, which looks like the text was just copied from crypttab(8). --- man/crypttab.xml | 93 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/man/crypttab.xml b/man/crypttab.xml index 49896a45ba..5223e16664 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -69,8 +69,7 @@ Empty lines and lines starting with the # character are ignored. Each of the remaining lines describes one - encrypted block device, fields on the line are delimited by white - space. + encrypted block device. Fields are delimited by white space. Each line is in the formname encrypted-device password options The first two fields are mandatory, the remaining two are @@ -108,14 +107,6 @@ - - - - Allow discard requests to be passed through - the encrypted block device. This improves performance on SSD - storage but has security implications. - - @@ -127,6 +118,14 @@ recommended. + + + + Allow discard requests to be passed through the encrypted block + device. This improves performance on SSD storage but has security implications. + + + @@ -148,30 +147,6 @@ option. - - - - Start offset in the backend device, in 512-byte sectors. - This option is only relevant for plain devices. - - - - - - - How many 512-byte sectors of the encrypted data to skip - at the beginning. This is different from the - option with respect to the sector numbers used in initialization vector - (IV) calculation. Using will shift the IV - calculation by the same negative amount. Hence, if is given, - sector n will get a sector number of 0 for the IV calculation. - Using causes sector n to also be the first - sector of the mapped device, but with its number for IV generation being n. - - This option is only relevant for plain devices. - - - @@ -231,6 +206,13 @@ does not show up. + + + + Start offset in the backend device, in 512-byte sectors. This + option is only relevant for plain devices. + + @@ -244,6 +226,23 @@ mode. + + + + How many 512-byte sectors of the encrypted data to skip at the + beginning. This is different from the option with respect + to the sector numbers used in initialization vector (IV) calculation. Using + will shift the IV calculation by the same negative + amount. Hence, if is given, + sector n will get a sector number of 0 for the IV + calculation. Using causes sector + n to also be the first sector of the mapped device, but + with its number for IV generation being n. + + This option is only relevant for plain devices. + + + @@ -349,19 +348,6 @@ indefinitely (which is the default). - - - - Specifies how long systemd should wait for a - device to show up before giving up on the entry. The argument - is a time in seconds or explicitly specified units of - s, - min, - h, - ms. - - - @@ -393,6 +379,19 @@ typos. + + + + Specifies how long systemd should wait for a device to show up + before giving up on the entry. The argument is a time in seconds or explicitly + specified units of + s, + min, + h, + ms. + + + At early boot and when the system manager configuration is