summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ja/appendix/chroot-install.xml39
-rw-r--r--ja/appendix/preseed.xml13
-rw-r--r--ja/bookinfo.xml3
3 files changed, 42 insertions, 13 deletions
diff --git a/ja/appendix/chroot-install.xml b/ja/appendix/chroot-install.xml
index fbf83fa2d..a22bfd425 100644
--- a/ja/appendix/chroot-install.xml
+++ b/ja/appendix/chroot-install.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 33719 -->
+<!-- original version: 34713 -->
<sect1 id="linux-upgrade">
<!--
@@ -148,33 +148,52 @@ The tool that the Debian installer uses, which is recognized as the
official way to install a Debian base system, is
<command>debootstrap</command>. It uses <command>wget</command> and
<command>ar</command>, but otherwise depends only on
-<classname>/bin/sh</classname>. Install <command>wget</command> and
-<command>ar</command> if they aren't already on your current system,
-then download and install <command>debootstrap</command>.
+<classname>/bin/sh</classname> and basic Unix/Linux tools<footnote>
-->
Debian インストーラが使用するツール
(Debian 基本システムをインストールする公式の方法と認められている)
が <command>debootstrap</command> です。
<command>wget</command> と <command>ar</command> を使用しますが、
-<classname>/bin/sh</classname> にのみ依存しています。
-今のシステムに既にインストールしていなければ、
+<classname>/bin/sh</classname> と基本的な Unix/Linux ツール<footnote>
+
+<para>
+
+<!--
+These include the GNU core utilities and commands like <command>sed</command>, <command>grep</command>, <command>tar</command> and <command>gzip</command>.
+-->
+これには、<command>sed</command>, <command>grep</command>,
+<command>tar</command>, <command>gzip</command> といった、
+GNU コアユーティリティが含まれます。
+
+</para>
+
+<!--
+</footnote>. Install <command>wget</command> and
+<command>ar</command> if they aren't already on your current system,
+then download and install <command>debootstrap</command>.
+-->
+</footnote>にのみ依存しています。今のシステムにまだインストールしていなければ、
<command>wget</command> と <command>ar</command> をインストールし、
その後 <command>debootstrap</command>
をダウンロード・インストールしてください。
-</para><para>
+</para>
+
+<!-- The files linked to here are from 2004 and thus currently not usable
+<para>
-<!--
If you have an rpm-based system, you can use alien to convert the
.deb into .rpm, or download an rpm-ized version at
<ulink url="http://people.debian.org/~blade/install/debootstrap"></ulink>
--->
rpm ベースシステムがあるなら、alien を使って .deb を .rpm に変換できます。
もしくは、
<ulink url="http://people.debian.org/~blade/install/debootstrap"></ulink>
から rpm 形式のものをダウンロードできます。
-</para><para>
+</para>
+-->
+
+<para>
<!--
Or, you can use the following procedure to install it
diff --git a/ja/appendix/preseed.xml b/ja/appendix/preseed.xml
index 6ce007806..55546164e 100644
--- a/ja/appendix/preseed.xml
+++ b/ja/appendix/preseed.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 33891 -->
+<!-- original version: 34168 -->
<!--
Be carefull with the format of this file as it is parsed to generate
@@ -836,8 +836,17 @@ d-i netcfg/choose_interface select auto
# it, this might be useful.
#d-i netcfg/dhcp_timeout string 60
-# If you prefer to configure the network manually, here's how:
+# If you prefer to configure the network manually, uncomment this line and
+# the static network configuration below.
#d-i netcfg/disable_dhcp boolean true
+
+# If you want the preseed file to work on systems both with and without
+# a dhcp server, uncomment these lines and the static network configuration
+# below.
+#d-i netcfg/dhcp_failed note
+#d-i netcfg/dhcp_options select Configure network manually
+
+# Static network configuration.
#d-i netcfg/get_nameservers string 192.168.1.1
#d-i netcfg/get_ipaddress string 192.168.1.42
#d-i netcfg/get_netmask string 255.255.255.0
diff --git a/ja/bookinfo.xml b/ja/bookinfo.xml
index a783ba8e4..b53ee429f 100644
--- a/ja/bookinfo.xml
+++ b/ja/bookinfo.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 29882 -->
+<!-- original version: 34719 -->
<bookinfo id="debian_installation_guide">
<title>&debian; インストールガイド</title>
@@ -70,6 +70,7 @@ You may also be able to find additional translations there.
<copyright>
<year>2004</year>
<year>2005</year>
+ <year>2006</year>
<holder>the Debian Installer team</holder>
</copyright>