d-i manual: update po|pot files after changings in en

1 files changed, 160 insertions, 180 deletions

diff --git a/po/tl/install-methods.po b/po/tl/install-methods.po
index 3611b3af1..fea98be45 100644
--- a/po/tl/install-methods.po
+++ b/po/tl/install-methods.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-01-06 16:36+0000\n"
+"POT-Creation-Date: 2013-05-22 19:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -63,12 +63,12 @@ msgid ""
 "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
 "relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
 "use an alternative strategy such as <phrase condition=\"supports-floppy-boot"
-"\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated tape,</phrase> "
-"<phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase condition="
-"\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-tftp\">net "
-"boot,</phrase> or manually loading the kernel from the CD to initially boot "
-"the system installer. The files you need for booting by another means are "
-"also on the CD; the &debian; network archive and CD folder organization are "
+"\">floppy disk,</phrase> <phrase arch=\"s390\">VM reader,</phrase> <phrase "
+"condition=\"bootable-disk\">hard disk,</phrase> <phrase condition=\"bootable-"
+"usb\">usb stick,</phrase> <phrase condition=\"supports-tftp\">net boot,</"
+"phrase> or manually loading the kernel from the CD to initially boot the "
+"system installer. The files you need for booting by another means are also "
+"on the CD; the &debian; network archive and CD folder organization are "
 "identical. So when archive file paths are given below for particular files "
 "you need for booting, look for those files in the same directories and "
 "subdirectories on your CD."
@@ -87,7 +87,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "If you don't have a CD set, then you will need to download the installer "
-"system files and place them on the <phrase arch=\"s390\">installation tape</"
+"system files and place them on the <phrase arch=\"s390\">VM minidisk</"
 "phrase> <phrase condition=\"supports-floppy-boot\">floppy disk or</phrase> "
 "<phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase condition="
 "\"bootable-usb\">usb stick or</phrase> <phrase condition=\"supports-tftp\">a "
@@ -246,31 +246,11 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:244
 #, no-c-format
-msgid "Creating an IPL tape"
-msgstr ""
-
-#. Tag: para
-#: install-methods.xml:246
-#, no-c-format
-msgid ""
-"If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
-"create an IPL tape first. This is described in section 3.4.3 in the <ulink "
-"url=\"http://www.redbooks.ibm.com/pubs/pdfs/redbooks/sg246264.pdf\"> Linux "
-"for IBM eServer zSeries and S/390: Distributions</ulink> Redbook. The files "
-"you need to write to the tape are (in this order): <filename>kernel.debian</"
-"filename>, <filename>parmfile.debian</filename> and <filename>initrd.debian</"
-"filename>. The files can be downloaded from the <filename>tape</filename> "
-"sub-directory, see <xref linkend=\"where-files\"/>."
-msgstr ""
-
-#. Tag: title
-#: install-methods.xml:270
-#, no-c-format
 msgid "Creating Floppies from Disk Images"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:271
+#: install-methods.xml:245
 #, no-c-format
 msgid ""
 "Bootable floppy disks are generally used as a last resort to boot the "
@@ -278,7 +258,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:276
+#: install-methods.xml:250
 #, no-c-format
 msgid ""
 "Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -286,7 +266,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:281
+#: install-methods.xml:255
 #, no-c-format
 msgid ""
 "Disk images are files containing the complete contents of a floppy disk in "
@@ -299,7 +279,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:292
+#: install-methods.xml:266
 #, no-c-format
 msgid ""
 "There are different techniques for creating floppies from disk images. This "
@@ -308,7 +288,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:298
+#: install-methods.xml:272
 #, no-c-format
 msgid ""
 "Before you can create the floppies, you will first need to download them "
@@ -319,7 +299,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:306
+#: install-methods.xml:280
 #, no-c-format
 msgid ""
 "No matter which method you use to create your floppies, you should remember "
@@ -328,13 +308,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:314
+#: install-methods.xml:288
 #, no-c-format
 msgid "Writing Disk Images From a Linux or Unix System"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:315
+#: install-methods.xml:289
 #, no-c-format
 msgid ""
 "To write the floppy disk image files to the floppy disks, you will probably "
@@ -355,7 +335,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:336
+#: install-methods.xml:310
 #, no-c-format
 msgid ""
 "Some systems attempt to automatically mount a floppy disk when you place it "
