X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=7c3a6c75f84cd6305949777a15e3b73bf26a7a6e;hp=bba0f5d29f0d0c88df81d7c62e6a252855477eb9;hb=4f19b1df41b9a1971989ffd858d0a2f6977b01c8;hpb=8afbb8e1180dce3cb33a14fc3ec5afcf501104e6
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index bba0f5d29..7c3a6c75f 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -159,11 +159,10 @@
Note that while systemd offers a flexible
dependency system between units it is recommended to
- use this functionality only sparsely and instead rely
+ use this functionality only sparingly and instead rely
on techniques such as bus-based or socket-based
- activation which makes dependencies implicit, which
- both results in a simpler and more flexible
- system.
+ activation which make dependencies implicit, resulting
+ in a both simpler and more flexible system.
Some unit names reflect paths existing in the
file system name space. Example: a device unit
@@ -222,7 +221,7 @@
carries generic information about the unit that is not
dependent on the type of unit:
-
+
Description=
@@ -254,8 +253,13 @@
reference documentation that explains
what the unit's purpose is, followed
by how it is configured, followed by
- any other related
- documentation.
+ any other related documentation. This
+ option may be specified more than once
+ in which case the specified list of
+ URIs is merged. If the empty string is
+ assigned to this option the list is
+ reset and all prior assignments will
+ have no effect.
@@ -907,8 +911,12 @@
pipe symbol must be passed first, the
exclamation second. Except for
ConditionPathIsSymbolicLink=,
- all path checks follow
- symlinks.
+ all path checks follow symlinks. If
+ any of these options is assigned the
+ empty string the list of conditions is
+ reset completely, all previous
+ condition settings (of any kind) will
+ have no effect.
@@ -935,7 +943,7 @@
systemctl1
tool during installation of a unit:
-
+
Alias=
@@ -986,6 +994,10 @@
+ The following specifiers are interpreted in the
+ Install section: %n, %N, %p, %i, %U, %u, %m, %H, %b.
+ For their meaning see the next section.
+
@@ -1123,7 +1135,8 @@
systemd.timer5,
systemd.snapshot5,
systemd.time7,
- capabilities7
+ capabilities7,
+ systemd.directives7