From 65c1cdb282d33f72d2c247dfe13dd7c8baa8f302 Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <maxime.deroucy@gmail.com>
Date: Sun, 31 Jul 2016 14:38:56 +0200
Subject: documentation: add cgroup-v2.txt link

add cgroup-v2.txt link in section "Unified and Legacy Control Group
Hierarchies" of systemd.resource-control man.
---
 man/systemd.resource-control.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'man')

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index bf44a68345..76f3370b53 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -99,9 +99,10 @@
   <refsect1>
     <title>Unified and Legacy Control Group Hierarchies</title>
 
-    <para>The unified control group hierarchy is the new version of kernel control group interface. Depending on the
-    resource type, there are differences in resource control capabilities.  Also, because of interface changes, some
-    resource types have a separate set of options on the unified hierarchy.</para>
+    <para>The unified control group hierarchy is the new version of kernel control group interface, see <ulink
+    url="https://www.kernel.org/doc/Documentation/cgroup-v2.txt">cgroup-v2.txt</ulink>. Depending on the resource type,
+    there are differences in resource control capabilities.  Also, because of interface changes, some resource types
+    have separate set of options on the unified hierarchy.</para>
 
     <para>
       <variablelist>
-- 
cgit v1.2.3-54-g00ecf


From c23b2c70bf65d3fdf869c60eee4072b1d4e5905b Mon Sep 17 00:00:00 2001
From: Maxime de Roucy <maxime.deroucy@gmail.com>
Date: Sun, 31 Jul 2016 14:43:23 +0200
Subject: documentation: cgroup-v1 and systemd user instance

Explain in the systemd.resource-control man that systemd user instance can't use resource control on
cgroup-v1.
---
 man/systemd.resource-control.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'man')

diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 76f3370b53..cb8c896e5c 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -127,6 +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
+    hierarchy, resource control is disabled for systemd user instance, see
+    <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+    </para>
   </refsect1>
 
   <refsect1>
-- 
cgit v1.2.3-54-g00ecf