Update untranslated documents

5 files changed, 66 insertions, 51 deletions

diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index bf878762f..0e781d224 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 62198 untranslated -->
+<!-- original version: 62798 untranslated -->
 
 <!--
 Be careful with the format of this file as it is parsed to generate
@@ -1073,6 +1073,7 @@ d-i partman-auto/choose_recipe select atomic
 d-i partman-partitioning/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
 </screen></informalexample>
 
    </sect3>
@@ -1146,6 +1147,7 @@ d-i partman-md/confirm boolean true
 d-i partman-partitioning/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
+d-i partman/confirm_nooverwrite boolean true
 </screen></informalexample>
 
    </sect3>
@@ -1416,6 +1418,11 @@ to be used easily on the kernel command line as well.
 # too:
 #d-i lilo-installer/skip boolean true
 
+# With a few exceptions for unusual partitioning setups, GRUB 2 is now the
+# default. If you need GRUB Legacy for some particular reason, then
+# uncomment this:
+#d-i grub-installer/grub2_instead_of_grub_legacy boolean false
+
 # This is fairly safe to set, it makes grub install automatically to the MBR
 # if no other operating system is detected on the machine.
 d-i grub-installer/only_debian boolean true
diff --git a/nl/boot-installer/accessibility.xml b/nl/boot-installer/accessibility.xml
index 97afb4ea5..7321bc4fc 100644
--- a/nl/boot-installer/accessibility.xml
+++ b/nl/boot-installer/accessibility.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 61147 untranslated -->
+<!-- original version: 62899 untranslated -->
 
  <sect1 id="boot-installer-accessibility" arch="not-s390">
  <title>Accessibility</title>
@@ -87,8 +87,13 @@ automatically installed on the target system.
 Some accessibility devices are actual boards that are plugged inside the
 machine and that read text directly from the video memory. To get them
 to work framebuffer support must be disabled by using the
-<userinput>fb=false</userinput> boot parameter. This will however reduce
-the number of available languages.
+<userinput arch="x86">vga=normal</userinput> <userinput>fb=false</userinput>
+boot parameter. This will however reduce the number of available languages.
+
+</para><para arch="x86">
+
+If desired a textual version of the bootloader can be activated before adding
+the boot parameter by typing <userinput>h</userinput> &enterkey;.
 
 </para>
   </sect2>
diff --git a/nl/boot-installer/arm.xml b/nl/boot-installer/arm.xml
index 81de776e2..fedd0b0c5 100644
--- a/nl/boot-installer/arm.xml
+++ b/nl/boot-installer/arm.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 59771 untranslated -->
+<!-- original version: 62875 untranslated -->
 
   <sect2 arch="arm" id="boot-tftp"><title>Booting from TFTP</title>
 
@@ -138,17 +138,13 @@ serial ports.
 
 </para><para>
 
-To boot the SS4000-E, first load the Debian-provided firmware image
-(ss4000e.pkg) through the SS4000-E's web interface (go to
-<quote>administration</quote>, then to <quote>firmware</quote>, and
-upload the image). Next,
-use your serial nullmodem cable and the ribbon cable to connect to the
-serial port of the SS4000-E, and reboot the machine. You need to use a
-serial terminal application to communicate with the machine; a good
-option on a Debian GNU/Linux is to use the <command>cu</command>
-program, in the package of the same name. Assuming the serial port on
-your computer is to be found on <filename>/dev/ttyS0</filename>, use the
-following command line:
+To boot the SS4000-E, use your serial nullmodem cable and the ribbon
+cable to connect to the serial port of the SS4000-E, and reboot the
+machine. You need to use a serial terminal application to communicate
+with the machine; a good option on a Debian GNU/Linux is to use the
+<command>cu</command> program, in the package of the same name. Assuming
+the serial port on your computer is to be found on
+<filename>/dev/ttyS0</filename>, use the following command line:
 
 </para>
 
@@ -186,41 +182,54 @@ just powercycle the machine and try again.
 </para>
 
 </footnote>. This will give you the RedBoot prompt. Enter the
-following command:
-
-</para>
+following commands:
 
 <informalexample><screen>