@@ -375,7 +355,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:357
+#: install-methods.xml:331
 #, no-c-format
 msgid ""
 "If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -384,13 +364,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:375
+#: install-methods.xml:349
 #, no-c-format
 msgid "Writing Disk Images From DOS, Windows, or OS/2"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:377
+#: install-methods.xml:351
 #, no-c-format
 msgid ""
 "If you have access to an i386 or amd64 machine, you can use one of the "
@@ -398,7 +378,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:382
+#: install-methods.xml:356
 #, no-c-format
 msgid ""
 "The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -409,7 +389,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:390
+#: install-methods.xml:364
 #, no-c-format
 msgid ""
 "The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -418,7 +398,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:396
+#: install-methods.xml:370
 #, no-c-format
 msgid ""
 "These tools can be found on the Official &debian; CD-ROMs under the "
@@ -426,13 +406,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:409
+#: install-methods.xml:383
 #, no-c-format
 msgid "Writing Disk Images From MacOS"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:410
+#: install-methods.xml:384
 #, no-c-format
 msgid ""
 "An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -446,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:421
+#: install-methods.xml:395
 #, no-c-format
 msgid ""
 "You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -456,13 +436,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:432
+#: install-methods.xml:406
 #, no-c-format
 msgid "Writing Disk Images with <command>Disk Copy</command>"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:433
+#: install-methods.xml:407
 #, no-c-format
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
@@ -472,7 +452,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:442
+#: install-methods.xml:416
 #, no-c-format
 msgid ""
 "Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -480,7 +460,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:449
+#: install-methods.xml:423
 #, no-c-format
 msgid ""
 "Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -489,7 +469,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:456
+#: install-methods.xml:430
 #, no-c-format
 msgid ""
 "<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -500,7 +480,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:465
+#: install-methods.xml:439
 #, no-c-format
 msgid ""
 "Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -509,7 +489,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:472
+#: install-methods.xml:446
 #, no-c-format
 msgid ""
 "Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -520,13 +500,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:487
+#: install-methods.xml:461
 #, no-c-format
 msgid "Writing Disk Images with <command>suntar</command>"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:491
+#: install-methods.xml:465
 #, no-c-format
 msgid ""
 "Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -536,21 +516,21 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:499
+#: install-methods.xml:473
 #, no-c-format
 msgid ""
 "Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:505
+#: install-methods.xml:479
 #, no-c-format
 msgid ""
 "Select the <filename>root.bin</filename> file in the file-opening dialog."
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:510
+#: install-methods.xml:484
 #, no-c-format
 msgid ""
 "After the floppy has been created successfully, select <menuchoice> "
@@ -560,7 +540,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:518
+#: install-methods.xml:492
 #, no-c-format
 msgid ""
 "Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -569,13 +549,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:537
+#: install-methods.xml:511
 #, no-c-format
 msgid "Preparing Files for USB Memory Stick Booting"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:539
+#: install-methods.xml:513
 #, no-c-format
 msgid ""
 "To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -590,7 +570,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:552
+#: install-methods.xml:526
 #, no-c-format
 msgid ""
 "The procedures described in this section will destroy anything already on "
@@ -600,13 +580,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:562
+#: install-methods.xml:536
 #, no-c-format
 msgid "Preparing a USB stick using a hybrid CD or DVD image"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:563
+#: install-methods.xml:537
 #, no-c-format
 msgid ""
 "Debian CD and DVD images can now be written directly a USB stick, which is a "
@@ -616,7 +596,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:570
+#: install-methods.xml:544
 #, no-c-format
 msgid ""
 "Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -626,7 +606,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:577
+#: install-methods.xml:551
 #, no-c-format
 msgid ""
 "The CD or DVD image you choose should be written directly to the USB stick, "
@@ -636,7 +616,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:584
+#: install-methods.xml:558
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
@@ -645,7 +625,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:586
+#: install-methods.xml:560
 #, no-c-format
 msgid ""
 "Simply writing the CD or DVD image to USB like this should work fine for "
@@ -654,7 +634,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:594
+#: install-methods.xml:568
 #, no-c-format
 msgid ""
 "The hybrid image on the stick does not occupy all the storage space, so it "
