doc: Update lxc.conf(5)

* Update Japanese lxc.conf(5) for commit 508c263ee6ed2fac73f6979af287caba38963b4b
* Remove duplicate line in English lxc.conf(5)

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/doc/ja/lxc.conf.sgml.in b/doc/ja/lxc.conf.sgml.in
index 3b7ae79d3ebdae5d52d33e1b47cb33c1e5e316af..5e1b4104fee30d731383df3c14135ebeb61c4c37 100644 (file)
--- a/doc/ja/lxc.conf.sgml.in
+++ b/doc/ja/lxc.conf.sgml.in
@@ -480,10 +480,14 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
              the interface mac address is dynamically allocated by
              default to the virtual interface, but in some cases,
              this is needed to resolve a mac address conflict or to
-             always have the same link-local ipv6 address
+             always have the same link-local ipv6 address.
+             Any "x" in address will be replaced by random value,
+             this allows setting hwaddr templates.
               -->
-              インターフェースの MAC アドレスは，デフォルトでは動的に割り当てられます．
+              仮想インターフェースの MAC アドレスは，デフォルトでは動的に割り当てられます．
               しかし，MAC アドレスの衝突や，リンクローカルIPv6 アドレスを常に同じにした場合などは，このオプションが必要です．
+              アドレス中の "x" という文字は，ランダムな値に置き換えられます．
+              これによりテンプレートに hwaddr を設定することが可能になります．
            </para>
          </listitem>
        </varlistentry>

diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index ba109399249a72dc9592746d51a2494d52f0f1d0..4910cffba71d9f71631182ad04226593c02c486b 100644 (file)
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -360,7 +360,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
              the interface mac address is dynamically allocated by
              default to the virtual interface, but in some cases,
              this is needed to resolve a mac address conflict or to
-             always have the same link-local ipv6 address
              always have the same link-local ipv6 address.
              Any "x" in address will be replaced by random value,
              this allows setting hwaddr templates.