doc: Update Japanese man pages translation

doc/ja/common_options.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/legacy/lxc-ls.sgml.in

-
 <!--
 
 lxc: linux Container library
@@ -20,9 +19,9 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-Translated into Japanese 
+Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
 -->

doc/ja/lxc-attach.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-cgroup.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-checkconfig.sgml.in

@@ -17,7 +17,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-checkpoint.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-console.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -94,6 +94,15 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
     <para>
       <!--
+      A <replaceable>ttynum</replaceable> of 0 may be given to attach
+      to the container's /dev/console instead of its
+      dev/tty&lt;<replaceable>ttynum</replaceable>&gt;.
+      -->
+      <replaceable>ttynum</replaceable> を 0 に設定すると，dev/tty&lt;<replaceable>ttynum</replaceable>&gt;の代わりにコンテナの /dev/console に接続します．
+    </para>
+
+    <para>
+      <!--
       A keyboard escape sequence may be used to disconnect from the tty
       and quit lxc-console. The default escape sequence is &lt;Ctrl+a q&gt;.
       -->
@@ -129,10 +138,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	<listitem>
 	  <para>
             <!--
-	    Specify the tty number to connect, if not specified a tty
-	    number will be automatically choosen by the container.
+            Specify the tty number to connect to or 0 for the console. If not
+	    specified the next available tty number will be automatically
+	    choosen by the container.
             -->
-            接続する tty の番号を指定します．指定しない場合は，コンテナが自動的に tty 番号を選択します．
+            接続する tty の番号か，コンソールに接続するために 0 を指定します．指定しない場合は，次に利用可能な tty 番号を自動的にコンテナが選択します．
 	  </para>
 	</listitem>
       </varlistentry>

doc/ja/lxc-create.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -150,16 +150,18 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	<listitem>
           <para>
             <!--
-	    'backingstore' is one of 'none', 'dir', 'lvm', or 'btrfs'.  The
+	    'backingstore' is one of 'none', 'dir', 'lvm', 'loop', or 'btrfs'.  The
 	    default is 'none', meaning that the container root filesystem
 	    will be a directory under <filename>@LXCPATH@/container/rootfs</filename>.
 	    'dir' has the same meaning as 'none', but also allows the optional
 	    <replaceable>&#045;&#045;dir ROOTFS</replaceable> to be specified, meaning
 	    that the container rootfs should be placed under the specified path,
-	    rather than the default.
-	    The option 'btrfs' need not be specified as it will be used
-	    automatically if the <filename>@LXCPATH@</filename> filesystem is found to
-	    be btrfs.  If backingstore is 'lvm', then an lvm block device will be
+	    rather than the default.  If 'btrfs' is specified, then the
+	    target filesystem must be btrfs, and the container rootfs will be
+	    created as a new subvolume.  This allows snapshotted clones to be
+	    created, but also causes rsync &#045;&#045;one-filesystem to treat it as a
+	    separate filesystem.
+	    If backingstore is 'lvm', then an lvm block device will be
 	    used and the following further options are available:
             <replaceable>&#045;&#045;lvname lvname1</replaceable> will create an LV
 	    named <filename>lvname1</filename> rather than the default, which
@@ -172,8 +174,8 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	    filesystem) of size SIZE rather than the default, which is 1G.
             -->
             <replaceable>backingstore</replaceable> には 'none' か 'dir' か 'lvm' か 'btrfs' のいずれかを指定します．デフォルトは 'none' で，コンテナのルートファイルシステムが <filename>@LXCPATH@/container/rootfs</filename> 以下のディレクトリであることを意味します．
