From: Max Gautier <mg@max.gautier.name>
Date: Sat, 30 Jul 2022 06:46:27 +0000 (+0200)
Subject: docs: Correct StandartOutput documentation
X-Git-Tag: v252-rc1~558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a12b96344b1d7ee499df1d0447b14ced62c1b4;p=thirdparty%2Fsystemd.git

docs: Correct StandartOutput documentation

fix #2114
---

diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 3e61e0fc5ef..f90a1e25d0d 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -2792,7 +2792,11 @@ SystemCallErrorNumber=EPERM</programlisting>
         writing text to stderr will not work. To mitigate this use the construct <command>echo "hello"
         >&amp;2</command> instead, which is mostly equivalent and avoids this pitfall.</para>
 
-        <para>This setting defaults to the value set with <varname>DefaultStandardOutput=</varname> in
+        <para>If <varname>StandardInput=</varname> is set to one of <option>tty</option>, <option>tty-force</option>,
+        <option>tty-fail</option>, <option>socket</option>, or <option>fd:<replaceable>name</replaceable></option>, this
+        setting defaults to <option>inherit</option>.</para>
+
+        <para>In other cases, this setting defaults to the value set with <varname>DefaultStandardOutput=</varname> in
         <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, which
         defaults to <option>journal</option>. Note that setting this parameter might result in additional dependencies
         to be added to the unit (see above).</para></listitem>