Merge pull request #2101 from tenforward/japanese

doc: Update Japanese lxc-attach(1) and lxc.container.conf(5)

diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in
index f04ee021b7cd3a3856eb4780ba2a16aa357204f8..19ccfb8aa406d9312c23b2030c23230bf1960c71 100644 (file)
--- a/doc/ja/lxc-attach.sgml.in
+++ b/doc/ja/lxc-attach.sgml.in
@@ -63,7 +63,6 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       <arg choice="opt">-R, --remount-sys-proc</arg>
       <arg choice="opt">--keep-env</arg>
       <arg choice="opt">--clear-env</arg>
-      <arg choice="opt">-L, --pty-log <replaceable>file</replaceable></arg>
       <arg choice="opt">-v, --set-var <replaceable>variable</replaceable></arg>
       <arg choice="opt">--keep-var <replaceable>variable</replaceable></arg>
       <arg choice="opt">-- <replaceable>command</replaceable></arg>
@@ -338,28 +337,6 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
        </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term>
-          <option>-L, --pty-log <replaceable>file</replaceable></option>
-        </term>
-        <listitem>
-          <para>
-            <!--
-            Specify a file where the output of <command>lxc-attach</command> will be
-            logged.
-              -->
-            <command>lxc-attach</command> の出力を記録するファイルを指定します。
-          </para>
-          <para>
-            <!--
-            <emphasis>Important:</emphasis>  When a standard file descriptor
-            does not refer to a pty output produced on it will not be logged.
-            -->
-            <emphasis>重要:</emphasis> 標準ファイルディスクリプタが pty を参照していない場合、それらに対する出力は記録されないでしょう。
-          </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
        <term>
          <option>-v, --set-var <replaceable>variable</replaceable></option>

diff --git a/doc/ja/lxc.container.conf.sgml.in b/doc/ja/lxc.container.conf.sgml.in
index 8f71a73fb3ee1c21b5641174cea8c3df98f7095b..26e64baa7ab661642c81ca00caf3a27f10a01d16 100644 (file)
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -2877,7 +2877,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         </varlistentry>
         <varlistentry>
           <term>
-            <option>lxc.log</option>
+            <option>lxc.log.file</option>
           </term>
           <listitem>
             <para>