-'dir' は 'none' と同じ意味ですが，オプションとして <replaceable>--dir ROOTFS</replaceable> を指定することも可能です．このオプションは，デフォルトの代わりに特定のパス以下にコンテナの rootfs を置くということになります．
-            'btrfs' オプションは，もし <filename>@LXCPATH@</filename> のファイルシステムが btrfs であることがわかれば，自動的にこの値が使われますので指定する必要はありません．もし backingstore が 'lvm' である場合，lvm ブロックデバイスを使用します．この時，以下のオプションが有効になります: <replaceable>--lvname lvname1</replaceable> はデフォルト値のコンテナ名の LV の代わりに <filename>lvname1</filename> という名前の LV を作成します．<replaceable>--vgname vgname1</replaceable> は，デフォルト値である <filename>lxc</filename> という volume group の代わりに <filename>vgname1</filename> という名前の volume group 内に LV を作成します．<replaceable>--fstype FSTYPE</replaceable> は LV 上のファイルシステムをデフォルト値である ext4 の代わりに FSTYPE で指定したもので作成します．<replaceable>--fssize SIZE</replaceable> はデフォルト値である 1G の代わりに SIZE で指定したサイズで LV を作成します．
+'dir' は 'none' と同じ意味ですが，オプションとして <replaceable>--dir ROOTFS</replaceable> を指定することも可能です．このオプションは，デフォルトの代わりに特定のパス以下にコンテナの rootfs を置くということになります．'btrfs' が指定された場合，ターゲットのファイルシステムは btrfs でなければいけません．そして，コンテナの rootfs は新しい subvolume として作製されます．このことにより，スナップショットによるクローンが作製可能になりますが，rsync --one-filesystem が，別々のファイルシステムとして取り扱ってしまうことも引き起こします．
+backingstore が 'lvm' である場合，lvm ブロックデバイスを使用します．この時，以下のオプションが有効になります: <replaceable>--lvname lvname1</replaceable> はデフォルト値のコンテナ名の LV の代わりに <filename>lvname1</filename> という名前の LV を作成します．<replaceable>--vgname vgname1</replaceable> は，デフォルト値である <filename>lxc</filename> という volume group の代わりに <filename>vgname1</filename> という名前の volume group 内に LV を作成します．<replaceable>--fstype FSTYPE</replaceable> は LV 上のファイルシステムをデフォルト値である ext4 の代わりに FSTYPE で指定したもので作成します．<replaceable>--fssize SIZE</replaceable> はデフォルト値である 1G の代わりに SIZE で指定したサイズで LV を作成します．
 	  </para>
 	</listitem>
       </varlistentry>

doc/ja/lxc-destroy.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-device.sgml.in

+
 <!--
 
 (C) Copyright Canonical Ltd. 2013
@@ -17,7 +18,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -43,7 +44,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
     <refpurpose>
       <!--
-      manage deices of running containers
+      manage devices of running containers
       -->
       実行中のコンテナのデバイスを管理する
     </refpurpose>

doc/ja/lxc-execute.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -163,17 +163,17 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
             <!--
 	    Signal the end of options and disables further option
 	    processing. Any arguments after the &#045;&#045; are treated as
-	    arguments.
+	    arguments to <replaceable>command</replaceable>.
             -->
-            オプション指定の最後の印で，それ以上のオプションの処理を止めます．-- の後の引数は実行するコマンドとその引数として扱われます．
+            オプション指定の最後の印で，それ以上のオプションの処理を止めます．-- の後の引数は実行する <replaceable>command</replaceable> の引数として扱われます．
 	  </para>
 	  <para>
             <!--
-	    This option is useful when you want to execute, with the
-	    command <command>lxc-execute</command>, a command line
-	    with its own options.
+	    This option is useful when you want specify options
+	    to <replaceable>command</replaceable> and don't want
+	    <command>lxc-execute</command> to interpret them.
             -->
-            このオプションは，<command>lxc-execute</command> で実行するコマンドが，コマンドラインオプションを持つ場合に役に立ちます．
+            このオプションは，<replaceable>command</replaceable> にオプションを指定したいときに，<command>lxc-execute</command> がそのオプションを読み取ってほしくないときに役に立ちます．
 	  </para>
 	</listitem>
       </varlistentry>

doc/ja/lxc-freeze.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-info.sgml.in

@@ -17,7 +17,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -54,9 +54,10 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     <cmdsynopsis>
       <command>lxc-info</command>
       <arg choice="req">-n <replaceable>name</replaceable></arg>
-      <arg choice="req">-s</arg>
-      <arg choice="req">-p</arg>
-      <arg choice="req">-t <replaceable>state</replaceable></arg>
+      <arg choice="opt">-c <replaceable>KEY</replaceable></arg>
+      <arg choice="opt">-s</arg>
+      <arg choice="opt">-p</arg>
+      <arg choice="opt">-t <replaceable>state</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -91,6 +92,21 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
       <varlistentry>
         <term>
