X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.slice.xml;h=4d27ddf890a9b0a7ea540ef7169eac5017d065f1;hp=7ddef85eec8df662362cb650dd0dbe99621b58f3;hb=1b9e5b126359a2a2ec37de1f94f046093abc74b8;hpb=847ae0ae7f29e7bfb245d692409fc2948eab7d1d

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 <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 "-" 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
     the root slice <filename>-.slice</filename>.
     </para>
 
-    <para>By default service and scope units are placed in
+    <para>By default, service and scope units are placed in
     <filename>system.slice</filename>, virtual machines and containers
     registered with
     <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -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>,