- Etch ships with X.Org 7.1

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

11 files changed, 61 insertions, 60 deletions

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 2e7e61da6..09c4a270a 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -72,7 +72,7 @@
 <!ENTITY low-mem-threshold "5&notation-megabytes;">
 
 <!-- version of X11 shipping with the current release -->
-<!ENTITY x11ver "7.0">
+<!ENTITY x11ver "7.1">
 
 <!-- an example of adding another image to lilo.conf, cf
      en/post-install.sgml etc. -->
diff --git a/debian/changelog b/debian/changelog
index d1330219b..0cae21a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * Update Sparc specific information and document common installation issues
     for Sparc. Many thanks to Jurij Smakov for reviewing the Sparc manual and
     for his overview of issues.
+  * Etch ships with X.Org 7.1.
   * bookinfo:
     - Add note for m68k that it is not a release architecture for Etch.
   * hardware:
@@ -150,7 +151,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * appendix/chroot-install:
     - Changes suggested in review by Wiktor Wandachowicz. Closes: #394929.
 
- -- Frans Pop <fjp@debian.org>  Sun, 31 Dec 2006 02:58:37 +0100
+ -- Frans Pop <fjp@debian.org>  Sun, 31 Dec 2006 23:08:33 +0100
 
 installation-guide (20060726) unstable; urgency=low
 
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>
 
diff --git a/en/hardware/installation-media.xml b/en/hardware/installation-media.xml
index 311228c90..4a5380006 100644
--- a/en/hardware/installation-media.xml
+++ b/en/hardware/installation-media.xml
@@ -168,23 +168,27 @@ systems which have no room for unnecessary drives.
 
   <sect2><title>Network</title>
 
-<para condition="supports-tftp">
+<para>
+
+The network can be used during the installtion to retrieve files needed
+for the installation. Whether the network is used or not depends on the
+installation method you choose and your answers to certain questions that
+will be asked during the installation. The installation system supports
+most types of network connection (including PPPoE, but not ISDN or PPP),
+via either HTTP or FTP. After the installation is completed, you can also
+configure your system to use ISDN and PPP.
+
+</para><para condition="supports-tftp">
 
-You can also <emphasis>boot</emphasis> your system over the network.
-<phrase arch="mips">This is the preferred installation technique for
-Mips.</phrase>
+You can also <emphasis>boot</emphasis> the installation system over the
+network. <phrase arch="mips">This is the preferred installation technique
+for &arch-title;.</phrase>
 
 </para><para condition="supports-nfsroot">
 
 Diskless installation, using network booting from a local area network
 and NFS-mounting of all local filesystems, is another option.
 
-</para><para>
-
-After the operating system kernel is installed, you can install the
-rest of your system via any sort of network connection (including
-PPP after installation of the base system), via FTP or HTTP.
-
 </para>
   </sect2>
 
@@ -193,7 +197,7 @@ PPP after installation of the base system), via FTP or HTTP.
 <para>
 
 If you are running another Unix-like system, you could use it to install
-&debian; without using the &d-i; described in the rest of the
+&debian; without using the &d-i; described in the rest of this
 manual. This kind of install may be useful for users with otherwise
 unsupported hardware or on hosts which can't afford downtime.  If you
 are interested in this technique, skip to the <xref
diff --git a/en/hardware/supported/i386.xml b/en/hardware/supported/i386.xml
index 1b52da93d..60a2b715f 100644
--- a/en/hardware/supported/i386.xml
+++ b/en/hardware/supported/i386.xml
@@ -16,13 +16,13 @@ This section merely outlines the basics.
 
 Nearly all x86-based (IA-32) processors still in use in personal computers
 are supported, including all varieties of Intel's "Pentium" series.
-This also includes 32-bit AMD and VIA (former Cyrix) processors, and new
+This also includes 32-bit AMD and VIA (former Cyrix) processors, and
 processors like the Athlon XP and Intel P4 Xeon.
 
 </para>
 <note><para>
 
-If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo processor,
+If your system has a 64-bit processor from the AMD64 or Intel EM64T families,
 you will probably want to use the installer for the amd64 architecture instead
 of the installer for the (32-bit) i386 architecture.
 
@@ -30,9 +30,9 @@ of the installer for the (32-bit) i386 architecture.
 <para>
 
 However, Debian GNU/Linux &releasename; will <emphasis>not</emphasis> run
-on 386 or earlier processors.  Despite the architecture name "i386", Debian
-Sarge has <emphasis>dropped support</emphasis> for actual 80386 processors
-(and their clones), which were supported by earlier releases<footnote>
+on 386 or earlier processors.  Despite the architecture name "i386", support
+for actual 80386 processors (and their clones) was dropped with the Sarge
+(r3.1) release of Debian<footnote>
 
 <para>
 We have long tried to avoid this, but in the end it was necessary due a
diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml
index 9cee2afdb..edd836333 100644
--- a/en/howto/installation-howto.xml
+++ b/en/howto/installation-howto.xml
@@ -301,7 +301,9 @@ If you need more information on the install process, see
 If you successfully managed an installation with &d-i;,
 please take time to provide us with a report.
 The simplest way to do so is to install the reportbug package
-(<command>apt-get install reportbug</command>), and run
+(<command>apt-get install reportbug</command>), configure
+<classname>reportbug</classname> as explained in
+<xref linkend="mail-outgoing"/>, and run
 <command>reportbug installation-report</command>.
 
 </para><para>
@@ -316,7 +318,7 @@ see <xref linkend="problem-report" />.
  </sect1>
 
  <sect1 id="howto-installation-finally">
- <title>And finally..</title>
+ <title>And finally&hellip;</title>
 <para>
 
 We hope that your Debian installation is pleasant and that you find Debian
diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml
index c35ef1e24..50f2d51ae 100644
--- a/en/install-methods/usb-setup/x86.xml
+++ b/en/install-methods/usb-setup/x86.xml
@@ -87,11 +87,8 @@ contain the following two lines:
 
 <informalexample><screen>
 default vmlinuz
-append initrd=initrd.gz ramdisk_size=12000 root=/dev/ram rw
+append initrd=initrd.gz
 </screen></informalexample>
 
-Please note that the <userinput>ramdisk_size</userinput> parameter
-may need to be increased, depending on the image you are booting.
-
 </para>
    </sect3>
diff --git a/en/preparing/backup.xml b/en/preparing/backup.xml
index b9355d822..4d7bde4ee 100644
--- a/en/preparing/backup.xml
+++ b/en/preparing/backup.xml
@@ -9,11 +9,11 @@ Before you start, make sure to back up every file that is now on your
 system. If this is the first time a non-native operating system has
 been installed on your computer, it's quite likely you will need to
 re-partition your disk to make room for &debian;. Anytime you
-partition your disk, you should count on losing everything on the
+partition your disk, you run a risk of losing everything on the
 disk, no matter what program you use to do it. The programs used in
 installation are quite reliable and most have seen years of use; but
 they are also quite powerful and a false move can cost you. Even after
-backing up be careful and think about your answers and actions. Two
+backing up, be careful and think about your answers and actions. Two
 minutes of thinking can save hours of unnecessary work.
 
 </para><para>
diff --git a/en/preparing/install-overview.xml b/en/preparing/install-overview.xml
index c3707a16e..7003f4f9a 100644
--- a/en/preparing/install-overview.xml
+++ b/en/preparing/install-overview.xml
@@ -135,8 +135,10 @@ actors in this installation drama:
 The installer software, <classname>debian-installer</classname>, is
 the primary concern of this manual. It detects hardware and loads
 appropriate drivers, uses <classname>dhcp-client</classname> to set up the
-network connection, and runs <classname>debootstrap</classname> to install
-the base system packages. Many more actors play smaller parts in this process,
+network connection, runs <classname>debootstrap</classname> to install
+the base system packages, and runs <classname>tasksel</classname> to allow
+you to install certain additional software.
+Many more actors play smaller parts in this process,
 but <classname>debian-installer</classname> has completed its task when
 you load the new system for the first time.
 
@@ -148,20 +150,22 @@ server or a Desktop environment.
 
 </para><para>
 
-When <classname>debian-installer</classname> finishes, before the
-first system load, you have only a very basic command line driven
-system. The graphical interface which displays windows on your monitor
-will not be installed unless you select it with <classname>tasksel</classname>.
-It's optional because many &debian; systems are servers which don't really
-have any need for a graphical user interface to do their job.
+One important option during the installation is whether or not to install
+a graphical desktop environment, consisting of the X11 window system and
+one of the available graphical desktop environments.
+If you choose not to select the <quote>Desktop environment</quote> task,
+you will only have a relatively basic, command line driven system.
+Installing the Desktop environment task is optional because it requires a
+fairly large amount of disk space, and because many &debian; systems are
+servers which don't really have any need for a graphical user interface
+to do their job.
 
 </para><para arch="not-s390">
 
-Just be aware that the X system is completely separate from
+Just be aware that the X11 window system is completely separate from
 <classname>debian-installer</classname>, and in fact is much more
 complicated. Installation and trouble shooting of the X window
 installation is not within the scope of this manual.
 
 </para>
  </sect1>
-