@@ -664,7 +644,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:602
+#: install-methods.xml:576
 #, no-c-format
 msgid ""
 "Create a second, FAT partition on the stick, mount the partition and copy or "
@@ -672,7 +652,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:607
+#: install-methods.xml:581
 #, no-c-format
 msgid ""
 "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -683,7 +663,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:609
+#: install-methods.xml:583
 #, no-c-format
 msgid ""
 "You might have written the <filename>mini.iso</filename> to the USB stick. "
@@ -693,13 +673,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:623
+#: install-methods.xml:597
 #, no-c-format
 msgid "Manually copying files to the USB stick"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:624
+#: install-methods.xml:598
 #, no-c-format
 msgid ""
 "An alternative way to set up your USB stick is to manually copy the "
@@ -709,7 +689,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:631
+#: install-methods.xml:605
 #, no-c-format
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -720,7 +700,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:640
+#: install-methods.xml:614
 #, no-c-format
 msgid ""
 "Note that, although convenient, this method does have one major "
@@ -731,19 +711,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:648
+#: install-methods.xml:622
 #, no-c-format
 msgid "To use this image simply extract it directly to your USB stick:"
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:652
+#: install-methods.xml:626
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:654
+#: install-methods.xml:628
 #, no-c-format
 msgid ""
 "Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -752,13 +732,13 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:660
+#: install-methods.xml:634
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:662
+#: install-methods.xml:636
 #, no-c-format
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
@@ -772,13 +752,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:679
+#: install-methods.xml:653
 #, no-c-format
 msgid "Manually copying files to the USB stick &mdash; the flexible way"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:680
+#: install-methods.xml:654
 #, no-c-format
 msgid ""
 "If you like more flexibility or just want to know what's going on, you "
@@ -789,13 +769,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:695 install-methods.xml:817
+#: install-methods.xml:669 install-methods.xml:791
 #, no-c-format
 msgid "Partitioning the USB stick"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:696
+#: install-methods.xml:670
 #, no-c-format
 msgid ""
 "We will show how to set up the memory stick to use the first partition, "
@@ -803,7 +783,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:701
+#: install-methods.xml:675
 #, no-c-format
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -823,7 +803,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:725
+#: install-methods.xml:699
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -835,7 +815,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:735
+#: install-methods.xml:709
 #, no-c-format
 msgid ""
 "To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -850,13 +830,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:752 install-methods.xml:864
+#: install-methods.xml:726 install-methods.xml:838
 #, no-c-format
 msgid "Adding the installer image"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:753
+#: install-methods.xml:727
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
@@ -872,7 +852,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:777
+#: install-methods.xml:751
 #, no-c-format
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -888,7 +868,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:789
+#: install-methods.xml:763
 #, no-c-format
 msgid ""
 "To enable the boot prompt to permit further parameter appending, add a "
@@ -896,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:794 install-methods.xml:904
+#: install-methods.xml:768 install-methods.xml:878
 #, no-c-format
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy the "
@@ -909,7 +889,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:818
+#: install-methods.xml:792
 #, no-c-format
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -927,7 +907,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:835
+#: install-methods.xml:809
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -938,7 +918,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:844
+#: install-methods.xml:818
 #, no-c-format
 msgid ""
 "The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -959,7 +939,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:865
+#: install-methods.xml:839
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -967,31 +947,31 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:872
+#: install-methods.xml:846
 #, no-c-format
 msgid "<filename>vmlinux</filename> (kernel binary)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:877
+#: install-methods.xml:851
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:882
+#: install-methods.xml:856
 #, no-c-format
 msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:887
+#: install-methods.xml:861
 #, no-c-format
 msgid "<filename>boot.msg</filename> (optional boot message)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:894
+#: install-methods.xml:868
 #, no-c-format
 msgid ""
 "The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1012,13 +992,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:932
+#: install-methods.xml:906
 #, no-c-format
 msgid "Preparing Files for Hard Disk Booting"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:933
+#: install-methods.xml:907
 #, no-c-format
 msgid ""
 "The installer may be booted using boot files placed on an existing hard "
@@ -1027,7 +1007,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:939
+#: install-methods.xml:913
 #, no-c-format
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1037,7 +1017,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:946
+#: install-methods.xml:920
 #, no-c-format
 msgid ""
 "The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1051,7 +1031,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:957
