From 579e0622569e6a5c7ac087fdeb198809b92e19aa Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 1 Jun 2015 13:12:18 +0000
Subject: [PATCH] - Merge the following from the English version:

	r45153 -> r45169	head/ja_JP.eucJP/articles/contributing/article.xml
---
 ja_JP.eucJP/articles/contributing/article.xml | 108 +-----------------
 1 file changed, 6 insertions(+), 102 deletions(-)

diff --git a/ja_JP.eucJP/articles/contributing/article.xml b/ja_JP.eucJP/articles/contributing/article.xml
index 39ae3a9985..c5eb411266 100644
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@@ -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>