X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=35644d38a666c68dd1b7c0d37aeabbca1a624e33;hb=20155530437b6b564e60b6b8cf1a69f1bad78c37;hp=00f60667175db2c63938cf05ab0fe6e31e70c249;hpb=742a862bb803641b78a40f6b498486397a321294;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 00f606671..35644d38a 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -75,10 +75,10 @@
inspired by Microsoft Windows
.ini files.
- This man pages lists the common configuration
+ This man page lists the common configuration
options of all the unit types. These options need to
- be configured in the [Unit] resp. [Install]
- section of the unit files.
+ be configured in the [Unit] or [Install]
+ sections of the unit files.In addition to the generic [Unit] and [Install]
sections described here, each unit should have a
@@ -111,7 +111,7 @@
the values are added up. Example: "50" refers to 50
seconds; "2min 200ms" refers to 2 minutes plus 200
milliseconds, i.e. 120200ms. The following time units
- are understood: s, min, h, d, w, ms, us.
+ are understood: s, min, h, d, w, ms, us. For details see systemd.time7.
Empty lines and lines starting with # or ; are
ignored. This may be used for commenting. Lines ending
@@ -273,6 +273,21 @@
User shellThis is the shell of the configured user of the unit, or (if none is set) the user running the systemd instance.
+
+ %m
+ Machine ID
+ The machine ID of the running system, formatted as string. See machine-id5 for more information.
+
+
+ %b
+ Boot ID
+ The boot ID of the running system, formatted as string. See random4 for more information.
+
+
+ %H
+ Host name
+ The host name of the running system.
+
@@ -323,7 +338,15 @@
man:. For more
information about the syntax of these
URIs see
- uri7.
+ uri7. The
+ URIs should be listed in order of
+ relevance, starting with the most
+ relevant. It is a good idea to first
+ reference documentation that explains
+ what the unit's purpose is, followed
+ by how it is configured, followed by
+ any other related
+ documentation.
@@ -403,7 +426,7 @@
Similar to
Requires=
- resp. RequiresOverridable=. However,
+ and RequiresOverridable=, respectively. However,
if a unit listed here is not started
already it will not be started and the
transaction fails
@@ -440,7 +463,7 @@
Configures requirement
dependencies, very similar in style to
Requires=, however
- in addition to this behaviour it also
+ in addition to this behavior it also
declares that this unit is stopped
when any of the units listed suddenly
disappears. Units can suddenly,
@@ -551,7 +574,7 @@
Before=. If two
units have no ordering dependencies
between them they are shut down
- resp. started up simultaneously, and
+ or started up simultaneously, and
no ordering takes
place.
@@ -657,13 +680,13 @@
Takes a boolean
argument. If
this unit can only be activated
- (resp. deactivated) indirectly. In
+ or deactivated indirectly. In
this case explicit start-up
- (resp. termination) requested by the
+ or termination requested by the
user is denied, however if it is
- started (resp. stopped) as a
+ started or stopped as a
dependency of another unit, start-up
- (resp. termination) will succeed. This
+ or termination will succeed. This
is mostly a safety feature to ensure
that the user does not accidentally
activate units that are not intended
@@ -1008,8 +1031,8 @@
Installs a symlink in
the .wants/
- resp. .requires/
- subdirectory for a unit. This has the
+ or .requires/
+ subdirectory for a unit, respectively. This has the
effect that when the listed unit name
is activated the unit listing it is
activated
@@ -1054,6 +1077,7 @@
systemd.path5,
systemd.timer5,
systemd.snapshot5,
+ systemd.time7,
capabilities7