+#: install-methods.xml:931
 #, no-c-format
 msgid ""
 "Different programs are used for hard disk installation system booting, "
@@ -1060,7 +1040,7 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:966
+#: install-methods.xml:940
 #, no-c-format
 msgid ""
 "Hard disk installer booting from Linux using <command>LILO</command> or "
@@ -1068,7 +1048,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:968
+#: install-methods.xml:942
 #, no-c-format
 msgid ""
 "This section explains how to add to or even replace an existing linux "
@@ -1076,7 +1056,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:974
+#: install-methods.xml:948
 #, no-c-format
 msgid ""
 "At boot time, both bootloaders support loading in memory not only the "
@@ -1085,7 +1065,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:980
+#: install-methods.xml:954
 #, no-c-format
 msgid ""
 "Copy the following files from the &debian; archives to a convenient location "
@@ -1094,19 +1074,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:988
+#: install-methods.xml:962
 #, no-c-format
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:993
+#: install-methods.xml:967
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1000
+#: install-methods.xml:974
 #, no-c-format
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1114,13 +1094,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1010
+#: install-methods.xml:984
 #, no-c-format
 msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1011
+#: install-methods.xml:985
 #, no-c-format
 msgid ""
 "This section explains how to prepare your hard drive for booting the "
@@ -1128,7 +1108,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1016
+#: install-methods.xml:990
 #, no-c-format
 msgid ""
 "Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1136,26 +1116,26 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1021
+#: install-methods.xml:995
 #, no-c-format
 msgid ""
 "<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1026
+#: install-methods.xml:1000
 #, no-c-format
 msgid "<filename>/tools</filename> (loadlin tool)"
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1039
+#: install-methods.xml:1013
 #, no-c-format
 msgid "Hard Disk Installer Booting for OldWorld Macs"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1040
+#: install-methods.xml:1014
 #, no-c-format
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1170,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1053
+#: install-methods.xml:1027
 #, no-c-format
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
@@ -1187,13 +1167,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1073
+#: install-methods.xml:1047
 #, no-c-format
 msgid "Hard Disk Installer Booting for NewWorld Macs"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1074
+#: install-methods.xml:1048
 #, no-c-format
 msgid ""
 "NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1206,7 +1186,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1085
+#: install-methods.xml:1059
 #, no-c-format
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1216,31 +1196,31 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: install-methods.xml:1095 install-methods.xml:1421
+#: install-methods.xml:1069 install-methods.xml:1395
 #, no-c-format
 msgid "vmlinux"
 msgstr ""
 
 #. Tag: filename
-#: install-methods.xml:1100 install-methods.xml:1426
+#: install-methods.xml:1074 install-methods.xml:1400
 #, no-c-format
 msgid "initrd.gz"
 msgstr ""
 
 #. Tag: filename
-#: install-methods.xml:1105 install-methods.xml:1431
+#: install-methods.xml:1079 install-methods.xml:1405
 #, no-c-format
 msgid "yaboot"
 msgstr ""
 
 #. Tag: filename
-#: install-methods.xml:1110 install-methods.xml:1436
+#: install-methods.xml:1084 install-methods.xml:1410
 #, no-c-format
 msgid "yaboot.conf"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1115
+#: install-methods.xml:1089
 #, no-c-format
 msgid ""
 "Make a note of the partition number of the MacOS partition where you place "
@@ -1251,19 +1231,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1123
+#: install-methods.xml:1097
 #, no-c-format
 msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1136
+#: install-methods.xml:1110
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1137
+#: install-methods.xml:1111
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1274,7 +1254,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1145
+#: install-methods.xml:1119
 #, no-c-format
 msgid ""
 "You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1283,7 +1263,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1152
+#: install-methods.xml:1126
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1296,7 +1276,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1166
+#: install-methods.xml:1140
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1305,7 +1285,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1172
+#: install-methods.xml:1146
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1313,7 +1293,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1177
+#: install-methods.xml:1151
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1323,7 +1303,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1185
+#: install-methods.xml:1159
 #, no-c-format
 msgid ""
 "For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1333,13 +1313,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1201
+#: install-methods.xml:1175
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1202
+#: install-methods.xml:1176
 #, no-c-format
 msgid ""
 "To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1352,7 +1332,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1214
