From owner-svn-doc-all@FreeBSD.ORG Wed Jan 2 00:01:21 2013 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 115DA8F4; Wed, 2 Jan 2013 00:01:21 +0000 (UTC) (envelope-from ryusuke@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CDF948FC08; Wed, 2 Jan 2013 00:01:20 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0201KrS068399; Wed, 2 Jan 2013 00:01:20 GMT (envelope-from ryusuke@svn.freebsd.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0201K03068394; Wed, 2 Jan 2013 00:01:20 GMT (envelope-from ryusuke@svn.freebsd.org) Message-Id: <201301020001.r0201K03068394@svn.freebsd.org> From: Ryusuke SUZUKI Date: Wed, 2 Jan 2013 00:01:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40530 - head/ja_JP.eucJP/htdocs/copyright X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jan 2013 00:01:21 -0000 Author: ryusuke Date: Wed Jan 2 00:01:20 2013 New Revision: 40530 URL: http://svnweb.freebsd.org/changeset/doc/40530 Log: - Merge the following from the English version: r21129 -> r40529 head/ja_JP.eucJP/htdocs/copyright/Makefile r37622 -> r40529 head/ja_JP.eucJP/htdocs/copyright/copyright.xml Modified: head/ja_JP.eucJP/htdocs/copyright/Makefile head/ja_JP.eucJP/htdocs/copyright/copyright.xml Modified: head/ja_JP.eucJP/htdocs/copyright/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/copyright/Makefile Tue Jan 1 13:41:33 2013 (r40529) +++ head/ja_JP.eucJP/htdocs/copyright/Makefile Wed Jan 2 00:01:20 2013 (r40530) @@ -1,6 +1,6 @@ # $FreeBSD$ # The FreeBSD Japanese Documentation Project -# Original revision: 1.15 +# Original revision: r40529 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -16,6 +16,8 @@ DOCS+= freebsd-license.xml DOCS+= license.xml DOCS+= trademarks.xml +#DATA+= COPYING COPYING.LIB + INDEXLINK= copyright.html .include "${DOC_PREFIX}/share/mk/web.site.mk" Modified: head/ja_JP.eucJP/htdocs/copyright/copyright.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/copyright/copyright.xml Tue Jan 1 13:41:33 2013 (r40529) +++ head/ja_JP.eucJP/htdocs/copyright/copyright.xml Wed Jan 2 00:01:20 2013 (r40530) @@ -4,7 +4,7 @@ ]> - + @@ -22,9 +22,10 @@

登録商標

BSD の著作権

BSD デーモン

-

FreeBSD Ports を再配布する際の制限

-

GNU GENERAL PUBLIC LICENSE

-

GNU LIBRARY GENERAL PUBLIC LICENSE

+

FreeBSD + Ports を再配布する際の制限

+

GNU GENERAL PUBLIC LICENSE

+

GNU LIBRARY GENERAL PUBLIC LICENSE

FreeBSD プライバシーポリシー