doc: reword "shared per-thread" wording

[elogind.git] / man / systemd.xml

diff --git a/man/systemd.xml b/man/systemd.xml
index 47d6438939a12020142aa3db9ab86521f3f363ad..4abd8902a431d4a579316dfdaa27b8741796911b 100644 (file)
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -118,25 +118,11 @@
                                 configuration items understood in unit
                                 definition files.</para></listitem>
                         </varlistentry>
                                 configuration items understood in unit
                                 definition files.</para></listitem>
                         </varlistentry>

-                        <varlistentry>
-                                <term><option>--introspect=</option></term>
-
-                                <listitem><para>Extract D-Bus
-                                interface introspection data. This is
-                                mostly useful at install time
-                                to generate data suitable for the
-                                D-Bus interfaces
-                                repository. Optionally the interface
-                                name for the introspection data may be
-                                specified. If omitted, the
-                                introspection data for all interfaces
-                                is dumped.</para></listitem>
-                        </varlistentry>

                         <varlistentry>
                                 <term><option>--unit=</option></term>
 
                                 <listitem><para>Set default unit to
                         <varlistentry>
                                 <term><option>--unit=</option></term>
 
                                 <listitem><para>Set default unit to

-                                activate on startup. If not specified
+                                activate on startup. If not specified,

                                 defaults to
                                 <filename>default.target</filename>.</para></listitem>
                         </varlistentry>
                                 defaults to
                                 <filename>default.target</filename>.</para></listitem>
                         </varlistentry>


@@ -233,7 +219,7 @@
 
                                 <listitem><para>Highlight important
                                 log messages. Argument is a boolean
 
                                 <listitem><para>Highlight important
                                 log messages. Argument is a boolean

-                                value. If the argument is omitted it
+                                value. If the argument is omitted, it

                                 defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>
                                 defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>


@@ -407,7 +393,7 @@
                 and ordering dependencies are placed between two
                 units. Also note that the majority of dependencies are
                 implicitly created and maintained by systemd. In most
                 and ordering dependencies are placed between two
                 units. Also note that the majority of dependencies are
                 implicitly created and maintained by systemd. In most

-                cases it should be unnecessary to declare additional
+                cases, it should be unnecessary to declare additional

                 dependencies manually, however it is possible to do
                 this.</para>
 
                 dependencies manually, however it is possible to do
                 this.</para>
 


@@ -429,7 +415,7 @@
                 <filename>multi-user.target</filename> (for limited
                 console-only boots for use in embedded or server
                 environments, or similar; a subset of
                 <filename>multi-user.target</filename> (for limited
                 console-only boots for use in embedded or server
                 environments, or similar; a subset of

-                graphical.target). However it is at the discretion of
+                graphical.target). However, it is at the discretion of

                 the administrator to configure it as an alias to any
                 other target unit. See
                 <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                 the administrator to configure it as an alias to any
                 other target unit. See
                 <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>


@@ -494,7 +480,7 @@
                 <filename>/proc</filename>.</para>
 
                 <para>For more information about the concepts and
                 <filename>/proc</filename>.</para>
 
                 <para>For more information about the concepts and

-                ideas behind systemd please refer to the <ulink
+                ideas behind systemd, please refer to the <ulink

                 url="http://0pointer.de/blog/projects/systemd.html">Original
                 Design Document</ulink>.</para>
 
                 url="http://0pointer.de/blog/projects/systemd.html">Original
                 Design Document</ulink>.</para>
 


@@ -1030,9 +1016,9 @@
                                 <term><varname>systemd.dump_core=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.dump_core=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
+                                argument. If <option>true</option>,

                                 systemd dumps core when it
                                 systemd dumps core when it

-                                crashes. Otherwise no core dump is
+                                crashes. Otherwise, no core dump is

                                 created. Defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>
                                 created. Defaults to
                                 <option>true</option>.</para></listitem>
                         </varlistentry>


@@ -1041,9 +1027,9 @@
                                 <term><varname>systemd.crash_shell=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.crash_shell=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
+                                argument. If <option>true</option>,

                                 systemd spawns a shell when it
                                 systemd spawns a shell when it

-                                crashes. Otherwise no shell is
+                                crashes. Otherwise, no shell is

                                 spawned. Defaults to
                                 <option>false</option>, for security
                                 reasons, as the shell is not protected
                                 spawned. Defaults to
                                 <option>false</option>, for security
                                 reasons, as the shell is not protected


@@ -1065,7 +1051,7 @@
                                 <term><varname>systemd.confirm_spawn=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.confirm_spawn=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
+                                argument. If <option>true</option>,

                                 asks for confirmation when spawning
                                 processes. Defaults to
                                 <option>false</option>.</para></listitem>
                                 asks for confirmation when spawning
                                 processes. Defaults to
                                 <option>false</option>.</para></listitem>


@@ -1075,14 +1061,20 @@
                                 <term><varname>systemd.show_status=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <term><varname>systemd.show_status=</varname></term>
 
                                 <listitem><para>Takes a boolean

-                                argument. If <option>true</option>
-                                shows terse service status updates on
-                                the console during bootup. Defaults to
+                                argument or the constant
+                                <constant>auto</constant>. If
+                                <option>true</option>, shows terse
+                                service status updates on the console
+                                during bootup.
+                                <constant>auto</constant> behaves like
+                                <option>false</option> until a service
+                                fails or there is a significant delay
+                                in boot. Defaults to

                                 <option>true</option>, unless
                                 <option>quiet</option> is passed as
                                 kernel command line option in which
                                 case it defaults to
                                 <option>true</option>, unless
                                 <option>quiet</option> is passed as
                                 kernel command line option in which
                                 case it defaults to

-                                <option>false</option>.</para></listitem>
+                                <constant>auto</constant>.</para></listitem>

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


@@ -1149,6 +1141,7 @@
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>

+                                <term><varname>-b</varname></term>

                                 <term><varname>emergency</varname></term>
 
                                 <listitem><para>Boot into emergency
                                 <term><varname>emergency</varname></term>
 
                                 <listitem><para>Boot into emergency


@@ -1280,6 +1273,7 @@
         <refsect1>
                 <title>See Also</title>
                 <para>
         <refsect1>
                 <title>See Also</title>
                 <para>

+                        The <ulink url="http://www.freedesktop.org/wiki/Software/systemd/">systemd Homepage</ulink>,

                         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>locale.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,