From owner-svn-doc-head@FreeBSD.ORG Wed Dec 31 15:01:42 2014 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3225150C; Wed, 31 Dec 2014 15:01:42 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D7992835; Wed, 31 Dec 2014 15:01:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBVF1fR7090820; Wed, 31 Dec 2014 15:01:41 GMT (envelope-from ryusuke@FreeBSD.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBVF1f6h090817; Wed, 31 Dec 2014 15:01:41 GMT (envelope-from ryusuke@FreeBSD.org) Message-Id: <201412311501.sBVF1f6h090817@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to ryusuke@FreeBSD.org using -f From: Ryusuke SUZUKI Date: Wed, 31 Dec 2014 15:01:41 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46132 - in head/ja_JP.eucJP: htdocs/copyright htdocs/events share/xml 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.18-1 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Dec 2014 15:01:42 -0000 Author: ryusuke Date: Wed Dec 31 15:01:40 2014 New Revision: 46132 URL: https://svnweb.freebsd.org/changeset/doc/46132 Log: - Merge the following from the English version: r43406 -> r46130 head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml r43408 -> r46128 head/ja_JP.eucJP/htdocs/events/Makefile r45920 -> r46128 head/ja_JP.eucJP/share/xml/header.l10n.ent Happy New Year ! Modified: head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml head/ja_JP.eucJP/htdocs/events/Makefile head/ja_JP.eucJP/share/xml/header.l10n.ent Modified: head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml Wed Dec 31 14:42:11 2014 (r46131) +++ head/ja_JP.eucJP/htdocs/copyright/freebsd-license.xml Wed Dec 31 15:01:40 2014 (r46132) @@ -1,10 +1,10 @@ ]> - + @@ -17,7 +17,7 @@

訳注 : 以下は FreeBSD の license の原文です。

-

Copyright 1992-2014 +

Copyright 1992-2015 The FreeBSD Project. All rights reserved.

@@ -26,7 +26,6 @@ following conditions are met:

    -
  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    2. @@ -37,11 +36,11 @@ materials provided with the distribution.
-

THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT +

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 THE FREEBSD PROJECT OR CONTRIBUTORS + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; Modified: head/ja_JP.eucJP/htdocs/events/Makefile ============================================================================== --- head/ja_JP.eucJP/htdocs/events/Makefile Wed Dec 31 14:42:11 2014 (r46131) +++ head/ja_JP.eucJP/htdocs/events/Makefile Wed Dec 31 15:01:40 2014 (r46132) @@ -1,6 +1,6 @@ # $FreeBSD$ # The FreeBSD Japanese Documentation Project -# Original revision: r43408 +# Original revision: r46128 .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -13,9 +13,9 @@ #SUBDIR+= 2003 # The year the top level events.html file starts from: -YEARSTART= 2014 +YEARSTART= 2015 # Years to generate past events pages for and link from top level: -PASTYEARS= 2013 2012 2011 2010 2009 2008 2007 2006 2005 2004 2003 +PASTYEARS= 2014 2013 2012 2011 2010 2009 2008 2007 2006 2005 2004 2003 DATA= events.css INDEXLINK= events.html Modified: head/ja_JP.eucJP/share/xml/header.l10n.ent ============================================================================== --- head/ja_JP.eucJP/share/xml/header.l10n.ent Wed Dec 31 14:42:11 2014 (r46131) +++ head/ja_JP.eucJP/share/xml/header.l10n.ent Wed Dec 31 15:01:40 2014 (r46132) @@ -5,7 +5,7 @@ - + サイトマップ | 知的財産権について | (C) 1995–2014 The FreeBSD Project.