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 9ef669d5b3b1233640f351a0d350b79c5b10886c..c34af93b6c7ca57c4bf3044ccdd995e5c82c5d5d 100644 (file)
--- 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 039c3db544fe1afe60afb1354f5ed698ba18f526..e7aed7e1ffbb278441c61e22fc1ecfb0251523b8 100644 (file)
--- 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>