From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Tue, 23 Sep 2014 13:36:03 +0000 (+0900)
Subject: doc: Add description about ignoring lxc.cgroup.use when using cgmanager
X-Git-Tag: lxc-1.1.0.alpha2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58575f74843284077c622d46747adf8ad13ebba;p=thirdparty%2Flxc.git

doc: Add description about ignoring lxc.cgroup.use when using cgmanager

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/doc/ja/lxc.system.conf.sgml.in b/doc/ja/lxc.system.conf.sgml.in
index 9ef669d5b..c34af93b6 100644
--- a/doc/ja/lxc.system.conf.sgml.in
+++ b/doc/ja/lxc.system.conf.sgml.in
@@ -118,8 +118,11 @@ 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.
               -->
               使用する cgroup コントローラのコンマ区切りのリスト。
+              現時点では、LXC が cgroup の管理を cgmanager 経由で行っている場合、この設定は無視されます。
             </para>
           </listitem>
         </varlistentry>
diff --git a/doc/lxc.system.conf.sgml.in b/doc/lxc.system.conf.sgml.in
index 039c3db54..e7aed7e1f 100644
--- a/doc/lxc.system.conf.sgml.in
+++ b/doc/lxc.system.conf.sgml.in
@@ -98,6 +98,8 @@ 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.
             </para>
           </listitem>
         </varlistentry>