- 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
This commit is contained in:
Ryusuke SUZUKI 2013-01-02 00:01:20 +00:00
parent 348a343f67
commit 2051f2fd19
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=40530
2 changed files with 8 additions and 5 deletions
ja_JP.eucJP/htdocs/copyright

View file

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
# The FreeBSD Japanese Documentation Project # The FreeBSD Japanese Documentation Project
# Original revision: 1.15 # Original revision: r40529
.if exists(../Makefile.conf) .if exists(../Makefile.conf)
.include "../Makefile.conf" .include "../Makefile.conf"
@ -16,6 +16,8 @@ DOCS+= freebsd-license.xml
DOCS+= license.xml DOCS+= license.xml
DOCS+= trademarks.xml DOCS+= trademarks.xml
#DATA+= COPYING COPYING.LIB
INDEXLINK= copyright.html INDEXLINK= copyright.html
.include "${DOC_PREFIX}/share/mk/web.site.mk" .include "${DOC_PREFIX}/share/mk/web.site.mk"

View file

@ -4,7 +4,7 @@
<!ENTITY title "FreeBSD Copyright および Legal Information"> <!ENTITY title "FreeBSD Copyright および Legal Information">
]> ]>
<!-- The FreeBSD Japanese Documentation Project --> <!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.13 --> <!-- Original revision: r40529 -->
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
@ -22,9 +22,10 @@
<h2><a href="trademarks.html">登録商標</a></h2> <h2><a href="trademarks.html">登録商標</a></h2>
<h2><a href="license.html">BSD の著作権</a></h2> <h2><a href="license.html">BSD の著作権</a></h2>
<h2><a href="daemon.html">BSD デーモン</a></h2> <h2><a href="daemon.html">BSD デーモン</a></h2>
<h2><a href="../../copyright/LEGAL">FreeBSD Ports を再配布する際の制限</a></h2> <h2><a href="http://svnweb.FreeBSD.org/ports/head/LEGAL?revision=HEAD&amp;view=co">FreeBSD
<h2><a href="../../copyright/COPYING">GNU GENERAL PUBLIC LICENSE</a></h2> Ports を再配布する際の制限</a></h2>
<h2><a href="../../copyright/COPYING.LIB">GNU LIBRARY GENERAL PUBLIC LICENSE</a></h2> <h2><a href="&enbase;/copyright/COPYING">GNU GENERAL PUBLIC LICENSE</a></h2>
<h2><a href="&enbase;/copyright/COPYING.LIB">GNU LIBRARY GENERAL PUBLIC LICENSE</a></h2>
<h2><a href="&enbase;/privacy.html">FreeBSD プライバシーポリシー</a></h2> <h2><a href="&enbase;/privacy.html">FreeBSD プライバシーポリシー</a></h2>
<p/> <p/>