summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/sd-daemon.xml8
-rw-r--r--man/systemd.xml23
2 files changed, 13 insertions, 18 deletions
diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml
index 374dac63f5..d78a1151c5 100644
--- a/man/sd-daemon.xml
+++ b/man/sd-daemon.xml
@@ -98,9 +98,11 @@
<para>These prefixes are intended to be used in
conjunction with stderr-based logging as implemented
by systemd. If a systemd service definition file is
- configured with <varname>StandardError=syslog</varname>
- or <varname>StandardError=kmsg</varname>, these
- prefixes can be used to encode a log level in lines
+ configured with
+ <varname>StandardError=journal</varname>,
+ <varname>StandardError=syslog</varname> or
+ <varname>StandardError=kmsg</varname>, these prefixes
+ can be used to encode a log level in lines
printed. This is similar to the kernel
<function>printk()</function>-style logging. See
<citerefentry><refentrytitle>klogctl</refentrytitle><manvolnum>2</manvolnum></citerefentry>
diff --git a/man/systemd.xml b/man/systemd.xml
index bcbfa02ba1..0d017575b6 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -180,10 +180,8 @@
target. Argument must be one of
<option>console</option>,
<option>journal</option>,
- <option>syslog</option>,
<option>kmsg</option>,
<option>journal-or-kmsg</option>,
- <option>syslog-or-kmsg</option>,
<option>null</option>.</para></listitem>
</varlistentry>
<varlistentry>
@@ -844,26 +842,21 @@
<term><constant>SIGRTMIN+26</constant></term>
<term><constant>SIGRTMIN+27</constant></term>
<term><constant>SIGRTMIN+28</constant></term>
- <term><constant>SIGRTMIN+29</constant></term>
<listitem><para>Sets the log level to
- <literal>journal-or-kmsg</literal>
- (or <literal>console</literal> on
+ <literal>journal-or-kmsg</literal> (or
+ <literal>console</literal> on
<constant>SIGRTMIN+27</constant>,
<literal>kmsg</literal> on
- <constant>SIGRTMIN+28</constant>,
- or <literal>syslog-or-kmsg</literal>
- on <constant>SIGRTMIN+29</constant>), as
+ <constant>SIGRTMIN+28</constant>), as
controlled via
<varname>systemd.log_target=journal-or-kmsg</varname>
- (or <varname>systemd.log_target=console</varname>
- on <constant>SIGRTMIN+27</constant>,
+ (or
+ <varname>systemd.log_target=console</varname>
+ on <constant>SIGRTMIN+27</constant> or
<varname>systemd.log_target=kmsg</varname>
- on <constant>SIGRTMIN+28</constant>,
- or
- <varname>systemd.log_target=syslog-or-kmsg</varname>
- on <constant>SIGRTMIN+29</constant>) on
- the kernel command
+ on <constant>SIGRTMIN+28</constant>)
+ on the kernel command
line.</para></listitem>
</varlistentry>
</variablelist>