From de6c78f8795743894431a099d26ec562a8acf3df Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 30 Aug 2011 22:57:55 +0200
Subject: service: change default stdout/stderr to syslog

---
 man/systemd.exec.xml | 15 ++++++++++++---
 man/systemd.xml      |  7 ++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'man')

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index c7da8e312e..609484b3a3 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -396,8 +396,13 @@
                                 socket activation, semantics are
                                 similar to the respective option of
                                 <varname>StandardInput=</varname>.
-                                This setting defaults to
-                                <option>inherit</option>.</para></listitem>
+                                This setting defaults to the value set
+                                with
+                                <option>DefaultStandardOutput=</option>
+                                in
+                                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                                which defaults to
+                                <option>syslog</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><varname>StandardError=</varname></term>
@@ -411,7 +416,11 @@
                                 <option>inherit</option> the file
                                 descriptor used for standard output is
                                 duplicated for standard error. This
-                                setting defaults to
+                                setting defaults to the value set with
+                                <option>DefaultStandardError=</option>
+                                in
+                                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                                which defaults to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
diff --git a/man/systemd.xml b/man/systemd.xml
index d66b23027a..a11c96e7f1 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -270,7 +270,12 @@
                                 <option>syslog+console</option>,
                                 <option>kmsg</option>,
                                 <option>kmsg+console</option>.  If the
-                                argument is omitted it defaults to
+                                argument is omitted
+                                <option>--default-standard-output=</option>
+                                defaults to <option>syslog</option>
+                                and
+                                <option>--default-standard-error=</option>
+                                to
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                 </variablelist>
-- 
cgit v1.2.3-54-g00ecf