Update of original English docs

10 files changed, 99 insertions, 85 deletions

diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index a1fd7227d..6c1458b38 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42302 untranslated -->
+<!-- original version: 43737 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -193,16 +193,31 @@ when your mouse only has one button. Just add the following lines to
  clear the slate, quit aptitude and repeat for other tasks.
  Space requirements need to be determined from tasksel as tasksel will not
  install recommended packages while selecting a task from aptitude will.
+
+ The size for the minimal base system should be determined after running
+ 'aptitude clean' using 'du -hsx /'. After that the "Standard system" task
+ should be installed after which the size of the standard system should be
+ determined using the same method.
 -->
 
 <para>
 
-The base installation for i386 using the default 2.6 kernel,
-including all standard packages, requires 585MB of disk space.
-A minimal base installation, without the standard task selected,
-will take 365MB.
+A standard installation for the i386 architecture, including all standard
+packages and using the default 2.6 kernel, takes up 442MB of disk space.
+A minimal base installation, without the <quote>Standard system</quote>
+task selected, will take 230MB.
 
-</para><para>
+</para>
+<important><para>
+
+In both cases this is the actual disk space used <emphasis>after</emphasis>
+the installation is finished and any temporary files deleted. It also does
+not take into account overhead used by the file system, for example for
+journal files. This means that significantly more disk space is needed both
+<emphasis>during</emphasis> the installation and for normal system use.
+
+</para></important>
+<para>
 
 The following table lists sizes reported by aptitude for the tasks listed
 in tasksel. Note that some tasks have overlapping constituents, so the
@@ -212,9 +227,10 @@ obtained by adding up the numbers.
 </para><para>
 
 Note that you will need to add the sizes listed in the table to the size
-of the base installation when determining the size of partitions.
+of the standard installation when determining the size of partitions.
 Most of the size listed as <quote>Installed size</quote> will end up in
-<filename>/usr</filename>; the size listed as <quote>Download size</quote>
+<filename>/usr</filename> and in <filename>/lib</filename>;
+the size listed as <quote>Download size</quote>
 is (temporarily) required in <filename>/var</filename>.
 
 </para><para>
@@ -231,17 +247,25 @@ is (temporarily) required in <filename>/var</filename>.
 
 <tbody>
 <row>
-  <entry>Desktop</entry>
-  <entry>1258</entry>
-  <entry>418</entry>
-  <entry>1676</entry>
+  <entry>Desktop environment</entry>
+  <entry>1267</entry>
+  <entry>420</entry>
+  <entry>1667</entry>
 </row>
 
 <row>
-  <entry>Laptop</entry>
-  <entry>46</entry>
-  <entry>16</entry>
-  <entry>62</entry>
+  <entry>Laptop<footnote>
+  
+  <para>
+  There is a large overlap of the Laptop task with the Destop environment task.
+  If you install both, the Laptop task will only require a few MB additional
+  disk space.
+  </para>
+
+  </footnote></entry>
+  <entry>50</entry>
+  <entry>17</entry>
+  <entry>67</entry>
 </row>
 
 <row>
@@ -253,9 +277,9 @@ is (temporarily) required in <filename>/var</filename>.
 
 <row>
   <entry>Print server</entry>
-  <entry>326</entry>
-  <entry>95</entry>
-  <entry>421</entry>
+  <entry>277</entry>
+  <entry>79</entry>
+  <entry>356</entry>
 </row>
 
 <row>
@@ -267,9 +291,9 @@ is (temporarily) required in <filename>/var</filename>.
 
 <row>
   <entry>File server</entry>
-  <entry>50</entry>
+  <entry>49</entry>
   <entry>21</entry>
-  <entry>71</entry>
+  <entry>70</entry>
 </row>
 
 <row>
@@ -301,7 +325,7 @@ environment.
 If you install in a language other than English, <command>tasksel</command>
 may automatically install a <firstterm>localization task</firstterm>, if one
 is available for your language. Space requirements differ per language;
-you should allow up to 200MB in total for download and installation.
+you should allow up to 350MB in total for download and installation. 
 
 </para>
  </sect1>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 0ff49ff2c..8d4826bda 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: 43675 untranslated -->
