ask-password: add --console mode to ask questions on /dev/console

[elogind.git] / man / systemd.conf.xml

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 399cae0a6c5c67e6a34285da51aa452b0db629de..6759f978148b5f3f6a8a837aa4dff08ed1ad7cfa 100644 (file)
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -49,7 +49,7 @@
 
         <refsynopsisdiv>
                 <para><filename>system.conf</filename></para>
-                <para><filename>session.conf</filename></para>
+                <para><filename>user.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
@@ -57,7 +57,7 @@
 
                 <para>When run as system instance systemd reads the
                 configuration file <filename>system.conf</filename>,
-                otherwise <filename>session.conf</filename>. These
+                otherwise <filename>user.conf</filename>. These
                 configuration files contain a few settings controlling
                 basic manager operations.</para>
 
@@ -79,6 +79,7 @@
                                 <term><varname>DumpCore=yes</varname></term>
                                 <term><varname>CrashShell=no</varname></term>
                                 <term><varname>ShowStatus=yes</varname></term>
+                                <term><varname>SysVConsole=yes</varname></term>
                                 <term><varname>CrashChVT=1</varname></term>
 
                                 <listitem><para>Configures various
@@ -99,6 +100,18 @@
                                 process. Takes a space-separated list
                                 of CPU indexes.</para></listitem>
                         </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>MountAuto=yes</varname></term>
+                                <term><varname>SwapAuto=yes</varname></term>
+
+                                <listitem><para>Configures whether
+                                systemd should automatically activate
+                                all swap or mounts listed in
+                                <filename>/etc/fstab</filename>, or
+                                whether this job is left to some other
+                                system script.</para></listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>