summaryrefslogtreecommitdiff
path: root/man/systemd.exec.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-29 09:16:45 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-29 09:16:45 -0400
commit3e39355a96f615f2cb1e805c7d74efbc272de1cd (patch)
treea31b20b819e007d959db412c8d18ee1bf37bed8d /man/systemd.exec.xml
parent427a28ecbe0eb170e651e0530ab58d6e6f6c498c (diff)
parent1fcefd8815455e416c1eda3c8c1220831a2f82e9 (diff)
Merge pull request #3126 from poettering/small-fixes
fsync directory when creating or rotating journal files and other small fixes, most importantly for the DHCP DUID code.
Diffstat (limited to 'man/systemd.exec.xml')
-rw-r--r--man/systemd.exec.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index fea42ebd31..2d0fb63f1d 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -94,10 +94,9 @@
required to access <filename>/tmp</filename> and
<filename>/var/tmp</filename>.</para>
- <para>Units whose output standard output or error output is connected to <option>journal</option>,
- <option>syslog</option> or <option>kmsg</option> (or their combinations with console output, see below)
- automatically acquire dependencies of type <varname>After=</varname> on
- <filename>systemd-journald.socket</filename>.</para>
+ <para>Units whose standard output or error output is connected to <option>journal</option>, <option>syslog</option>
+ or <option>kmsg</option> (or their combinations with console output, see below) automatically acquire dependencies
+ of type <varname>After=</varname> on <filename>systemd-journald.socket</filename>.</para>
</refsect1>
<refsect1>
@@ -469,8 +468,8 @@
similar to the same option of
<varname>StandardInput=</varname>.</para>
- <para>If the standard output (or error output, see below) of a unit is connected with the journal, syslog or
- the kernel log buffer the unit will implicitly gain a dependency of type <varname>After=</varname> on
+ <para>If the standard output (or error output, see below) of a unit is connected to the journal, syslog or the
+ kernel log buffer, the unit will implicitly gain a dependency of type <varname>After=</varname> on
<filename>systemd-journald.socket</filename> (also see the automatic dependencies section above).</para>
<para>This setting defaults to the value set with