os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge the following from the English version:

Browse source 
1.8  -> 1.12	copyright/copyright.sgml
	1.25 -> 1.30	copyright/daemon.sgml

Submitted by:   Hiroki Kobayashi <solidsneak at hyper dot cx>
Reviewed by:	Hiroo Ono <hiroo at jp dot lreeBSD dot org>, ryusuke
References:	[doc-jp-work 1415, 1416, 1438]
This commit is contained in:
Ryusuke SUZUKI 2010-05-16 15:38:05 +00:00
parent 055d9f4adc
commit 9bdcca6183
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=35759
2 changed files with 6 additions and 7 deletions

7
ja/copyright/copyright.sgml
View file

@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/ja/copyright/copyright.sgml,v 1.15 2005/10/04 16:21:46 hrs Exp $">
<!ENTITY title "FreeBSD Copyright and Legal Information">
<!ENTITY date "$FreeBSD: www/ja/copyright/copyright.sgml,v 1.16 2006/08/19 21:24:41 hrs Exp $">
<!ENTITY title "FreeBSD Copyright および Legal Information">
<!ENTITY % navinclude.about "INCLUDE">
]>
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.8 -->
<!-- Original revision: 1.12 -->
<html>
&header;
@ -13,6 +13,7 @@
<p></p>
<h2><a href="freebsd-license.html">FreeBSD の著作権</a></h2>
<h2><a href="&enbase;/copyright/freebsd-doc-license.html">FreeBSD ドキュメントの著作権</a></h2>
<h2><a href="trademarks.html">登録商標</a></h2>
<h2><a href="license.html">BSD の著作権</a></h2>
<h2><a href="daemon.html">BSD デーモン</a></h2>

6
ja/copyright/daemon.sgml
View file

@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/ja/copyright/daemon.sgml,v 1.24 2005/10/04 16:21:46 hrs Exp $">
<!ENTITY date "$FreeBSD: www/ja/copyright/daemon.sgml,v 1.25 2006/08/19 21:24:41 hrs Exp $">
<!ENTITY title "The BSD Daemon">
<!ENTITY % navinclude.about "INCLUDE">
]>
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.25 -->
<!-- Original revision: 1.30 -->
<html>
&header;
@ -47,8 +47,6 @@
<p>様々な大きさのデーモン君のぬいぐるみや帽子が
<a href="http://www.freebsdmall.com">the FreeBSD Mall</a>
<img alt="beanie daemon" src="../../gifs/plueschtier-tiny.jpg">から手に入ります。
ヨーロッパでは、ドイツ製のデーモン君のぬいぐるみが
<a href="http://lem.freibergnet.de/cgi-bin/fanshop/scan/sf=category/se=BSD">Liebscher & Partner</a> 社から手に入ります。
<p><A HREF="http://www.scotgold.com/acatalog/ScotGold_Catalogue_BSD_Daemon_Stuff_3.html">ScotGold</a>
は PC ケース用の 1 インチ四方のデーモン君エンブレムを作っています。