aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHideyuki KURASHINA <rushani@FreeBSD.org>2003-10-14 06:11:41 +0000
committerHideyuki KURASHINA <rushani@FreeBSD.org>2003-10-14 06:11:41 +0000
commit9bfcf97c854583167a1525f5290593b9c69732ff (patch)
tree3c9dcbc43d5bb117b527c703e279fcb1fb2c4788
parentcd90e6f2186253aa61cb961d7d546b0a41d19cd0 (diff)
downloaddoc-9bfcf97c854583167a1525f5290593b9c69732ff.tar.gz
doc-9bfcf97c854583167a1525f5290593b9c69732ff.zip
Catch up with the English version:
1.417 -> 1.419 articles/contributors/article.sgml 1.1 -> 1.2 articles/fbsd-from-scratch/article.sgml
Notes
Notes: svn path=/head/; revision=18422
-rw-r--r--ja_JP.eucJP/articles/contributors/article.sgml17
-rw-r--r--ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml14
2 files changed, 25 insertions, 6 deletions
diff --git a/ja_JP.eucJP/articles/contributors/article.sgml b/ja_JP.eucJP/articles/contributors/article.sgml
index c4b3cd2c8e..2312e51c25 100644
--- a/ja_JP.eucJP/articles/contributors/article.sgml
+++ b/ja_JP.eucJP/articles/contributors/article.sgml
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: 1.417
+ Original revision: 1.419
$FreeBSD$
-->
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -16,7 +16,10 @@
%teams;
<!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
%mailing-lists;
-
+<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
+%ja-trademarks;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
<!ENTITY % contrib.ent SYSTEM "../../../en_US.ISO8859-1/articles/contributors/contrib.ent">
%contrib.ent;
<!ENTITY % not.published "IGNORE">
@@ -27,6 +30,12 @@
<title>FreeBSD への貢献者</title>
<pubdate>$FreeBSD$</pubdate>
+
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.sun;
+ &tm-attrib.general;
+ </legalnotice>
<abstract>
<para>この文書は FreeBSD に貢献した個人や組織を列記したものです。</para>
@@ -478,7 +487,7 @@
</varlistentry>
<varlistentry>
- <term>FreeBSD Java プロジェクト</term>
+ <term>FreeBSD &java; プロジェクト</term>
<listitem>
<para>&a.patrick;</para>
@@ -632,7 +641,7 @@
<term>Bugmeister</term>
<listitem>
- <para>&a.keramida;</para>
+ <para>&a.ceri;</para>
</listitem>
</varlistentry>
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
index d4dc23deea..e12b066d17 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml
@@ -3,10 +3,14 @@
%man;
<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
%freebsd;
+<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
+%ja-trademarks;
+<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
+%trademarks;
<!ENTITY scratch.ap "<application>FreeBSD をゼロから設定する</application>">
<!--
$FreeBSD$
- Original revision: 1.1
+ Original revision: 1.2
-->
]>
@@ -27,6 +31,12 @@
</copyright>
<pubdate>$FreeBSD$</pubdate>
+
+ <legalnotice id="trademarks" role="trademarks">
+ &tm-attrib.freebsd;
+ &tm-attrib.adobe;
+ &tm-attrib.general;
+ </legalnotice>
</articleinfo>
<abstract>
@@ -431,7 +441,7 @@ Do you wish to delete what is left of /var/tmp/temproot.stage1? [no] <userinput>
<para>他の部分に対する設定は、第 2 段階が終わるまで動作しません。
たとえば、プリンタや X11 の設定ファイルもコピーされますが、
- プリンタは PostScript ユーティリティなど、
+ プリンタは &postscript; ユーティリティなど、
ベースシステムに含まれないアプリケーションを使うことが多いでしょう。
X11 はサーバ、ライブラリ、プログラムをコンパイルしないと動作しません。</para>
</sect1>