From dea53c2d1522abd4286c51af6f0442f04b72d7e1 Mon Sep 17 00:00:00 2001 From: KATOH Yasufumi 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=UTF-8 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 Acked-by: Stéphane Graber --- 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 ae6a2f6d0b..a9c9ef8d10 100644 --- a/doc/ja/lxc.system.conf.sgml.in +++ b/doc/ja/lxc.system.conf.sgml.in @@ -118,11 +118,10 @@ by KATOH Yasufumi 使用する cgroup コントローラのコンマ区切りのリスト。 - 現時点では、LXC が cgroup の管理を cgmanager 経由で行っている場合、この設定は無視されます。 + 何も指定されていない場合、全ての利用可能なコントローラが使われます。 diff --git a/doc/lxc.system.conf.sgml.in b/doc/lxc.system.conf.sgml.in index e7aed7e1ff..65ec5b17e9 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 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.