Merge the following from the English version:

1.51  -> 1.72 	Makefile
	1.118 -> 1.142	book.sgml
	1.19  -> 1.24 	chapters.ent
	1.58  -> 1.59 	bibliography/chapter.sgml
This commit is contained in:
Hiroki Sato 2003-11-17 08:53:49 +00:00
parent 6f0e95eff6
commit 5d91d404af
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=18888
4 changed files with 151 additions and 89 deletions

View file

@ -3,7 +3,7 @@
#
# Build the FreeBSD Handbook (Japanese).
#
# Original revision: 1.51
# Original revision: 1.72
#
# ------------------------------------------------------------------------
@ -26,84 +26,114 @@
#
# ------------------------------------------------------------------------
MAINTAINER=kuriyama@FreeBSD.ORG
MAINTAINER= doc@FreeBSD.org
DOC?= book
FORMATS?= html-split
HAS_INDEX= true
WITH_GLOSSARY?=
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#IMAGES = advanced-networking/isdn-bus.eps
#IMAGES+= advanced-networking/isdn-twisted-pair.eps
#IMAGES+= advanced-networking/natd.eps
#IMAGES+= install/userconfig.scr
#IMAGES+= install/userconfig2.scr
#IMAGES+= install/hdwrconf.scr
#IMAGES+= install/probstart.scr
#IMAGES+= install/main1.scr
#IMAGES+= install/sysinstall-exit.scr
#IMAGES+= install/main-doc.scr
#IMAGES+= install/docmenu1.scr
#IMAGES+= install/main-keymap.scr
#IMAGES+= install/keymap.scr
#IMAGES+= install/main-options.scr
#IMAGES+= install/options.scr
#IMAGES+= install/main-std.scr
#IMAGES+= install/fdisk-drive1.scr
#IMAGES+= install/fdisk-edit1.scr
#IMAGES+= install/fdisk-edit2.scr
#IMAGES+= install/boot-mgr.scr
#IMAGES+= install/fdisk-drive2.scr
#IMAGES+= install/disklabel-ed1.scr
#IMAGES+= install/disklabel-auto.scr
#IMAGES+= install/disklabel-root1.scr
#IMAGES+= install/disklabel-root2.scr
#IMAGES+= install/disklabel-fs.scr
#IMAGES+= install/disklabel-root3.scr
#IMAGES+= install/disklabel-ed2.scr
#IMAGES+= install/dist-set.scr
#IMAGES+= install/dist-set2.scr
#IMAGES+= install/media.scr
#IMAGES+= install/ed0-conf.scr
#IMAGES+= install/ed0-conf2.scr
#IMAGES+= install/ftp-anon1.scr
#IMAGES+= install/ftp-anon2.scr
#IMAGES+= install/nfs-server-edit.scr
#IMAGES+= install/security.scr
#IMAGES+= install/console-saver1.scr
#IMAGES+= install/console-saver2.scr
#IMAGES+= install/console-saver3.scr
#IMAGES+= install/console-saver4.scr
#IMAGES+= install/timezone1.scr
#IMAGES+= install/timezone2.scr
#IMAGES+= install/timezone3.scr
#IMAGES+= install/mouse1.scr
#IMAGES+= install/mouse2.scr
#IMAGES+= install/mouse3.scr
#IMAGES+= install/mouse4.scr
#IMAGES+= install/mouse5.scr
#IMAGES+= install/mouse6.scr
#IMAGES+= install/xf86setup.scr
#IMAGES+= install/desktop.scr
#IMAGES+= install/pkg-cat.scr
#IMAGES+= install/pkg-sel.scr
#IMAGES+= install/pkg-install.scr
#IMAGES+= install/pkg-confirm.scr
#IMAGES+= install/adduser1.scr
#IMAGES+= install/adduser2.scr
#IMAGES+= install/adduser3.scr
#IMAGES+= install/mainexit.scr
#IMAGES+= install/disk-layout.eps
#IMAGES+= install/edit-inetd-conf.scr
#IMAGES_EN = advanced-networking/isdn-bus.eps
#IMAGES_EN+= advanced-networking/isdn-twisted-pair.eps
#IMAGES_EN+= advanced-networking/natd.eps
#IMAGES_EN+= install/adduser1.scr
#IMAGES_EN+= install/adduser2.scr
#IMAGES_EN+= install/adduser3.scr
#IMAGES_EN+= install/boot-mgr.scr
#IMAGES_EN+= install/console-saver1.scr
#IMAGES_EN+= install/console-saver2.scr
#IMAGES_EN+= install/console-saver3.scr
#IMAGES_EN+= install/console-saver4.scr
#IMAGES_EN+= install/desktop.scr
#IMAGES_EN+= install/disklabel-auto.scr
#IMAGES_EN+= install/disklabel-ed1.scr
#IMAGES_EN+= install/disklabel-ed2.scr
#IMAGES_EN+= install/disklabel-fs.scr
#IMAGES_EN+= install/disklabel-root1.scr
#IMAGES_EN+= install/disklabel-root2.scr
#IMAGES_EN+= install/disklabel-root3.scr
#IMAGES_EN+= install/disk-layout.eps
#IMAGES_EN+= install/dist-set.scr
#IMAGES_EN+= install/dist-set2.scr
#IMAGES_EN+= install/docmenu1.scr
#IMAGES_EN+= install/ed0-conf.scr
#IMAGES_EN+= install/ed0-conf2.scr
#IMAGES_EN+= install/edit-inetd-conf.scr
#IMAGES_EN+= install/fdisk-drive1.scr
#IMAGES_EN+= install/fdisk-drive2.scr
#IMAGES_EN+= install/fdisk-edit1.scr
#IMAGES_EN+= install/fdisk-edit2.scr
#IMAGES_EN+= install/ftp-anon1.scr
#IMAGES_EN+= install/ftp-anon2.scr
#IMAGES_EN+= install/hdwrconf.scr
#IMAGES_EN+= install/keymap.scr
#IMAGES_EN+= install/main1.scr
#IMAGES_EN+= install/mainexit.scr
#IMAGES_EN+= install/main-std.scr
#IMAGES_EN+= install/main-options.scr
#IMAGES_EN+= install/main-doc.scr
#IMAGES_EN+= install/main-keymap.scr
#IMAGES_EN+= install/media.scr
#IMAGES_EN+= install/mouse1.scr
#IMAGES_EN+= install/mouse2.scr
#IMAGES_EN+= install/mouse3.scr
#IMAGES_EN+= install/mouse4.scr
#IMAGES_EN+= install/mouse5.scr
#IMAGES_EN+= install/mouse6.scr
#IMAGES_EN+= install/mta-main.scr
#IMAGES_EN+= install/net-config-menu1.scr
#IMAGES_EN+= install/net-config-menu2.scr
#IMAGES_EN+= install/nfs-server-edit.scr
#IMAGES_EN+= install/ntp-config.scr
#IMAGES_EN+= install/options.scr
#IMAGES_EN+= install/pkg-cat.scr
#IMAGES_EN+= install/pkg-confirm.scr
#IMAGES_EN+= install/pkg-install.scr
#IMAGES_EN+= install/pkg-sel.scr
#IMAGES_EN+= install/probstart.scr
#IMAGES_EN+= install/routed.scr
#IMAGES_EN+= install/security.scr
#IMAGES_EN+= install/sysinstall-exit.scr
#IMAGES_EN+= install/timezone1.scr
#IMAGES_EN+= install/timezone2.scr
#IMAGES_EN+= install/timezone3.scr
#IMAGES_EN+= install/userconfig.scr
#IMAGES_EN+= install/userconfig2.scr
#IMAGES_EN+= install/xf86setup.scr
#
#IMAGES_EN+= install/example-dir1.eps
#IMAGES_EN+= install/example-dir2.eps
#IMAGES_EN+= install/example-dir3.eps
#IMAGES_EN+= install/example-dir4.eps
#IMAGES_EN+= install/example-dir5.eps
#IMAGES_EN+= security/ipsec-network.pic
#IMAGES_EN+= security/ipsec-crypt-pkt.pic
#IMAGES_EN+= security/ipsec-encap-pkt.pic
#IMAGES_EN+= security/ipsec-out-pkt.pic
#IMAGES_EN+= vinum/vinum-concat.pic
#IMAGES_EN+= vinum/vinum-mirrored-vol.pic
#IMAGES_EN+= vinum/vinum-raid10-vol.pic
#IMAGES_EN+= vinum/vinum-raid5-org.pic
#IMAGES_EN+= vinum/vinum-simple-vol.pic
#IMAGES_EN+= vinum/vinum-striped-vol.pic
#IMAGES_EN+= vinum/vinum-striped.pic
# Images from the cross-document image library
#IMAGES_LIB= callouts/1.png
#IMAGES_LIB+= callouts/2.png
#IMAGES_LIB+= callouts/3.png
#IMAGES_LIB+= callouts/4.png
#IMAGES_LIB+= callouts/5.png
IMAGES_LIB= callouts/1.png
IMAGES_LIB+= callouts/2.png
IMAGES_LIB+= callouts/3.png
IMAGES_LIB+= callouts/4.png
IMAGES_LIB+= callouts/5.png
IMAGES_LIB+= callouts/6.png
IMAGES_LIB+= callouts/7.png
IMAGES_LIB+= callouts/8.png
IMAGES_LIB+= callouts/9.png
IMAGES_LIB+= callouts/10.png
#
# SRCS lists the individual SGML files that make up the document. Changes
@ -111,7 +141,7 @@ INSTALL_ONLY_COMPRESSED?=
#
# SGML content
SRCS= book.sgml
SRCS+= book.sgml
SRCS+= advanced-networking/chapter.sgml
SRCS+= basics/chapter.sgml
SRCS+= bibliography/chapter.sgml
@ -127,15 +157,18 @@ SRCS+= l10n/chapter.sgml
SRCS+= linuxemu/chapter.sgml
SRCS+= mail/chapter.sgml
SRCS+= mirrors/chapter.sgml
#SRCS+= multimedia/chapter.sgml
#SRCS+= desktop/chapter.sgml
SRCS+= pgpkeys/chapter.sgml
SRCS+= ppp-and-slip/chapter.sgml
SRCS+= printing/chapter.sgml
SRCS+= security/chapter.sgml
SRCS+= serialcomms/chapter.sgml
SRCS+= sound/chapter.sgml
SRCS+= users/chapter.sgml
#SRCS+= vinum/chapter.sgml
SRCS+= x11/chapter.sgml
SRCS+= ports/chapter.sgml
#SRCS+= preface/preface.sgml
SRCS+= colophon.sgml
# Entities
@ -150,6 +183,9 @@ SYMLINKS= ${DESTDIR} index.html handbook.html
CHAPTERS?= ${SRCS:M*chapter.sgml}
SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./}
.if defined(WITH_GLOSSARY) && !empty(WITH_GLOSSARY)
SGMLFLAGS+= -i chap.freebsd-glossary
.endif
# XXX The Handbook build currently overflows some internal, hardcoded
# limits in pdftex. Until we split the Handbook up, build the PDF

