X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fcrypttab.xml;h=1a1002ecf432490fab62600c4f72bbccfc7f2ae6;hb=78eb158a20e2bee772f6e49d8b432b98f68cbb55;hp=9dbf1546b1b9c85b25ad6a8c0542c6b1da7f7543;hpb=63b03c0b2889dd490b3511f12f00268c154a655c;p=elogind.git

diff --git a/man/crypttab.xml b/man/crypttab.xml
index 9dbf1546b..1a1002ecf 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -141,6 +141,18 @@
                                 this option.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>header=</option></term>
+
+                                <listitem><para>Use a detached (separated)
+                                metadata device or file where the LUKS header
+                                is stored. This option is only relevant for
+                                LUKS devices. See
+                                <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                                for possible values and the default value of
+                                this option.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>keyfile-offset=</option></term>
 
@@ -233,7 +245,7 @@
                                 be used as a swap device, and will be formatted
                                 accordingly after setting up the encrypted
                                 block device, with
-                                <citerefentry><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+                                <citerefentry project='man-pages'><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
                                 This option implies <option>plain</option>.</para>
 
                                 <para>WARNING: Using the <option>swap</option>
@@ -318,13 +330,28 @@
                                 indefinitely (which is the default).</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>x-systemd.device-timeout=</option></term>
+
+                                <listitem><para>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 <literal>s</literal>,
+                                <literal>min</literal>,
+                                <literal>h</literal>,
+                                <literal>ms</literal>.
+                                </para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>tmp</option></term>
 
                                 <listitem><para>The encrypted block device will
                                 be prepared for using it as <filename>/tmp</filename>;
                                 it will be formatted using
-                                <citerefentry><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+                                <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
                                 This option implies <option>plain</option>.</para>
 
                                 <para>WARNING: Using the <option>tmp</option>
@@ -380,8 +407,8 @@ hidden     /mnt/tc_hidden  /dev/null                tcrypt-hidden,tcrypt-keyfile
                         <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry project='man-pages'><refentrytitle>mkswap</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                        <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>