X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fbootup.xml;h=ed72acfda9fba326017d9b47d6e7a6431e845f6c;hp=ae84cff0b79d82ba5c049b5652ba2418e24aa3c7;hb=6ffd3337867076067955ec4d5d1a0cde521d9b86;hpb=013d8a39a6178179080bcfee9122b29cf9d29259

diff --git a/man/bootup.xml b/man/bootup.xml
index ae84cff0b..ed72acfda 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -73,7 +73,7 @@
                 storage technologies backing them), and then
                 (optionally) jumps back into the initrd code which
                 unmounts/detaches the root file system and the storage
-                it resides on. As last step the system powered down.</para>
+                it resides on. As last step the system is powered down.</para>
 
                 <para>Additional information about the system boot
                 process may be found in
@@ -147,18 +147,18 @@
                                                v
                                          basic.target
                                                |
-                             _________________/|                                 emergency.service
-                            /                  |                                         |
-                            |                  |                                         v
-                            v                  v                                 <emphasis>emergency.target</emphasis>
-                     (various system    (various system
-                        services           services)
-                      required for             |
-                     graphical UIs)            v
-                            |           <emphasis>multi-user.target</emphasis>
-                            |                  |
-                            | _________________/
-                            |/
+            __________________________________/|                                 emergency.service
+           /                |                  |                                         |
+           |                |                  |                                         v
+           v                v                  v                                 <emphasis>emergency.target</emphasis>
+       display-      (various system    (various system
+   manager.service       services           services)
+           |           required for            |
+           |          graphical UIs)           v
+           |                |           <emphasis>multi-user.target</emphasis>
+           |                |                  |
+           \_______________ | _________________/
+                           \|/
                             v
                     <emphasis>graphical.target</emphasis></programlisting>
 
@@ -183,32 +183,32 @@
 
 
 
-<programlisting>                   (conflicts with  (conflicts with
-                     all system     all file system
-                      services)     mounts, swaps,
-                          |           cryptsetup
-                          |          devices, ...)
-                          |                |
-                          v                v
-                   shutdown.target    umount.target
-                          |                |
-                          \_______   ______/
-                                  \ /
-                                   v
-                          (various low-level
-                               services)
-                                   |
-                                   v
-                             final.target
-                                   |
-        __________________________/ \_____________________
-       /                  |                |              \
-       |                  |                |              |
-       v                  v                v              v
-reboot.service    poweroff.service   halt.service   kexec.service
-       |                  |                |              |
-       v                  v                v              v
-<emphasis>reboot.target</emphasis>     <emphasis>poweroff.target</emphasis>    <emphasis>halt.target</emphasis>    <emphasis>kexec.target</emphasis></programlisting>
+<programlisting>                                  (conflicts with  (conflicts with
+                                    all system     all file system
+                                     services)     mounts, swaps,
+                                         |           cryptsetup
+                                         |          devices, ...)
+                                         |                |
+                                         v                v
+                                  shutdown.target    umount.target
+                                         |                |
+                                         \_______   ______/
+                                                 \ /
+                                                  v
+                                         (various low-level
+                                              services)
+                                                  |
+                                                  v
+                                            final.target
+                                                  |
+            _____________________________________/ \_________________________________
+           /                         |                        |                      \
+           |                         |                        |                      |
+           v                         v                        v                      v
+systemd-reboot.service   systemd-poweroff.service   systemd-halt.service   systemd-kexec.service
+           |                         |                        |                      |
+           v                         v                        v                      v
+    <emphasis>reboot.target</emphasis>             <emphasis>poweroff.target</emphasis>            <emphasis>halt.target</emphasis>           <emphasis>kexec.target</emphasis></programlisting>
 
                 <para>Commonly used system shutdown targets are <emphasis>emphasized</emphasis>.</para>
         </refsect1>