Merge books/handbook/book.sgml from English version (partially):

- Declare trademark related entities and utilize &tm-attrib.*;.

  - Update copyright year.

  - Add some IDs to <part>.

I would not update ``Original revision'' due to some translated docs are
not yet synced w/ original ones.
This commit is contained in:
Hideyuki KURASHINA 2003-10-18 23:41:54 +00:00
parent 9a9ef91ab4
commit 76a6300213
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=18487

View file

@ -27,6 +27,10 @@
<!ENTITY % ja-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA"> <!ENTITY % ja-mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA">
%ja-mailing-lists; %ja-mailing-lists;
<!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups; <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"> %newsgroups;
<!ENTITY % ja-trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//JA">
%ja-trademarks;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY % not.published "INCLUDE"> <!ENTITY % not.published "INCLUDE">
<!ENTITY % chap.introduction "IGNORE"> <!ENTITY % chap.introduction "IGNORE">
@ -77,11 +81,53 @@
<year>1999</year> <year>1999</year>
<year>2000</year> <year>2000</year>
<year>2001</year> <year>2001</year>
<year>2002</year>
<year>2003</year>
<holder>The FreeBSD Documentation Project</holder> <holder>The FreeBSD Documentation Project</holder>
</copyright> </copyright>
&bookinfo.legalnotice; &bookinfo.legalnotice;
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
&tm-attrib.3com;
&tm-attrib.3ware;
&tm-attrib.arm;
&tm-attrib.adaptec;
&tm-attrib.adobe;
&tm-attrib.apple;
&tm-attrib.corel;
&tm-attrib.creative;
&tm-attrib.heidelberger;
&tm-attrib.ibm;
&tm-attrib.ieee;
&tm-attrib.intel;
&tm-attrib.intuit;
&tm-attrib.linux;
&tm-attrib.lsilogic;
&tm-attrib.m-systems;
&tm-attrib.macromedia;
&tm-attrib.microsoft;
&tm-attrib.netscape;
&tm-attrib.opengroup;
&tm-attrib.oracle;
&tm-attrib.powerquest;
&tm-attrib.realnetworks;
&tm-attrib.redhat;
&tm-attrib.sap;
&tm-attrib.sun;
&tm-attrib.symantec;
&tm-attrib.themathworks;
&tm-attrib.thomson;
&tm-attrib.usrobotics;
&tm-attrib.vmware;
&tm-attrib.waterloomaple;
&tm-attrib.wolframresearch;
&tm-attrib.xfree86;
&tm-attrib.xiph;
&tm-attrib.general;
</legalnotice>
<abstract> <abstract>
<para>FreeBSD へようこそ! <para>FreeBSD へようこそ!
このハンドブックは <emphasis>FreeBSD &rel.current;-RELEASE</emphasis> このハンドブックは <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
@ -133,7 +179,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para>Unix の基礎</para> <para>&unix; の基礎</para>
</listitem> </listitem>
<listitem> <listitem>
@ -142,7 +188,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para>Unix におけるウィンドウシステム X、 <para>&unix; におけるウィンドウシステム X、
およびクリエイティブなデスクトップ環境の設定の詳細の紹介</para> およびクリエイティブなデスクトップ環境の設定の詳細の紹介</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -159,7 +205,7 @@
<![ %chap.x11; [ &chap.x11; ]]> <![ %chap.x11; [ &chap.x11; ]]>
</part> </part>
<part> <part id="system-administration">
<title>システム管理</title> <title>システム管理</title>
<partintro> <partintro>
@ -192,7 +238,7 @@
<![ %chap.linuxemu; [ &chap.linuxemu; ]]> <![ %chap.linuxemu; [ &chap.linuxemu; ]]>
</part> </part>
<part> <part id="appendices">
<title>付録</title> <title>付録</title>
<![ %chap.mirrors; [ &chap.mirrors; ]]> <![ %chap.mirrors; [ &chap.mirrors; ]]>