Update of original English docs

13 files changed, 75 insertions, 70 deletions

diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index cd72a3a88..33acc1e47 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36758 untranslated -->
+<!-- original version: 39463 untranslated -->
 
  <sect1 id="linux-upgrade">
  <title>Installing &debian; from a Unix/Linux System</title>
@@ -38,7 +38,7 @@ or at least 300MB if you plan to install X.
 
 </para><para>
 
-To create file systems on your partitions. For example, to create an
+Create file systems on your partitions. For example, to create an
 ext3 file system on partition <filename>/dev/hda6</filename> (that's
 our example root partition):
 
@@ -83,7 +83,7 @@ manually before proceding with the next stage.
   <title>Install <command>debootstrap</command></title>
 <para>
 
-The tool that the Debian installer uses, which is recognized as the
+The utility used by the Debian installer, and recognized as the
 official way to install a Debian base system, is
 <command>debootstrap</command>. It uses <command>wget</command> and
 <command>ar</command>, but otherwise depends only on
@@ -357,15 +357,16 @@ interface name (eth0, eth1, etc.) that you expect.
 <para>
 
 To configure your locale settings to use a language other than
-English, install the locales support package and configure it:
+English, install the <classname>locales</classname> support package
+and configure it:
 
 <informalexample><screen>
-# apt-get install locales
+# aptitude install locales
 # dpkg-reconfigure locales
 </screen></informalexample>
 
-NOTE: Apt must be configured beforehand by creating a sources.list and
-running apt-get update.
+NOTE: <classname>apt</classname> must be configured beforehand by creating
+a sources.list and running <command>aptitude update</command>.
 Before using locales with character sets other than ASCII or latin1,
 please consult the appropriate localization HOWTO.
 
@@ -387,7 +388,7 @@ and a boot loader. Identify available pre-packaged kernels with
 Then install your choice using its package name.
 
 <informalexample><screen>
-# apt-get install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
+# aptitude install <phrase condition="classic-kpkg">kernel</phrase><phrase condition="common-kpkg">linux</phrase>-image-<replaceable>&kernelversion;-arch-etc</replaceable>
 </screen></informalexample>
 
 </para>
@@ -398,9 +399,9 @@ Then install your choice using its package name.
 <para>
 
 To make your &debian; system bootable, set up your boot loader to load
-the installed kernel with your new root partition. Note that debootstrap
-does not install a boot loader, though you can use apt-get inside your
-Debian chroot to do so.
+the installed kernel with your new root partition. Note that
+<command>debootstrap</command> does not install a boot loader, though you
+can use <command>aptitude</command> inside your Debian chroot to do so.
 
 </para><para arch="i386">
 
diff --git a/nl/appendix/files.xml b/nl/appendix/files.xml
index ad7332bf8..481a28aec 100644
--- a/nl/appendix/files.xml
+++ b/nl/appendix/files.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33887 untranslated -->
+<!-- original version: 39463 untranslated -->
 
 
  <sect1 id="linuxdevices"><title>Linux Devices</title>
@@ -147,8 +147,8 @@ will re-connect the mouse in software without restarting X.
 
 </para><para>
 
-If gpm is disabled or not installed with some reason, make sure to set X to
-read directly from the mouse device such as /dev/psaux. For details, refer
+If gpm is disabled or not installed for some reason, make sure to set X to
+read directly from a mouse device such as /dev/psaux. For details, refer
 to the 3-Button Mouse mini-Howto at
 <filename>/usr/share/doc/HOWTO/en-txt/mini/3-Button-Mouse.gz</filename>,
 <userinput>man gpm</userinput>,
@@ -282,7 +282,7 @@ is (temporarily) required in <filename>/var</filename>.
 
 <note><para>
 
-The <emphasis>Desktop</emphasis> task will install both the Gnome and KDE
+The <emphasis>Desktop</emphasis> task will install both the GNOME and KDE
 desktop environments.
 
 </para></note>
diff --git a/nl/appendix/plip.xml b/nl/appendix/plip.xml
index 74913ab34..858f97d4d 100644
--- a/nl/appendix/plip.xml
+++ b/nl/appendix/plip.xml
@@ -1,12 +1,12 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 29687 untranslated -->
+<!-- original version: 39463 untranslated -->
 
  <sect1 id="plip" arch="i386">
  <title>Installing &debian; over Parallel Line IP (PLIP)</title>
 
 <para>
 
-This section explains how to install &debian; on a computer without
+This section explains how to install &debian; on a computer without an
 Ethernet card, but with just a remote gateway computer attached via
 a Null-Modem cable (also called Null-Printer cable). The gateway
 computer should be connected to a network that has a Debian mirror