View file

@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.58
Original revision: 1.59
$FreeBSD$
-->
@ -89,6 +89,14 @@
ISBN 3-936546-06-1.</para>
</listitem>
<listitem>
<para><ulink url="http://www.mitp.de/vmi/mitp/detail/pWert/1343/">
FreeBSD de Luxe</ulink> (ドイツ語),
<ulink url="http://www.mitp.de">Verlag Modere Industrie</ulink> 発行,
2003 年。ISBN 3-8266-1343-0
</para>
</listitem>
<listitem>
<para><ulink
url="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">

View file

@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.118
Original revision: 1.142
$FreeBSD$
-->
@ -31,6 +31,8 @@
%ja-trademarks;
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY % txtfiles SYSTEM "../../../en_US.ISO8859-1/books/handbook/txtfiles.ent"> %txtfiles;
<!ENTITY % not.published "INCLUDE">
<!ENTITY % chap.introduction "IGNORE">
@ -44,23 +46,23 @@
<!ENTITY % chap.security "IGNORE">
<!ENTITY % chap.printing "IGNORE">
<!ENTITY % chap.disks "IGNORE">
<!ENTITY % chap.backups "IGNORE">
<!ENTITY % chap.vinum "IGNORE">
<!ENTITY % chap.x11 "IGNORE">
<!ENTITY % chap.l10n "IGNORE">
<!ENTITY % chap.sound "IGNORE">
<!ENTITY % chap.multimedia "IGNORE">
<!ENTITY % chap.desktop "IGNORE">
<!ENTITY % chap.serialcomms "IGNORE">
<!ENTITY % chap.ppp-and-slip "IGNORE">
<!ENTITY % chap.advanced-networking "IGNORE">
<!ENTITY % chap.mail "IGNORE">
<!ENTITY % chap.cutting-edge "IGNORE">
<!ENTITY % chap.policies "IGNORE">
<!ENTITY % chap.kerneldebug "IGNORE">
<!ENTITY % chap.linuxemu "IGNORE">
<!ENTITY % chap.mirrors "IGNORE">
<!ENTITY % chap.bibliography "IGNORE">
<!ENTITY % chap.eresources "IGNORE">
<!ENTITY % chap.pgpkeys "IGNORE">
<!ENTITY % chap.index "IGNORE">
<!ENTITY % chap.freebsd-glossary "IGNORE">
<!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
]>
@ -130,7 +132,8 @@
<abstract>
<para>FreeBSD へようこそ!
¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
¤³¤Î¥Ï¥ó¥É¥Ö¥Ã¥¯¤Ï <emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
¤È <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>
のインストールおよび、日常での使い方について記述したものです。
本ハンドブックは<emphasis>改編作業中</emphasis>であり、
さまざまな人々が編集に携わっています。
@ -150,7 +153,7 @@
<ulink url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>
から購入することができます。また、
<ulink url="../../../../search/index.html">ハンドブックの検索</ulink>を行なうことも可能です。</para>
<para>FreeBSD ハンドブック日本語版の作成は FreeBSD
日本語ドキュメンテーションプロジェクト (FreeBSD doc-jp) がおこなっています。
ハンドブックの日本語訳に関することは FreeBSD &a.jp.doc-jp;
@ -162,7 +165,11 @@
</abstract>
</bookinfo>
<part>
<!--
&chap.preface;
-->
<part id="getting-started">
<title>導入</title>
<partintro>
@ -177,16 +184,16 @@
<listitem>
<para>インストールの手順の解説</para>
</listitem>
<listitem>
<para>&unix; の基礎</para>
</listitem>
<listitem>
<para>FreeBSD で利用できる豊富なサードパーティ製のアプリケーションの
インストール方法</para>
</listitem>
<listitem>
<para>&unix; におけるウィンドウシステム X、
およびクリエイティブなデスクトップ環境の設定の詳細の紹介</para>
@ -226,15 +233,19 @@
<![ %chap.security; [ &chap.security; ]]>
<![ %chap.printing; [ &chap.printing; ]]>
<![ %chap.disks; [ &chap.disks; ]]>
<!--
<![ %chap.vinum; [ &chap.vinum; ]]>
-->
<![ %chap.l10n; [ &chap.l10n; ]]>
<![ %chap.sound; [ &chap.sound; ]]>
<!--
<![ %chap.desktop; [ &chap.desktop; ]]>
<![ %chap.multimedia; [ &chap.multimedia; ]]>
-->
<![ %chap.serialcomms; [ &chap.serialcomms; ]]>
<![ %chap.ppp-and-slip; [ &chap.ppp-and-slip; ]]>
<![ %chap.advanced-networking; [ &chap.advanced-networking; ]]>
<![ %chap.mail; [ &chap.mail; ]]>
<![ %chap.cutting-edge; [ &chap.cutting-edge; ]]>
<![ %chap.policies; [ &chap.policies; ]]>
<![ %chap.kerneldebug; [ &chap.kerneldebug; ]]>
<![ %chap.linuxemu; [ &chap.linuxemu; ]]>
</part>
@ -245,8 +256,9 @@
<![ %chap.bibliography; [ &chap.bibliography; ]]>
<![ %chap.eresources; [ &chap.eresources; ]]>
<![ %chap.pgpkeys; [ &chap.pgpkeys; ]]>
<![ %chap.index; [ &chap.index; ]]>
</part>
<![ %chap.freebsd-glossary; [ &bookinfo.freebsd-glossary; ]]>
<![ %chap.index; [ &chap.index; ]]>
&chap.colophon;
</book>

