diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.conf.xml | 2 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 19 |
2 files changed, 16 insertions, 5 deletions
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 56490ef442..ba144da8cf 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -81,7 +81,7 @@ <term><varname>ShowStatus=yes</varname></term> <term><varname>SysVConsole=yes</varname></term> <term><varname>CrashChVT=1</varname></term> - <term><varname>DefaultStandardOutput=null</varname></term> + <term><varname>DefaultStandardOutput=journal</varname></term> <term><varname>DefaultStandardError=inherit</varname></term> <listitem><para>Configures various diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 230c4a31f7..c1ab6b9010 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -366,8 +366,10 @@ <option>tty</option>, <option>syslog</option>, <option>kmsg</option>, + <option>journal</option>, + <option>syslog+console</option>, <option>kmsg+console</option>, - <option>syslog+console</option> or + <option>journal+console</option> or <option>socket</option>. If set to <option>inherit</option> the file descriptor of standard input is @@ -392,8 +394,17 @@ service. <option>kmsg</option> connects it with the kernel log buffer which is accessible via - <citerefentry><refentrytitle>dmesg</refentrytitle><manvolnum>1</manvolnum></citerefentry>. <option>syslog+console</option> - and <option>kmsg+console</option> work + <citerefentry><refentrytitle>dmesg</refentrytitle><manvolnum>1</manvolnum></citerefentry>. <option>journal</option> + connects it with the journal which is + accessible via + <citerefentry><refentrytitle>systemd-journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry> + (Note that everything that is written + to syslog or kmsg is implicitly stored + in the journal as well, those options + are hence supersets of this + one). <option>syslog+console</option>, + <option>journal+console</option> and + <option>kmsg+console</option> work similarly but copy the output to the system console as well. <option>socket</option> connects @@ -407,7 +418,7 @@ in <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, which defaults to - <option>syslog</option>.</para></listitem> + <option>journal</option>.</para></listitem> </varlistentry> <varlistentry> <term><varname>StandardError=</varname></term> |