@@ -100,6 +100,15 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 
 Boot the installation media. The installation needs to be run in
 expert mode; enter <userinput>expert</userinput> at the boot prompt.
+If you need to set paramenters for kernel modules, you also need to
+do this at the boot prompt. For example, to boot the installer and
+set values for the <quote>io</quote> and <quote>irq</quote> options
+for the parport_pc module, enter the following at the boot prompt:
+
+<informalexample><screen>
+expert parport_pc.io=<replaceable>0x378</replaceable> parport_pc.irq=<replaceable>7</replaceable>
+</screen></informalexample>
+
 Below are the answers that should be given during various stages of
 the installation.
 
@@ -134,27 +143,11 @@ show this list.
  </para></listitem>
  <listitem><para>
 
-Prompt for module parameters: Yes
-
- </para></listitem>
- <listitem><para>
-
 Because no network card was detected/selected earlier, the installer will
 ask you to select a network driver module from a list.
 Select the <userinput>plip</userinput> module.
 
  </para></listitem>
- <listitem><para>
-
-Additional parameters for module parport_pc:
-<userinput><replaceable>io=0x378 irq=7</replaceable></userinput>
-
- </para></listitem>
- <listitem><para>
-
-Additional parameters for module plip: leave empty
-
- </para></listitem>
  </itemizedlist>
 
 </listitem>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index cc16ccbb3..d24188876 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39285 untranslated -->
+<!-- original version: 39468 untranslated -->
 
 <!--
 Be carefull with the format of this file as it is parsed to generate
@@ -986,6 +986,14 @@ You can also choose to install no tasks, and force the installation of a
 set of packages in some other way. We recommend always including the
 <userinput>standard</userinput> task.
 
+</para><para>
+
+If you want to install some individual packages in addition to packages
+installed by tasks, you can use the parameter
+<classname>pkgsel/include</classname>. The value of this parameter can be
+either comma-separated or space-separated, so you can also use it easily on
+the kernel command line.
+
 </para>
 
 <informalexample role="example"><screen>
@@ -993,6 +1001,9 @@ tasksel tasksel/first multiselect standard, desktop
 #tasksel tasksel/first multiselect standard, web-server
 #tasksel tasksel/first multiselect standard, kde-desktop
 
+# Individual additional packages to install
+#d-i pkgsel/include string openssh-server build-essential
+
 # Some versions of the installer can report back on what software you have
 # installed, and what software you use. The default is not to report back,
 # but sending reports helps the project determine what software is most
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index c7e2d454f..e8e0d8cb3 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: 38289 untranslated -->
+<!-- original version: 39461 untranslated -->
 
  <sect1 id="boot-parms"><title>Boot Parameters</title>
 <para>
@@ -241,7 +241,8 @@ Because of display problems on some systems, framebuffer support is
 in ugly display on systems that do properly support the framebuffer, like
 those with ATI graphical cards.
 If you see display problems in the installer, you can try booting with
-parameter <userinput>debian-installer/framebuffer=true</userinput>.
+parameter <userinput>debian-installer/framebuffer=true</userinput> or
+<userinput>fb=true</userinput> for short.
 
 </para></note></listitem>
 </varlistentry>
diff --git a/nl/partitioning/partition-programs.xml b/nl/partitioning/partition-programs.xml
index 4bd51a9bb..a5852ac9f 100644
--- a/nl/partitioning/partition-programs.xml
+++ b/nl/partitioning/partition-programs.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 36732 untranslated -->
+<!-- original version: 39465 untranslated -->
 
  <sect1 id="partition-programs">
  <title>Debian Partitioning Programs</title>
@@ -38,7 +38,7 @@ Be careful if you have existing FreeBSD partitions on your machine.
 The installation kernels include support for these partitions, but the
 way that <command>fdisk</command> represents them (or not) can make the
 device names differ.  See the
-<ulink url="&url-linux-freebsd;">Linux+FreeBSD HOWTO</ulink>
+<ulink url="&url-linux-freebsd;">Linux+FreeBSD HOWTO</ulink>.
 
 </para></listitem>
 </varlistentry>
diff --git a/nl/partitioning/partition/alpha.xml b/nl/partitioning/partition/alpha.xml
index 240e7bd3d..21ea31ff0 100644
--- a/nl/partitioning/partition/alpha.xml
+++ b/nl/partitioning/partition/alpha.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28997 untranslated -->
+<!-- original version: 39465 untranslated -->
 
 
   <sect2 arch="alpha"><title>Partitioning for &arch-title;</title>
