- 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 !
This commit is contained in:
Ryusuke SUZUKI 2014-12-31 15:01:40 +00:00
parent a5adb4ed7e
commit 42d0fbd38a
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=46132
3 changed files with 9 additions and 10 deletions
ja_JP.eucJP
htdocs
share/xml

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="euc-jp"?>
<!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
"http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
<!ENTITY title "The FreeBSD Copyright">
]>
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: r43406 -->
<!-- Original revision: r46130 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@ -17,7 +17,7 @@
<p>訳注 : 以下は FreeBSD の license の原文です。</p>
<p>Copyright 1992-2014
<p>Copyright 1992-2015
The FreeBSD Project.
All rights reserved.</p>
@ -26,7 +26,6 @@
following conditions are met:</p>
<ol>
<li>Redistributions of source code must retain the above
copyright notice, this list of conditions and the
following disclaimer.</li>
@ -37,11 +36,11 @@
materials provided with the distribution.</li>
</ol>
<p>THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT
<p>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;

View file

@ -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

View file

@ -5,7 +5,7 @@
<!-- PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN" -->
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: r45920 -->
<!-- Original revision: r46128 -->
<!ENTITY copyright '<span xmlns="http://www.w3.org/1999/xhtml"><a href="&base;/search/index-site.html">サイトマップ</a> |
<a href="&base;/copyright/">知的財産権について</a> | <!-- &copy; -->(C) 1995&ndash;2014 The FreeBSD Project.