鍋太郎です。
またえらく間が開いてしまいました。
インストールマニュアルの訳の更新をしました。
#D-Iのベータリリースをするから
#2/10までに訳の更新をしろと、Frans Pop にせっつかれてしまいました。
手の入ったファイルは、以下になります。
M ja/howto/installation-howto.xml
M ja/install-methods/download/arm.xml
M ja/preparing/non-debian-partitioning.xml
M ja/appendix/chroot-install.xml
M ja/appendix/preseed.xml
M ja/appendix/graphical.xml
M ja/using-d-i/components.xml
M ja/using-d-i/modules/finish-install.xml
M ja/using-d-i/modules/clock-setup.xml
M ja/using-d-i/modules/partman.xml
M ja/using-d-i/modules/netcfg.xml
A ja/using-d-i/modules/clock-setup-finish.xml
M ja/using-d-i/modules/user-setup.xml
M ja/using-d-i/modules/mdcfg.xml
M ja/using-d-i/modules/apt-setup.xml
M ja/using-d-i/modules/x86/lilo-installer.xml
M ja/using-d-i/modules/network-console.xml
M ja/using-d-i/modules/lowmem.xml
M ja/using-d-i/modules/tzsetup.xml
M ja/using-d-i/using-d-i.xml
M ja/hardware/hardware-supported.xml
M ja/hardware/supported/sparc.xml
M ja/hardware/supported/arm.xml
M ja/hardware/installation-media.xml
M ja/boot-installer/boot-installer.xml
M ja/boot-installer/parameters.xml
diffとファイルを添付します。
チェックしていただけるとありがたいです。
よろしくお願いいたします。
--
+--------------------------------------------------------+
倉澤 望(鍋太郎)
KURASAWA Nozomu (nabetaro) <nabetaro @ caldron.jp>
GnuPG FingerPrint:
C4E5 7063 FD75 02EB E71D 559B ECF6 B9D2 8147 ADFB
+--------------------------------------------------------+
Index: ja/howto/installation-howto.xml
===================================================================
--- ja/howto/installation-howto.xml (revision 51135)
+++ ja/howto/installation-howto.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 45291 -->
+<!-- original version: 50721 -->
<!--
<appendix id="installation-howto">
@@ -440,7 +440,20 @@
DHCP ̵ϡͥåȥưꤹ뵡Ϳޤ
</para><para>
+<!--
+The next step is setting up your clock and time zone. The installer will
+try to contact a time server on the Internet to ensure the clock is set
+correcty. The time zone is based on the country selected earlier and the
+installer will only ask to select one if a country has multiple zones.
+-->
+ΥƥåפϡפȥॾǤ
+ȡϡפꤵΤݾڤ뤿ᡢ
+ͥåȾΥॵФ³ޤ
+ॾϡ餫ˤޤ
+ιʣΥΤ䤤碌Ƥޤ
+</para><para>
+
<!--
Now it is time to partition your disks. First you will be given the
opportunity to automatically partition either an entire drive, or available
@@ -499,21 +512,6 @@
</para><para>
<!--
-The next steps are setting up your time zone and clock. The installer will
-try to select the correct settings automatically and will only ask if it
-cannot. This is followed by setting up user accounts. By default you will
-need to provide a password for the <quote>root</quote> (administrator)
-account and information necessary to create one regular user account.
--->
-ΥƥåפϡॾȻפǤ
-ȡưԲǽʾΤ䤤碌Ƥޤ
-³ơ桼ȤԤޤ
-ǥեȤǤϡ<quote>root</quote> () ȤΥѥɤꤷ
-̾桼ΥȤ 1 ĺ뤳Ȥˤʤޤ
-
-</para><para>
-
-<!--
The base system that was installed earlier is a working, but very minimal
installation. To make the system more functional the next step allows you
to install additional packages by selecting tasks. Before packages can be
@@ -540,6 +538,17 @@
</para><para>
<!--
+Partitioning is followed by setting up user accounts. By default you will
+need to provide a password for the <quote>root</quote> (administrator)
+account and information necessary to create one regular user account.
+-->
+ѡƥʬ³桼ȤԤޤ
+ǥեȤǤϡ<quote>root</quote> () ȤΥѥɤꤷ
+̾桼ΥȤ 1 ĺ뤳Ȥˤʤޤ
+
+</para><para>
+
+<!--
The last step is to install a boot loader. If the installer detects
other operating systems on your computer, it will add them to the boot menu
and let you know.
Index: ja/install-methods/download/arm.xml
===================================================================
--- ja/install-methods/download/arm.xml (revision 51135)
+++ ja/install-methods/download/arm.xml (working copy)
@@ -1,29 +1,8 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46426 -->
+<!-- original version: 49849 -->
- <sect3 arch="arm" condition="etch" id="riscpc-install-files">
- <title>RiscPC ȡե</title>
-<para>
-
-<!--
-The RiscPC installer is booted initially from RISC OS. All the
-necessary files are provided in one Zip archive, &rpc-install-kit;.
-Download this file onto the RISC OS machine, copy the
-<filename>linloader.!Boot</filename> components into place, and run
-<filename>!dInstall</filename>.
--->
-RiscPC Υȡϡǽ RISC OS 鵯ưޤ
-ɬפʥեϤ٤ơ&rpc-install-kit; Ȥ 1 Ĥ
-Zip ֤Ǽ줿Ƥޤ
-Υե RISC OS ޥ˥ɤơ
-äƤ <filename>linloader.!Boot</filename> Ŭڤʾ˥ԡ
-<filename>!dInstall</filename> ¹ԤƤ
-
-</para>
- </sect3>
-
<sect3 arch="arm" id="netwinder-install-files">
<!--
<title>Netwinder Installation Files</title>
Index: ja/preparing/non-debian-partitioning.xml
===================================================================
--- ja/preparing/non-debian-partitioning.xml (revision 51135)
+++ ja/preparing/non-debian-partitioning.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 -->
+<!-- original version: 50621 -->
<sect1 id="non-debian-partitioning">
<title>ޥ֡ȥƥǤλѡƥʬ</title>
@@ -129,7 +129,7 @@
If your machine has only one hard disk, and you would like to
completely replace the current operating system with &debian;,
you also can wait to partition as part of the installation process
-(<xref linkend="partman"/>), after you have booted the
+(<xref linkend="di-partition"/>), after you have booted the
installation system. However this only works if you plan to boot the
installer system from tapes, CD-ROM or files on a connected machine.
Consider: if you boot from files placed on the hard disk, and then
@@ -142,7 +142,7 @@
ޥ 1 椷ǥʤƤ⡢ߤ OS &debian;
Ǵ֤ƤޤĤʤ顢
ѡƥʬϥȡưǡ
-ȡȤΰȤƹԤäƹޤ (<xref linkend="partman"/>)
+ȡȤΰȤƹԤäƹޤ (<xref linkend="di-partition"/>)
줬ǽʤΤϡȡ饷ƥơסCD-ROM
³줿ޥΥեΤ줫鵯ưǤ
äȹͤƤߤƤϡɥǥˤե뤫鵯ươ
Index: ja/appendix/chroot-install.xml
===================================================================
--- ja/appendix/chroot-install.xml (revision 51135)
+++ ja/appendix/chroot-install.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44410 -->
+<!-- original version: 50736 -->
<sect1 id="linux-upgrade">
<!--
@@ -29,7 +29,7 @@
Red Hat, Mandrake, SUSE &debian; ˰ܹԤ桼˾ǽޤ
Ǥϡ*nix ޥɤϤˤĤƽΤ
ե륷ƥǤΤȤʤäƤޤ
-ޤ<prompt>#</prompt> Debian chroot Ϥ줿ޥɤ
+Ǥϡ<prompt>#</prompt> Debian chroot Ϥ줿ޥɤ
<prompt>$</prompt> ϥ桼θߤΥƥϤ륳ޥɤɽޤ
@@ -52,7 +52,55 @@
</para>
+<note><para>
+
+<!--
+As this is a mostly manual procedure, you should bear in mind that you
+will need to do a lot of basic configuration of the system yourself,
+which will also require more knowledge of Debian and of Linux in general
+than performing a regular installation. You cannot expect this procedure
+to result in a system that is identical to a system from a regular
+installation. You should also keep in mind that this procedure only
+gives the basic steps to set up a system. Additional installation and/or
+configuration steps may be needed.
+-->
+ϤۤȤɼȤˤʤޤ顢
+ʬǥƥ̤δԤɬפꡢ
+ˤ̾Υȡ Debian LinuxμɬפʤȤ
+ФƤƤ
+ޤμ̾ΥȡƱƥˤʤȴԤƤϤޤ
+ϥƥåȥåפŪʼǤޤ
+ɲåȡɲ꤬ɬפˤʤ뤫⤷ޤ
+
+</para></note>
+
+<note><para>
+
+<!--
+As this is a mostly manual procedure, you should bear in mind that you
+will need to do a lot of basic configuration of the system yourself,
+which will also require more knowledge of Debian and of Linux in general
+than performing a regular installation. You cannot expect this procedure
+to result in a system that is identical to a system from a regular
+installation. You should also keep in mind that this procedure only
+gives the basic steps to set up a system. Additional installation and/or
+configuration steps may be needed.
+-->
+ϤܼۤȤȤʤޤΤǡ¿Υƥδ꤬ɬפʤȤ䡢
+̾Υȡ¹Ԥ⡢
+Debian Linux ˤĤƤΰŪμɬפˤʤ뤳ȤǰƬ֤٤Ǥ
+μˤ륷ƥब̾Υȡˤ륷ƥȡ
+Ʊˤʤ뤳ȤϴԤǤޤ
+μ礬ƥåȥåפŪʼ˲ʤȤ⡢
+ǰƬ֤Ƥ
+ɲäǡȡμ礬ɬפˤʤǽޤ
+
+</para></note>
+
<sect2>
+<!--
+ <title>Getting Started</title>
+-->
<title>Ϥ</title>
<para>
@@ -329,6 +377,81 @@
</para>
<sect3>
+<!--
+ <title>Create device files</title>
+-->
+ <title>ǥХեκ</title>
+<para>
+
+<!--
+At this point <filename>/dev/</filename> only contains very basic device
+files. For the next steps of the installation additional device files may
+be needed. There are different ways to go about this and which method you
+should use depends on the host system you are using for the installation,
+on whether you intend to use a modular kernel or not, and on whether you
+intend to use dynamic (e.g. using <classname>udev</classname>) or static
+device files for the new system.
+-->
+λǡ<filename>/dev/</filename> ˤϡ
+˴ŪʥǥХե뤬Ǥ
+餯ȡμΥƥåפǡɲåǥХե뤬ɬפˤʤޤ
+ȡ˻Ѥۥȥƥब⥸塼벽ͥѤ뤫ɤ䡢
+ƥưŪǥХե (: <classname>udev</classname> )
+ŪǥХեΤɤѤ뤫ˤꡢ
+ɤˡǹԤۤʤޤ
+
+
+</para><para>
+
+<!--
+A few of the available options are:
+-->
+ʲΤ褦褬ޤ
+
+<itemizedlist>
+<listitem><para>
+
+<!--
+create a default set of static device files using
+-->
+Τ褦ˤƥǥեȤŪǥХե뷲ޤ
+<informalexample><screen>
+# cd /dev
+# MAKEDEV generic
+</screen></informalexample>
+
+</para></listitem>
+<listitem><para>
+
+<!--
+manually create only specific device files using <command>MAKEDEV</command>
+-->
+<command>MAKEDEV</command> Ѥơ
+ꤷǥХեΤߤǺޤ
+
+</para></listitem>
+<listitem><para>
+
+<!--
+bind mount /dev from your host system on top of /dev in the target system;
+note that the postinst scripts of some packages may try to create device
+files, so this option should only be used with care
+-->
+ۥȥƥ /dev åȥƥ /dev Ƭ˥ޥȤޤ
+ĤΥѥå postinst ץȤǤϡ
+ǥХե褦ȤΤդƤ
+ΤᡢտѤ٤Ǥ
+
+</para></listitem>
+</itemizedlist>
+
+</para>
+ </sect3>
+
+ <sect3>
+<!--
+ <title>Mount Partitions</title>
+-->
<title>ѡƥΥޥ</title>
<para>
@@ -592,10 +715,10 @@
ʲϥѥåȥƥɲäƤޤ
<informalexample><screen>
-deb-src http://ftp.us.debian.org/debian etch main
+deb-src http://ftp.us.debian.org/debian &releasename; main
-deb http://security.debian.org/ etch/updates main
-deb-src http://security.debian.org/ etch/updates main
+deb http://security.debian.org/ &releasename;/updates main
+deb-src http://security.debian.org/ &releasename;/updates main
</screen></informalexample>
<!--
@@ -793,6 +916,18 @@
ǸΥޥɤǡ
ư <filename>/boot/grub/menu.lst</filename> ޤ
+</para><para>
+
+<!--
+Note that this assumes that a <filename>/dev/hda</filename> device file has
+been created. There are alternative methods to install <command>grub</command>,
+but those are outside the scope of this appendix.
+-->
+: <filename>/dev/hda</filename> ǥХեϡ
+Ǥ˺ƤȲꤷƤޤ
+<command>grub</command> Υȡˤ̤ˡ⤢ޤ
+ϤϿǤϰޤ
+
</para><para arch="x86">
<!--
@@ -807,6 +942,7 @@
delay=20
lba32
image=/vmlinuz
+initrd=/initrd.img
label=Debian
</screen></informalexample>
Index: ja/appendix/preseed.xml
===================================================================
--- ja/appendix/preseed.xml (revision 51135)
+++ ja/appendix/preseed.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 49321 -->
+<!-- original version: 50744 -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -1392,9 +1392,8 @@
<informalexample role="example"><screen>
# If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp<phrase condition="etch">
-d-i mirror/country string enter information manually</phrase><phrase condition="lenny">
-d-i mirror/country string manual</phrase>
+#d-i mirror/protocol string ftp
+d-i mirror/country string manual
d-i mirror/http/hostname string &archive-mirror;
d-i mirror/http/directory string /debian
d-i mirror/http/proxy string
@@ -1407,6 +1406,28 @@
</sect2>
+ <sect2 id="preseed-time">
+<!--
+ <title>Clock and time zone setup</title>
+-->
+ <title>פȻӤ</title>
+
+<informalexample role="example"><screen>
+# Controls whether or not the hardware clock is set to UTC.
+d-i clock-setup/utc boolean true
+
+# You may set this to any valid setting for $TZ; see the contents of
+# /usr/share/zoneinfo/ for valid values.
+d-i time/zone string US/Eastern
+
+# Controls whether to use NTP to set the clock during the install
+d-i clock-setup/ntp boolean true
+# NTP server to use. The default is almost always fine here.
+#d-i clock-setup/ntp-server ntp.example.com
+</screen></informalexample>
+
+ </sect2>
+
<sect2 id="preseed-partman">
<!--
<title>Partitioning</title>
@@ -1452,18 +1473,13 @@
#d-i partman-auto/init_automatically_partition \
# select Guided - use the largest continuous free space
-<phrase condition="etch"># Alternatively, you can specify a disk to partition. The device name
-# can be given in either devfs or traditional non-devfs format.
-# For example, to use the first disk:
-d-i partman-auto/disk string /dev/discs/disc0/disc
-d-i partman-auto/disk string /dev/discs/disc0/disc</phrase><phrase condition="lenny">
# Alternatively, you can specify a disk to partition. The device name must
# be given in traditional non-devfs format.
# For example, to use the first SCSI/SATA hard disk:
d-i partman-auto/disk string /dev/sda
# Note: If you want to use whatever disk is available, no matter
# what its device name, comment the line above out. This will only work if
-# the system only has one disk.</phrase>
+# the system only has one disk.
# In addition, you'll need to specify the method to use.
# The presently available methods are: "regular", "lvm" and "crypto"
d-i partman-auto/method string lvm
@@ -1510,7 +1526,8 @@
# method{ swap } format{ } \
# .
-# This makes partman automatically partition without confirmation.
+# This makes partman automatically partition without confirmation, provided
+# that you told it what to do using one of the methods above.
d-i partman/confirm_write_new_label boolean true
d-i partman/choose_partition \
select Finish partitioning and write changes to disk
@@ -1622,25 +1639,29 @@
</sect2>
- <sect2 id="preseed-time">
+ <sect2 id="preseed-base-installer">
<!--
- <title>Clock and time zone setup</title>
+ <title>Base system installation</title>
-->
- <title>סॾ</title>
+ <title>١ƥΥȡ</title>
+<para>
-<informalexample role="example"><screen>
-# Controls whether or not the hardware clock is set to UTC.
-d-i clock-setup/utc boolean true
+<!--
+There is actually not very much that can be preseeded for this stage of the
+installation. The only questions asked concern the installation of the kernel.
+-->
+ȡΤʳǡºݤ preseed Ǥܤ¿ޤ
+ϥͥΥȡ˴ؤΤǤ
-# You may set this to any valid setting for $TZ; see the contents of
-# /usr/share/zoneinfo/ for valid values.
-d-i time/zone string US/Eastern<phrase condition="lenny">
+</para>
-# Controls whether to use NTP to set the clock during the install
-d-i clock-setup/ntp boolean true
-# NTP server to use. The default is almost always fine here.
-#d-i clock-setup/ntp-server ntp.example.com
-</phrase>
+<informalexample role="example"><screen>
+# Select the initramfs generator used to generate the initrd for 2.6 kernels.
+#d-i base-installer/kernel/linux/initramfs-generators string yaird
+
+# The kernel image (meta) package to be installed; "none" can be used if no
+# kernel is to be installed.
+#d-i base-installer/kernel/image linux-image-2.6-486
</screen></informalexample>
</sect2>
@@ -1703,11 +1724,11 @@
# or encrypted using an MD5 hash.
#d-i passwd/user-password-crypted password [MD5 hash]
# Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010<phrase condition="lenny">
+#d-i passwd/user-uid string 1010
# The user account will be added to some standard initial groups. To
# override that, use this.
-#d-i passwd/user-default-groups string audio cdrom video</phrase>
+#d-i passwd/user-default-groups string audio cdrom video
</screen></informalexample>
<para>
@@ -1743,33 +1764,6 @@
</para>
</sect2>
- <sect2 id="preseed-base-installer">
-<!--
- <title>Base system installation</title>
--->
- <title>ܥƥΥȡ</title>
-<para>
-
-<!--
-There is actually not very much that can be preseeded for this stage of the
-installation. The only questions asked concern the installation of the kernel.
--->
-ȡΤʳǤϡºݤˤϤޤ preseed ǤʤȤޤ
-ͣΤΤͥΥȡˤĤƤμǤ
-
-</para>
-
-<informalexample role="example"><screen>
-# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird<phrase condition="lenny">
-
-# The kernel image (meta) package to be installed; "none" can be used if no
-# kernel is to be installed.
-#d-i base-installer/kernel/image linux-image-2.6-486</phrase>
-</screen></informalexample>
-
- </sect2>
-
<sect2 id="preseed-apt">
<!--
<title>Apt setup</title>
@@ -1794,15 +1788,12 @@
#d-i apt-setup/non-free boolean true
#d-i apt-setup/contrib boolean true
# Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false<phrase condition="etch">
-# Uncomment this to avoid adding security sources, or
-# add a hostname to use a different server than security.debian.org.
-#d-i apt-setup/security_host string</phrase><phrase condition="lenny">
+#d-i apt-setup/use_mirror boolean false
# Select which update services to use; define the mirrors to be used.
# Values shown below are the normal defaults.
#d-i apt-setup/services-select multi-select security, volatile
#d-i apt-setup/security_host string security.debian.org
-#d-i apt-setup/volatile_host string volatile.debian.org</phrase>
+#d-i apt-setup/volatile_host string volatile.debian.org
# Additional repositories, local[0-9] available
#d-i apt-setup/local0/repository string \
@@ -1904,11 +1895,10 @@
</para>
<informalexample role="example"><screen>
-#tasksel tasksel/first multiselect standard, web-server<phrase condition="lenny">
+#tasksel tasksel/first multiselect standard, web-server
# If the desktop task is selected, install the kde and xfce desktops
# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce</phrase><phrase condition="etch">
-#tasksel tasksel/first multiselect standard, kde-desktop</phrase>
+#tasksel tasksel/desktop multiselect kde, xfce
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential
@@ -1931,10 +1921,10 @@
<informalexample role="example"><screen>
# Grub is the default boot loader (for x86). If you want lilo installed
# instead, uncomment this:
-#d-i grub-installer/skip boolean true<phrase condition="lenny">
+#d-i grub-installer/skip boolean true
# To also skip installing lilo, and install no bootloader, uncomment this
# too:
-#d-i lilo-installer/skip boolean true</phrase>
+#d-i lilo-installer/skip boolean true
# This is fairly safe to set, it makes grub install automatically to the MBR
# if no other operating system is detected on the machine.
@@ -1957,9 +1947,9 @@
<sect2 id="preseed-finish">
<!--
- <title>Finishing up the first stage install</title>
+ <title>Finishing up the installation</title>
-->
- <title>ȡ 1 ʳλž夲</title>
+ <title>ȡλž夲</title>
<informalexample role="example"><screen>
# Avoid that last message about the install being complete.
@@ -1968,6 +1958,10 @@
# This will prevent the installer from ejecting the CD during the reboot,
# which is useful in some situations.
#d-i cdrom-detect/eject boolean false
+
+# This is how to make the installer shutdown when finished, but not
+# reboot into the installed system.
+#d-i debian-installer/exit/halt boolean true
</screen></informalexample>
</sect2>
Index: ja/appendix/graphical.xml
===================================================================
--- ja/appendix/graphical.xml (revision 51135)
+++ ja/appendix/graphical.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 48015 -->
+<!-- original version: 49849 -->
<sect1 condition="gtk" id="graphical">
<!--
@@ -67,9 +67,8 @@
<para>
The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for
-<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
-<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
+in <xref linkend="downloading-files"/>.
+Look for <filename>netboot/gtk/mini.iso</filename>.
</para>
</footnote>, which is mainly useful for testing; in this case the image is
@@ -83,9 +82,7 @@
ߥ ISO ϡ
<xref linkend="downloading-files"/>
Debian ߥ顼ȤɤǤޤ
-<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
-<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>
-õƤ
+<filename>netboot/gtk/mini.iso</filename> õƤ
</para>
</footnote>
@@ -100,9 +97,8 @@
<para>
The mini ISO image can be downloaded from a Debian mirror as described
-in <xref linkend="downloading-files"/>. Look for
-<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
-<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>.
+in <xref linkend="downloading-files"/>.
+Look for <filename>netboot/gtk/mini.iso</filename>.
</para>
</footnote>. It should work on almost all PowerPC systems that have
@@ -114,9 +110,7 @@
ߥ ISO ϡ
<xref linkend="downloading-files"/>
Debian ߥ顼ȤɤǤޤ
-<phrase condition="etch"><filename>gtk-miniiso</filename></phrase>
-<phrase condition="lenny"><filename>netboot/gtk/mini.iso</filename></phrase>
-õƤ
+<filename>netboot/gtk/mini.iso</filename> õƤ
</para>
</footnote>ATI եåɤ롢
Index: ja/using-d-i/components.xml
===================================================================
--- ja/using-d-i/components.xml (revision 51135)
+++ ja/using-d-i/components.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43965 -->
+<!-- original version: 50618 -->
<sect1 id="module-details">
<!--
@@ -89,6 +89,8 @@
&module-anna.xml;
&module-netcfg.xml;
&module-choose-mirror.xml;
+<!-- tzsetup is included in clock-setup -->
+&module-clock-setup.xml;
</sect2>
@@ -111,13 +113,14 @@
<!--
As the title of this section indicates, the main task of the next few
components lies in partitioning your disks, creating filesystems,
-assigning mountpoints and optionally configuring closely related issues
-like LVM or RAID devices.
+assigning mountpoints and optionally configuring closely related options
+like RAID, LVM or encrypted devices.
-->
Υȥ뤬ɽ褦ˡ
-ʲΥݡͥȤμʥϡǥΥѡƥʬ䤷
+ʲΥݡͥȤμʥϡ
+ǥΥѡƥʬ䤷
ե륷ƥޥȥݥȤƤơ
-LVM RAID ֤Τ褦̩ܤ˴طΥץԤȤǤ
+LVM RAIDŹ沽ǥХΤ褦̩ܤ˴طΥץԤȤǤ
</para>
@@ -131,27 +134,6 @@
&module-partman-crypto.xml;
</sect2>
- <sect2 id="di-system-setup">
-<!--
- <title>Setting up the System</title>
--->
- <title>ƥΥåȥå</title>
-<para>
-
-<!--
-After partitioning the installer asks a few more questions that will be
-used to set up the system it is about to install.
--->
-ѡƥʬ䤬ȡ
-ȡϥȡԤƥ˴ؤƤޤ
-
-</para>
-
-&module-tzsetup.xml;
-&module-clock-setup.xml;
-&module-user-setup.xml;
-</sect2>
-
<sect2 id="di-install-base">
<!--
<title>Installing the Base System</title>
@@ -174,7 +156,30 @@
&module-base-installer.xml;
</sect2>
-
+
+ <sect2 id="di-user-setup">
+<!--
+ <title>Setting Up Users And Passwords</title>
+-->
+ <title>桼ȥѥɤΥåȥå</title>
+<para>
+
+<!--
+After the base system has been installed, the installer will allow you
+to set up the <quote>root</quote> account and/or an account for the first
+user. Other user accounts can be created after the installation has been
+completed.
+-->
+١ƥΥȡ뤬ȡ
+ȡ <quote>root</quote> Ȥ䡢
+ǽΥ桼ȤΥåȥåפԤޤ
+¾Υ桼Ȥϡȡ봰λ˺Ƥ
+
+</para>
+
+&module-user-setup.xml;
+ </sect2>
+
<sect2 id="di-install-software">
<!--
<title>Installing Additional Software</title>
@@ -183,21 +188,21 @@
<para>
<!--
-After the base system is installed, you have a usable but limited system.
+At this point you have a usable but limited system.
Most users will want to install additional software on the system to tune it to
their needs, and the installer allows you do so. This step can take even
longer than installing the base system if you have a slow computer or
-network.
+network connection.
-->
-ܥƥΥȡ뤬ȡ
-¤줿ƥबѤǤ褦ˤʤޤ
+λǤϡ¤줿ƥबѤǤ褦ˤʤޤ
ۤȤɤΥ桼ϡߤĴΤˡ
ɲåեȥƥ˥ȡ뤹Ǥ礦
ϥȡ餫Ԥޤ
-٤ԥ塼ѤƤȡ
+٤ԥ塼ͥåȥ³ѤƤȡ
ΥƥåפϴܥƥΥȡ֤ޤ
</para>
+
&module-apt-setup.xml;
&module-pkgsel.xml;
</sect2>
@@ -250,14 +255,16 @@
<para>
<!--
-These are the last bits to do before rebooting to your new system. It
-mostly consists of tidying up after the &d-i;.
+This is the last step in the Debian installation process during which the
+installer will do any last minute tasks.
+It mostly consists of tidying up after the &d-i;.
-->
-ƥƵưˡۤξԤȤޤ
-ۤȤɤ &d-i; θդǤ
+Debian Υȡץǡȡ餬Ԥ
+ǸΥƥåפˤʤޤۤȤɤ &d-i; θդǤ
</para>
+&module-clock-setup-finish.xml;
&module-finish-install.xml;
</sect2>
Index: ja/using-d-i/modules/finish-install.xml
===================================================================
--- ja/using-d-i/modules/finish-install.xml (revision 51135)
+++ ja/using-d-i/modules/finish-install.xml (working copy)
@@ -1,40 +1,35 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 37253 -->
+<!-- original version: 50618 -->
<sect3 id="finish-install">
<!--
- <title>Finish the Installation and Reboot</title>
+ <title>Reboot the System</title>
-->
- <title>ȡδλȺƵư</title>
+ <title>ƥκƵư</title>
-<para>
+<para arch="not-s390">
<!--
-This is the last step in the initial Debian installation process. You will
-be prompted to remove the boot media (CD, floppy, etc) that you used to
-boot the installer. The installer will do any last minute tasks, and then
-reboot into your new Debian system.
+You will be prompted to remove the boot media (CD, floppy, etc) that you
+used to boot the installer. After that the system will be rebooted into
+your new Debian system.
-->
- Debian ȡץκǽƥåפǤ
ȡεư˻Ѥ֡ȥǥ (CD, floppy, etc)
Ф褦¥ޤ
-ȡϺǸο¹ԤƤƵư
- Debian ƥưޤ
+θ奷ƥϡ Debian ƥǺƵưޤ
</para><para arch="s390">
<!--
-Select the <guimenuitem>Finish the installation</guimenuitem>
-menu item which will halt the system
-because rebooting is not supported on &arch-title; in this case. You
-then need to IPL GNU/Linux from the DASD which you selected for the
+After a final prompt the system will be halted because rebooting is not
+supported on &arch-title;.
+You then need to IPL &debian; from the DASD which you selected for the
root filesystem during the first steps of the installation.
-->
-<guimenuitem>ȡδλ</guimenuitem> ˥塼
-ƥߤƤ
-ξ硢&arch-title; ǤϺƵưݡȤƤʤǤ
-ȡκǽ˥롼ȥե륷ƥȤ DASD
+ǸΥץץȤθ塢ƥߤƤ
+ξ硢&arch-title; ǤϺƵưݡȤƤʤΤǤ
+θ塢ȡκǽ˥롼ȥե륷ƥȤ DASD
GNU/Linux IPL Ƥ
</para>
Index: ja/using-d-i/modules/clock-setup.xml
===================================================================
--- ja/using-d-i/modules/clock-setup.xml (revision 51135)
+++ ja/using-d-i/modules/clock-setup.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39614 -->
+<!-- original version: 50618 -->
<sect3 id="clock-setup">
<!--
@@ -11,51 +11,21 @@
<para>
<!--
-The installer might ask you if the computer's clock is set to UTC. Normally
-this question is avoided if possible and the installer tries to work out
-whether the clock is set to UTC based on things like what other operating
-systems are installed.
+The installer will first attempt to connect to a time server on the
+Internet (using the <firstterm>NTP</firstterm> protocol) in order to
+correctly set the system time. If this does not succeed, the installer
+will assume the time and date obtained from the system clock when the
+installation system was booted are correct. It is not possible to manually
+set the system time during the installation process.
-->
-ԥ塼λפ (UTC) ˥åȤ뤫ɤ
-ȡ餬䤹뤫⤷ޤ
-̾μϲǽʤԤ줺
-¾Υڥ졼ƥƥबȡ뤵Ƥ뤳Ȥʤɤˡ
-פ UTC ˥åȤ뤫ɤ褦Ȥޤ
+ȡϤޤƥפꤹ뤿ᡢ
+ͥåȤΥॵФ (<firstterm>NTP</firstterm>
+ץȥѤ) ³褦Ȥޤ줬ʤ硢
+ȡ륷ƥबưȤΥƥפȸʤޤ
+ȡץˡưǥƥפꤹ뤳ȤϤǤޤ
-</para><para>
-
-<!--
-In expert mode you will always be able to choose
-whether or not the clock is set to UTC.
-<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
-set to local time. If you want to dual-boot, select local time instead of
-GMT.</phrase>
-<phrase arch="x86">Systems that (also) run Dos or Windows are normally
-set to local time. If you want to dual-boot, select local time
-instead of GMT.</phrase>
--->
-ѡȥ⡼ɤǤϡפ UTC ˥åȤ뤫ݤ
-뤳Ȥˤʤޤ
-<phrase arch="m68k;powerpc">Macintosh Υϡɥåϡ
-̾˥åȤƤޤǥ奢֡Ȥϡ
-GMT ǤϤʤƤ</phrase>
-<phrase arch="x86">DOS Windows (Ǥ) ư륷ƥ̾
-˥åȤƤޤ ǥ奢֡Ȥϡ
-GMT ǤϤʤƤ</phrase>
-
-</para><para>
-
-<!--
-Note that the installer does not currently allow you to actually set the
-time in the computer's clock. You can set the clock to the current time
-after you have installed, if it is incorrect or if it was previously not
-set to UTC.
--->
-ȡ餬
-˥ԥ塼λפ碌櫓ǤϤʤȤդƤ
-פäƤꡢ UTC ˥åȤƤʤϡ
-ȡ뤬λƤ顢ߤλ˻פ碌뤳ȤǤޤ
-
</para>
+&module-tzsetup.xml;
+
</sect3>
Index: ja/using-d-i/modules/partman.xml
===================================================================
--- ja/using-d-i/modules/partman.xml (revision 51135)
+++ ja/using-d-i/modules/partman.xml (working copy)
@@ -1,18 +1,13 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 45238 -->
+<!-- original version: 50621 -->
- <sect3 id="partman">
- <title>ǥΥѡƥʬ</title>
-
<para>
<!--
-Now it is time to partition your disks. If you are uncomfortable with
-partitioning, or just want to know more details, see <xref
-linkend="partitioning"/>.
+If you are uncomfortable with partitioning, or just want to know more
+details, see <xref linkend="partitioning"/>.
-->
-ǥΥѡƥʬ䤷ޤ礦
ѡƥʬ¤äꡢܺ٤ΤꤿС
<xref linkend="partitioning"/>
@@ -56,9 +51,16 @@
<quote></quote>ѡƥʬȤƤӤޤ
ưʬ˾ޤʤС<guimenuitem>ư</guimenuitem> Ǥ
-</para><para>
+</para>
+ <sect3 id="partman-auto">
<!--
+ <title>Guided Partitioning</title>
+-->
+ <title>ɥѡƥʬ</title>
+<para>
+
+<!--
If you choose guided partitioning, you may have three options: to create
partitions directly on the hard disk (classic method), or to create them
using Logical Volume Management (LVM), or to create them using encrypted
@@ -345,9 +347,17 @@
ɥѡƥʬƼ¹ԤƤ
ޤϡʲ˽Ҥ٤ưѡƥʬǽƤ
-</para><para>
+</para>
+ </sect3>
+ <sect3 id="partman-manual">
<!--
+ <title>Manual Partitioning</title>
+-->
+ <title>ưѡƥʬ</title>
+<para>
+
+<!--
A similar screen to the one shown just above will be displayed if you
choose manual partitioning except that your existing partition table will
be shown and without the mount points. How to manually setup your partition
Index: ja/using-d-i/modules/netcfg.xml
===================================================================
--- ja/using-d-i/modules/netcfg.xml (revision 51135)
+++ ja/using-d-i/modules/netcfg.xml (working copy)
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46101 -->
+<!-- original version: 50619 -->
<sect3 id="netcfg">
+<!--
+ <title>Configuring the Network</title>
+-->
<title>ͥåȥ</title>
<para>
Index: ja/using-d-i/modules/clock-setup-finish.xml
===================================================================
--- ja/using-d-i/modules/clock-setup-finish.xml (revision 0)
+++ ja/using-d-i/modules/clock-setup-finish.xml (revision 0)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="EUC-JP"?>
+<!-- retain these comments for translator revision tracking -->
+<!-- original version: 50618 -->
+
+ <sect3 id="system-clock">
+<!--
+ <title>Setting the System Clock</title>
+-->
+ <title>ƥפ</title>
+
+<para>
+
+<!--
+The installer may ask you if the computer's clock is set to UTC. Normally
+this question is avoided if possible and the installer tries to work out
+whether the clock is set to UTC based on things like what other operating
+systems are installed.
+-->
+ȡϡԥ塼λפ UTC ˤ뤫ɤҤͤ뤳Ȥޤ
+̾盧μϲǽʸ¤¾Υڥ졼ƥबȡ뤵Ƥ뤫ɤ
+ȤäȤ UTC ˤ뤫ɤȽǤޤ
+
+</para><para>
+
+<!--
+In expert mode you will always be able to choose
+whether or not the clock is set to UTC.
+<phrase arch="m68k;powerpc">Macintosh hardware clocks are normally
+set to local time. If you want to dual-boot, select local time instead of
+UTC.</phrase>
+<phrase arch="x86">Systems that (also) run Dos or Windows are normally
+set to local time. If you want to dual-boot, select local time
+instead of UTC.</phrase>
+-->
+ѡȥ⡼ɤǤϡ˻פ UTC ˤ碌뤫ɤ뤳Ȥˤʤޤ
+<phrase arch="m68k;powerpc">Macintosh Υϡɥפϡ̾︽ϻ֤ˤ碌Ƥޤ
+ǥ奢֡ȤϡUTC ǤϤʤϻ֤Ƥ</phrase>
+<phrase arch="x86">DOS Windows Ѥ륷ƥϡ̾︽ϻ֤ˤ碌Ƥޤ
+ǥ奢֡ȤϡUTC ǤϤʤϻ֤Ƥ</phrase>
+
+</para><para>
+
+<!--
+At this point &d-i; will also attempt to save the current time to the
+system's hardware clock. This will be done either in UTC or local time,
+depending on the selection that was just made.
+-->
+ǡ&d-i; ϡƥΥϡɥפ˸ߤλ֤¸ѤȻߤޤ
+ۤɤˤꡢUTC ϻ֤Τɤ餫¸ޤ
+
+</para>
+
+ </sect3>
Index: ja/using-d-i/modules/user-setup.xml
===================================================================
--- ja/using-d-i/modules/user-setup.xml (revision 51135)
+++ ja/using-d-i/modules/user-setup.xml (working copy)
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43741 -->
+<!-- original version: 50618 -->
- <sect3 id="user-setup">
+ <sect3 id="user-setup-root">
<!--
- <title>Setting Up Users And Passwords</title>
+ <title>Set the Root Password</title>
-->
- <title>桼ȥѥɤΥåȥå</title>
+ <title>root ѥɤ</title>
- <sect4 id="user-setup-root">
-<!--
- <title>Set the Root Password</title>
--->
- <title>root ѥɤ</title>
-
<!-- TODO: Document sudo setup (no root password); medium/low prio only -->
<para>
@@ -59,13 +53,13 @@
root ѥɤɬפϡ̾褷Ƥޤ
</para>
- </sect4>
+ </sect3>
- <sect4 id="make-normal-user">
+ <sect3 id="make-normal-user">
<!--
- <title>Create an Ordinary User</title>
+ <title>Create an Ordinary User</title>
-->
- <title>̥桼κ</title>
+ <title>̥桼κ</title>
<para>
@@ -125,5 +119,4 @@
<command>adduser</command> ޥɤѤƤ
</para>
- </sect4>
</sect3>
Index: ja/using-d-i/modules/mdcfg.xml
===================================================================
--- ja/using-d-i/modules/mdcfg.xml (revision 51135)
+++ ja/using-d-i/modules/mdcfg.xml (working copy)
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44026 -->
+<!-- original version: 50619 -->
<sect3 id="mdcfg">
+<!--
+ <title>Configuring Multidisk Devices (Software RAID)</title>
+-->
<title>ޥǥǥХ (եȥ RAID) </title>
<para>
Index: ja/using-d-i/modules/apt-setup.xml
===================================================================
--- ja/using-d-i/modules/apt-setup.xml (revision 51135)
+++ ja/using-d-i/modules/apt-setup.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 43573 -->
+<!-- original version: 49871 -->
<sect3 id="apt-setup">
<!--
@@ -20,7 +20,6 @@
<command>apt-get</command> ץबޤ<footnote>
<para>
-
<!--
Note that the program which actually installs the packages is called
<command>dpkg</command>. However, this program is more of a low-level
@@ -39,7 +38,6 @@
ѥåɤΤ褦˼뤫ΤäƤޤ
ˡȡȤԤ褦ˡ
ѥåɬפȤ¾Υѥå⼫ưŪ˥ȡǤޤ
-
</para>
</footnote>
@@ -62,18 +60,235 @@
</para><para>
<!--
-<command>apt</command> must be configured so that it knows where to retrieve
-packages from. The installer largely takes care of this automatically based on
-what it knows about your installation medium. The results of this configuration
-are written to the file <filename>/etc/apt/sources.list</filename>, and you can
-examine and edit it to your liking after the install is complete.
+<command>apt</command> must be configured so that it knows from where to
+retrieve packages. The results of this configuration are written to the
+file <filename>/etc/apt/sources.list</filename>. You can examine and edit
+this file to your liking after the installation is complete.
-->
ѥåɤ뤫
<command>apt</command> ꤷƤʤƤϤʤޤ
-ȡϡưŪ˥ȡǥˤˤưޤ
η̤ϡ<filename>/etc/apt/sources.list</filename>
ե˽ޤޤ
-ޤȡ봰λˡߤ˹碌ƸԽǤޤ
+ȡ봰λˡߤ˹碌ƸԽǤޤ
+</para><para>
+
+<!--
+If you are installing at default priority, the installer will largely
+take care of the configuration automatically, based on the installation
+method you are using and possibly using choices made earlier in the
+installation. In most cases the installer will automatically add a security
+mirror and, if you are installing the stable distribution, a mirror for the
+<quote>volatile</quote> update service.
+-->
+ǥեȤͥ٤ǥȡ뤷Ƥ硢ȡˡȡ
+ǽǤХȡΤϤƤ顢
+ʬưݤߤƤޤ
+ۤȤɤξ硢ȡϼưǥƥߥ顼ɲäޤ
+ޤǤȡ뤷Ƥ硢
+<quote>volatile</quote> ӥΥߥ顼ɲäޤ
+
+</para><para>
+
+<!--
+If you are installing at a lower priority (e.g. in expert mode), you will
+be able to make more decisions yourself. You can choose whether or not to
+use the security and/or volatile update services, and you can choose to
+add packages from the <quote>contrib</quote> and <quote>non-free</quote>
+sections of the archive.
+-->
+㤤ͥ٤ǥȡ뤷Ƥ (: ѡȥ⡼)
+ä¿ΤȤʬǷǤޤ
+ƥ volatile ӥ̵ͭ䡢
+֤ <quote>contrib</quote>
+<quote>non-free</quote> Υѥåɲä̵ͭ٤ޤ
+
</para>
+
+ <sect4 id="apt-setup-mirror">
+<!--
+ <title>Using a network mirror</title>
+-->
+ <title>ͥåȥߥ顼</title>
+
+<para>
+
+<!--
+One question that will be asked in most cases is whether or not to use a
+network mirror as a source for packages. In most cases the default answer
+should be fine, but there are some exceptions.
+-->
+褯ˡ
+ѥåμ˥ͥåȥߥ顼Ѥ뤫ɤޤ
+ۤȤɤξ硢ǥեȤβǤޤޤˤ㳰⤢ޤ
+
+</para><para>
+
+<!--
+If you are <emphasis>not</emphasis> installing from a full CD or DVD or
+using a full CD/DVD image, you really should use a network mirror as
+otherwise you will end up with only a very minimal system. However, if you
+have a limited Internet connection it is best <emphasis>not</emphasis>
+to select the <literal>desktop</literal> task in the next step of the
+installation.
+-->
+ CD DVD 饤ȡ<emphasis>ʤ</emphasis>
+ CD/DVD Ѥ<emphasis>ʤ</emphasis>硢
+˺Ǿ¤ΥƥΤߤǴλʤ顢ͥåȥߥ顼Ѥ٤Ǥ
+ͥ峤硢ȡμΥƥåפǡ
+<literal>desktop</literal> <emphasis>ʤ</emphasis>ΤǤ礦
+
+</para><para>
+
+<!--
+If you are installing from a full CD or using a CD image (not DVD), using a
+network mirror is not required, but is still strongly recommended because a
+single CD contains only a fairly limited number of packages. The installer
+currently does not support using multiple CD or DVD images during the
+installation<footnote>
+
+<para>
+Adding that option is planned.
+</para>
+
+</footnote>. If you have a limited Internet connection it may still be best
+to <emphasis>not</emphasis> select a network mirror here, but to finish the
+installation using only what's available on the CD and install additional
+packages after the installation (i.e. after you have rebooted into the new
+system).
+-->
+(DVD ǤϤʤ) CD ǥȡ뤷Ƥꡢ
+ CD ѤƤ硢
+ͥåȥߥ顼ѤɬפϤޤ
+1 CD ˤ˸¤줿ΥѥåޤޤƤʤᡢ
+ߥ顼ѤΤᤷޤ
+ߥȡϡʣ CD DVD
+ȡ˻ȤˡϥݡȤƤޤ<footnote>
+
+<para>
+ΥץɲäײǤ
+</para>
+
+</footnote>ͥ峤ϡޤǥͥåȥߥ顼ꤷʤ褤Ǥ礦
+CD ǤǤ¤ΥȡԤɲåѥåΥȡϡ
+(ƥǵưʤ) ǹԤΤ褤Ǥ礦
+
+
+</para><para>
+
+<!--
+If you are installing from a DVD or using a DVD image, the need to use a
+network mirror is a lot smaller, but there is still a chance that some
+packages that are part of the tasks you select in the next step will not
+be included on the first DVD. This is especially true if you are installing
+in another language than English: a number of font and localization packages
+are known to be on the second DVD. So, if you have a reasonable Internet
+connection it is still advisable to use a network mirror.
+-->
+DVD饤ȡ뤷ꡢDVD ѤƤ硢
+ͥåȥߥ顼ɬϤʤ㤤Ǥ
+Υƥåפ륿ΰ
+1 ܤ DVD ˴ޤޤƤʤǽޤ
+Ѹʳθǥȡ뤷Ƥϡäˤηޤ
+ΥեȤϰ貽Υѥå
+DVD 2 ܤ˴ޤޤƤ뤳ȤΤƤޤ
+Τᡢ꺢ʥͥå³ʤ顢
+ͥåȥߥ顼ѤǤ
+
+
+</para><para>
+
+<!-- This should probably be documented a bit more extensively in
+ post-install instead. -->
+<!--
+To install additional packages after the installation you have two options:
+-->
+ȡɲåѥåȡ뤹ˤϡ
+ʲ 2 ̤ˡޤ
+
+<orderedlist>
+<listitem><para>
+
+<!--
+if you have additional CD/DVD images available (from same set as the
+installation CD/DVD you are using), you can add those to the
+<filename>sources.list</filename> using <command>apt-cdrom</command>;
+-->
+(ȡ˻Ѥ CD/DVD ƱåȤ) ɲCD/DVDѤǤ硢
+<command>apt-cdrom</command> Ѥơ
+<filename>sources.list</filename> ɲäǤޤ
+
+</para></listitem>
+<listitem><para>
+
+<!--
+manually add a mirror to the <filename>sources.list</filename> using an
+editor.
+-->
+ǥѤơ
+<filename>sources.list</filename> ˥ߥ顼ɲäƤ
+
+</para></listitem>
+</orderedlist>
+
+<!--
+You can then use one of the package management front-ends to select and
+install additional packages<footnote>
+
+<para>
+It is possible to add both additional CDs or DVDs <emphasis>and</emphasis>
+a network mirror in <filename>/etc/apt/sources.list</filename>. Also adding
+a network mirror has the advantage that it will make updates of packages in
+point releases of the distribution available for installation.
+</para>
+
+</footnote>.
+-->
+줫顢ѥåեȥɤΤ줫Ѥơ
+ɲäѥåȡ뤷Ƥ<footnote>
+
+<para>
+<filename>/etc/apt/sources.list</filename> ؤ CD DVD ɲ<emphasis></emphasis>
+ͥåȥߥ顼ɲäƱ˹Ԥޤ
+ޤͥåȥߥ顼ɲäΤˤϡȡѤǤ롢
+Υǥȥӥ塼Υݥȥѥåι
+Ȥޤ
+</para>
+
+</footnote>
+
+</para><para>
+
+<!--
+In summary: selecting a network mirror is generally a good idea, except
+if you do not have a good Internet connection. If the current version of
+a package is available on the CD/DVD, the installer will always use that.
+The amount of data that will be downloaded if you do select a mirror thus
+depends on a) the tasks you select in the next step of the installation, b)
+which packages are needed for those tasks, and c) which of those packages
+are present on the CD/DVD.
+-->
+ʲˤޤȤޤͥåȥߥ顼Τϡ
+ɤͥå³ʤŪˤ褤ͤǤ
+ѥåκǿǤ CD/DVD ѤǤˤϡ
+ȡϾˤѤޤ
+äơߥ顼Υɤǡ̤ϡ
+a) ȡμΥƥåפ륿
+b) ɤΥѥåΥɬפ
+c) Υѥå CD/DVD ˼ϿƤ뤫ɤ˰¸ޤ
+
+</para><para>
+
+<!--
+Note that even if you choose not to use a network mirror, some packages
+may still be downloaded from the Internet if there is a security or
+volatile update available for them and those services have been configured.
+-->
+ͥåȥߥ顼Ѥʤ褦ȤƤ⡢
+ƥ volatile ˹ꡢ
+ΥӥѤ褦ꤷƤϡ
+ѥåɤǽĤäƤ뤳ȤդƤ
+
+</para>
+</sect4>
</sect3>
Index: ja/using-d-i/modules/x86/lilo-installer.xml
===================================================================
--- ja/using-d-i/modules/x86/lilo-installer.xml (revision 51135)
+++ ja/using-d-i/modules/x86/lilo-installer.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 48599 -->
+<!-- original version: 49849 -->
<sect3 arch="x86">
<title>ϡɥǥؤ <command>LILO</command>
@@ -79,11 +79,7 @@
<!--
Useful for advanced users who want to install <command>LILO</command>
somewhere else. In this case you will be asked for desired
-location. You can use
-<phrase condition="etch">devfs style names, such as those that start with
-<filename>/dev/ide</filename>, <filename>/dev/scsi</filename>, and
-<filename>/dev/discs</filename>, as well as traditional names,</phrase>
-<phrase condition="lenny">traditional device names</phrase> such as
+location. You can use traditional device names such as
<filename>/dev/hda</filename> or <filename>/dev/sda</filename>.
-->
<command>LILO</command> ¾ξ˥ȡ뤷桼Ωޤ
Index: ja/using-d-i/modules/network-console.xml
===================================================================
--- ja/using-d-i/modules/network-console.xml (revision 51135)
+++ ja/using-d-i/modules/network-console.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 31173 -->
+<!-- original version: 50787 -->
<sect3 id="network-console">
<!--
@@ -131,20 +131,83 @@
</para><note><para>
<!--
+The <command>ssh</command> server in the installer uses a default
+configuration that does not send keep-alive packets. In principle,
+a connection to the system being installed should be kept open
+indefinitely. However, in some situations — depending on your
+local network setup — the connection may be lost after some
+period of inactivity. One common case where this can happen is when
+there is some form of Network Address Translation (NAT) somewhere
+between the client and the system being installed. Depending on at
+which point of the installation the connection was lost, you may or
+may not be able to resume the installation after reconnecting.
+-->
+ȡ <command>ssh</command> Фϡ
+keep-alive ѥåȤʤȤǥեѤޤ
+§Ūˡȡ뤹륷ƥؤ³ϡ̵¤ݤ٤Ǥ
+ (ʤΥͥåȥ˰¸) Ǥϡ
+Իѻ֤³³ǽޤ
+褯ϡ饤Ȥȥȡ뤹륷ƥδ֤Τɤˡ
+ͥåȥɥ쥹Ѵ (NAT) 뤳ȤǤ
+³줿ݤΥȡΥݥȤˤꡢ
+³˥ȡƳǤ뤫ɤޤǤ礦
+
+</para><para>
+
+<!--
+You may be able to avoid the connection being dropped by adding the option
+<userinput>-o ServerAliveInterval=<replaceable>value</replaceable></userinput>
+when starting the <command>ssh</command> connection, or by adding that
+option in your <command>ssh</command> configuration file. Note however
+that in some cases adding this option may also <emphasis>cause</emphasis>
+a connection to be dropped (for example if keep-alive packets are sent
+during a brief network outage, from which <command>ssh</command> would
+otherwise have recovered), so it should only be used when needed.
+-->
+<command>ssh</command> ³Ϥݤ䡢
+<command>ssh</command> եˡץ
+<userinput>-o ServerAliveInterval=<replaceable>value</replaceable></userinput>
+ɲäơ³ڤΤǤ뤫⤷ޤ
+ǤϡΥץɲäȡ
+³ڤ<emphasis></emphasis>ˤʤ뤫⤷ʤȤˤդ
+(㤨Сʤʤ <command>ssh</command> 줷Ƥޤ褦ʡ
+û֤Υͥåȥ㳲 keep-alive ѥåȤʤ)
+ΤᡢѤɬǾ¤ˤ٤Ǥ
+
+
+</para></note>
+
+<note><para>
+
+<!--
If you install several computers in turn and they happen to have the
same IP address or hostname, <command>ssh</command> will refuse to connect
to such host. The reason is that it will have different fingerprint, which
is usually a sign of a spoofing attack. If you are sure this is not the
case, you will need to delete the relevant line from
-<filename>~/.ssh/known_hosts</filename> and try again.
+<filename>~/.ssh/known_hosts</filename><footnote>
-->
֤ˤĤΥԥ塼˥ȡ뤷ơ
Ʊ IP ɥ쥹ۥ̾äƤꤹȡ
<command>ssh</command> ϤäۥȤؤ³ݤޤ
椬ۤʤäƤȤΤϡ̾ʤꤹޤΥǤ
ʤꤹޤǤϤʤȤΤʤ顢<filename>~/.ssh/known_hosts</filename>
-ϢԤơ⤦ٹԤɬפޤ
+ϢԤ<footnote>
+
+<para>
+<!--
+The following command will remove an existing entry for a host:
+<command>ssh-keygen -R <<replaceable>hostname</replaceable>|<replaceable>IP address</replaceable>></command>.
+-->
+ʲΥޥɤǡ¸ΥۥȥȥǤޤ
+<command>ssh-keygen -R <<replaceable>hostname</replaceable>|<replaceable>IP address</replaceable>></command>
+</para>
+<!--
+</footnote> and try again.
+-->
+</footnote>⤦ٹԤɬפޤ
+
</para></note><para>
<!--
Index: ja/using-d-i/modules/lowmem.xml
===================================================================
--- ja/using-d-i/modules/lowmem.xml (revision 51135)
+++ ja/using-d-i/modules/lowmem.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 47209 -->
+<!-- original version: 49849 -->
<sect3 id="lowmem">
<!--
@@ -98,7 +98,7 @@
ǺƤ
ext2 ѡƥȡ ext3 ѹǤޤ
-</para><para condition="lenny">
+</para><para>
<!--
It is possible to force the installer to use a higher lowmem level than
Index: ja/using-d-i/modules/tzsetup.xml
===================================================================
--- ja/using-d-i/modules/tzsetup.xml (revision 51135)
+++ ja/using-d-i/modules/tzsetup.xml (working copy)
@@ -1,26 +1,84 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 35518 -->
+<!-- original version: 50620 -->
- <sect3 id="tzsetup">
-<!--
- <title>Configuring Your Time Zone</title>
--->
- <title>ॾ</title>
+<!-- As tzsetup is invoked from inside clock-setup, this is not a
+ separate section -->
<para>
<!--
-Depending on the location selected at the beginning of the installation
-process, you might be shown a list of timezones relevant for that location.
+Depending on the location selected earlier in the installation process,
+you may be shown a list of timezones relevant for that location.
If your location has only one time zone, you will not be asked anything and
the system will assume that time zone.
-->
-ȡν˰¸ơ
-ξ˴Ϣ륿ॾΰɽޤ
+ȡν˰¸ơ
+ξ˴Ϣ륿ॾΰɽޤ
ʤξ˥ॾҤȤĤʤС
ƥϰɽΥॾǤȲꤷޤ
+</para><para>
+
+<!--
+If for some reason you wish to set a time zone for the installed system
+that does <emphasis>not</emphasis> match the selected location, there are
+two options.
+-->
+餫ͳǡȡ뤷ƥΥॾ
+Ȥ<emphasis>ۤʤ</emphasis>Τˤϡ
+2 Ĥ褬ޤ
+
</para>
- </sect3>
+<orderedlist>
+<listitem>
+
+<para>
+
+<!--
+The simplest option is to just select a different timezone after the
+installation has been completed and you've booted into the new system.
+The command to do this is:
+-->
+ץˡϡȡ뤬λƥबưǡ
+ۤʤ륿ॾ뤳ȤǤ
+ʲΤ褦ʥޥɤˤʤޤ
+
+<informalexample><screen>
+# dpkg-reconfigure tzdata
+</screen></informalexample>
+
+</para>
+
+</listitem><listitem>
+
+<para>
+
+<!--
+Alternatively, the time zone can be set at the very start of the
+installation by passing the parameter
+<userinput>time/zone=<replaceable>value</replaceable></userinput>
+when you boot the installation system. The value should of course be a
+valid time zone, for example <userinput>Europe/London</userinput> or
+<userinput>UTC</userinput>.
+-->
+¾ˤϡȡ륷ƥεưˡѥ
+<userinput>time/zone=<replaceable>value</replaceable></userinput>
+Ϥȡȡκǽ餫饿ॾǤޤ
+ͤʥॾ (㤨 <userinput>Europe/London</userinput>
+<userinput>UTC</userinput>) Ǥ٤Ǥ
+
+</para>
+
+</listitem>
+</orderedlist>
+
+<para>
+
+<!--
+For automated installations the time zone can also be set using preseeding.
+-->
+ưȡѤˡॾ preseed ѤƤǤޤ
+
+</para>
Index: ja/using-d-i/using-d-i.xml
===================================================================
--- ja/using-d-i/using-d-i.xml (revision 51135)
+++ ja/using-d-i/using-d-i.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46722 -->
+<!-- original version: 50641 -->
<chapter id="d-i-intro"><title>Debian Installer λˡ</title>
@@ -376,6 +376,29 @@
</varlistentry>
<varlistentry>
+<term>clock-setup</term><listitem><para>
+
+<!--
+Updates the system clock and determines whether the clock is set to UTC
+or not.
+-->
+ƥפơפ UTC ˤ뤫ɤꤷޤ
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
+<term>tzsetup</term><listitem><para>
+
+<!--
+Selects the time zone, based on the location selected earlier.
+-->
+餫ˡॾޤ
+
+</para></listitem>
+</varlistentry>
+<varlistentry>
+
<term>partman</term><listitem><para>
<!--
@@ -464,29 +487,20 @@
</para></listitem>
</varlistentry>
<varlistentry>
-
-<term>tzsetup</term><listitem><para>
-<!--
-Selects the time zone, based on the location selected earlier.
--->
-餫ˡॾޤ
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
+<term>base-installer</term><listitem><para>
-<term>clock-setup</term><listitem><para>
-
<!--
-Determines whether the clock is set to UTC or not.
+Installs the most basic set of packages which would allow
+the computer to operate under Linux when rebooted.
-->
-å UTC ꤹ뤫ɤꤷޤ
+Ƶưˡԥ塼 Linux Ȥư뤿Ρ
+äȤŪʥѥååȤȡ뤷ޤ
</para></listitem>
</varlistentry>
<varlistentry>
-
+
<term>user-setup</term><listitem><para>
<!--
@@ -498,19 +512,6 @@
</varlistentry>
<varlistentry>
-<term>base-installer</term><listitem><para>
-
-<!--
-Installs the most basic set of packages which would allow
-the computer to operate under Linux when rebooted.
--->
-Ƶư˥ԥ塼 Linux ư뤳ȤǤ褦ˡ
-äȤŪʥѥåΥåȤȡ뤷ޤ
-
-</para></listitem>
-</varlistentry>
-<varlistentry>
-
<term>apt-setup</term><listitem><para>
<!--
@@ -522,7 +523,7 @@
</para></listitem>
</varlistentry>
<varlistentry>
-
+
<term>pkgsel</term><listitem><para>
<!--
@@ -534,7 +535,7 @@
</para></listitem>
</varlistentry>
<varlistentry>
-
+
<term>os-prober</term><listitem><para>
<!--
Index: ja/hardware/hardware-supported.xml
===================================================================
--- ja/hardware/hardware-supported.xml (revision 51135)
+++ ja/hardware/hardware-supported.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 48719 -->
+<!-- original version: 49849 -->
<sect1 id="hardware-supported">
<!--
@@ -96,17 +96,13 @@
<row>
<!--
- <entry morerows="3" condition="etch">ARM and StrongARM</entry>
- <entry morerows="2" condition="lenny">ARM and StrongARM</entry>
- <entry morerows="3" condition="etch">arm</entry>
- <entry morerows="2" condition="lenny">arm</entry>
+ <entry morerows="2">ARM and StrongARM</entry>
+ <entry morerows="2">arm</entry>
<entry>Netwinder and CATS</entry>
<entry>netwinder</entry>
-->
- <entry morerows="3" condition="etch">ARMStrongARM</entry>
- <entry morerows="2" condition="lenny">ARMStrongARM</entry>
- <entry morerows="3" condition="etch">arm</entry>
- <entry morerows="2" condition="lenny">arm</entry>
+ <entry morerows="2">ARMStrongARM</entry>
+ <entry morerows="2">arm</entry>
<entry>NetwinderCATS</entry>
<entry>netwinder</entry>
</row><row>
@@ -115,9 +111,6 @@
</row><row>
<entry>Intel IXP4xx</entry>
<entry>ixp4xx</entry>
-</row><row condition="etch">
- <entry>RiscPC</entry>
- <entry>rpc</entry>
</row>
<row>
@@ -210,14 +203,9 @@
<entry>prep</entry>
</row>
-<row condition="etch">
- <entry morerows="2">Sun SPARC</entry>
- <entry morerows="2">sparc</entry>
- <entry>sun4m</entry>
- <entry>sparc32</entry>
-</row><row>
- <entry morerows="1" condition="lenny">Sun SPARC</entry>
- <entry morerows="1" condition="lenny">sparc</entry>
+<row>
+ <entry morerows="1">Sun SPARC</entry>
+ <entry morerows="1">sparc</entry>
<entry>sun4u</entry>
<entry morerows="1">sparc64</entry>
</row><row>
Index: ja/hardware/supported/sparc.xml
===================================================================
--- ja/hardware/supported/sparc.xml (revision 51135)
+++ ja/hardware/supported/sparc.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 48719 -->
+<!-- original version: 49849 -->
<sect2 arch="sparc" id="sparc-cpus">
<!--
@@ -23,59 +23,7 @@
</para>
<variablelist>
-<varlistentry condition="etch">
-<term>sun4, sun4c, sun4d</term>
-
-<listitem><para>
-
-<!--
-These subarchitectures include some very old 32-bit machines, which are
-no longer supported. For a complete list please consult the
-<ulink url="http://en.wikipedia.org/wiki/SPARCstation";>Wikipedia
-SPARCstation page</ulink>.
--->
-Υ֥ƥˤϡ켰 32 ӥåȥޥޤޤƤꡢ
-⤦ݡȤƤޤ
-ʥꥹȤϡ
-<ulink url="http://en.wikipedia.org/wiki/SPARCstation";>Wikipedia
-SPARCstation ڡ</ulink>
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry condition="etch">
-<term>sun4m</term>
-
-<listitem><para>
-
-<!--
-sun4m is the only 32-bit subarchitecture (sparc32) that is currently
-supported. The most popular machines belonging to this class are
-Sparcstation 4, 5, 10 and 20.
--->
-sun4m ϸߥݡȤƤ롢
-ͣ 32 ӥåȥ֥ƥ (sparc32) Ǥ
-Υ饹ΤäȤݥԥ顼ʥޥϡSparcstation 4, 5, 10, 20 Ǥ
-
-</para><para>
-
-<!--
-Note that symmetric multiprocessing (SMP) — the ability to run
-processes on multiple processors — is not supported on this hardware,
-due to stability problems with such configurations. The available
-uniprocessor (UP) sparc32 kernel will boot fine on multiprocessor
-machines, although it will activate and use only the first CPU.
--->
-ʣΥץåǥץ¹Ԥоηޥץå (SMP)
-꤬뤿ᡢΥϡɥǤϡ
-ݡȤƤʤȤդƤ
-ñץå (UP) sparc32 ͥϥޥץåޥǤ⡢
-(ǽ CPU ͭˤʤޤ) ʤưޤ
-
-</para></listitem>
-</varlistentry>
-
-<varlistentry condition="lenny">
+<varlistentry>
<term>sun4, sun4c, sun4d, sun4m</term>
<listitem><para>
Index: ja/hardware/supported/arm.xml
===================================================================
--- ja/hardware/supported/arm.xml (revision 51135)
+++ ja/hardware/supported/arm.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46426 -->
+<!-- original version: 49849 -->
<sect2 arch="arm"><title>CPUޥܡɡӥǥΥݡ</title>
@@ -115,35 +115,6 @@
</para></listitem>
</varlistentry>
-<varlistentry condition="etch">
-<term>RiscPC</term>
-<listitem><para>
-
-<!--
-This machine is the oldest supported hardware: it was released
-in 1994. It has RISC OS in ROM, Linux can be booted from that OS using
-linloader. The RiscPC has a modular CPU card and typically has a 30MHz
-610, 40MHz 710 or 233MHz Strongarm 110 CPU fitted. The mainboard has
-integrated IDE, SVGA video, parallel port, single serial port, PS/2
-keyboard and proprietary mouse port. The proprietary module expansion
-bus allows for up to eight expansion cards to be fitted depending on
-configuration, several of these modules have Linux drivers.
--->
-Υޥ 1994 ǯ˥줿
-ǤŤ饵ݡȤƤϡɥǤ
- ROM RISC OS
-Linux linloader ѤƤ OS 鵯ưǤޤ
-RiscPC ϥ⥸塼 CPU ɤäƤꡢ
- 30MHz 610, 40MHz 710, 233MHz Strongarm 110 CPU Ŭ礷ޤ
-ᥤܡɤ IDESVGA ӥǥѥݡȡ1 ĤΥꥢݡȡ
-PS/2 ܡɡץץ饤ޥݡȤ礷Ƥޤ
-ץץ饤ʥ⥸塼ĥХϡ
-˰¸ 8 ĤޤǤγĥɤŬ礹ΤǽǤ
-Υ⥸塼ΤĤ Linux ɥ饤ФäƤޤ
-
-</para></listitem>
-</varlistentry>
-
</variablelist>
</para>
Index: ja/hardware/installation-media.xml
===================================================================
--- ja/hardware/installation-media.xml (revision 51135)
+++ ja/hardware/installation-media.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 46426 -->
+<!-- original version: 49849 -->
<sect1 id="installation-media">
<title>ȡѤǤǥ</title>
@@ -136,10 +136,8 @@
<!--
IDE/ATAPI CD-ROMs are supported on all ARM machines.
-<phrase condition="etch">On RiscPCs, SCSI CD-ROMs are also supported.</phrase>
-->
٤Ƥ ARM ޥ IDE/ATAPI CD-ROM ݡȤƤޤ
-<phrase condition="etch">RiscPC Ǥ SCSI CD-ROM ⥵ݡȤƤޤ</phrase>
</para><para arch="mips">
Index: ja/boot-installer/boot-installer.xml
===================================================================
--- ja/boot-installer/boot-installer.xml (revision 51135)
+++ ja/boot-installer/boot-installer.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 44407 -->
+<!-- original version: 49985 -->
<chapter id="boot-installer"><title>ȡ륷ƥεư</title>
@@ -13,6 +13,28 @@
<!-- structure inside out for this chapter. Each arch has a document. -->
<!-- Note: arch hppa is currently missing -->
+<warning arch="x86;powerpc"><para>
+
+<!--
+If you have any other operating systems on your system that you wish to
+keep (dual boot setup), you should make sure that they have been properly
+shut down <emphasis>before</emphasis> you boot the installer.
+Installing an operating system while another operating system is in
+hibernation (has been suspended to disk) could result in loss of, or damage
+to the state of the suspended operating system which could cause problems
+when it is rebooted.
+-->
+ƥ¾Υڥ졼ƥƥबꡢ
+¸ (ǥ奢֡ȥåȥå) 硢
+ȡư<emphasis></emphasis>ˡ
+μ¤˥åȥƤ
+¾Υڥ졼ƥƥबϥХ͡
+(ǥؤΥڥ) ֤ǡ
+ڥ졼ƥƥȡ뤹ȡ
+Ƶưˡڥɤڥ졼ƥƥξ֤
+ä㳲Ϳǽޤ
+
+</para></warning>
<note condition="gtk"><para>
<!--
Index: ja/boot-installer/parameters.xml
===================================================================
--- ja/boot-installer/parameters.xml (revision 51135)
+++ ja/boot-installer/parameters.xml (working copy)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="EUC-JP"?>
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 48421 -->
+<!-- original version: 49849 -->
<sect1 id="boot-parms"><title>֡ȥѥ</title>
<para>
@@ -339,7 +339,7 @@
</para></listitem>
</varlistentry>
-<varlistentry condition="lenny">
+<varlistentry>
<term>lowmem</term>
<listitem><para>
@@ -490,7 +490,7 @@
</para></listitem>
</varlistentry>
-<varlistentry condition="lenny">
+<varlistentry>
<term>disk-detect/dmraid/enable (dmraid)</term>
<listitem><para>
Attachment:
di20080202.tar.gz
Description: Binary data