X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.slice.xml;h=4d27ddf890a9b0a7ea540ef7169eac5017d065f1;hb=708c143c7cd2bbd748ac0fa993496ff44e72701c;hp=7ddef85eec8df662362cb650dd0dbe99621b58f3;hpb=847ae0ae7f29e7bfb245d692409fc2948eab7d1d;p=elogind.git
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 7ddef85ee..4d27ddf89 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -58,21 +58,21 @@ along with systemd; If not, see .
.slice encodes information about a slice which
is a concept for hierarchially managing resources of a group of
processes. This management is performed by creating a node in the
- control group tree. Units that manage processes (primarilly scope
- and service units) may be assigned to a specific slice. For each
- slice certain resource limits may the be set, that apply to all
- processes of all units contained in that slice. Slices are
- organized hierarchially in a tree. The name of the slice encodes
- the location in the tree. The name consists of a "-" separated
- series of names, which describes the path to the slice from the
- root slice. The root slice is named,
+ Linux Control Group (cgroup) tree. Units that manage processes
+ (primarilly scope and service units) may be assigned to a specific
+ slice. For each slice, certain resource limits may the be set that
+ apply to all processes of all units contained in that
+ slice. Slices are organized hierarchially in a tree. The name of
+ the slice encodes the location in the tree. The name consists of a
+ dash-separated series of names, which describes the path to the
+ slice from the root slice. The root slice is named,
-.slice. Example:
foo-bar.slice is a slice that is located
within foo.slice, which in turn is located in
the root slice -.slice.
- By default service and scope units are placed in
+ By default, service and scope units are placed in
system.slice, virtual machines and containers
registered with
systemd-machined1
@@ -89,9 +89,9 @@ along with systemd; If not, see .
files. The common configuration items are configured
in the generic [Unit] and [Install] sections. The
slice specific configuration options are configured in
- the [Slice] section. Currently, only generic cgroup settings
+ the [Slice] section. Currently, only generic resource control settings
as described in
- systemd.cgroup7 are allowed.
+ systemd.resource-control7 are allowed.
Unless DefaultDependencies=false
@@ -110,7 +110,7 @@ along with systemd; If not, see .
systemd1,
systemd.unit5,
- systemd.cgroup5,
+ systemd.resource-control5,
systemd.service5,
systemd.scope5,
systemd.special7,