svn commit: r46738 - head/ja_JP.eucJP/articles/contributing

Author: ryusuke
Date: Mon Jun  1 13:12:18 2015
New Revision: 46738
URL: https://svnweb.freebsd.org/changeset/doc/46738

Log:
  - Merge the following from the English version:
  
  	r45153 -> r45169	head/ja_JP.eucJP/articles/contributing/article.xml

Modified:
  head/ja_JP.eucJP/articles/contributing/article.xml

Modified: head/ja_JP.eucJP/articles/contributing/article.xml
==============================================================================
--- head/ja_JP.eucJP/articles/contributing/article.xml	Mon Jun  1 08:03:59 2015	(r46737)
+++ head/ja_JP.eucJP/articles/contributing/article.xml	Mon Jun  1 13:12:18 2015	(r46738)
@@ -5,7 +5,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r45153
+     Original revision: r45169
      $FreeBSD$
 -->
 <article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ja">
@@ -400,107 +400,11 @@
 
       <para>ÂçÎ̤Υ³¡¼¥É¤ò°·¤Ã¤Æ¤¤¤ë»þ¤Ï¡¢
 	¾ï¤ËÃøºî¸¢¤Ë´Ø¤¹¤ëÈù̯¤ÊÌäÂ꤬½Ð¤Æ¤­¤Þ¤¹¡£