+          <option><optional>-c <replaceable>KEY</replaceable></optional></option>
+        </term>
+        <listitem>
+          <para>
+            <!--
+            Print a configuration key from the running container. This option
+            may be given mulitple times to print out multiple key = value pairs.
+            -->
+            実行中のコンテナの設定値を表示します．このオプションは複数の key = value のペアを表示したい場合には複数回指定することも可能です．
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
           <option><optional>-s</optional></option>
         </term>
         <listitem>
@@ -157,7 +173,19 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
             <!--
             exits 0 if foo is RUNNING, 1 otherwise.
             -->
-            もしコンテナ foo が RUNNING であれば 0 を返す．それ以外は 1 を返す．
+            もしコンテナ foo が RUNNING であれば 0 を返します．それ以外は 1 を返します．
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>lxc-info -n foo -c lxc.network.0.veth.pair</term>
+        <listitem>
+          <para>
+            <!--
+            prints the veth pair name of foo.
+            -->
+            コンテナ foo の veth pair を表示します．
           </para>
         </listitem>
       </varlistentry>

doc/ja/lxc-kill.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-ls.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-monitor.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -72,25 +72,20 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       <command>lxc-monitor</command> は指定されたコンテナの状態をモニタします．<replaceable>name</replaceable> は posix2 準拠の正規表現が使用可能ですので，全てのコンテナ，いくつかのコンテナ，一つだけのコンテナをモニタリングすることが可能です．
     </para>
 
-  </refsect1>
-
-  &commonoptions;
-
-  <refsect1>
-    <title><!-- Bugs -->バグ</title>
-
     <para>
       <!--
-      Only one <command>lxc-monitor</command> can run at a time. Other
-      invocations will fail with the following error:
+      The <option>-P, &#045;&#045;lxcpath</option>=PATH option may be specified multiple
+      times to monitor more than one container path. Note however that
+      containers with the same name in multiple paths will be
+      indistinguishable in the output.
       -->
-      一度に一つの <command>lxc-monitor</command> しか実行できません．それ以上起動しようとすると，以下のようなエラーで失敗します．
-    </para>
-    <para>
-      lxc-monitor: bind : Address already in use
+      1 つ以上のコンテナパスをモニタリングするために，複数回の <option>-P, --lxcpath</option>=PATH オプションを指定することが可能です．しかし，複数のパスで同じ名前のコンテナの場合は，出力の見分けがつかない事に注意が必要です．
     </para>
 
   </refsect1>
+
+  &commonoptions;
+
   <refsect1>
     <title>Examples</title>
     <variablelist>

doc/ja/lxc-netstat.sgml.in

@@ -17,7 +17,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-ps.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -57,7 +57,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       <arg choice="opt">--name <replaceable>name</replaceable></arg>
       <arg choice="opt">--lxc</arg>
       <arg choice="opt">--host</arg>
-      <arg choice="opt">-- ps option</arg>
+      <arg choice="opt">-- <replaceable>ps options</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -81,12 +81,12 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     </para>
     <para>
       <!--
-	The additionnal specified ps options must not
+	The additional specified <replaceable>ps options</replaceable> must not
 	remove the default ps header and the pid information,
 	to be able to have the <command>lxc-ps</command> to find
 	the container associated to processes.
         -->
-      <command>lxc-ps</command> がコンテナに関連したプロセスを見つけるためには，追加で指定された ps コマンドのオプションが，標準の ps コマンドのヘッダや pid 情報を削除してはいけません．
+      <command>lxc-ps</command> がコンテナに関連したプロセスを見つけるためには，追加で指定された <replaceable>ps options</replaceable> が，標準の ps コマンドのヘッダや pid 情報を削除してはいけません．
     </para>
   </refsect1>
 
@@ -105,7 +105,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	    to limit the output to the processes belonging
 	    to this container name.
             -->
-            <replaceable>name</replaceable> で指定したコンテナに属するプロセスのみ出力する．
+            <replaceable>name</replaceable> で指定したコンテナに属するプロセスのみ出力します．
 	  </para>
 	</listitem>
       </varlistentry>