+<!-- original version: 43730 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -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/nl/boot-installer/trouble.xml b/nl/boot-installer/trouble.xml
index e4efda20d..22cd22382 100644
--- a/nl/boot-installer/trouble.xml
+++ b/nl/boot-installer/trouble.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43694 untranslated -->
+<!-- original version: 43730 untranslated -->
 
  <sect1 id="boot-troubleshooting">
  <title>Troubleshooting the Installation Process</title>
@@ -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/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml
index 8472097bb..96edd60f4 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: 42929 untranslated -->
+<!-- original version: 43730 untranslated -->
 
   <sect2 arch="x86"><title>Booting from a CD-ROM</title>
 
@@ -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/nl/hardware/installation-media.xml b/nl/hardware/installation-media.xml
index 4fe874b25..54a4518e9 100644
--- a/nl/hardware/installation-media.xml
+++ b/nl/hardware/installation-media.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 41881 untranslated -->
+<!-- original version: 43730 untranslated -->
 
  <sect1 id="installation-media">
  <title>Installation Media</title>
@@ -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/nl/hardware/memory-disk-requirements.xml b/nl/hardware/memory-disk-requirements.xml
index e048007b8..3dd58e495 100644
--- a/nl/hardware/memory-disk-requirements.xml
+++ b/nl/hardware/memory-disk-requirements.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 43735 untranslated -->
 
  <sect1 id="memory-disk-requirements">
  <title>Memory and Disk Space Requirements</title>
@@ -7,11 +7,8 @@
 <para>
 
 You must have at least &minimum-memory; of memory and &minimum-fs-size; of hard disk
-space. For a minimal console-based system (all standard packages),
-250MB is required. If you want to install a reasonable amount of
-software, including the X Window System, and some development programs
-and libraries, you'll need at least 400MB. For a more or less complete
-desktop system, you'll need a few gigabytes.
+space. Note that these are really bare-minimum numbers. For more realistic
+figures, see <xref linkend="minimum-hardware-reqts"/>.
 
 </para><para arch="m68k">
 
diff --git a/nl/hardware/supported/i386.xml b/nl/hardware/supported/i386.xml
index b21c7d1ba..4f3a0021b 100644
--- a/nl/hardware/supported/i386.xml
+++ b/nl/hardware/supported/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43254 untranslated -->
+<!-- original version: 43730 untranslated -->
 
 
   <sect2 arch="i386"><title>CPU, Main Boards, and Video Support</title>
@@ -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/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml
index fee462767..bccad7414 100644
--- a/nl/howto/installation-howto.xml
+++ b/nl/howto/installation-howto.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 42302 untranslated -->
+<!-- original version: 43742 untranslated -->
 
 <appendix id="installation-howto">
 <title>Installation Howto</title>
@@ -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>aptitude 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/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index b3637b176..6ee3ace45 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39622 untranslated -->
+<!-- original version: 43730 untranslated -->
 
    <sect3 arch="x86">
    <title>USB stick partitioning on &arch-title;</title>
@@ -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/nl/preparing/nondeb-part/sparc.xml b/nl/preparing/nondeb-part/sparc.xml
index 97ed2a4c3..fe81e7291 100644
--- a/nl/preparing/nondeb-part/sparc.xml
+++ b/nl/preparing/nondeb-part/sparc.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43576 untranslated -->
+<!-- original version: 43732 untranslated -->
 
 
   <sect2 arch="sparc"><title>Partitioning from SunOS</title>
@@ -10,9 +10,6 @@ It's perfectly fine to partition from SunOS; in fact, if you intend to
 run both SunOS and Debian on the same machine, it is recommended that
 you partition using SunOS prior to installing Debian.  The Linux
 kernel understands Sun disk labels, so there are no problems there.
-Just make sure you leave room for the Debian root partition within the
-first 1GB area of the boot disk. You can also place the kernel image on a
-UFS partition if that is easier than putting the root partition there.
 SILO supports booting Linux and SunOS from any of EXT2 (Linux), UFS
 (SunOS), romfs or iso9660 (CDROM) partitions.