From 2d8632d5b75ce1e4b24f5714b9ec817a845881cf Mon Sep 17 00:00:00 2001
From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Wed, 19 Aug 2015 20:35:36 +0900
Subject: [PATCH] doc: Update lxc.cgroup.use in lxc.system.conf(5)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

LXC now uses lxc.cgroup.use even when cgmanager is used.
So remove the description for the case of using cgmanager.
And add the case of not specifying it.
This commit only updates en and ja man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---
 doc/ja/lxc.system.conf.sgml.in | 5 ++---
 doc/lxc.system.conf.sgml.in    | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/doc/ja/lxc.system.conf.sgml.in b/doc/ja/lxc.system.conf.sgml.in
index ae6a2f6d0..a9c9ef8d1 100644
--- a/doc/ja/lxc.system.conf.sgml.in
+++ b/doc/ja/lxc.system.conf.sgml.in
@@ -118,11 +118,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
             <para>
               <!--
               Comma separated list of cgroup controllers to setup.
-              Currently this configration will be ignored when LXC
-              uses cgmanager to manage cgroups.
+              If none is specified, all available controllers will be used.
               -->
               使用する cgroup コントローラのコンマ区切りのリスト。
-              現時点では、LXC が cgroup の管理を cgmanager 経由で行っている場合、この設定は無視されます。
+              何も指定されていない場合、全ての利用可能なコントローラが使われます。
             </para>
           </listitem>
         </varlistentry>
diff --git a/doc/lxc.system.conf.sgml.in b/doc/lxc.system.conf.sgml.in
index e7aed7e1f..65ec5b17e 100644
--- a/doc/lxc.system.conf.sgml.in
+++ b/doc/lxc.system.conf.sgml.in
@@ -98,8 +98,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
           <listitem>
             <para>
               Comma separated list of cgroup controllers to setup.
-              Currently this configration will be ignored when LXC
-              uses cgmanager to manage cgroups.
+              If none is specified, all available controllers will be used.
             </para>
           </listitem>
         </varlistentry>
-- 
2.47.2