- Etch ships with X.Org 7.1

- Fix some minor spacing problems
- Delete or update some obsoleted information
- General minor fixes

3 files changed, 17 insertions, 24 deletions

diff --git a/en/boot-installer/parameters.xml b/en/boot-installer/parameters.xml
index 582bd1f22..58667cb6d 100644
--- a/en/boot-installer/parameters.xml
+++ b/en/boot-installer/parameters.xml
@@ -349,11 +349,13 @@ installation.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry arch="alpha;m68k;mips;mipsel">
 <term>ramdisk_size</term>
 <listitem><para>
 
-If you are using a 2.2.x kernel, you may need to set &ramdisksize;.
+This parameter should already be set to a correct value where needed;
+set it only it you see errors during the boot that indicate the ramdisk
+could not be loaded completely. The value is in kB.
 
 </para></listitem>
 </varlistentry>
diff --git a/en/boot-installer/trouble.xml b/en/boot-installer/trouble.xml
index 5e71de06d..dab5afa4a 100644
--- a/en/boot-installer/trouble.xml
+++ b/en/boot-installer/trouble.xml
@@ -276,13 +276,6 @@ as discussed in <xref linkend="boot-parms"/>.
 
 </para><para>
 
-If you are booting with your own kernel instead of the one supplied
-with the installer, be sure that <userinput>CONFIG_DEVFS</userinput> is set in
-your kernel.  The installer requires
-<userinput>CONFIG_DEVFS</userinput>.
-
-</para><para>
-
 Often, problems can be solved by removing add-ons and peripherals, and
 then trying booting again.  <phrase arch="x86">Internal modems, sound
 cards, and Plug-n-Play devices can be especially problematic.</phrase>
@@ -440,12 +433,12 @@ We recommend to install such systems by netbooting the installer.
 <para>
 
 During the boot sequence, you may see many messages in the form
-<computeroutput>can't find <replaceable>something</replaceable>
-</computeroutput>, or <computeroutput>
-<replaceable>something</replaceable> not present</computeroutput>,
-<computeroutput>can't initialize <replaceable>something</replaceable>
-</computeroutput>, or even <computeroutput>this driver release depends
-on <replaceable>something</replaceable> </computeroutput>.
+<computeroutput>can't find <replaceable>something</replaceable></computeroutput>,
+or <computeroutput><replaceable>something</replaceable>
+not present</computeroutput>, <computeroutput>can't initialize
+<replaceable>something</replaceable></computeroutput>,
+or even <computeroutput>this driver release depends
+on <replaceable>something</replaceable></computeroutput>.
 Most of these messages are harmless. You
 see them because the kernel for the installation system is built to
 run on computers with many different peripheral devices. Obviously, no
@@ -497,7 +490,7 @@ number of hardware configurations.
 
 Note that your installation report will be published in the Debian Bug
 Tracking System (BTS) and forwarded to a public mailing list. Make sure that
-you use an E-Mail address that you do not mind being made public.
+you use an e-mail address that you do not mind being made public.
 
 </para><para>
 
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 2c7b6c865..8ae25431b 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -117,9 +117,9 @@ and place the needed files as described in <xref linkend="boot-drive-files"/>.
 <para>
 If you intend to use the hard drive only for booting and then
 download everything over the network, you should download the
-<filename>netboot/debian-installer/i386/initrd.gz</filename> file and its
+<filename>netboot/debian-installer/&architecture;/initrd.gz</filename> file and its
 corresponding kernel
-<filename>netboot/debian-installer/i386/linux</filename>. This will allow you
+<filename>netboot/debian-installer/&architecture;/linux</filename>. This will allow you
 to repartition the hard disk from which you boot the installer, although you
 should do so with care.
 </para>
@@ -158,8 +158,6 @@ Here is a <filename>/etc/lilo.conf</filename> example:
 image=/boot/newinstall/vmlinuz
        label=newinstall
        initrd=/boot/newinstall/initrd.gz
-       root=/dev/ram0
-       append="ramdisk_size=12000"
 </screen></informalexample>
 
 For more details, refer to the
@@ -178,7 +176,7 @@ add the following lines:
 
 <informalexample><screen>
 title  New Install
-kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000
+kernel (hd0,0)/boot/newinstall/vmlinuz
 initrd (hd0,0)/boot/newinstall/initrd.gz
 </screen></informalexample>
 
@@ -231,7 +229,7 @@ device.  This is done with the <emphasis>root=</emphasis> boot
 argument, giving the device that the ide-floppy driver maps the device
 to. For example, if your LS-120 drive is connected as the first IDE
 device (master) on the second cable, you enter
-<userinput>linux root=/dev/hdc</userinput> at the boot prompt.
+<userinput>install root=/dev/hdc</userinput> at the boot prompt.
 
 </para><para>
 
@@ -334,8 +332,8 @@ Information on available boot methods and on boot parameters which might
 be useful can be found by pressing <keycap>F2</keycap> through
 <keycap>F8</keycap>. If you add any parameters to
 the boot command line, be sure to type the boot method (the default is
-<userinput>linux</userinput>) and a space before the first parameter (e.g.,
-<userinput>linux fb=false</userinput>).
+<userinput>install</userinput>) and a space before the first parameter (e.g.,
+<userinput>install fb=false</userinput>).
 
 <note><para>