summaryrefslogtreecommitdiff
path: root/man/systemd.cgroup.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-19 17:23:10 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-19 17:23:34 +0200
commitdc7adf202b82fc0054c457ce6ca3bcedb88dde57 (patch)
tree15798987b55c806e8be8d6e580657e2926ea80ff /man/systemd.cgroup.xml
parente2f2fb786059fbed410938f16e5cc8b851366b14 (diff)
man: drop the old cgroup settings from the man pages
Diffstat (limited to 'man/systemd.cgroup.xml')
-rw-r--r--man/systemd.cgroup.xml11
1 files changed, 8 insertions, 3 deletions
diff --git a/man/systemd.cgroup.xml b/man/systemd.cgroup.xml
index b93b52ff6d..c2a823eba5 100644
--- a/man/systemd.cgroup.xml
+++ b/man/systemd.cgroup.xml
@@ -309,9 +309,14 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
<listitem>
<para>The name of the slice unit to place the unit
in. Defaults to <filename>system.slice</filename> for all
- unit types, except for slice units themselves. This may be
- used to arrange systemd units in a hierarchy of slices each
- of which might have resource settings applied.</para>
+ non-instantiated units of all unit types (except for slice
+ units themselves see below). Instance units are by default
+ placed in a subslice of <filename>system.slice</filename>
+ that is named after the template name.</para>
+
+ <para>This option may be used to arrange systemd units in a
+ hierarchy of slices each of which might have resource
+ settings applied.</para>
<para>For units of type slice the only accepted value for
this setting is the parent slice. Since the name of a slice