summaryrefslogtreecommitdiff
path: root/man/systemd.slice.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-09-27 00:05:07 +0200
committerLennart Poettering <lennart@poettering.net>2013-09-27 00:05:07 +0200
commit3fde5f30bda2a70d97f3dc8fa918e42e1c07cc2c (patch)
tree4ac0862136a2cb287497c2459bb44610ac71abda /man/systemd.slice.xml
parent7ac807320a7416463d7ff3ef6ede574863a601c5 (diff)
downloadsystemd-3fde5f30bda2a70d97f3dc8fa918e42e1c07cc2c.tar.gz
man: drop references to "cgroup" wher appropriate
Since cgroups are mostly now an implementation detail of systemd lets deemphasize it a bit in the man pages. This renames systemd.cgroup(5) to systemd.resource-control(5) and uses the term "resource control" rather than "cgroup" where appropriate. This leaves the word "cgroup" in at a couple of places though, like for example systemd-cgtop and systemd-cgls where cgroup stuff is at the core of what is happening.
Diffstat (limited to 'man/systemd.slice.xml')
-rw-r--r--man/systemd.slice.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index b7b0622d3c..4d27ddf890 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -58,14 +58,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<literal>.slice</literal> 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 dash-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,
<filename>-.slice</filename>. Example:
<filename>foo-bar.slice</filename> is a slice that is located
within <filename>foo.slice</filename>, which in turn is located in
@@ -89,9 +89,9 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
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
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>7</manvolnum></citerefentry> are allowed.
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>7</manvolnum></citerefentry> are allowed.
</para>
<para>Unless <varname>DefaultDependencies=false</varname>
@@ -110,7 +110,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
- <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,