X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=6aa4f7052706b1f0fd75a0aa2358997312b9cc7b;hp=edd824d31d4ff41fd95ac31290d81576f7004f5c;hb=5edf93ec94ff80edb795e561f2b5c1b7ab68a7d8;hpb=77d5f105bf63330350c7bddacdeda914f945590f

diff --git a/man/systemd.xml b/man/systemd.xml
index edd824d31..6aa4f7052 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -141,14 +141,20 @@
                                 <listitem><para>Tell systemd to run a
                                 system instance (resp. session
                                 instance), even if the process ID is
-                                not 1 (resp. is 1), i.e. systemd is not
-                                (resp. is) run as init process.
+                                not 1 (resp. is 1), i.e. systemd is
+                                not (resp. is) run as init process.
                                 Normally it should not be necessary to
                                 pass these options, as systemd
                                 automatically detects the mode it is
                                 started in. These options are hence of
-                                little use except for
-                                debugging.</para></listitem>
+                                little use except for debugging. Note
+                                that it is not supported booting and
+                                maintaining a full system with systemd
+                                running in <option>--system</option>
+                                mode, but PID not 1. In practice,
+                                passing <option>--system</option> explicitly is
+                                only useful in conjunction with
+                                <option>--test</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><option>--dump-core</option></term>
@@ -256,7 +262,7 @@
                 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
-                'maintenance' state is available as well which is very
+                '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
@@ -440,6 +446,11 @@
                 ideas behind systemd please refer to the <ulink
                 url="http://0pointer.de/blog/projects/systemd.html">Original
                 Design Document</ulink>.</para>
+
+                <para>Note that some but not all interfaces provided
+                by systemd are covered by the <ulink
+                url="http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise">Interface
+                Stability Promise</ulink>.</para>
         </refsect1>
 
         <refsect1>