From: KATOH Yasufumi <karma@jazz.email.ne.jp>
Date: Fri, 6 Oct 2017 10:40:53 +0000 (+0900)
Subject: doc: Update lxc.{execute,init}.cmd in lxc.container.conf(5)
X-Git-Tag: lxc-3.0.0.beta1~221^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1846%2Fhead;p=thirdparty%2Flxc.git

doc: Update lxc.{execute,init}.cmd in lxc.container.conf(5)

* Add lxc.execute.cmd to Japanese lxc.container.conf(5)
* Tweak the description of the "INIT COMMAND" section and lxc.init.cmd
  in en and ja man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
---

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index a82fc93db..525e2d551 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -337,15 +337,25 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       <para>
         <!--
         Sets the command to use as the init system for the containers.
-
-        This option is ignored when using lxc-execute.
-
-        Defaults to: /sbin/init
           -->
         コンテナの init として使うコマンドを設定します。
-        このオプションは lxc-execute では無視されます。
-        デフォルトは /sbin/init です。
       </para>
+      <variablelist>
+        <varlistentry>
+          <term>
+            <option>lxc.execute.cmd</option>
+          </term>
+          <listitem>
+            <para>
+	      <!--
+              Absolute path from container rootfs to the binary to run by default.  This
+	      mostly makes sense for lxc-execute.
+	      -->
+	      デフォルトで実行するバイナリのコンテナの root からの絶対パスを指定します。これは <command>lxc-execute</command> のための設定です。
+            </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
       <variablelist>
         <varlistentry>
           <term>
@@ -354,9 +364,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
           <listitem>
             <para>
               <!--
-                  Absolute path from container rootfs to the binary to use as init.
+                  Absolute path from container rootfs to the binary to use as init. This
+		  mostly makes sense for lxc-start. Default is /sbin/init.
                 -->
-              init として使うバイナリの、コンテナの rootfs からの絶対パスを指定します。
+              init として使うバイナリの、コンテナの root からの絶対パスを指定します。これは <command>lxc-start</command> のための設定です。デフォルトは <command>/sbin/init</command> です。
             </para>
           </listitem>
         </varlistentry>
diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 3f05e52b6..059942bc9 100644
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -255,10 +255,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       <title>Init command</title>
       <para>
         Sets the command to use as the init system for the containers.
-
-        This option is ignored when using lxc-execute.
-
-        Defaults to: /sbin/init
       </para>
       <variablelist>
         <varlistentry>
@@ -268,7 +264,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
           <listitem>
             <para>
               Absolute path from container rootfs to the binary to run by default.  This
-	      mostly makes sense for lxc-execute.
+	      mostly makes sense for <command>lxc-execute</command>.
             </para>
           </listitem>
         </varlistentry>
@@ -280,7 +276,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
           </term>
           <listitem>
             <para>
-              Absolute path from container rootfs to the binary to use as init.
+              Absolute path from container rootfs to the binary to use as init. This
+	      mostly makes sense for <command>lxc-start</command>. Default is <command>/sbin/init</command>.
             </para>
           </listitem>
         </varlistentry>