X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=6ea552e8b45868f1f543770bdbf2ef23fa32302d;hb=c2fa048c4a70c8386c6d8fe939e5ea9edecf1e98;hp=644758470611eafe914a3f6bbc220d903cb38c4e;hpb=91acdc17a5b47e775369c6b907601f44fab07dcb;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 644758470..6ea552e8b 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -203,7 +203,12 @@
settings to a unit, without having to modify their
unit files. Make sure that the file that is included
has the appropriate section headers before any
- directive.
+ directive. Note that for instanced units this logic
+ will first look for the instance
+ .d/ subdirectory and read its
+ .conf files, followed by the
+ template .d/ subdirectory and reads
+ its .conf files.
Note that while systemd offers a flexible
dependency system between units it is recommended to
@@ -275,8 +280,10 @@
() and the variable
$SYSTEMD_UNIT_PATH is set, this
contents of this variable overrides the unit load
- path.
-
+ path. If $SYSTEMD_UNIT_PATH ends
+ with an empty component (:), the
+ usual unit load path will be appended to the contents
+ of the variable.
@@ -996,6 +1003,7 @@
virtualization solution, or one of
qemu,
kvm,
+ zvm,
vmware,
microsoft,
oracle,
@@ -1248,9 +1256,10 @@
[Install] Section Options
- Unit file may include a [Install] section, which
- carries installation information for the unit. This
- section is not interpreted by
+ Unit file may include an
+ [Install] section, which carries
+ installation information for the unit. This section is
+ not interpreted by
systemd1
during runtime. It is used exclusively by the
enable and
@@ -1262,7 +1271,7 @@
Alias=
- A space-seperated list
+ A space-separated list
of additional names this unit shall be
installed under. The names listed here
must have the same suffix (i.e. type)
@@ -1495,7 +1504,7 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.special7,
systemd.service5,
systemd.socket5,
@@ -1510,6 +1519,7 @@
systemd.scope5,
systemd.slice5,
systemd.time7,
+ systemd-verify1,
capabilities7,
systemd.directives7,
uname1