From owner-svn-doc-head@FreeBSD.ORG  Fri Jul 26 22:41:12 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id EEC1E508;
 Fri, 26 Jul 2013 22:41:12 +0000 (UTC)
 (envelope-from ryusuke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C270B2478;
 Fri, 26 Jul 2013 22:41:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QMfCAw064065;
 Fri, 26 Jul 2013 22:41:12 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QMfCGM064064;
 Fri, 26 Jul 2013 22:41:12 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201307262241.r6QMfCGM064064@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 26 Jul 2013 22:41:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42449 - head/ja_JP.eucJP/articles/contributing
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 22:41:13 -0000

Author: ryusuke
Date: Fri Jul 26 22:41:12 2013
New Revision: 42449
URL: http://svnweb.freebsd.org/changeset/doc/42449

Log:
  - Merge the following from the English version:
  
  	r40061 -> r42402	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	Fri Jul 26 22:14:02 2013	(r42448)
+++ head/ja_JP.eucJP/articles/contributing/article.xml	Fri Jul 26 22:41:12 2013	(r42449)
@@ -6,7 +6,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r40061
+     Original revision: r42402
      $FreeBSD$
 -->
 
@@ -417,9 +417,9 @@
 
       <orderedlist>
 	<listitem>
-	  <indexterm><primary>BSD copyright</primary></indexterm>
 
-	  <para>BSD コピーライト。
+	  <para>BSD コピーライト <indexterm><primary>BSD コピーライト</primary></indexterm>
+。
 	    このコピーライトは
 	    <quote>権利に縛られない</quote>
 	    性格と商用企業にとって一般的な魅力をもつために最も好まれます。
@@ -429,6 +429,7 @@
 	</listitem>
 
 	<listitem>
+	  <para>
 	  <indexterm>
 	    <primary>GPL</primary>
 	    <see>GNU General Public License</see>
@@ -438,7 +439,7 @@
 	    <primary>GNU General Public License</primary>
 	  </indexterm>
 
-	  <para>GNU一般公有使用許諾、または <quote>GPL</quote>。
+	  GNU一般公有使用許諾、または <quote>GPL</quote>。
 	    このライセンスはコードを商用目的に使用する場合に余分な努力が求められるため、
 	    私たちにあまり評判が良いというわけではありません。しかし、
 	    私たちは既に GPL 下の高品質なコード
@@ -561,9 +562,9 @@ Copyright (C) [年]
 	<para>寄付は小切手で以下に送ってください。
 	  <address>
 	    The FreeBSD Foundation
-	    <street>7321 Brockway Dr.</street>
+	    <street>P.O. Box 20247</street>,
 	    <city>Boulder</city>,
-	    <state>CO</state> <postcode>80303</postcode>
+	    <state>CO</state> <postcode>80308</postcode>
 	    <country>USA</country>
 	  </address></para>