X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=e0e8d37a90ade54c1788838a6cbc0f796db2b9b3;hp=bcbfa02ba1fcc9a94cc12309994c4c5153c61cb2;hb=820aced6f6067a6b7c57b7d36e44f64378870cbf;hpb=5aded369782f28255bc6b494ca905d7acaea7a56
diff --git a/man/systemd.xml b/man/systemd.xml
index bcbfa02ba..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.
@@ -180,10 +182,8 @@
target. Argument must be one of
,
,
- ,
,
,
- ,
.
@@ -681,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.
@@ -844,26 +844,21 @@
SIGRTMIN+26SIGRTMIN+27SIGRTMIN+28
- SIGRTMIN+29Sets the log level to
- journal-or-kmsg
- (or console on
+ journal-or-kmsg (or
+ console on
SIGRTMIN+27,
kmsg on
- SIGRTMIN+28,
- or syslog-or-kmsg
- on SIGRTMIN+29), as
+ SIGRTMIN+28), as
controlled via
systemd.log_target=journal-or-kmsg
- (or systemd.log_target=console
- on SIGRTMIN+27,
+ (or
+ systemd.log_target=console
+ on SIGRTMIN+27 or
systemd.log_target=kmsg
- on SIGRTMIN+28,
- or
- systemd.log_target=syslog-or-kmsg
- on SIGRTMIN+29) on
- the kernel command
+ on SIGRTMIN+28)
+ on the kernel command
line.
@@ -1132,17 +1127,19 @@
- -bemergency
+ -bBoot 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.
+ rescuesinglesS