@@ -120,7 +120,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	    limit the output to the processes belonging
 	    to all lxc containers.
             -->
-            全ての lxc コンテナに属するプロセスを出力する．
+            全ての lxc コンテナに属するプロセスを出力します．
 	  </para>
 	</listitem>
       </varlistentry>
@@ -135,14 +135,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 	    limit the output to the processes belonging
 	    to the host.
             -->
-            ホスト (訳注: コンテナ以外) に属するプロセスのみを出力する．
+            ホスト (訳注: コンテナ以外) に属するプロセスのみを出力します．
 	  </para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>
-	  <option><optional>ps options</optional></option>
+	  <option><optional><replaceable>ps options</replaceable></optional></option>
 	</term>
 	<listitem>
 	  <para>

doc/ja/lxc-restart.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-shutdown.sgml.in

-<!--
-
-Copyright (C) 2012 Canonical, Inc
-
-Authors: Serge Hallyn <serge.hallyn@canonical.com>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Translated into Japanese
-by KATOH Yasufumi <karma at jazz.email.ne.jp>
-
--->
-
-<!DOCTYPE refentry PUBLIC @docdtd@ [
-
-<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
-<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
-]>
-
-<refentry>
-
-  <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo>
-
-  <refmeta>
-    <refentrytitle>lxc-shutdown</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-
-  <refnamediv>
-    <refname>lxc-shutdown</refname>
-
-    <refpurpose>
-      <!--
-      externally shut down or reboot a container
-      -->
-      コンテナ外部からコンテナのシャットダウンまたはリブートを行う
-    </refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>lxc-shutdown</command>
-      <arg choice="req">-n <replaceable>name</replaceable></arg>
-      <arg choice="opt">-w</arg>
-      <arg choice="opt">-r</arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1>
-    <title><!-- Description -->説明</title>
-
-    <para>
-      <!--
-      <command>lxc-shutdown</command> sends a SIGPWR signal to the
-      specified container to request it to cleanly shut down.  If
-      <optional>-w</optional> is specified, then <command>lxc-shutdown</command>
-      will wait until the container has shut down before exiting.
-      If <optional>-r</optional> is specified, the container will be
-      asked to reboot (using a SIGINT signal), and <optional>-w</optional>
-      will be ignored.  If the container ignore these signals, then
-      nothing will happen.  In that case, you can use <command>lxc-stop</command>
-      to force the container to stop.
-      -->
-      <command>lxc-shutdown</command> は，コンテナをクリーンにシャットダウンする要求をするために SIGPWR シグナルを指定したコンテナに送ります．もし <optional>-w</optional> オプションが指定された場合，<command>lxc-shutdown</command> はコンテナがシャットダウンするまで自身が終了するのを待ちます．もし <optional>-r</optional> が指定された場合，コンテナに (SIGINT シグナルを使って) 再起動を要求します．そして，この時 <optional>-w</optional> オプションは無視されます．もしコンテナがこの 2 つのシグナルを無視した場合は何も起きません．この場合はコンテナを強制的に停止するために <command>lxc-stop</command> コマンドが使えます．
-    </para>
-
-  </refsect1>
-
-  &commonoptions;
-
-  &seealso;
-
-  <refsect1>
-    <title><!-- Author -->作者</title>
-    <para>Serge Hallyn <email>serge.hallyn@canonical.com</email></para>
-  </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->

doc/ja/lxc-snapshot.sgml.in