-fconfig boot_script_data
+load -v -r -b 0x01800000 -m ymodem ramdisk.gz
+load -v -r -b 0x01008000 -m ymodem zImage
+exec -c "console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000" -r 0x01800000
 </screen></informalexample>
 
-<para>
+</para><para>
 
-RedBoot is now waiting for you to enter the boot script. Make sure to
-<emphasis>exactly</emphasis> enter the following script:
+After every <command>load</command> command, the system will expect a
+file to be transmitted using the YMODEM protocol. When using cu, make
+sure you have the package <classname>lrzsz</classname> installed, then
+hit enter, followed by the <quote>~&lt;</quote> escape sequence to start
+an external program, and run <command>sb initrd.gz</command> or
+<command>sb vmlinuz</command>.
 
-</para>
+</para><para>
+
+Alternatively, it is possible to load the kernel and ramdisk using
+HTTP rather than YMODEM. This is faster, but requires a working HTTP
+server on the network. To do so, first switch the bootloader to RAM mode:
 
 <informalexample><screen>
-fis load ramdisk.gz
-fis load zImage
-exec -c "console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000" -r 0x01800000
+fis load rammode
+g
 </screen></informalexample>
 
-<para>
+</para><para>
+
+This will seemingly restart the machine; but in reality, it loads
+reboot to RAM and restarts it from there. Not doing this step will cause
+the system to hang in the necessary ip_address step that comes next.
+
+</para><para>
 
-Finish the script with an empty line, and enter <quote>y</quote> at the
-prompt to update the non-volatile configuration. Finally, use
-<quote>reset</quote> to restart the system, and allow it to boot normally.
-The installer should now come up as normal. You can either install Debian
-through the serial port, or use an SSH client to connect through SSH.
+You will need to hit Ctrl-C again to interrupt the boot. Then:
+
+<informalexample><screen>
+ip_address -l 192.168.2.249 -h 192.168.2.4
+load -v -r -b 0x01800000 -m http /initrd.gz
+load -v -r -b 0x01008000 -m http /zImage
+exec -c "console=ttyS0,115200 rw root=/dev/ram mem=256M@0xa0000000" -r 0x01800000
+</screen></informalexample>
 
 </para><para>
 
-Note that it is not necessary to update the boot script after the
-installation. The system will be configured to take the root device from
-system configuration, rather than from the kernel command line. It will
-not do any harm to do so anyway, however.
+The installer will now start as usual.
 
 </para>
    </sect3>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 6edfada39..631584476 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 62399 untranslated -->
+<!-- original version: 62899 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -243,16 +243,10 @@ Useful for unattended installations where physical security is limited.
 
 Some architectures use the kernel framebuffer to offer installation in
 a number of languages. If framebuffer causes a problem on your system
-you can disable the feature by the parameter
-<userinput>fb=false</userinput>. Problem symptoms are error messages
-about bterm or bogl, a blank screen, or a freeze within a few minutes after
-starting the install.
-
-</para><para arch="x86">
-
-The <userinput>video=vga16:off</userinput> argument may also be used
-to disable the kernel's use of the framebuffer. Such problems have been
-reported on a Dell Inspiron with Mobile Radeon card.
+you can disable the feature using the parameter
+<userinput arch="x86">vga=normal</userinput> <userinput>fb=false</userinput>.
+Problem symptoms are error messages about bterm or bogl, a blank screen,
+or a freeze within a few minutes after starting the install.
 
 </para><para arch="hppa">
 
diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml
index f6f04e18a..4dbe1970b 100644
--- a/nl/boot-installer/x86.xml
+++ b/nl/boot-installer/x86.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 58402 untranslated -->
+<!-- original version: 62896 untranslated -->
 
   <sect2 arch="x86"><title>Booting from a CD-ROM</title>
 
@@ -424,8 +424,8 @@ to get a text boot prompt, or (equally blindly) press <quote>H</quote>
 followed by &enterkey; to select the <quote>Help</quote> option described
 above. After that your keystrokes should be echoed at the prompt.
 To prevent the installer from using the framebuffer for the rest of the
-installation, you will also want to add <userinput>fb=false</userinput> to
-the boot prompt, as described in the help text.
+installation, you will also want to add <userinput>vga=normal fb=false</userinput>
+to the boot prompt, as described in the help text.
 
 </para></note>
 </para>