From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 1 Aug 2016 01:14:26 +0000 (-0400)
Subject: Merge pull request #3843 from maxime1986/minor-systemd.resource-control
X-Git-Tag: v232~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d5299ef5a5bedb8921275741d6cbdcc04d69286;p=thirdparty%2Fsystemd.git

Merge pull request #3843 from maxime1986/minor-systemd.resource-control
---

0d5299ef5a5bedb8921275741d6cbdcc04d69286
diff --cc man/systemd.resource-control.xml
index bf44a683451,cb8c896e5ce..0e98ca78b8f
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@@ -126,6 -127,13 +127,13 @@@
      settings of a unit for a given resource type are for the other hierarchy type, the settings are translated and
      applied. If there are any valid settings for the hierarchy in use, all translations are disabled for the resource
      type. Mixing the two types of settings on a unit can lead to confusing results.</para>
+ 
+     <para>Legacy control group hierarchy (see <ulink
+     url="https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt">cgroups.txt</ulink>), also called cgroup-v1,
 -    doesn't allow safe delegation of controllers to unprivileged processes. If the system use legacy control group
++    doesn't allow safe delegation of controllers to unprivileged processes. If the system uses the legacy control group
+     hierarchy, resource control is disabled for systemd user instance, see
+     <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+     </para>
    </refsect1>
  
    <refsect1>