+<!--
+
+lxc: linux Container library
+
+(C) Copyright Canonical Inc. 2007, 2008
+
+Authors:
+Serge Hallyn <serge.hallyn at ubuntu.com>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Translated into Japanese
+by KATOH Yasufumi <karma at jazz.email.ne.jp>
+-->
+
+<!DOCTYPE refentry PUBLIC @docdtd@ [
+
+<!ENTITY commonoptions SYSTEM "@builddir@/common_options.sgml">
+<!ENTITY seealso SYSTEM "@builddir@/see_also.sgml">
+]>
+
+<refentry>
+
+  <docinfo><date>@LXC_GENERATE_DATE@</date></docinfo>
+
+  <refmeta>
+    <refentrytitle>lxc-snapshot</refentrytitle>
+    <manvolnum>1</manvolnum>
+  </refmeta>
+
+  <refnamediv>
+    <refname>lxc-snapshot</refname>
+
+    <refpurpose>
+      <!--
+      Snapshot an existing container.
+      -->
+      既存のコンテナのスナップショットを取得する
+    </refpurpose>
+  </refnamediv>
+
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>lxc-snapshot</command>
+      <arg choice="req">-n, --name <replaceable>name</replaceable></arg>
+      <arg choice="opt">-c, --comment <replaceable>file</replaceable></arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>lxc-snapshot</command>
+      <arg choice="req">-n, --name <replaceable>name</replaceable></arg>
+      <arg choice="req">-L, --list </arg>
+      <arg choice="opt">-C, --showcomments </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>lxc-snapshot</command>
+      <arg choice="req">-n, --name <replaceable>name</replaceable></arg>
+      <arg choice="req">-r, -restore <replaceable>snapshot-name</replaceable></arg>
+      <arg choice="opt"> <replaceable> newname</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+
+  <refsect1>
+    <title><!-- Description -->説明</title>
+
+    <para>
+      <!--
+      <command>lxc-snapshot</command> creates, lists, and restores
+      container snapshots.
+      -->
+      <command>lxc-snapshot</command> はコンテナのスナップショットの作製，スナップショットのリスト表示，スナップショットからのリストアを行います．
+    </para>
+    <para>
+      <!--
+    Snapshots are stored as snapshotted containers under a private configuration path.  For instance, if the container's configuration path is <filename>/var/lib/lxc</filename> and the container is <filename>c1</filename>, then the first snapshot will be stored as container <filename>snap0</filename> under configuration path <filename>/var/lib/lxcsnaps/c1</filename>.
+    -->
+      スナップショットは，専用の設定されたパス以下にスナップショット化されたコンテナとして保存されます．例えば，もしコンテナパスが <filename>/var/lib/lxc</filename> で，コンテナが <filename>c1</filename> である場合，最初に取得するスナップショットは，パス <filename>/var/lib/lxcsnaps/c1</filename> の下の <filename>snap0</filename> として保存されます．
+    </para>
+  </refsect1>
+
+  <refsect1>
+
+    <title><!-- Options -->オプション</title>
+
+    <variablelist>
+
+	  <varlistentry>
+	    <term> <option>-c,--comment <replaceable>comment_file</replaceable></option> </term>
+	   <listitem>
+	    <para>
+              <!--
+              Associate the comment in <replaceable>comment_file</replaceable> with the newly created snapshot.
+              -->
+              新しく作製するスナップショットに <replaceable>comment_file</replaceable> ファイル内のコメントを関連付ける．
+            </para>
+	   </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term> <option>-L,--list </option> </term>
+	   <listitem>
+	    <para>
+              <!--
+              List existing snapshots. 
+              -->
+              存在するスナップショットをリスト表示する．
+            </para>
+	   </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term> <option>-C,--showcomments </option> </term>
+	   <listitem>
+	    <para>
+              <!--
+              Show snapshot comments in the snapshots listings. 
+              -->
+              スナップショットのリスト表示でスナップショットに対するコメントを表示する．
+            </para>
+	   </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term> <option>-r,--restore snapshot-name</option> </term>
+	   <listitem>
+	    <para>
+              <!--
+              Restore the named snapshot, meaning a full new container is created which is a copy of the snapshot.
+              -->
+              指定のスナップショットをリストアする．これはスナップショットのコピーである完全に新しいコンテナが作製されるということです．
+            </para>
+	   </listitem>
+	  </varlistentry>
+
+	  <varlistentry>
+	    <term> <option>newname</option> </term>
+	   <listitem>
+	    <para>
+              <!--
+              When restoring a snapshot, the last optional argument is the name to use for the restored container.  If no name is given, then the original container will be destroyed and the restored container will take its place.  Note that deleting the original snapshot is not possible in the case of overlayfs or zfs backed snapshots.
+              -->
+              スナップショットをリストアする際，最後のオプション引数はリストアされたコンテナの名前として使用されます．もし名前が与えられてない場合，元のコンテナが破壊され，リストアされるコンテナに置き換えられます．スナップショット元を削除することは，overlayfs と zfs がバックエンドのスナップショットでは出来ないことに注意が必要です．
+            </para>
+	   </listitem>
+	  </varlistentry>
+
+    </variablelist>
+
+  </refsect1>
+
+  &commonoptions;
+
+  &seealso;
+
+  <refsect1>
+    <title>Author</title>
+    <para>Serge Hallyn <email>serge.hallyn@ubuntu.com </email></para>
+  </refsect1>
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->

