X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.xml;h=e0e8d37a90ade54c1788838a6cbc0f796db2b9b3;hb=75836b9d2071aab978ee78d7d797126a18a32052;hp=0d017575b61793cf1f7ad66fef9968d7ef212348;hpb=ee0e998e1ccb07cc90748e5edcb312f13e8a06f4;p=elogind.git
diff --git a/man/systemd.xml b/man/systemd.xml
index 0d017575b..e0e8d37a9 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -75,10 +75,12 @@
telinit8
for more information.
- When run as system instance, systemd interprets
- the configuration file
- system.conf, otherwise
- user.conf. See
+ When run as a system instance, systemd interprets the
+ configuration file system.conf and the
+ files in system.conf.d directories; when
+ run as a user instance, systemd interprets the configuration
+ file user.conf and the files in
+ user.conf.d directories. See
systemd-system.conf5
for more information.
@@ -679,7 +681,7 @@
received the systemd manager will log
its complete state in human readable
form. The data logged is the same as
- printed by systemctl
+ printed by systemd-analyze
dump.
@@ -1125,17 +1127,19 @@
- -b
emergency
+ -b
Boot into emergency
mode. This is equivalent to
systemd.unit=emergency.target
- and provided for compatibility
- reasons and to be easier to type.
+ and provided for compatibility reasons
+ and to be easier to
+ type.
+ rescue
single
s
S