[lxc-devel] [PATCH] doc: Update lxc.cgroup.use in lxc.system.conf(5)
Stéphane Graber
stgraber at ubuntu.com
Thu Aug 27 19:42:47 UTC 2015
On Wed, Aug 19, 2015 at 08:35:36PM +0900, KATOH Yasufumi wrote:
> 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 at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at 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 ae6a2f6..a9c9ef8 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 e7aed7e..65ec5b1 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.2.1
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
--
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20150827/73e184d4/attachment.sig>
More information about the lxc-devel
mailing list