doc/ja/lxc-start-ephemeral.sgml.in

+
 <!--
 
 (C) Copyright Canonical Ltd. 2013
@@ -17,7 +18,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-start.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-stop.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -56,6 +56,11 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
     <cmdsynopsis>
       <command>lxc-stop</command>
       <arg choice="req">-n <replaceable>name</replaceable></arg>
+      <arg choice="opt">-W</arg>
+      <arg choice="opt">-r</arg>
+      <arg choice="opt">-t <replaceable>timeout</replaceable></arg>
+      <arg choice="opt">-k</arg>
+      <arg choice="opt">-s</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -64,16 +69,112 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
     <para>
       <!--
-      <command>lxc-stop</command> kills all the processes inside the
-      container. This command should be used if the processes are no
-      longer accessible and can no be exited normally.
+      <command>lxc-stop</command> reboots, cleanly shuts down, or kills
+      all the processes inside the container.  By default, it will
+      request a clean shutdown of the container (by sending SIGPWR to
+      the container), wait 60 seconds for the container to exit, and
+      returns.  If the container fails to cleanly exit, then after 60
+      seconds the container will be sent the
+      <command>lxc.stopsignal</command> to force it to shut down.
       -->
-      <command>lxc-stop</command> はコンテナ内の全てのプロセスを kill します．もし，プロセスにアクセスできない場合や，普通に停止できない場合は，このコマンドを使うべきです．
+      <command>lxc-stop</command> は，リブート，クリーンシャットダウン，コンテナ内の全てのプロセスの kill のどれかを行います．デフォルトでは，コンテナのクリーンなシャットダウンを (SIGPWR をコンテナに送ることで) 行い，コンテナの終了を 60 秒待ち，return します．コンテナがクリーンに終了するのに失敗した場合，60 秒待った後，コンテナに <command>lxc.stopsignal</command> で指定したシグナルを送り，強制的にシャットダウンします．
+    </para>
+
+    <para>
+      <!--
+      The <optional>-W</optional>, <optional>-r</optional>, <optional>-s</optional>
+      and <optional>-k</optional> options specify the action to perform.
+      <optional>-W</optional> indicates that after performing the specified
+      action, <command>lxc-stop</command> should immediately exit, while
+      <optional>-t TIMEOUT</optional> specifies the maximum amount of time
+      to wait for the container to complete the shutdown or reboot.
+      -->
+      <optional>-W</optional>, <optional>-r</optional>, <optional>-s</optional>, <optional>-k</optional> オプションは実行する際のアクションを指定します．<optional>-W</optional> は，指定したアクションの後に，<command>lxc-stop</command> は速やかに終了します．一方，<optional>-t TIMEOUT</optional> はコンテナが完全にシャットダウンやリブートするのを待つ時間の最大値を設定します．
     </para>
 
   </refsect1>
 