@@ -11,8 +11,8 @@ partition table, on your boot disk.  (Remember, the SRM boot block is
 incompatible with MS-DOS partition tables &mdash; see
 <xref linkend="alpha-firmware"/>.)  As a result, <command>partman</command>
 creates BSD disk labels when running on &architecture;, but if your disk
-has an existing DOS partition table the existing partitions will need to
-be deleted before partman can convert it to use a disk label.
+has an existing DOS partition table the existing partitions will need to be
+deleted before <command>partman</command> can convert it to use a disk label.
 
 </para><para>
 
diff --git a/nl/partitioning/partition/i386.xml b/nl/partitioning/partition/i386.xml
index c7864c635..6d864a2ba 100644
--- a/nl/partitioning/partition/i386.xml
+++ b/nl/partitioning/partition/i386.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 35590 untranslated -->
+<!-- original version: 39465 untranslated -->
 
 
   <sect2 arch="i386"><title>Partitioning for &arch-title;</title>
@@ -9,8 +9,9 @@ If you have an existing other operating system such as DOS or Windows and
 you want to preserve that operating system while installing Debian, you may
 need to resize its partition to free up space for the Debian installation.
 The installer supports resizing of both FAT and NTFS filesystems; when you
-get to the installer's partitioning step, select the option to partition
-manually and then simply select an existing partition and change its size.
+get to the installer's partitioning step, select the option
+<guimenuitem>Manually edit partition table</guimenuitem> and then simply
+select an existing partition and change its size.
 
 </para><para>
 
diff --git a/nl/partitioning/partition/ia64.xml b/nl/partitioning/partition/ia64.xml
index 1dc42db62..4193c7aeb 100644
--- a/nl/partitioning/partition/ia64.xml
+++ b/nl/partitioning/partition/ia64.xml
@@ -1,17 +1,16 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 39465 untranslated -->
 
 
   <sect2 arch="ia64"><title>Partitioning for &arch-title;</title>
-
 <para>
 
 The <command>partman</command> disk partitioner is the default
 partitioning tool for the installer.
 It manages the set of partitions and their mount points to ensure
-that the disks and filesystems is properly configured for a successful
-installation.  It actually uses the <command>parted</command> to
-do the on-disk partitioning.
+that the disks and filesystems are properly configured for a successful
+installation.  It actually uses <command>parted</command> to do the
+on-disk partitioning.
 
 </para>
 
@@ -22,8 +21,8 @@ do the on-disk partitioning.
 The IA64 EFI firmware supports two partition table (or disk label)
 formats, GPT and MS-DOS.  MS-DOS, the format typically used on i386
 PCs, is no longer recommended for IA64 systems.  Although
-the installer also provides the <command>cfdisk</command>,
-you should only use the <ulink url="parted.txt">
+the installer also provides <command>cfdisk</command>,
+you should only use <ulink url="parted.txt">
 <command>parted</command></ulink> because only it can manage both GPT
 and MS-DOS tables correctly.
 
@@ -71,7 +70,6 @@ complete, as it scans the partition for bad blocks.
   </sect2>
 
   <sect2 arch="ia64"><title>Boot Loader Partition Requirements</title>
-
 <para>
 
 ELILO, the ia64 boot loader, requires a partition containing a FAT
@@ -102,11 +100,9 @@ It is strongly recommended that you allocate the EFI boot partition
 on the same disk as the <emphasis>root</emphasis> filesystem.
 
 </para>
-
   </sect2>
 
   <sect2 arch="ia64"><title>EFI Diagnostic Partitions</title>
-
 <para>
 
 The EFI firmware is significantly more sophisticated than the usual
@@ -121,5 +117,4 @@ The easiest time to set up a diagnostics partition is at the same time you
 set up the EFI boot partition.
 
 </para>
-
-   </sect2>
+  </sect2>
diff --git a/nl/partitioning/schemes.xml b/nl/partitioning/schemes.xml
index 64f99c2db..26aee4fc8 100644
--- a/nl/partitioning/schemes.xml
+++ b/nl/partitioning/schemes.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 31069 untranslated -->
+<!-- original version: 39465 untranslated -->
 
 
  <sect1>
@@ -28,7 +28,7 @@ you plan to install many programs that are not part of the Debian
 distribution.  If your machine will be a mail server, you might need
 to make <filename>/var/mail</filename> a separate partition.  Often,
 putting <filename>/tmp</filename> on its own partition, for instance
-20 to 50MB, is a good idea.  If you are setting up a server with lots
+20&ndash;50MB, is a good idea.  If you are setting up a server with lots
 of user accounts, it's generally good to have a separate, large
 <filename>/home</filename> partition.  In general, the partitioning
 situation varies from computer to computer depending on its uses.
