shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 11:55:44 +03:00
Code

Merge pull request #12168 from poettering/man-fixes

Browse Source 
three minor tweaks to the man pages
This commit is contained in:
Yu Watanabe 2019-04-02 07:32:40 +09:00 committed by GitHub
commit 1589231365
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
man/systemd.exec.xml
View File

@ -851,40 +851,40 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
<tgroup cols='4'>
<thead>
<row>
<entry>Locations</entry>
<entry>for system</entry>
<entry>for users</entry>
<entry>Environment variable</entry>
<entry>Directory</entry>
<entry>Below path for system units</entry>
<entry>Below path for user units</entry>
<entry>Environment variable set</entry>
</row>
</thead>
<tbody>
<row>
<entry><varname>RuntimeDirectory=</varname></entry>
<entry><filename>/run</filename></entry>
<entry><filename>/run/</filename></entry>
<entry><varname>$XDG_RUNTIME_DIR</varname></entry>
<entry><varname>$RUNTIME_DIRECTORY</varname></entry>
</row>
<row>
<entry><varname>StateDirectory=</varname></entry>
<entry><filename>/var/lib</filename></entry>
<entry><filename>/var/lib/</filename></entry>
<entry><varname>$XDG_CONFIG_HOME</varname></entry>
<entry><varname>$STATE_DIRECTORY</varname></entry>
</row>
<row>
<entry><varname>CacheDirectory=</varname></entry>
<entry><filename>/var/cache</filename></entry>
<entry><filename>/var/cache/</filename></entry>
<entry><varname>$XDG_CACHE_HOME</varname></entry>
<entry><varname>$CACHE_DIRECTORY</varname></entry>
</row>
<row>
<entry><varname>LogsDirectory=</varname></entry>
<entry><filename>/var/log</filename></entry>
<entry><varname>$XDG_CONFIG_HOME</varname><filename>/log</filename></entry>
<entry><filename>/var/log/</filename></entry>
<entry><varname>$XDG_CONFIG_HOME</varname><filename>/log/</filename></entry>
<entry><varname>$LOGS_DIRECTORY</varname></entry>
</row>
<row>
<entry><varname>ConfigurationDirectory=</varname></entry>
<entry><filename>/etc</filename></entry>
<entry><filename>/etc/</filename></entry>
<entry><varname>$XDG_CONFIG_HOME</varname></entry>
<entry><varname>$CONFIGURATION_DIRECTORY</varname></entry>
</row>
@ -892,10 +892,10 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
</tgroup>
</table>
<para>In case of <varname>RuntimeDirectory=</varname> the lowest subdirectories are removed when the unit is
stopped. It is possible to preserve the specified directories in this case if
<varname>RuntimeDirectoryPreserve=</varname> is configured to <option>restart</option> or <option>yes</option>
(see below). The directories specified with <varname>StateDirectory=</varname>,
<para>In case of <varname>RuntimeDirectory=</varname> the innermost subdirectories are removed when
the unit is stopped. It is possible to preserve the specified directories in this case if
<varname>RuntimeDirectoryPreserve=</varname> is configured to <option>restart</option> or
<option>yes</option> (see below). The directories specified with <varname>StateDirectory=</varname>,
<varname>CacheDirectory=</varname>, <varname>LogsDirectory=</varname>,
<varname>ConfigurationDirectory=</varname> are not removed when the unit is stopped.</para>

31
man/systemd.timer.xml
View File

@ -142,12 +142,12 @@
</tgroup>
</table>
<para>Multiple directives may be combined of the same and of
different types. For example, by combining
<varname>OnBootSec=</varname> and
<varname>OnUnitActiveSec=</varname>, it is possible to define
a timer that elapses in regular intervals and activates a
specific service each time.</para>
<para>Multiple directives may be combined of the same and of different types, in which case the timer
unit will trigger whenever any of the specified timer expressions elapse. For example, by combining
<varname>OnBootSec=</varname> and <varname>OnUnitActiveSec=</varname>, it is possible to define a
timer that elapses in regular intervals and activates a specific service each time. Moreover, both
monotonic time expressions and <varname>OnCalendar=</varname> calendar expressions may be combined in
the same timer unit.</para>
<para>The arguments to the directives are time spans
configured in seconds. Example: "OnBootSec=50" means 50s after
@ -162,13 +162,12 @@
and the configured unit is started. This is not the case for
timers defined in the other directives.</para>
<para>These are monotonic timers, independent of wall-clock
time and timezones. If the computer is temporarily suspended,
the monotonic clock stops too.</para>
<para>These are monotonic timers, independent of wall-clock time and timezones. If the computer is
temporarily suspended, the monotonic clock pauses, too.</para>
<para>If the empty string is assigned to any of these options,
the list of timers is reset, and all prior assignments will
have no effect.</para>
<para>If the empty string is assigned to any of these options, the list of timers is reset (both
monotonic timers and <varname>OnCalendar=</varname> timers, see below), and all prior assignments
will have no effect.</para>
<para>Note that timers do not necessarily expire at the
precise time configured with these settings, as they are
@ -192,7 +191,13 @@
the <varname>AccuracySec=</varname> setting
below.</para>
<para>May be specified more than once.</para></listitem>
<para>May be specified more than once, in which case the timer unit will trigger whenever any of the
specified expressions elapse. Moreover calendar timers and monotonic timers (see above) may be
combined within the same timer unit.</para>
<para>If the empty string is assigned to any of these options, the list of timers is reset (both
<varname>OnCalendar=</varname> timers and monotonic timers, see above), and all prior assignments
will have no effect.</para></listitem>
</varlistentry>
<varlistentry>