X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=2a965f5a1ca57520aeabcd20a4f2bc61d95839fc;hb=892213bf1fd23e48d64a407ece6e10b07bef1926;hp=6a065d2d7a6e52c3cd5b1db3ccb5bb074e7e0813;hpb=2cfbd749af308bdbe56edcfed7f3eea0fc2b93d2;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 6a065d2d7..2a965f5a1 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -232,7 +232,7 @@
multiple units from a single configuration file. If
systemd looks for a unit configuration file, it will
first search for the literal unit name in the
- filesystem. If that yields no success and the unit
+ file system. If that yields no success and the unit
name contains an @ character, systemd will look for a
unit template that shares the same name but with the
instance string (i.e. the part between the @ character
@@ -403,7 +403,7 @@
what the unit's purpose is, followed
by how it is configured, followed by
any other related documentation. This
- option may be specified more than once
+ 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
@@ -492,7 +492,7 @@
Requires= and
RequiresOverridable=,
respectively. However, if the units
- listed here are not started already
+ listed here are not started already,
they will not be started and the
transaction will fail immediately.
@@ -506,7 +506,7 @@
listed in this option will be started
if the configuring unit is. However,
if the listed units fail to start
- or cannot be added to the transaction
+ or cannot be added to the transaction,
this has no impact on the validity of
the transaction as a whole. This is
the recommended way to hook start-up
@@ -519,7 +519,7 @@
symlinks to a
.wants/ directory
accompanying the unit file. For
- details see above.
+ details, see above.
@@ -528,7 +528,7 @@
Configures requirement
dependencies, very similar in style to
Requires=, however
- in addition to this behavior 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,
@@ -548,7 +548,7 @@
of units. When systemd stops or restarts
the units listed here, the action is
propagated to this unit.
- Note that this is a one way dependency â
+ Note that this is a one-way dependency â
changes to this unit do not affect the
listed units.
@@ -577,9 +577,9 @@
be modified to be fixed (in case one
or both jobs are not a required part
of the transaction). In the latter
- case the job that is not the required
+ case, the job that is not the required
will be removed, or in case both are
- not required the unit that conflicts
+ not required, the unit that conflicts
will be started and the unit that is
conflicted is
stopped.
@@ -606,7 +606,7 @@
a common pattern to include a unit
name in both the
After= and
- Requires= option in
+ Requires= option, in
which case the unit listed will be
started before the unit that is
configured with these options. This
@@ -634,7 +634,7 @@
dependency on another unit is shut
down while the latter is started up,
the shut down is ordered before the
- start-up regardless whether the
+ start-up regardless of whether the
ordering dependency is actually of
type After= or
Before=. If two
@@ -686,13 +686,13 @@
directives (see
systemd.exec5
for details). If a unit that has this
- setting set is started its processes
+ setting set is started, its processes
will see the same
/tmp,
/tmp/var and
network namespace as one listed unit
that is started. If multiple listed
- units are already started it is not
+ units are already started, it is not
defined which namespace is
joined. Note that this setting only
has an effect if
@@ -979,7 +979,7 @@
exists, is a regular file and marked
executable.
- Similar,
+ Similarly,
ConditionKernelCommandLine=
may be used to check whether a
specific kernel command line option is
@@ -1270,7 +1270,7 @@
%p
Prefix name
- For instantiated units this refers to the string before the @ character of the unit name. For non-instantiated units this refers to the name of the unit with the type suffix removed.
+ For instantiated units, this refers to the string before the @ character of the unit name. For non-instantiated units, this refers to the name of the unit with the type suffix removed.
%P
@@ -1304,7 +1304,7 @@
%R
- Root control group path where slices and units are placed below
+ Root control group path below which slices and units are placed
For system instances, this resolves to /, except in containers, where this maps to the container's root control group path.
@@ -1325,12 +1325,12 @@
%h
User home directory
- This is the home directory of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to %U this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.
+ This is the home directory of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to %U, this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.
%s
User shell
- This is the shell of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to %U this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.
+ This is the shell of the configured user of the unit, or (if none is set) the user running the systemd user instance. Similar to %U, this specifier is not available for units run by the systemd system instance, unless the configured user is the root user.
%m