[lxc-devel] [PATCH] doc: Update lxc.conf(5)

[Stéphane Graber]

On Tue, Jan 14, 2014 at 03:51:47PM +0900, KATOH Yasufumi wrote:
> * Update Japanese lxc.conf(5) for commit 508c263ee6ed2fac73f6979af287caba38963b4b
> * Remove duplicate line in English lxc.conf(5)
> 
> Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  doc/ja/lxc.conf.sgml.in | 8 ++++++--
>  doc/lxc.conf.sgml.in    | 1 -
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/ja/lxc.conf.sgml.in b/doc/ja/lxc.conf.sgml.in
> index 3b7ae79..5e1b410 100644
> --- 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 ba10939..4910cff 100644
> --- 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.
> -- 
> 1.8.4.4
> 
> _______________________________________________
> 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: 836 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140114/fb939ea9/attachment.pgp>