Update of original English docs

6 files changed, 28 insertions, 29 deletions

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.