doc: reword "shared per-thread" wording

[elogind.git] / man / systemd.xml

diff --git a/man/systemd.xml b/man/systemd.xml
index c7aed3c6ff06b320cf44ddaa6c56d14ab5d5b626..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>


@@ -285,25 +271,27 @@
                 <title>Concepts</title>
 
                 <para>systemd provides a dependency system between
                 <title>Concepts</title>
 
                 <para>systemd provides a dependency system between

-                various entities called "units". Units encapsulate
-                various objects that are relevant for system boot-up
-                and maintenance. The majority of units are configured
-                in unit configuration files, whose syntax and basic
-                set of options is described in
+                various entities called "units" of 12 different
+                types. Units encapsulate various objects that are
+                relevant for system boot-up and maintenance. The
+                majority of units are configured in unit configuration
+                files, whose syntax and basic set of options is
+                described in

                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 however some are created automatically from other
                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 however some are created automatically from other

-                configuration or dynamically from system state. Units
-                may be 'active' (meaning started, bound, plugged in,
-                ...  depending on the unit type, see below), or
-                'inactive' (meaning stopped, unbound, unplugged, ...),
-                as well as in the process of being activated or
-                deactivated, i.e. between the two states (these states
-                are called 'activating', 'deactivating'). A special
-                'failed' state is available as well which is very
-                similar to 'inactive' and is entered when the service
-                failed in some way (process returned error code on
-                exit, or crashed, or an operation timed out). If this
-                state is entered the cause will be logged, for later
+                configuration, dynamically from system state or
+                programmatically at runtime. Units may be "active"
+                (meaning started, bound, plugged in, ..., depending on
+                the unit type, see below), or "inactive" (meaning
+                stopped, unbound, unplugged, ...), as well as in the
+                process of being activated or deactivated,
+                i.e. between the two states (these states are called
+                "activating", "deactivating"). A special "failed"
+                state is available as well, which is very similar to
+                "inactive" and is entered when the service failed in
+                some way (process returned error code on exit, or
+                crashed, or an operation timed out). If this state is
+                entered, the cause will be logged, for later

                 reference. Note that the various unit types may have a
                 number of additional substates, which are mapped to
                 the five generalized unit states described
                 reference. Note that the various unit types may have a
                 number of additional substates, which are mapped to
                 the five generalized unit states described


@@ -312,7 +300,7 @@
                 <para>The following unit types are available:</para>
 
                 <orderedlist>
                 <para>The following unit types are available:</para>
 
                 <orderedlist>

-                        <listitem><para>Service units, which control
+                        <listitem><para>Service units, which start and control

                         daemons and the processes they consist of. For
                         details see
                         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
                         daemons and the processes they consist of. For
                         details see
                         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>


@@ -369,6 +357,18 @@
                         objects change or are modified. See
                         <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 
                         objects change or are modified. See
                         <citerefentry><refentrytitle>systemd.path</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 

+                        <listitem><para>Slice units may be used to
+                        group units which manage system processes
+                        (such as service and scope units) in a
+                        hierarchical tree for resource management
+                        purposes. See
+                        <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+
+                        <listitem><para>Scope units are similar to
+                        service units, but manage foreign processes
+                        instead of starting them as well. See
+                        <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
+

                 </orderedlist>
 
                 <para>Units are named as their configuration
                 </orderedlist>
 
                 <para>Units are named as their configuration


@@ -393,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>
 


@@ -415,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>


@@ -480,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>
 


@@ -1008,7 +1008,7 @@
                                 option prefixed with
                                 <literal>rd.</literal> is honored
                                 only in the initial RAM disk (initrd),
                                 option prefixed with
                                 <literal>rd.</literal> is honored
                                 only in the initial RAM disk (initrd),

-                                while the one that isn't prefixed only
+                                while the one that is not prefixed only

                                 in the main system.</para></listitem>
                         </varlistentry>
 
                                 in the main system.</para></listitem>
                         </varlistentry>
 


@@ -1016,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>


@@ -1027,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


@@ -1051,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>


@@ -1061,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>


@@ -1099,16 +1105,11 @@
                                 <term><varname>systemd.setenv=</varname></term>
 
                                 <listitem><para>Takes a string
                                 <term><varname>systemd.setenv=</varname></term>
 
                                 <listitem><para>Takes a string

-                                argument in the form
-                                VARIABLE=VALUE. May be used to set
-                                environment variables for the init
-                                process and all its children at boot
-                                time. May be used more than once to
-                                set multiple variables. If the equal
-                                sign and variable are missing it unsets
-                                an environment variable which might be
-                                passed in from the initial ram
-                                disk.</para></listitem>
+                                argument in the form VARIABLE=VALUE.
+                                May be used to set default environment
+                                variables to add to forked child processes.
+                                May be used more than once to set multiple
+                                variables.</para></listitem>

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


@@ -1140,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


@@ -1271,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>,