+#: install-methods.xml:1188
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1367,23 +1347,23 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1235
+#: install-methods.xml:1209
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1236
+#: install-methods.xml:1210
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
-"gnu;, the <classname>isc-dhcp-server</classname> package is recommended. Here "
-"is a sample configuration file for it (see <filename>/etc/dhcp/dhcpd.conf</"
-"filename>):"
+"gnu;, the <classname>isc-dhcp-server</classname> package is recommended. "
+"Here is a sample configuration file for it (see <filename>/etc/dhcp/dhcpd."
+"conf</filename>):"
 msgstr ""
 
 #. Tag: screen
-#: install-methods.xml:1243
+#: install-methods.xml:1217
 #, no-c-format
 msgid ""
 "option domain-name \"example.com\";\n"
@@ -1408,7 +1388,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1245
+#: install-methods.xml:1219
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1420,7 +1400,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1255
+#: install-methods.xml:1229
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1428,13 +1408,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1263
+#: install-methods.xml:1237
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1264
+#: install-methods.xml:1238
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1472,13 +1452,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1284
+#: install-methods.xml:1258
 #, no-c-format
 msgid "Setting up a BOOTP server"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1285
+#: install-methods.xml:1259
 #, no-c-format
 msgid ""
 "There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1489,7 +1469,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1293
+#: install-methods.xml:1267
 #, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1524,7 +1504,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1326
+#: install-methods.xml:1300
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1533,19 +1513,19 @@ msgid ""
 "clients via BOOTP. If yours is one of those, read the section <xref linkend="
 "\"dhcpd\"/>. Otherwise you will probably be able to get away with simply "
 "adding the <userinput>allow bootp</userinput> directive to the configuration "
-"block for the subnet containing the client in <filename>/etc/dhcp3/dhcpd."
+"block for the subnet containing the client in <filename>/etc/dhcp/dhcpd."
 "conf</filename>, and restart <command>dhcpd</command> with <userinput>/etc/"
 "init.d/isc-dhcp-server restart</userinput>."
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1345
+#: install-methods.xml:1319
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1346
+#: install-methods.xml:1320
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -1553,7 +1533,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1351
+#: install-methods.xml:1325
 #, no-c-format
 msgid ""
 "In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -1564,7 +1544,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1360
+#: install-methods.xml:1334
 #, no-c-format
 msgid ""
 "Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -1576,7 +1556,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1370
+#: install-methods.xml:1344
 #, no-c-format
 msgid ""
 "All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -1587,7 +1567,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1378
+#: install-methods.xml:1352
 #, no-c-format
 msgid ""
 "If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -1605,13 +1585,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1400
+#: install-methods.xml:1374
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1401
+#: install-methods.xml:1375
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -1622,7 +1602,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1410
+#: install-methods.xml:1384
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -1633,13 +1613,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: install-methods.xml:1441
+#: install-methods.xml:1415
 #, no-c-format
 msgid "boot.msg"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1446
+#: install-methods.xml:1420
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -1650,7 +1630,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1454
+#: install-methods.xml:1428
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -1661,13 +1641,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1466
+#: install-methods.xml:1440
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1467
+#: install-methods.xml:1441
 #, no-c-format
 msgid ""
 "Some SPARC architectures add the subarchitecture names, such as "
@@ -1686,7 +1666,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1483
+#: install-methods.xml:1457
 #, no-c-format
 msgid ""
 "If you've done all this correctly, giving the command <userinput>boot net</"
@@ -1696,7 +1676,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1490
+#: install-methods.xml:1464
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -1706,13 +1686,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1501
+#: install-methods.xml:1475
 #, no-c-format
 msgid "SGI TFTP Booting"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1502
+#: install-methods.xml:1476
 #, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -1722,13 +1702,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1610
+#: install-methods.xml:1584
 #, no-c-format
 msgid "Automatic Installation"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1611
+#: install-methods.xml:1585
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -1739,13 +1719,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: install-methods.xml:1623
+#: install-methods.xml:1597
 #, no-c-format
 msgid "Automatic Installation Using the &debian; Installer"
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1624
+#: install-methods.xml:1598
 #, no-c-format
 msgid ""
 "The &debian; Installer supports automating installs via preconfiguration "
@@ -1755,7 +1735,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:1631
+#: install-methods.xml:1605
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "