nspawn,man: use a common vocabulary when referring to selinux security contexts

[elogind.git] / man / crypttab.xml

diff --git a/man/crypttab.xml b/man/crypttab.xml
index 5aade57c426af33152e8d0cf6c1f8e8296d486d6..c563851f213cba66de40b0fedb684e513c5d1adf 100644 (file)
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -112,7 +112,7 @@
                 <variablelist class='crypttab-options'>
 
                         <varlistentry>
                 <variablelist class='crypttab-options'>
 
                         <varlistentry>

-                                <term><varname>allow-discards</varname></term>
+                                <term><varname>discard</varname></term>

 
                                 <listitem><para>Allow discard requests to be
                                 passed through the encrypted block device. This
 
                                 <listitem><para>Allow discard requests to be
                                 passed through the encrypted block device. This


@@ -163,6 +163,20 @@
                                 given by the key size.</para></listitem>
                         </varlistentry>
 
                                 given by the key size.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><varname>key-slot=</varname></term>
+
+                                <listitem><para>Specifies the key slot to
+                                compare the passphrase or key against.
+                                If the key slot does not match the given
+                                passphrase or key, but another would, the
+                                setup of the device will fail regardless.
+                                This implies <varname>luks</varname>. See
+                                <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                                for possible values. The default is to try
+                                all key slots in sequential order.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><varname>luks</varname></term>
 
                         <varlistentry>
                                 <term><varname>luks</varname></term>
 


@@ -291,14 +305,7 @@
 
                                 <listitem><para>Use TrueCrypt in system
                                 encryption mode. This implies
 
                                 <listitem><para>Use TrueCrypt in system
                                 encryption mode. This implies

-                                <varname>tcrypt</varname>.</para>
-
-                                <para>Please note that when using this mode, the
-                                whole device needs to be given in the second
-                                field instead of the partition. For example: if
-                                <literal>/dev/sda2</literal> is the system
-                                encrypted TrueCrypt patition, <literal>/dev/sda</literal>
-                                has to be given.</para></listitem>
+                               <varname>tcrypt</varname>.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -330,7 +337,9 @@
                                 <term><varname>tries=</varname></term>
 
                                 <listitem><para>Specifies the maximum number of
                                 <term><varname>tries=</varname></term>
 
                                 <listitem><para>Specifies the maximum number of

-                                times the user is queried for a password.</para></listitem>
+                                times the user is queried for a password.
+                                The default is 3. If set to 0, the user is
+                                queried for a password indefinitely.</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>