-	FreeBSD ¤Ë´Þ¤á¤ë¥³¡¼¥É¤ÎÃøºî¸¢¤È¤·¤Æ¼õ¤±Æþ¤ì¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ï¡¢
-	°Ê²¼¤ÎÆó¤Ä¤Ç¤¹¡£</para>
-
-      <orderedlist>
-	<listitem>
-
-	  <para>BSD ¥³¥Ô¡¼¥é¥¤¥È <indexterm><primary>BSD
-	      ¥³¥Ô¡¼¥é¥¤¥È</primary></indexterm>
-¡£
-	    ¤³¤Î¥³¥Ô¡¼¥é¥¤¥È¤Ï
-	    <quote>¸¢Íø¤ËÇû¤é¤ì¤Ê¤¤</quote>
-	    À­³Ê¤È¾¦ÍÑ´ë¶È¤Ë¤È¤Ã¤Æ°ìÈÌŪ¤ÊÌ¥ÎϤò¤â¤Ä¤¿¤á¤ËºÇ¤â¹¥¤Þ¤ì¤Þ¤¹¡£
-	    FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Ï¾¦ÍÑÍøÍѤòÁˤó¤À¤ê¤»¤º¡¢²¿¤«¤ò
-	    FreeBSD
-	    ¤ØÅê»ñ¤¹¤ëµ¤¤Ë¤Ê¤Ã¤¿¾¦¶È´Ø·¸¼Ô¤Ë¤è¤ë»²²Ã¤òÀѶËŪ¤Ë¾©Î夷¤Þ¤¹¡£</para>
-	</listitem>
-      </orderedlist>
-
-      <para>¤³¤ì°Ê³°¤Î¥¿¥¤¥×¤ÎÃøºî¸¢¤Ë¤è¤ë´ó£¤Ï¡¢FreeBSD
-	¤Ø´Þ¤á¤ë¤³¤È¤ò¹Íθ¤¹¤ëÁ°¤ËÃí°Õ¿¼¤¤¥ì¥Ó¥å¡¼¤ò¼õ¤±¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	Æä˸ÂÄêŪ¤Ê¾¦ÍѤÎÃøºî¸¢¤¬Å¬ÍѤµ¤ì¤ë´ó£¤Ï°ìÈ̤˵ñÈݤµ¤ì¤Þ¤¹¡£¤·¤«¤·¡¢
-	ºî¼Ô¤¬Æȼ«¤Î·ÐÏ©¤Ç¤½¤Î¤è¤¦¤ÊÊѹ¹¤òÇÛÉÛ¤¹¤ë¤³¤È¤Ï¾ï¤Ë¾©Î夵¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <para>¤¢¤Ê¤¿¤ÎºîÉÊ¤Ë <quote>BSD ¥¹¥¿¥¤¥ë</quote> ¤ÎÃøºî¸¢¤òÉÕ¤±¤ë¤Ë¤Ï¡¢
-	Êݸ¤¿¤¤¥½¡¼¥¹¥³¡¼¥É¥Õ¥¡¥¤¥ë¤¹¤Ù¤Æ¤Î°ìÈֺǽé¤Ë°Ê²¼¤Î¥Æ¥­¥¹¥È¤òÆþ¤ì¤Æ¡¢
-	<literal>%%</literal>
-	¤Î´Ö¤òŬÀڤʾðÊó¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <programlisting>Copyright (c) %%ŬÀÚ¤Êǯ%%
-	%%¤¢¤Ê¤¿¤Î̾Á°%%, %%¤¢¤Ê¤¿¤Î½£%%  %%͹ÊØÈÖ¹æ%%.
-      All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer as
-   the first lines of this file unmodified.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY %%¤¢¤Ê¤¿¤Î̾Á°%% ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL %%¤¢¤Ê¤¿¤Î̾Á°%% BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-        &dollar;&os;&dollar;</programlisting>
-
-      <para>Êص¹¤ò¤Ï¤«¤ë¤¿¤á¡¢
-	¤³¤Î¥Æ¥­¥¹¥È¤Î¥³¥Ô¡¼¤Ï¼¡¤Î¾ì½ê¤ËÃÖ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£
-	<filename>/usr/share/examples/etc/bsd-style-copyright</filename></para>
-
-      <note>
-	<title>ÌõÃí</title>
-
-	<para>°Ê²¼¤Ï¿ÀÅÄÉÒ¹­»á¤è¤ê´ó£¤µ¤ì¤¿ bsd-style-copyright
-	  ¤ÎÆüËܸìÌõ¤Ç¤¹¡£
-	  ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Ë´Þ¤á¤ë¤â¤Î¤Ï¸¶Ê¸¤ÎÊý¤Ç¤¢¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤´ÍøÍѤ¯¤À¤µ¤¤¡£
-	  ¤Þ¤¿¡¢¸¶Ê¸¤È¤Î´Ö¤Ë¼ñ»Ý¤Îº¹°Û¤¬À¸¤¸¤¿¾ì¹ç¡¢
-	  ¸¶Ê¸¤ÎÆâÍƤ¬ FreeBSD ¥×¥í¥¸¥§¥¯¥È¤Î°Õ»×¤Ç¤¢¤ë¤â¤Î¤È¤·¤Þ¤¹¡£</para>
-      </note>
-
-      <programlisting>
-Copyright (C) [ǯ]
-     [¤¢¤Ê¤¿¤Î̾Á°]  All rights reserved.
-
-¥½¡¼¥¹¤È¥Ð¥¤¥Ê¥ê·Á¼°¤ÎºÆÇÛÉÛ¤ª¤è¤Ó»ÈÍѤϡ¢Êѹ¹¤Î̵ͭ¤Ë¤«¤«¤ï¤é¤º°Ê²¼¤Î
-¾ò·ï¤òËþ¤¿¤¹¾ì¹ç¤Ë¸Â¤êµö²Ä¤µ¤ì¤ë:
-1. ¥½¡¼¥¹¥³¡¼¥É¤ÎºÆÇÛÉۤϡ¢¾åµ­¤ÎÃøºî¸¢É½¼¨¡¦¤³¤Î¾ò·ï¤Î¥ê¥¹¥È¡¦²¼µ­¤Î
-   ÈÝǧÀ¼ÌÀʸ¤òÊÝ»ý¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
-
-2. ¥Ð¥¤¥Ê¥ê·Á¼°¤ÎºÆÇÛÉۤϾ嵭¤ÎÃøºî¸¢É½¼¨¡¦¤³¤Î¾ò·ï¤Î¥ê¥¹¥È¡¦²¼µ­¤Î
-   ÈÝǧÀ¼ÌÀʸ¤ò¡¢ÇÛÉÛʪ¤È¶¦¤ËÄ󶡤µ¤ì¤ëʸ½ñ¤ª¤è¤Ó/¤Þ¤¿¤Ï¾¤Î»ñÎÁ¤ÎÃæ¤Ë
-   ´Þ¤á¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡£
-
-(ÌõÃí:¤³¤³¤«¤é¡ÖÈÝǧÀ¼ÌÀʸ¡×¤Ç¤¹)
-
-¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ï[¤¢¤Ê¤¿¤Î̾Á°]¤ª¤è¤Ó¹×¸¥¼Ô¤Ë¤è¤Ã¤Æ ``¤¢¤ë¤¬¤Þ¤Þ¤Î¾õÂÖ''
-¤ÇÄ󶡤µ¤ì¡¢¾¦ÉÊÀ­¤ÈÆÃÄê¤ÎÌÜŪ¤ËÂФ¹¤ëŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤Î°ÅÌÛ¤ÎÊݾڤËα¤Þ
-¤é¤º¡¢¤¤¤«¤Ê¤ëÌÀ¼¨¤ª¤è¤Ó°ÅÌÛ¤ÎÊݾڤòǧ¤á¤Ê¤¤¡£[¤¢¤Ê¤¿¤Î̾Á°]¤ª¤è¤Ó¹×¸¥
-¼Ô¤Ï¡¢¤¢¤é¤æ¤ëľÀÜŪ¡¦´ÖÀÜŪ¡¦¶öȯŪ¡¦ÆüìŪ¡¦Åµ·¿Åª¡¦É¬Á³Åª¤Ê»³² (Âå
-ÂØÀ½Éʤޤ¿¤ÏÂåÂØ¥µ¡¼¥Ó¥¹¤Î³ÍÆÀÈñ; ¸úÍÑ¡¦¥Ç¡¼¥¿¡¦Íø±×¤ÎÁÓ¼º; ¤Þ¤¿¤Ï¶È̳
-ÃæÃǤò´Þ¤ß¡¢¤Þ¤¿¤½¤ì¤À¤±¤Ëα¤Þ¤é¤Ê¤¤Â»³²) ¤ËÂФ·¤Æ¡¢¤¿¤È¤¨¤É¤Î¤è¤¦¤Ë¤·
-¤ÆÀ¸¤¸¤¿¤È¤·¤Æ¤â¡¢¤½¤·¤Æ¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤Î»ÈÍѤˤè¤Ã¤Æ¤É¤Î¤è¤¦¤Ë¤Ç¤¢¤ì
-À¸¤¸¤ë¡¢·ÀÌó¾å¤Ç¤¢¤í¤¦¤È¡¢¸·Ì©¤ÊÀÕǤÆâ¤Ç¤¢¤í¤¦¤È¡¢¤¢¤ë¤¤¤ÏÉÔÀµ¹Ô°Ù (²á
-¼º¤ä¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤ò´Þ¤à) ¤Ë¤ª¤±¤ë¾ì¹ç¤Ç¤¢¤í¤¦¤È¤â¡¢¤¤¤«¤Ê¤ëÀÕǤÏÀ¾å¤â¡¢
-¤¿¤È¤¨¤½¤Î¤è¤¦¤Ê»³²¤Î²ÄǽÀ­¤¬Í½¸«¤µ¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢°ìÀÚ¤ÎÀÕǤ¤ò»ý¤¿
-¤Ê¤¤¡£
-
-ËÝÌõ: ¿ÀÅÄÉÒ¹­
-¸æ¶¨ÎÏ (¸Þ½½²»½ç¡¦·É¾Îά):
-  ÃÓÅĸ¦Æó¡¢ÆâÀî ´î¾Ï¡¢Æ£Â¼ ±Ñ¼£¡¢¤à¤é¤¿¤·¤å¤¦¤¤¤Á¤í¤¦
-  ÌÝÌî ²í°ì¡¢²£ÅÄ¡÷±§ÅÔµÜ
-      </programlisting>
+	&os; ¤Ç¤Ï¡¢BSD ¤Þ¤¿¤Ï ISC
+	¤È¤¤¤Ã¤¿¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¥é¥¤¥»¥ó¥¹¤¬¹¥¤Þ¤ì¤Þ¤¹¡£
+	GPLv2 ¤Î¤è¤¦¤Ê¥³¥Ô¡¼¥ì¥Õ¥È¥é¥¤¥»¥ó¥¹¤â¡¢¾ì¹ç¤Ë¤è¤Ã¤Æ¤Ïµö²Ä¤µ¤ì¤Þ¤¹¡£
+	´°Á´¤Ê¥ê¥¹¥È¤¬¡¢<link
+	xlink:href="&url.base;/../internal/software-license.html">¥³¥¢¥Á¡¼¥à¥é¥¤¥»¥ó¥¹¥Ý¥ê¥·</link> ¥Ú¡¼¥¸¤Ë¤¢¤ê¤Þ¤¹¡£</para>
     </sect2>
 
     <sect2>

_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"