鍋太郎です。
インストールマニュアルの訳を追随しました。
(ちょっと油断するとすぐにたまりますね……)
本文と差分を添付しますので査読をお願いいたします。
アーカイブの内容は以下になります。
$ tar ztf d-i-update0817.tar.gz
ja/install-methods/floppy/i386.xml
ja/install-methods/tftp/rarp.xml
ja/preparing/bios-setup/i386.xml
ja/appendix/chroot-install.xml
ja/appendix/files.xml
ja/appendix/plip.xml
ja/appendix/preseed.xml
ja/using-d-i/components.xml
ja/using-d-i/modules/partman-crypto.xml
ja/using-d-i/modules/partman.xml
ja/using-d-i/modules/partman-lvm.xml
ja/hardware/hardware-supported.xml
ja/hardware/supported/i386.xml
ja/hardware/supported/amd64.xml
ja/hardware/supported/s390.xml
ja/hardware/installation-media.xml
ja/boot-installer/parameters.xml
--
+--------------------------------------------------------+
倉澤 望(鍋太郎)
KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp>
GnuPG FingerPrint:
C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+
Attachment:
d-i-update0817.tar.gz
Description: Binary data
Index: ja/install-methods/floppy/i386.xml
===================================================================
--- ja/install-methods/floppy/i386.xml (ӥ 39906)
+++ ja/install-methods/floppy/i386.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 -->
+<!-- original version: 39870 -->
<!-- This is not set off for i386 only, because many people will have -->
@@ -11,10 +11,10 @@
<para>
<!--
-If you have access to an i386 machine, you can use one of the
+If you have access to an i386 or amd64 machine, you can use one of the
following programs to copy images to floppies.
-->
-i386 ޥѤǤȤϡ
+i386 ޥ amd64 ޥѤǤ硢
եåԡؤΥΥԡˤϰʲΥץΤɤ줫Ȥޤ
</para><para>
Index: ja/install-methods/tftp/rarp.xml
===================================================================
--- ja/install-methods/tftp/rarp.xml (ӥ 39906)
+++ ja/install-methods/tftp/rarp.xml (ȥԡ)
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 -->
+<!-- original version: 39897 -->
<sect2 condition="supports-rarp" id="tftp-rarp">
- <title>RARP Ф</title>
+<!--
+ <title>Setting up RARP server</title>
+-->
+ <title>RARP Ф</title>
<para>
<!--
-To setup RARP, you need to know the Ethernet address (a.k.a. the MAC address)
+To set up RARP, you need to know the Ethernet address (a.k.a. the MAC address)
of the client computers to be installed.
If you don't know this information, you can
@@ -32,76 +35,31 @@
</para><para>
<!--
-On a RARP server system using a Linux 2.2.x kernel,
-you need to populate the kernel's RARP table.
-To do this, run the following commands:
--->
-Linux 2.2.x ͥȤäƤ RARP ХƥǤϡ
-ͥ RARP ơ֥ؤϿɬפǤ
-Υޥɤ¹ԤƤ
-
-<informalexample><screen>
-# <userinput>/sbin/rarp -s
-<replaceable>client-hostname</replaceable>
-<replaceable>client-enet-addr</replaceable></userinput>
-
-# <userinput>/usr/sbin/arp -s
-<replaceable>client-ip</replaceable>
-<replaceable>client-enet-addr</replaceable></userinput>
-</screen></informalexample>
-
-<!--
-If you get
--->
-
-<informalexample><screen>
-SIOCSRARP: Invalid argument
-</screen></informalexample>
-
-<!--
-you probably need to load the RARP kernel module or else recompile the
-kernel to support RARP. Try <userinput>modprobe rarp</userinput> and
-then try the <command>rarp</command> command again.
--->
-ȤäåФϡRARP ͥ⥸塼ɤ뤫
-줬Բǽʤ RARP ΥݡȤȤ߹褦
-ͥƹۤɬפޤ
-<userinput>modprobe rarp</userinput> ޤä⤦
-<command>rarp</command> ޥɤ¹ԤƤ
-
-</para><para>
-
-<!--
-On a RARP server system using a Linux 2.4.x kernel,
-there is no RARP module, and
-you should instead use the <command>rarpd</command> program. The
-procedure is similar to that used under SunOS in the following
-paragraph.
--->
-Linux 2.4.x ͥRARP ХƥǤϡRARP ⥸塼Ϥޤ
-ޤȤץ <command>rarpd</command> ˤʤޤ
-ϼ SunOS ξƱ褦ˤʤޤ
-
-</para><para>
-
-<!--
-Under SunOS, you need to ensure that the Ethernet hardware address for
-the client is listed in the <quote>ethers</quote> database (either in the
+On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS,
+you use the <command>rarpd</command> program.
+You need to ensure that the Ethernet hardware address for the client is
+listed in the <quote>ethers</quote> database (either in the
<filename>/etc/ethers</filename> file, or via NIS/NIS+) and in the
<quote>hosts</quote> database. Then you need to start the RARP daemon.
-In SunOS 4, issue the command (as root):
-<userinput>/usr/etc/rarpd -a</userinput>; in SunOS 5, use
-<userinput>/usr/sbin/rarpd -a</userinput>.
+Issue the command (as root): <userinput>/usr/sbin/rarpd -a</userinput>
+on most Linux systems and SunOS 5 (Solaris 2),
+<userinput>/usr/sbin/in.rarpd -a</userinput> on some other Linux systems,
+or <userinput>/usr/etc/rarpd -a</userinput> in SunOS 4 (Solaris 1).
-->
-SunOS Ǥϡ饤ȤΥͥåȥϡɥɥ쥹
+Linux 2.4 ͥʤ 2.6 ͥ RARP Хƥ䡢
+Solaris/SunOS Ǥϡ<command>rarpd</command> Ѥޤ
+饤ȤΥͥåȥϡɥɥ쥹
<quote>ethers</quote> ǡ١ <quote>hosts</quote> ǡ١
-ꥹȤƤʤФʤޤ
+ꥹȤƤɬפޤ
(Υǡ١ <filename>/etc/(ethers,hosts)</filename> ե뤫
NIS/NIS+ Υޥåפˤޤ)
RARP ǡưޤ
-SunOS 4 Ǥ <userinput>/usr/etc/rarpd -a</userinput>
-SunOS 5 Ǥ <userinput>/usr/sbin/rarpd -a</userinput>
-(롼ȸ¤) ¹ԤƤ
+ۤȤɤ Linux ƥ SunOS 5 (Solaris 2)Ǥϡ
+<userinput>/usr/sbin/rarpd -a</userinput>
+Ĥ¾ Linux ƥǤ
+<userinput>/usr/sbin/in.rarpd -a</userinput>
+SunOS 4 (Solaris 1) Ǥ <userinput>/usr/etc/rarpd -a</userinput>
+ (롼ȸ¤) ¹ԤƤ
</para>
</sect2>
Index: ja/preparing/bios-setup/i386.xml
===================================================================
--- ja/preparing/bios-setup/i386.xml (ӥ 39906)
+++ ja/preparing/bios-setup/i386.xml (ȥԡ)
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 39887 -->
+<!-- This section is heavily outdated. It only really describes
+ older BIOSes and not the current situation. Most of it is not
+ really relevant for AMD64, but a general description would be.
+ File should be renamed to x86.xml if a more general text is
+ written. -->
+<!--
+ <sect2 arch="x86" id="bios-setup"><title>Invoking the BIOS Set-Up Menu</title>
+-->
<sect2 arch="x86" id="bios-setup"><title>BIOS ˥塼εư</title>
<para>
Index: ja/appendix/chroot-install.xml
===================================================================
--- ja/appendix/chroot-install.xml (ӥ 39906)
+++ 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: 36758 -->
+<!-- original version: 39614 -->
<sect1 id="linux-upgrade">
<!--
@@ -71,11 +71,11 @@
</para><para>
<!--
-To create file systems on your partitions. For example, to create an
+Create file systems on your partitions. For example, to create an
ext3 file system on partition <filename>/dev/hda6</filename> (that's
our example root partition):
-->
-ѡƥؤΥե륷ƥ
+ѡƥ˥ե륷ƥƤ
㤨С<filename>/dev/hda6</filename> ѡƥˡ
ext3 ե륷ƥˤϡʲΤ褦ˤޤ
(ǤϤΥѡƥ root ѡƥȤޤ)
@@ -144,15 +144,15 @@
<para>
<!--
-The tool that the Debian installer uses, which is recognized as the
+The utility used by the Debian installer, and 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> and basic Unix/Linux tools<footnote>
-->
-Debian ȡ餬Ѥġ
-(Debian ܥƥȡ뤹ˡǧƤ)
- <command>debootstrap</command> Ǥ
+Debian ȡ餬Ѥ桼ƥƥǡ
+Debian ܥƥȡ뤹ˡǧƤΤ
+<command>debootstrap</command> Ǥ
<command>wget</command> <command>ar</command> Ѥޤ
<classname>/bin/sh</classname> ȴŪ Unix/Linux ġ<footnote>
@@ -541,24 +541,26 @@
<!--
To configure your locale settings to use a language other than
-English, install the locales support package and configure it:
+English, install the <classname>locales</classname> support package
+and configure it:
-->
ѸʳθѤ褦뤿ˡ
-Τ褦˥ݡȤѥåȡ롦ꤷޤ
+Τ褦˥ݡȤѥå
+(<classname>locales</classname>) ȡ롦ꤷޤ
<informalexample><screen>
-# apt-get install locales
+# aptitude install locales
# dpkg-reconfigure locales
</screen></informalexample>
<!--
-NOTE: Apt must be configured beforehand by creating a sources.list and
-running apt-get update.
+NOTE: <classname>apt</classname> must be configured beforehand by creating
+a sources.list and running <command>aptitude update</command>.
Before using locales with character sets other than ASCII or latin1,
please consult the appropriate localisation HOWTO.
-->
: 餫 sources.list κ apt-get update ¹Ԥơ
-apt ꤷƤʤФʤޤ
+<classname>apt</classname> ꤷƤʤФʤޤ
ASCII latin1 ʳʸåȤĥѤˤϡ
Ŭڤ localization HOWTO Ĵ٤Ƥ
@@ -588,7 +590,7 @@
ˡѥå̾Ȥäƥȡ뤷Ƥ
<informalexample><screen>
-# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+# aptitude install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
</screen></informalexample>
</para>
@@ -600,16 +602,16 @@
<!--
To make your &debian; system bootable, set up your boot loader to load
-the installed kernel with your new root partition. Note that debootstrap
-does not install a boot loader, though you can use apt-get inside your
-Debian chroot to do so.
+the installed kernel with your new root partition. Note that
+<command>debootstrap</command> does not install a boot loader, though you
+can use <command>aptitude</command> inside your Debian chroot to do so.
-->
&debian; ƥưǤ褦ˤ뤿ˡ
ȡ뤷ͥ root ѡƥɤ߹褦ˡ
-֡ȥåȥåפƤ
-debootstrap ϡ֡ȥȡ뤷ʤȤդƤ
-ȤϸäƤ⡢åȥåפ뤿 Debian chroot apt-get
-Ѥ뤳ȤǤޤ
+֡ȥåȥåפƤ<command>debootstrap</command> ϡ
+֡ȥȡ뤷ʤȤդƤ
+ȤϸäƤ⡢åȥåפΤ Debian chroot
+<command>aptitude</command> ѤǤޤ
</para><para arch="x86">
Index: ja/appendix/files.xml
===================================================================
--- ja/appendix/files.xml (ӥ 39906)
+++ ja/appendix/files.xml (ȥԡ)
@@ -1,31 +1,30 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 33887 -->
+<!-- original version: 39551 -->
<sect1 id="linuxdevices"><title>Linux ΥǥХ</title>
<para>
<!--
-In Linux you have various special files in
-<filename>/dev</filename>. These files are called device files. In
-the Unix world accessing hardware is different. There you have a
-special file which actually runs a driver which in turn accesses the
-hardware. The device file is an interface to the actual system
-component. Files under <filename>/dev</filename> also behave
-differently than ordinary files. Below are the most important device
-files listed.
+In Linux various special files can be found under the directory
+<filename>/dev</filename>. These files are called device files and
+behave unlike ordinary files. The most common types of device files
+are for block devices and character devices. These files are an
+interface to the actual driver (part of the Linux kernel) which in
+turn accesses the hardware. Another, less common, type of device file
+is the named <firstterm>pipe</firstterm>.
+The most important device files are listed in the tables below.
-->
Linux Ǥϡ<filename>/dev</filename> ̤ʥե뤬Ȥޤ
-ΥեϥǥХեȸƤФޤ
-Unix ǤϥϡɥؤΥѤǤ
-Ǥϥϡɥ˥ݤˡ
-ɥ饤Фºݤư̤ʥե뤬ޤ
-ǥХեϡ
-ºݤΥƥॳݡͥȤؤΥեȤʤޤ
-ޤ<filename>/dev</filename> ʲΥեϡ
-̾ΥեȰۤʤ뿶ޤ
-ʲϡǤפʥǥХեΰǤ
+ΥեϥǥХեȸƤФ졢
+̾ΥեȰۤʤ뿶ޤ
+ǥХեΰŪʤΤϡ֥åǥХȥ饯ǥХǤ
+Υեϡϡɥ˥ºݤΥɥ饤
+(Linux ͥΰ) ؤΥեǤ
+¾ޤŪǤϤޤ
+<firstterm>ѥ</firstterm> ȤǥХեη⤢ޤ
+ʲˡǤפʥǥХեޤ
</para><para>
@@ -119,7 +118,10 @@
<informaltable><tgroup cols="2"><tbody>
<row>
<entry><filename>null</filename></entry>
- <entry>줿Τ٤ƾäƤޤǥХ</entry>
+<!--
+ <entry>Anything written to this device will disappear</entry>
+-->
+ <entry>ޤ줿Τ٤ƾäƤޤǥХ</entry>
</row><row>
<entry><filename>zero</filename></entry>
<entry>̵¤ 0 ɤ߽ФǥХ</entry>
@@ -185,8 +187,8 @@
</para><para>
<!--
-If gpm is disabled or not installed with some reason, make sure to set X to
-read directly from the mouse device such as /dev/psaux. For details, refer
+If gpm is disabled or not installed for some reason, make sure to set X to
+read directly from a mouse device such as /dev/psaux. For details, refer
to the 3-Button Mouse mini-Howto at
<filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>,
<userinput>man gpm</userinput>,
@@ -394,11 +396,11 @@
<note><para>
<!--
-The <emphasis>Desktop</emphasis> task will install both the Gnome and KDE
+The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE
desktop environments.
-->
<emphasis>ǥȥå</emphasis> ϡ
-Gnome KDE ξǥȥå״Ķȡ뤷ޤ
+GNOME KDE ξǥȥå״Ķȡ뤷ޤ
</para></note>
Index: ja/appendix/plip.xml
===================================================================
--- ja/appendix/plip.xml (ӥ 39906)
+++ ja/appendix/plip.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 29687 -->
+<!-- original version: 39644 -->
<sect1 id="plip" arch="x86">
<!--
@@ -11,7 +11,7 @@
<para>
<!--
-This section explains how to install &debian; on a computer without
+This section explains how to install &debian; on a computer without an
Ethernet card, but with just a remote gateway computer attached via
a Null-Modem cable (also called Null-Printer cable). The gateway
computer should be connected to a network that has a Debian mirror
@@ -164,12 +164,28 @@
<!--
Boot the installation media. The installation needs to be run in
expert mode; enter <userinput>expert</userinput> at the boot prompt.
-Below are the answers that should be given during various stages of
-the installation.
+If you need to set parameters for kernel modules, you also need to
+do this at the boot prompt. For example, to boot the installer and
+set values for the <quote>io</quote> and <quote>irq</quote> options
+for the parport_pc module, enter the following at the boot prompt:
-->
ȡǥǵưƤ
ȡ뤹ˤϡѡȥ⡼ɤưɬפޤ
֡ȥץץȤ <userinput>expert</userinput> ϤƤ
+ͥ⥸塼˥ѥåȤɬפϡ
+֡ȥץץȤˤꤷʤФʤޤ
+㤨Хȡ鵯ưˡparport_pc ⥸塼
+<quote>io</quote> ץ <quote>irq</quote> ץϤ硢
+ʲΤ褦˥֡ȥץץȤϤޤ
+
+<informalexample><screen>
+expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc.irq=<replaceable>7</replaceable>
+</screen></informalexample>
+
+<!--
+Below are the answers that should be given during various stages of
+the installation.
+-->
ʲϡȡγʳͿͤǤ
</para>
@@ -178,9 +194,9 @@
<listitem><para>
<!--
-<guimenuitem>Load installer components</guimenuitem>
+<guimenuitem>Load installer components from CD</guimenuitem>
-->
-<guimenuitem>ȡ饳ݡͥȤ</guimenuitem>
+<guimenuitem>ȡ饳ݡͥȤ CD </guimenuitem>
</para><para>
@@ -222,14 +238,6 @@
<listitem><para>
<!--
-Prompt for module parameters: Yes
--->
-֥⥸塼ѥͿޤפˤϡ֤Ϥפޤ
-
- </para></listitem>
- <listitem><para>
-
-<!--
Because no network card was detected/selected earlier, the installer will
ask you to select a network driver module from a list.
Select the <userinput>plip</userinput> module.
@@ -240,25 +248,6 @@
<userinput>plip</userinput> ⥸塼Ƥ
</para></listitem>
- <listitem><para>
-
-<!--
-Additional parameters for module parport_pc:
-<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>
--->
-parport_pc ⥸塼ɲåѥϡ
-<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>
-ȤƤ
-
- </para></listitem>
- <listitem><para>
-
-<!--
-Additional parameters for module plip: leave empty
--->
-plip ⥸塼ɲåѥϡΤޤޤˤƤ
-
- </para></listitem>
</itemizedlist>
</listitem>
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (ӥ 39906)
+++ ja/appendix/preseed.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39285 -->
+<!-- original version: 39468 -->
<!--
Be carefull with the format of this file as it is parsed to generate
@@ -1514,6 +1514,22 @@
¾ˡǥѥåΥåȤŪ˥ȡ뤵뤳Ȥ⤢ޤ
<userinput>standard</userinput> Ͼ˴ޤΤᤷޤ
+</para><para>
+
+
+<!--
+If you want to install some individual packages in addition to packages
+installed by tasks, you can use the parameter
+<classname>pkgsel/include</classname>. The value of this parameter can be
+either comma-separated or space-separated, so you can also use it easily on
+the kernel command line.
+-->
+ǥȡ뤹ѥå˲äơ
+Υѥåȡ뤹硢
+<classname>pkgsel/include</classname> ѥѤǤޤ
+Υѥͤϡͥ륳ޥɥ饤ǻȤ䤹Τǡ
+ڤ꤫ڤˤƤ
+
</para>
<informalexample role="example"><screen>
@@ -1521,6 +1537,9 @@
#tasksel tasksel/first multiselect standard, web-server
#tasksel tasksel/first multiselect standard, kde-desktop
+# Individual additional packages to install
+#d-i pkgsel/include string openssh-server build-essential
+
# Some versions of the installer can report back on what software you have
# installed, and what software you use. The default is not to report back,
# but sending reports helps the project determine what software is most
Index: ja/using-d-i/components.xml
===================================================================
--- ja/using-d-i/components.xml (ӥ 39906)
+++ ja/using-d-i/components.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 38703 -->
+<!-- original version: 39622 -->
<sect1 id="module-details">
<!--
Index: ja/using-d-i/modules/partman-crypto.xml
===================================================================
--- ja/using-d-i/modules/partman-crypto.xml (ӥ 39906)
+++ ja/using-d-i/modules/partman-crypto.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39224 -->
+<!-- original version: 39460 -->
<sect3 id="partman-crypto">
<!--
@@ -119,13 +119,13 @@
</para><para>
<!--
-First, let's have a look at available options available when you
-select <userinput>Device-mapper (dm-crypt)</userinput> as the
-encryption method. As always: when in doubt, use the defaults, because
+First, let's have a look at the options available when you select
+<userinput>Device-mapper (dm-crypt)</userinput> as the encryption
+method. As always: when in doubt, use the defaults, because
they have been carefully chosen with security in mind.
-->
-ϤˡŹ沽ˡȤ <userinput>Device-mapper (dm-crypt)</userinput>
-ơͭˤǤ륪ץͭˤޤ礦
+ϤˡŹ沽ˤ <userinput>Device-mapper (dm-crypt)</userinput>
+ơץͭˤޤ礦
ĤΤ褦ˡ褯ʬʤХǥեͤꤷƤ
ƥǰƬ֤Ƥޤ
Index: ja/using-d-i/modules/partman.xml
===================================================================
--- ja/using-d-i/modules/partman.xml (ӥ 39906)
+++ ja/using-d-i/modules/partman.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39346 -->
+<!-- original version: 39529 -->
<sect3 id="partman">
<title>ǥΥѡƥʬ</title>
@@ -51,9 +51,22 @@
: LVM Ѥˡϡ
٤ƤΥƥǻѤǤ櫓ǤϤޤ
-</para><para>
+</para>
+<warning><para>
<!--
+If you choose guided partitioning using LVM, it will not be possible to
+undo changes made in the partition table. This effectively erases all
+data that is currently on the selected hard disk.
+-->
+LVM Ѥƥɥѡƥʬ硢
+ѡƥơ֥ؤѹ᤻ʤʤޤ
+ˤꡢϡɥǥθߤΥǡϡ٤ƾõޤ
+
+</para></warning>
+<para>
+
+<!--
After you choose guided partitioning (either classic or using LVM), you
will be able to choose from the schemes listed in the table below.
All schemes have their pros and cons,
@@ -111,11 +124,11 @@
<!--
If you choose guided partitioning using LVM, the installer will also create
-a separate /boot partition. The other partitions, except for the swap
-partition, will be created inside the LVM partition.
+a separate <filename>/boot</filename> partition. The other partitions, except
+for the swap partition, will be created inside the LVM partition.
-->
LVM Ѥ륬ɥѡƥʬԤȷ硢
-ȡΩ /boot ѡƥޤ
+ȡΩ <filename>/boot</filename> ѡƥޤ
åץѡƥ¾Υѡƥϡ
LVM ѡƥ˺ޤ
@@ -205,7 +218,8 @@
partitioning and write changes to disk</guimenuitem> from the menu to
implement the new partition table (as described at the end of this
section). If you are not happy, you can choose to <guimenuitem>Undo
-changes to partitions</guimenuitem><footnote>
+changes to partitions</guimenuitem> and run guided partitioning again, or
+modify the proposed changes as described below for manual partitioning.
-->
ǥɥѡƥʬޤ
줿ѡƥơ֥Ǥ褱С
@@ -214,27 +228,10 @@
˥塼٤ޤ
ǤʤС⤦٥ɥѡƥʬꡢ
ʲ˽Ҥ٤ưѡƥʬƤѹΤ
-<guimenuitem>Undo changes to partitions</guimenuitem><footnote>
+<guimenuitem>Undo changes to partitions</guimenuitem>
+ɥѡƥʬƼ¹ԤƤ
+ޤϡʲ˽Ҥ٤ưѡƥʬǽƤ
-<para>
-
-<!--
-If you selected guided partitioning using LVM, you will not be able to undo
-all changes made as some changes will already have been committed to the
-hard disk. The installer will warn you before that happens though.
--->
-LVM ѤƥɥѡƥʬԤ硢
-ϡɥǥ˥ߥåȤƤޤäѹϸ᤻ޤ
-äȤ⡢ʤ˥ȡ餬ٹ𤷤Ƥޤ
-
-</para>
-
-<!--
-</footnote> and run guided partitioning again, or modify the proposed changes
-as described below for manual partitioning.
--->
-</footnote> ٤ޤ
-
</para><para>
<!--
Index: ja/using-d-i/modules/partman-lvm.xml
===================================================================
--- ja/using-d-i/modules/partman-lvm.xml (ӥ 39906)
+++ ja/using-d-i/modules/partman-lvm.xml (ȥԡ)
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 33725 -->
+<!-- original version: 39531 -->
<sect3 id="partman-lvm">
+<!--
+ <title>Configuring the Logical Volume Manager (LVM)</title>
+-->
<title>ܥ塼ޥ͡ (LVM) </title>
<para>
@@ -15,8 +18,8 @@
-->
ƥԤ<quote></quote>桼Ȥƥԥ塼ưƤȡ
ǥΤѡƥ (ƤǤפʤ) ʤʤꡢ
-¾ΥѡƥŪˤޤѤƤʤȤμ¤ˤޤ
-Τ褦ʤȤϡ
+¾ΥѡƥŪˤޤѤƤʤȤμ¤ˤޤ
+Τ褦ʾϡ
ƤưꥷܥåĥȤäԤȤˤʤޤ
</para><para>
@@ -25,10 +28,10 @@
To avoid the described situation you can use Logical Volume Manager
(LVM). Simply said, with LVM you can combine your partitions
(<firstterm>physical volumes</firstterm> in LVM lingo) to form
-a virtual disc (so called <firstterm>volume group</firstterm>), which
+a virtual disk (so called <firstterm>volume group</firstterm>), which
can then be divided into virtual partitions (<firstterm>logical
volumes</firstterm>). The point is that logical volumes (and of course
-underlying volume groups) can span across several physical discs.
+underlying volume groups) can span across several physical disks.
-->
嵭Τ褦ʾ뤿ˡܥ塼ޥ͡ (LVM) ѤǤޤ
ñ˸ȡLVM ǤʣΥѡƥ
@@ -43,7 +46,7 @@
<!--
Now when you realize you need more space for your old 160GB
<filename>/home</filename> partition, you can simply add a new 300GB
-disc to the computer, join it with your existing volume group and then
+disk to the computer, join it with your existing volume group and then
resize the logical volume which holds your <filename>/home</filename>
filesystem and voila — your users have some room again on their
renewed 460GB partition. This example is of course a bit
@@ -65,44 +68,133 @@
</para><para>
<!--
-LVM setup in &d-i; is quite simple. At first, you have to mark your
-partitions to be used as physical volumes for LVM. (This is done in
-<command>partman</command> in the <guimenu>Partition
-settings</guimenu> menu where you should select <menuchoice>
-<guimenu>Use as:</guimenu> <guimenuitem>physical volume for
-LVM</guimenuitem> </menuchoice>.) Then start the
-<command>lvmcfg</command> module (either directly from
-<command>partman</command> or from the &d-i;'s main menu) and combine
-physical volumes to volume group(s) under the <guimenuitem>Modify
-volume groups (VG)</guimenuitem> menu. After that, you should create
-logical volumes on the top of volume groups from the menu
-<guimenuitem>Modify logical volumes (LV)</guimenuitem>.
+LVM setup in &d-i; is quite simple and completely supported inside
+<command>partman</command>. First, you have to mark the partition(s)
+to be used as physical volumes for LVM. This is done in the
+<guimenu>Partition settings</guimenu> menu where you should select
+<menuchoice> <guimenu>Use as:</guimenu> <guimenuitem>physical volume
+for LVM</guimenuitem> </menuchoice>.
+
-->
-&d-i; Ǥ LVM ΥåȥåפϤʤꥷץǤ
+&d-i; Ǥ LVM ΥåȥåפϤʤꥷץǡ
+<command>partman</command> Ǵ˥ݡȤƤޤ
Ϥˡѡƥ LVM ʪܥ塼ȤƻѤ褦
ޡĤͤФʤޤ
-(<guimenu>Partition settings</guimenu> ˥塼
+ϡ<guimenu>ѡƥ</guimenu> ˥塼
<command>partman</command>
-<menuchoice> <guimenu>Use as:</guimenu> <guimenuitem>physical volume for
-LVM</guimenuitem> </menuchoice> ֤ȤǹԤޤ)
- <command>lvmcfg</command> ⥸塼 (<command>partman</command>
-ľܵưǤ &d-i; Υᥤ˥塼Ǥ) ư
-<guimenuitem>Modify volume groups (VG)</guimenuitem> ˥塼ǡ
-ʪܥ塼ܥ塼॰롼פ˷礷ޤ
-θ塢<guimenuitem>Modify logical volumes (LV)</guimenuitem>
-ܥ塼॰롼פƬܥ塼Ƥ
+<menuchoice> <guimenu>Use as:</guimenu> <guimenuitem>LVM
+ʪܥ塼</guimenuitem> </menuchoice> ֤ȤǹԤޤ
</para><para>
<!--
-After returning from <command>lvmcfg</command> back to
-<command>partman</command>, you will see any created logical volumes
-in the same way as ordinary partitions (and you should treat them like
-that).
+When you return to the main <command>partman</command> screen, you will see
+a new option <guimenuitem>Configure the Logical Volume Manager</guimenuitem>.
+When you select that, you will first be asked to confirm pending changes to
+the partition table (if any) and after that the LVM configuration menu will
+be shown. Above the menu a summary of the LVM configuration is shown. The
+menu itself is context sensitive and only shows valid actions. The possible
+actions are:
-->
-<command>lvmcfg</command> <command>partman</command> ȡ
-̾ΥѡƥƱͤ˺ܥ塼बϤǤ
-(̾ΥѡƥƱͤ˰äƤ)
+ᥤ <command>partman</command> ̤ȡ
+<guimenuitem>ܥ塼ޥ͡</guimenuitem>
+Ǥ褦ˤʤäƤޤ
+ȡޤꤷƤʤѡƥơ֥ؤѹ ()
+ǧԤθ LVM ˥塼ɽޤ
+˥塼ξˤ LVM γפɽޤ
+˥塼Τʸ̮¸ͭΤɽޤ
+Ԥϰʲ̤Ǥ
+<itemizedlist>
+ <listitem><para>
+<!--
+ <guimenuitem>Display configuration details</guimenuitem>:
+ shows LVM device structure, names and sizes of logical volumes and more
+-->
+ <guimenuitem>ξܺɽ</guimenuitem>:
+ LVM ǥХι¤ܥ塼̾Τ䥵ʤɤɽޤ
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Create volume group</guimenuitem>
+-->
+ <guimenuitem>ܥ塼॰롼פκ</guimenuitem>
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Create logical volume</guimenuitem>
+-->
+ <guimenuitem>ܥ塼κ</guimenuitem>
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Delete volume group</guimenuitem>
+-->
+ <guimenuitem>ܥ塼॰롼פκ</guimenuitem>
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Delete logical volume</guimenuitem>
+-->
+ <guimenuitem>ܥ塼κ</guimenuitem>
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Extend volume group</guimenuitem>
+-->
+ <guimenuitem>ܥ塼॰롼פγĥ</guimenuitem>
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Reduce volume group</guimenuitem>
+-->
+ <guimenuitem>ܥ塼॰롼פν̾</guimenuitem>
+ </para></listitem>
+ <listitem><para>
+<!--
+ <guimenuitem>Finish</guimenuitem>:
+ return to the main <command>partman</command> screen
+-->
+ <guimenuitem>λ</guimenuitem>:
+ ᥤ <command>partman</command> ̤ޤ
+ </para></listitem>
+</itemizedlist>
+
+</para><para>
+
+<!--
+Use the options in that menu to first create a volume group and then create
+your logical volumes inside it.
+-->
+Ϥ˥ܥ塼॰롼פܥ塼Τˡ
+Υ˥塼ΥץѤƤ
+
</para>
+<note><para>
+
+<!--
+You can also use this menu to delete an existing LVM configuration from
+your hard disk before choosing <quote>Guided partitioning using LVM</quote>.
+Guided partitioning using LVM is not possible if there already are volume
+groups defined, but by removing them you can get a clean start.
+-->
+ޤ <quote>LVM Ѥɥѡƥʬ</quote>
+ϡɥǥˤ롢¸ LVM ˥塼Ǥޤ
+LVM Ѥɥѡƥʬϡ
+ܥ塼॰롼פƤȼ¹ԤǤޤ
+뤳ȤǤޤäʾ֤ǻϤޤ
+
+</para></note>
+<para>
+
+<!--
+After you return to the main <command>partman</command> screen, any created
+logical volumes will be displayed in the same way as ordinary partitions
+(and you should treat them as such).
+-->
+ᥤ <command>partman</command> ̤ȡ
+ܥ塼ब̾Υܥ塼Ʊ褦ɽƤޤ
+(Ʊ褦˰ޤ)
+
+</para>
</sect3>
Index: ja/hardware/hardware-supported.xml
===================================================================
--- ja/hardware/hardware-supported.xml (ӥ 39906)
+++ ja/hardware/hardware-supported.xml (ȥԡ)
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 39886 -->
<sect1 id="hardware-supported">
+<!--
+ <title>Supported Hardware</title>
+-->
<title>ݡȤϡɥ</title>
-
<para>
<!--
@@ -38,8 +40,10 @@
</para>
+<!--
+ <sect2><title>Supported Architectures</title>
+-->
<sect2><title>ݡȤ륢ƥ</title>
-
<para>
<!--
@@ -63,34 +67,20 @@
<tbody>
<row>
- <entry morerows="2">Intel x86 ١</entry>
- <entry morerows="2">i386</entry>
- <entry morerows="2"></entry>
- <entry>vanilla</entry>
-</row><row>
- <entry>speakup</entry>
-</row><row>
- <entry>linux26</entry>
+<!--
+ <entry>Intel x86-based</entry>
+-->
+ <entry>Intel x86 ١</entry>
+ <entry>i386</entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
- <entry morerows="5">Motorola 680x0</entry>
- <entry morerows="5">m68k</entry>
- <entry>Atari</entry>
- <entry>atari</entry>
-</row><row>
- <entry>Amiga</entry>
- <entry>amiga</entry>
-</row><row>
- <entry>68k Macintosh</entry>
- <entry>mac</entry>
-</row><row>
- <entry morerows="2">VME</entry>
- <entry>bvme6000</entry>
-</row><row>
- <entry>mvme147</entry>
-</row><row>
- <entry>mvme16x</entry>
+ <entry>AMD64 & Intel EM64t</entry>
+ <entry>amd64</entry>
+ <entry></entry>
+ <entry></entry>
</row>
<row>
@@ -101,15 +91,6 @@
</row>
<row>
- <entry morerows="1">Sun SPARC</entry>
- <entry morerows="1">sparc</entry>
- <entry morerows="1"></entry>
- <entry>sun4cdm</entry>
-</row><row>
- <entry>sun4u</entry>
-</row>
-
-<row>
<!--
<entry morerows="2">ARM and StrongARM</entry>
<entry morerows="2">arm</entry>
@@ -133,22 +114,6 @@
</row>
<row>
- <entry morerows="3">IBM/Motorola PowerPC</entry>
- <entry morerows="3">powerpc</entry>
- <entry>CHRP</entry>
- <entry>chrp</entry>
-</row><row>
- <entry>PowerMac</entry>
- <entry>pmac</entry>
-</row><row>
- <entry>PReP</entry>
- <entry>prep</entry>
-</row><row>
- <entry>APUS</entry>
- <entry>apus</entry>
-</row>
-
-<row>
<entry morerows="1">HP PA-RISC</entry>
<entry morerows="1">hppa</entry>
<entry>PA-RISC 1.1</entry>
@@ -206,6 +171,51 @@
</row>
<row>
+ <entry morerows="5">Motorola 680x0</entry>
+ <entry morerows="5">m68k</entry>
+ <entry>Atari</entry>
+ <entry>atari</entry>
+</row><row>
+ <entry>Amiga</entry>
+ <entry>amiga</entry>
+</row><row>
+ <entry>68k Macintosh</entry>
+ <entry>mac</entry>
+</row><row>
+ <entry morerows="2">VME</entry>
+ <entry>bvme6000</entry>
+</row><row>
+ <entry>mvme147</entry>
+</row><row>
+ <entry>mvme16x</entry>
+</row>
+
+<row>
+ <entry morerows="3">IBM/Motorola PowerPC</entry>
+ <entry morerows="3">powerpc</entry>
+ <entry>CHRP</entry>
+ <entry>chrp</entry>
+</row><row>
+ <entry>PowerMac</entry>
+ <entry>pmac</entry>
+</row><row>
+ <entry>PReP</entry>
+ <entry>prep</entry>
+</row><row>
+ <entry>APUS</entry>
+ <entry>apus</entry>
+</row>
+
+<row>
+ <entry morerows="1">Sun SPARC</entry>
+ <entry morerows="1">sparc</entry>
+ <entry morerows="1"></entry>
+ <entry>sun4cdm</entry>
+</row><row>
+ <entry>sun4u</entry>
+</row>
+
+<row>
<entry morerows="1">IBM S/390</entry>
<entry morerows="1">s390</entry>
<entry>VM-reader DASD IPL</entry>
@@ -260,11 +270,11 @@
ιɤɬפ⤷ޤ
</para>
-
</sect2>
<!-- supported cpu docs -->
&supported-alpha.xml;
+&supported-amd64.xml;
&supported-arm.xml;
&supported-hppa.xml;
&supported-i386.xml;
@@ -276,8 +286,10 @@
&supported-s390.xml;
&supported-sparc.xml;
+<!--
+ <sect2 id="gfx" arch="not-s390"><title>Graphics Card</title>
+-->
<sect2 id="gfx" arch="not-s390"><title>եå</title>
-
<para arch="x86">
<!--
@@ -343,9 +355,11 @@
Broadcom ɾܡѤ<ulink url="&url-bcm91250a-hardware;">ߴꥹ</ulink>ѤǤޤ
</para>
-
</sect2>
+<!--
+ <sect2 arch="x86" id="laptops"><title>Laptops</title>
+-->
<sect2 arch="x86" id="laptops"><title>åץȥåץԥ塼</title>
<para>
@@ -367,8 +381,7 @@
<sect2 condition="defaults-smp">
-<title>ޥץå</title>
-
+ <title>ޥץå</title>
<para>
<!--
@@ -405,12 +418,47 @@
ˤ <quote>&smp-config-option;</quote> Ƥ
</para>
+ </sect2>
+ <sect2 condition="smp-alternatives">
+<!--
+<title>Multiple Processors</title>
+-->
+<title>ޥץå</title>
+
+<para>
+
+<!--
+Multi-processor support — also called <quote>symmetric
+multi-processing</quote> or SMP — is available for this architecture.
+The standard Debian &release; kernel image was compiled with
+<firstterm>SMP-alternatives</firstterm> support. This means that the kernel
+will detect the number of processors (or processor cores) and will
+automatically deactivate SMP on uniprocessor systems.
+-->
+ΥƥǤϡ
+ޥץåݡ (<quote>оηޥץå</quote>
+SMP ȸƤФƤ) ѤǤޤ
+Debian &release; ɸ५ͥ륤
+<firstterm>SMP-alternatives</firstterm>
+ݡȤ褦ѥ뤵Ƥޤ
+Τᡢץåο (ץåο) Ф
+ñץåƥξ硢ưŪ SMP ̵ˤޤ
+
+</para><para arch="i386">
+
+<!--
+The 486 flavour of the Debian kernel image packages for &arch-title;
+is not compiled with SMP support.
+-->
+&arch-title; Debian ͥ륤ѥå 486 ե졼СǤϡ
+SMP ݡȤ褦ѥ뤵Ƥޤ
+
+</para>
</sect2>
-
<sect2 condition="supports-smp">
- <title>ޥץå</title>
+ <title>ޥץå</title>
<para>
<!--
@@ -449,7 +497,7 @@
</sect2>
<sect2 condition="supports-smp-sometimes">
- <title>ޥץå</title>
+ <title>ޥץå</title>
<para>
<!--
Index: ja/hardware/supported/i386.xml
===================================================================
--- ja/hardware/supported/i386.xml (ӥ 39906)
+++ ja/hardware/supported/i386.xml (ȥԡ)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 39898 -->
- <sect2 arch="x86"><title>CPUޥܡɡӥǥΥݡ</title>
+ <sect2 arch="i386"><title>CPUޥܡɡӥǥΥݡ</title>
<para>
<!--
@@ -21,18 +21,98 @@
<para>
<!--
-Nearly all x86-based processors are supported; this includes AMD and
-VIA (former Cyrix) processors as well. Also the new processors like
-Athlon XP and Intel P4 Xeon are supported. However, Linux will
-<emphasis>not</emphasis> run on 286 or earlier processors.
+Nearly all x86-based (IA-32) processors still in use in personal computers
+are supported, including all varieties of Intel's "Pentium" series.
+This also includes 32-bits AMD and VIA (former Cyrix) processors, and new
+processors like the Athlon XP and Intel P4 Xeon.
-->
-x86 ١ΥץåϡAMD VIA ( Cyrix) Υץåޤᡢ
-ΤۤȤɤ٤ƤݡȤƤޤ
-ޤAthlon XP Intel P4 Xeon Ȥäץå⥵ݡȤޤ
- 286 䤽 CPU Ǥϡ
-Linux ư<emphasis>ʤ</emphasis>Ǥ礦
+ޤѡʥ륳ԥ塼ǻȤƤ x86 ١ (IA-32) ץå
+Intel "Pentium" Τ٤ƤѼޤᡢ
+ۤȤɤ٤ƤݡȤƤޤ
+ޤAMD VIA ( Cyrix) Υץå䡢
+Athlon XP Intel P4 Xeon Ȥäץå⥵ݡȤޤ
</para>
+<note><para>
+
+<!--
+If your system has a 64-bits AMD64, Intel EM64t or Intel Core 2 Duo processor,
+you will probably want to use the installer for the amd64 architecture instead
+of the installer for the (32-bits) i386 architecture.
+-->
+ƥ 64-bit AMD64, Intel EM64t, Intel Core 2 Duo processor
+ȤƤʤ顢
+餯 (32-bit) i386 ƥѥȡǤϤʤ
+amd64 ƥѥȡѤǤ礦
+
+</para></note>
+<para>
+
+<!--
+However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
+on 386 or earlier processors. Despite the architecture name "i386", Debian
+Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors
+(and their clones), which were supported by earlier releases<footnote>
+-->
+ Debian GNU/Linux &releasename; ϡ
+386 ΥץåǤ<emphasis>ưޤ</emphasis>
+ƥ̾ "i386" Ǥˤؤ餺Sarge ϡ
+ΥǤϥݡȤƤ 80386 ץå (ȤΥ)
+<emphasis>ݡȤǤڤޤ</emphasis><footnote>
+
+<para>
+<!--
+We have long tried to avoid this, but in the end it was necessary due a
+unfortunate series of issues with the compiler and the kernel, starting
+with an bug in the C++ ABI provided by GCC. You should still be able to
+run Debian GNU/Linux on actual 80386 processors if you compile your own
+kernel and compile all packages from source, but that is beyond the
+scope of this manual.
+-->
+䤿Ǥڤ褦ϤƤޤ
+GCC C++ ABI ΥХ˻Ϥޤ륳ѥȥͥˤꡢ
+ǽŪˤʤʤޤ
+ʬΥͥȤ٤ƤΥѥå饳ѥ뤹С
+ޤ 80386 ץå Debian GNU/Linux ư뤫⤷ޤ
+ܥޥ˥奢ƤۤƤޤޤ
+</para>
+
+<!--
+</footnote>. (No version of Linux has ever supported the 286 or earlier
+chips in the series.) All i486 and later processors are still
+supported<footnote>
+-->
+</footnote>(Linux Ǥ 286 䤽ΥåפݡȤȤϤޤ)
+i486 ʹߤΤ٤ƤΥץåݡȤƤޤ<footnote>
+
+<para>
+
+<!--
+Many Debian packages will actually run slightly faster on modern computers
+as a positive side effect of dropping support for these old chips. The
+i486, introduced in 1989, has three opcodes (bswap, cmpxchg, and xadd)
+which the i386, introduced in 1986, did not have. Previously, these could not
+be easily used by most Debian packages; now they can.
+-->
+ŤåפݡȤʤȤˤαƶȤơ
+¿ Debian ѥåǶΥԥ塼ǡ
+ư뤳Ȥޤ
+1989 ǯȯ䤵줿 i486 Ǥϡ
+ڥɤ 3 (bswap, cmpxchg, xadd) äƤޤ
+1986 ǯȯ䤵줿 i386 ˤϤޤ
+ϤۤȤɤ Debian ѥåǤѤǤޤǤ
+ߤǤϻѤǤޤ
+
+</para>
+
+<!--
+</footnote>.
+-->
+</footnote>
+
+</para><para>
+
+</para>
</sect3>
<sect3 id="bus"><title>I/O Х</title>
@@ -43,7 +123,8 @@
communicate with peripherals such as storage devices. Your computer
must use the ISA, EISA, PCI, the Microchannel Architecture (MCA, used
in IBM's PS/2 line), or VESA Local Bus (VLB, sometimes called the VL
-bus).
+bus). Essentially all personal computers sold in recent years use one
+of these.
-->
ƥХȤϡCPU ȵ֤Τ褦ʼյȤ̿ǽˤ뤿
ޥܡɤܤƤΤǤ
@@ -51,8 +132,9 @@
Microchannel ƥ (MCAIBM PS/2 Ǻ)
VESA Х (VLBVL ХȤƤФޤ)
Τ줫ȤƤϤǤ
+ܼŪˡǯ䤵줿ѡʥ륳ԥ塼ˤϡ
+Τɤ줫ȤƤޤ
-
</para>
</sect3>
</sect2>
Index: ja/hardware/supported/amd64.xml
===================================================================
--- ja/hardware/supported/amd64.xml (ӥ 0)
+++ ja/hardware/supported/amd64.xml (ӥ 0)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="EUC-JP"?>
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 39614 -->
+
+
+<!--
+ <sect2 arch="amd64"><title>CPU, Main Boards, and Video Support</title>
+-->
+ <sect2 arch="amd64"><title>CPUޥܡɡӥǥΥݡ</title>
+<para>
+
+<!--
+Complete information concerning supported peripherals can be found at
+<ulink url="&url-hardware-howto;">Linux Hardware Compatibility HOWTO</ulink>.
+This section merely outlines the basics.
+-->
+ݡȤƤյ˴ؤ봰ʾϡ
+<ulink url="&url-hardware-howto;">Linux ϡɥߴ HOWTO</ulink>
+ˤޤǤϴŪʤȤΤޤ
+
+</para>
+
+ <sect3><title>CPU</title>
+<para>
+
+<!--
+Both AMD64 and Intel EM64t processors are supported.
+-->
+AMD64 Intel EM64t ץåξݡȤƤޤ
+
+</para>
+ </sect3>
+
+<!-- Not sure if this is relevant for AMD64; AFAIK only PCI supported
+ <sect3 id="bus"><title>I/O Bus</title>
+ <sect3 id="bus"><title>I/O Х</title>
+<para>
+
+The system bus is the part of the motherboard which allows the CPU to
+communicate with peripherals such as storage devices. Your computer
+must use the PCI bus.
+ƥХȤϡCPU ȵ֤Τ褦ʼյȤ̿ǽˤ뤿
+ޥܡɤܤƤΤǤ
+ʤΥԥ塼ǤϡPCI ХȤƤϤǤ
+
+</para>
+ </sect3>
+-->
+ </sect2>
+
Index: ja/hardware/supported/s390.xml
===================================================================
--- ja/hardware/supported/s390.xml (ӥ 39906)
+++ ja/hardware/supported/s390.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 -->
+<!-- original version: 39895 -->
<sect2 arch="s390"><title>S/390 zSeries ޥ</title>
@@ -12,8 +12,8 @@
<ulink url="http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf";>
Linux for IBM eServer zSeries and S/390: Distributions</ulink> in
chapter 2.1 or at the
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/documentation-2.4.shtml";>technical details web page</ulink> at
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml";>developerWorks</ulink>.
+<ulink url="http://www-128.ibm.com/developerworks/linux/linux390/index.html";>zSeries
+page at the developerWorks</ulink>.
In short, G5, Multiprise 3000, G6 and all zSeries are fully supported;
Multiprise 2000, G3 and G4 machines are supported with IEEE floating
point emulation and thus degraded performance.
@@ -21,8 +21,8 @@
S/390 zSeries ޥˤĤƤδʾϡIBM åɥ֥å 2.1
<ulink url="http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf";>
Linux for IBM eServer zSeries and S/390: Distributions</ulink>
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/index.shtml";>developerWorks</ulink>
-<ulink url="http://oss.software.ibm.com/developerworks/opensource/linux390/documentation-2.4.shtml";>technical details web page</ulink> ǸĤޤ
+<ulink url="http://www-128.ibm.com/developerworks/linux/linux390/index.html";>zSeries
+page at the developerWorks</ulink> ǸĤޤ
פˡG5, Multiprise 3000, G6 zSeries ϥե륵ݡȡ
Multiprise 2000, G3, G4 ϥѥեޥ㲼ޤ
IEEE ư黻ߥ졼ǥݡȤƤޤ
Index: ja/hardware/installation-media.xml
===================================================================
--- ja/hardware/installation-media.xml (ӥ 39906)
+++ ja/hardware/installation-media.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 39887 -->
<sect1 id="installation-media">
<title>ȡѤǤǥ</title>
@@ -382,7 +382,7 @@
SCSI ȥȥɥ饤֡USBFireWire ݡȤƤޤ
ݡȤƤե륷ƥϡFATWin-32 ĥ FAT (VFAT)NTFS Ǥ
-</para><para arch="x86">
+</para><para arch="i386">
<!--
Disk interfaces that emulate the <quote>AT</quote> hard disk interface
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml (ӥ 39906)
+++ ja/boot-installer/parameters.xml (ȥԡ)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 38289 -->
+<!-- original version: 39614 -->
<sect1 id="boot-parms"><title>֡ȥѥ</title>
<para>
@@ -393,7 +393,8 @@
in ugly display on systems that do properly support the framebuffer, like
those with ATI graphical cards.
If you see display problems in the installer, you can try booting with
-parameter <userinput>debian-installer/framebuffer=true</userinput>.
+parameter <userinput>debian-installer/framebuffer=true</userinput> or
+<userinput>fb=true</userinput> for short.
-->
ĤΥƥ꤬ȯ뤿ᡢ
&arch-title; Ǥϥե졼ХåեΥݡȤ
@@ -401,8 +402,8 @@
η ATI ΥեåɤΤ褦ˡƥɽʤˤϡ
ե졼ХåեݡȤ褦ˤƤ
ȡɽ顢
-<userinput>debian-installer/framebuffer=true</userinput>
-ȤѥƤ
+<userinput>debian-installer/framebuffer=true</userinput> ά
+<userinput>fb=true</userinput> ȤѥƤ
</para></note></listitem>
</varlistentry>