diff --git a/nl/partitioning/tree.xml b/nl/partitioning/tree.xml
index 39646f550..be729f8a4 100644
--- a/nl/partitioning/tree.xml
+++ b/nl/partitioning/tree.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 33773 untranslated -->
+<!-- original version: 39465 untranslated -->
 
 
  <sect1 id="directory-tree">
@@ -69,6 +69,9 @@ these directories:
   <entry><filename>var</filename></entry>
   <entry>Variable data</entry>
 </row><row>
+  <entry><filename>srv</filename></entry>
+  <entry>Data for services provided by the system</entry>
+</row><row>
   <entry><filename>opt</filename></entry>
   <entry>Add-on application software packages</entry>
 </row>
@@ -91,7 +94,7 @@ The root partition <filename>/</filename> must always physically
 contain <filename>/etc</filename>, <filename>/bin</filename>,
 <filename>/sbin</filename>, <filename>/lib</filename> and
 <filename>/dev</filename>, otherwise you won't be able to boot.
-Typically 150&ndash;250 MB is needed for the root partition.
+Typically 150&ndash;250MB is needed for the root partition.
 
 </para></listitem>
 <listitem><para>
@@ -101,10 +104,10 @@ Typically 150&ndash;250 MB is needed for the root partition.
 (<filename>/usr/lib</filename>), documentation
 (<filename>/usr/share/doc</filename>), etc.
 This is the part of the file system that generally takes up most space.
-You should provide at least 500 MB of disk space. This amount should
+You should provide at least 500MB of disk space. This amount should
 be increased depending on the number and type of packages you plan
 to install. A generous workstation or server installation should allow
-4-6 GB.
+4&ndash;6GB.
 
 </para></listitem>
 <listitem><para>
@@ -115,7 +118,7 @@ under this directory. The size of this directory depends greatly on
 the usage of your system, but for most people will be dictated by
 the package management tool's overhead.  If you are going to do a full
 installation of just about everything Debian has to offer, all in one
-session, setting aside 2 or 3 gigabyte of space for
+session, setting aside 2 or 3 GB of space for
 <filename>/var</filename> should be sufficient. If you are going to
 install in pieces (that is to say, install services and utilities,
 followed by text stuff, then X, ...), you can get away with 300&ndash;500
@@ -126,7 +129,7 @@ major system updates, you can get by with as little as 30 or 40 MB.
 <listitem><para>
 
 <filename>/tmp</filename>: temporary data created by programs will
-most likely go in this directory. 40&ndash;100 MB should usually
+most likely go in this directory. 40&ndash;100MB should usually
 be enough. Some applications &mdash; including archive manipulators,
 CD/DVD authoring tools, and multimedia software &mdash; may use
 <filename>/tmp</filename> to temporarily store image files. If you
@@ -140,7 +143,7 @@ in <filename>/tmp</filename> accordingly.
 into a subdirectory of this directory. Its size depends on how many
 users will be using the system and what files are to be stored in
 their directories.  Depending on your planned usage you should reserve
-about 100 MB for each user, but adapt this value to your needs. Reserve
+about 100MB for each user, but adapt this value to your needs. Reserve
 a lot more space if you plan to save a lot of multimedia files (pictures, MP3, movies)
 in your home directory.
 
diff --git a/nl/using-d-i/components.xml b/nl/using-d-i/components.xml
index 3eac9b271..c9834c760 100644
--- a/nl/using-d-i/components.xml
+++ b/nl/using-d-i/components.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- original version: 38703 -->
+<!-- original version: 39531 -->
 
  <sect1 id="module-details">
  <title>Individuele modules gebruiken</title>
diff --git a/nl/using-d-i/modules/partman-crypto.xml b/nl/using-d-i/modules/partman-crypto.xml
index 6377c9ebb..f277524ed 100644
--- a/nl/using-d-i/modules/partman-crypto.xml
+++ b/nl/using-d-i/modules/partman-crypto.xml
@@ -1,5 +1,5 @@
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 39224 untranslated -->
+<!-- original version: 39460 untranslated -->
 
    <sect3 id="partman-crypto">
    <title>Configuring Encrypted Volumes</title>
@@ -62,9 +62,9 @@ otherwise, it is recommended to use the default.
 
 </para><para>
 
-First, let's have a look at available options available when you
-select <userinput>Device-mapper (dm-crypt)</userinput> as the
-encryption method. As always: when in doubt, use the defaults, because
+First, let's have a look at the options available when you select
+<userinput>Device-mapper (dm-crypt)</userinput> as the encryption
+method. As always: when in doubt, use the defaults, because
 they have been carefully chosen with security in mind.
 
 <variablelist>