View file

@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
Original revision: 1.19
Original revision: 1.24
$FreeBSD$
Creates entities for each chapter in the FreeBSD Handbook. Each entity
@ -13,6 +13,10 @@
Chapters should be listed in the order in which they are referenced.
-->
<!--
<!ENTITY chap.preface SYSTEM "preface/preface.sgml">
-->
<!-- Part one -->
<!ENTITY chap.introduction SYSTEM "introduction/chapter.sgml">
<!ENTITY chap.install SYSTEM "install/chapter.sgml">
@ -27,9 +31,11 @@
<!ENTITY chap.security SYSTEM "security/chapter.sgml">
<!ENTITY chap.printing SYSTEM "printing/chapter.sgml">
<!ENTITY chap.disks SYSTEM "disks/chapter.sgml">
<!ENTITY chap.vinum SYSTEM "vinum/chapter.sgml">
<!ENTITY chap.x11 SYSTEM "x11/chapter.sgml">
<!ENTITY chap.l10n SYSTEM "l10n/chapter.sgml">
<!ENTITY chap.sound SYSTEM "sound/chapter.sgml">
<!ENTITY chap.desktop SYSTEM "desktop/chapter.sgml">
<!ENTITY chap.multimedia SYSTEM "multimedia/chapter.sgml">
<!ENTITY chap.serialcomms SYSTEM "serialcomms/chapter.sgml">
<!ENTITY chap.ppp-and-slip SYSTEM "ppp-and-slip/chapter.sgml">
<!ENTITY chap.advanced-networking SYSTEM "advanced-networking/chapter.sgml">