-  &commonoptions;
+  <refsect1>
+    <title>Options</title>
+    <variablelist>
+
+    <varlistentry>
+	<term>
+	  <option>-r,--reboot </option>
+	</term>
+	<listitem>
+	  <para>
+            <!--
+	    Request a reboot of the container.
+            -->
+            コンテナのリブートをリクエストします．
+	  </para>
+	</listitem>
+	</varlistentry>
+
+    <varlistentry>
+	<term>
+	  <option>-s,--shutdown </option>
+	</term>
+	<listitem>
+	  <para>
+            <!--
+	    Only request a clean shutdown, do not kill the container tasks if the
+		clean shutdown fails.
+              -->
+            クリーンシャットダウンだけをリクエストします．クリーンシャットダウンが失敗した場合，コンテナのタスクを kill しません．
+	  </para>
+	</listitem>
+	</varlistentry>
+
+    <varlistentry>
+	<term>
+	  <option>-k,--kill </option>
+	</term>
+	<listitem>
+	  <para>
+            <!--
+        Rather than requesting a clean shutdown of the container, explicitly
+        kill all tasks in the container.  This is the legacy
+        <command>lxc-stop</command> behavior.
+        -->
+           コンテナのクリーンシャットダウンをリクエストするのでなく，明確にコンテナ内の全てのタスクを kill します．これは，以前の <command>lxc-stop</command> の動作です．
+	  </para>
+	</listitem>
+	</varlistentry>
+
+    <varlistentry>
+	<term>
+	  <option>-W,--nowait </option>
+	</term>
+	<listitem>
+	  <para>
+            <!--
+	    Simply perform the requestion action (reboot, shutdown, or hard
+		kill) and exit.
+              -->
+            リクエストされたアクション (reboot, shutdown, 強制的な kill) を実行するだけで (すぐに) 終了します．
+	  </para>
+	</listitem>
+	</varlistentry>
+
+    <varlistentry>
+	<term>
+	  <option>-t,--timeout <replaceable>TIMEOUT</replaceable></option>
+	</term>
+	<listitem>
+	  <para>
+            <!--
+	    Wait TIMEOUT seconds before hard-stopping the container of (in
+		the reboot case) returning failure.
+              -->
+            コンテナの強制停止，失敗をを返して強制停止 (リブートの場合) まで TIMEOUT 秒待ちます．
+	  </para>
+	</listitem>
+	</varlistentry>
+
+  </variablelist>
+  </refsect1>
 
   <refsect1>
     <title><!-- Diagnostic -->診断</title>
@@ -107,7 +208,6 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         </listitem>
       </varlistentry>
 
-
     </variablelist>
 
   </refsect1>

doc/ja/lxc-top.sgml.in

@@ -17,7 +17,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 -->
 

doc/ja/lxc-unfreeze.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-unshare.sgml.in

@@ -20,7 +20,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>
@@ -55,7 +55,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>lxc-clone</command>
+      <command>lxc-unshare</command>
       <arg choice="req">-s <replaceable>namespaces</replaceable></arg>
       <arg choice="req">-u <replaceable>user</replaceable></arg>
       <arg choice="req">command</arg>
@@ -131,14 +131,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         <!--
         To spawn a new shell with its own UTS (hostname) namespace,
         <programlisting>
-          lxc-clone -s UTSNAME /bin/bash
+          lxc-unshare -s UTSNAME /bin/bash
         </programlisting>
 	If the hostname is changed in that shell, the change will not be
 	reflected on the host.
         -->
         自身の UTS(hostname)名前空間でシェルを起動するには以下のように実行します．
         <programlisting>
-          lxc-clone -s UTSNAME /bin/bash
+          lxc-unshare -s UTSNAME /bin/bash
         </programlisting>
         もし，そのシェル上でホスト名を変更しても，その変更はホストには反映されません．
       </para>
@@ -146,7 +146,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         <!--
         To spawn a shell in a new network, pid, and mount namespace,
         <programlisting>
-          lxc-clone -s "NETWORK|PID|MOUNT" /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT" /bin/bash
         </programlisting>
 	The resulting shell will have pid 1 and will see no network interfaces.
 	After re-mounting /proc in that shell,
@@ -157,7 +157,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
         -->
         新しいネットワーク，pid，マウント名前空間でシェルを起動するには以下のように実行します．
         <programlisting>
-          lxc-clone -s "NETWORK|PID|MOUNT" /bin/bash
+          lxc-unshare -s "NETWORK|PID|MOUNT" /bin/bash
         </programlisting>
         その結果起動するシェルは pid が 1 となり，ネットワークインターフェースがないでしょう．そのシェル上で /proc を再マウントした後
         <programlisting>

doc/ja/lxc-version.sgml.in

@@ -17,7 +17,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc-wait.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/lxc.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>

doc/ja/see_also.sgml.in

@@ -19,7 +19,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 Translated into Japanese
 by KATOH Yasufumi <karma at jazz.email.ne.jp>