Minor corrections and some rewrites based on suggestions from Clytie Siddall

11 files changed, 132 insertions, 111 deletions

diff --git a/debian/changelog b/debian/changelog
index f800264c7..a24f0f727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,7 +45,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * Correct error for alpha netboot installations. Thanks to Aurélien Géröme.
     Closes: #386591.
   * Correct number of release arches. Thanks to Holger Wansing. Closes: #384321.
-  * Minor corrections reported by Malcolm Parsons. Closes: #388138.
+  * Minor corrections suggested by Malcolm Parsons. Closes: #388138.
   * Document new boot parameters theme and directfb/hw-accel.
   * Remove now obsolete distinction between classic and common kpkg.
   * Update all arches to kernel version 2.6.17.
@@ -55,7 +55,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * Document changes in guided partitioning and added encrypted LVM support.
   * Disable m68k for official builds as it is not a release architecture.
   * buildweb.sh: use 'mv -f' to avoid errors during builds on the webserver.
-  * Minor corrections reported by Clytie Siddall. Closes: #394413, #394471.
+  * Minor corrections suggested by Clytie Siddall. Closes: #394413, #394471.
   * Update task sizes as per D-I RC1.
   * New troubleshooting section on how to deal with CD-ROM related problems.
   * Document how to pass parameters to kernel modules on boot.
@@ -97,25 +97,17 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
 
   [ Frans Pop ]
   * Update all arches to kernel version 2.6.18.
-  * boot-new:
-    - Remove reference to apt guide (not installed by default) and obsolete
-      debian-guide. Thanks, Philippe Batailler. Closes: #402492.
-    - As lynx is no longer installed, suggest w3m as text based browser.
-    - Explain how to browse /usr/share/doc/ using a graphical web browser.
-    - Mention documentation packages.
-    - Clarify what happens on first boot and how to get help to in case of
-      problems.
+  * hardware:
+    - Remove ancient section on parity RAM. Closes: #403035.
+    - Update documenation for Sparc, based on patch by Jurij Smakov.
+      Closes: #389516.
+    - PowerPC/APUS is currently not supported; removed from hardware table.
   * boot-installer/parameters:
     - Document anna/choose_modules boot parameter.
   * boot-installer/trouble:
     - Fix reference to Save debug logs menu option.
       Thanks, Philippe Batailler. Closes: #402439.
     - Add a note that installation reports will be published.
-  * hardware:
-    - Remove ancient section on parity RAM. Closes: #403035.
-    - Update documenation for Sparc, based on patch by Jurij Smakov.
-      Closes: #389516.
-    - PowerPC/APUS is currently not supported; removed from hardware table.
   * install-methods:
     - All architectures that support TFTP booting also support DCHP, so remove
       the "supports-dhcp" condition.
@@ -123,6 +115,17 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
     - Use dhcp3-server for examples rather than dhcp (version 2).
     - tftpd-hpa does not use /tftpboot by default; allow for this in examples.
       Closes: #342076.
+  * using-d-i:
+    - Minor corrections and some rewrites based on suggestions from
+      Clytie Siddall. Closes: #367861.
+  * boot-new:
+    - Remove reference to apt guide (not installed by default) and obsolete
+      debian-guide. Thanks, Philippe Batailler. Closes: #402492.
+    - As lynx is no longer installed, suggest w3m as text based browser.
+    - Explain how to browse /usr/share/doc/ using a graphical web browser.
+    - Mention documentation packages.
+    - Clarify what happens on first boot and how to get help to in case of
+      problems.
   * post-install:
     - Remove section on reactivating Windows; the installer should detect it
       automatically after all. Closes: #402437.
@@ -132,7 +135,7 @@ installation-guide (2006xxxx) UNRELEASED; urgency=low
   * appendix/chroot-install:
     - Changes suggested in review by Wiktor Wandachowicz. Closes: #394929.
 
- -- Frans Pop <fjp@debian.org>  Tue, 26 Dec 2006 22:46:28 +0100
+ -- Frans Pop <fjp@debian.org>  Wed, 27 Dec 2006 03:08:09 +0100
 
 installation-guide (20060726) unstable; urgency=low
 
diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml
index 5f7dfaa07..b46d750fd 100644
--- a/en/using-d-i/components.xml
+++ b/en/using-d-i/components.xml
@@ -110,8 +110,8 @@ take some time.
 <para>
 
 After the base system is installed, you have a usable but limited system.
-Most users will want to add additional software to the system to tune it to
-their needs, and the installer lets you do so. This step can take even
+Most users will want to install additional software to the system to tune it to
+their needs, and the installer allows you do so. This step can take even
 longer than installing the base system if you have a slow computer or
 network.
 
@@ -127,18 +127,10 @@ network.
 
 If you are installing a diskless workstation, obviously, booting off
 the local disk isn't a meaningful option, and this step will be
-skipped. <phrase arch="sparc">You may wish to set the OpenBoot to boot
+skipped. <phrase arch="sparc">You may wish to set OpenBoot to boot
 from the network by default; see <xref
 linkend="boot-dev-select-sun"/>.</phrase>
 
-</para><para>
-
-Note that multiple operating systems booting on a single machine is
-still something of a black art.  This document does not even attempt
-to document the various boot managers, which vary by architecture and
-even by subarchitecture.  You should see your boot manager's
-documentation for more information.
-
 </para>
 
 &module-os-prober.xml;
diff --git a/en/using-d-i/modules/alpha/aboot-installer.xml b/en/using-d-i/modules/alpha/aboot-installer.xml
index 7deaebb5a..1a40905d0 100644
--- a/en/using-d-i/modules/alpha/aboot-installer.xml
+++ b/en/using-d-i/modules/alpha/aboot-installer.xml
@@ -5,7 +5,7 @@
   <title>Install <command>aboot</command> on a Hard Disk</title>
 <para>
 
-If you have booted from SRM, if you select this option, the installer
+If you have booted from SRM and you select this option, the installer
 will write <command>aboot</command> to the first sector of the disk on
 which you installed Debian.  Be <emphasis>very</emphasis> careful &mdash; it
 is <emphasis>not</emphasis> possible to boot multiple operating
diff --git a/en/using-d-i/modules/apt-setup.xml b/en/using-d-i/modules/apt-setup.xml
index da181f814..76d530223 100644
--- a/en/using-d-i/modules/apt-setup.xml
+++ b/en/using-d-i/modules/apt-setup.xml
@@ -6,27 +6,29 @@
 
 <para>
 
-The main means that people use to install packages on their system is
-via a program called <command>apt-get</command>, from the
-<classname>apt</classname> package.<footnote>
+One of the tools used to install packages on a &debian; system is
+a program called <command>apt-get</command>, from the
+<classname>apt</classname> package<footnote>
 
 <para>
 
-Note that the actual program that installs packages is called
+Note that the program which actually installs the packages is called
 <command>dpkg</command>.  However, this program is more of a low-level
-tool.  <command>apt-get</command> is a higher-level tool as it will
-invoke <command>dpkg</command> as appropriate and also because it knows
-to install other packages which are required for the package you're
-trying to install, as well as how to retrieve the package from your
-CD, the network, or wherever.
+tool.  <command>apt-get</command> is a higher-level tool, which will
+invoke <command>dpkg</command> as appropriate. It knows how to retrieve
+packages from your CD, the network, or wherever. It is also able to
+automatically install other packages which are required to make the
+package you're trying to install work correctly.
 
 </para>
-</footnote>
+
+</footnote>.
 Other front-ends for package management, like <command>aptitude</command>
-and <command>synaptic</command> are also in use and depend on
-<command>apt-get</command>. These front-ends are recommended for new users,
-since they integrate some additional features (package searching and status checks)
-in a nice user interface.
+and <command>synaptic</command>, are also in use.
+These front-ends are recommended for new users, since they integrate
+some additional features (package searching and status checks)
+in a nice user interface. In fact, <command>aptitude</command> is now the
+recommended utility for package management.
 
 </para><para>
 
diff --git a/en/using-d-i/modules/base-installer.xml b/en/using-d-i/modules/base-installer.xml
index e9327eb43..4ba5139d8 100644
--- a/en/using-d-i/modules/base-installer.xml
+++ b/en/using-d-i/modules/base-installer.xml
@@ -1,24 +1,20 @@
 <!-- retain these comments for translator revision tracking -->
 <!-- $Id$ -->
 
-   <sect3 id="base-installer">
-   <title>Base System Installation</title>
-
 <para>
 
-During the Base installation, package unpacking and setup messages are
-redirected to <userinput>tty4</userinput>.  You can access this
-terminal by pressing
+During installation of the base system, package unpacking and setup
+messages are redirected to <userinput>tty4</userinput>.
+You can access this terminal by pressing
 <keycombo><keycap>Left Alt</keycap><keycap>F4</keycap></keycombo>;
 get back to the main installer process with
 <keycombo><keycap>Left Alt</keycap><keycap>F1</keycap></keycombo>.
 
-
 </para><para>
 
-The unpack/setup messages generated by the base installation are saved in
-<filename>/var/log/syslog</filename> when the installation is
-performed over a serial console.
+The unpack/setup messages generated during this phase are also saved in
+<filename>/var/log/syslog</filename>. You can check them there if the
+installation is performed over a serial console.
 
 </para><para>
 
@@ -28,4 +24,3 @@ hardware. In lower priority modes, you will be able to choose from a list
 of available kernels.
 
 </para>
-   </sect3>
diff --git a/en/using-d-i/modules/ia64/elilo-installer.xml b/en/using-d-i/modules/ia64/elilo-installer.xml
index 6ec6bc26d..5fa5d0efd 100644
--- a/en/using-d-i/modules/ia64/elilo-installer.xml
+++ b/en/using-d-i/modules/ia64/elilo-installer.xml
@@ -15,10 +15,10 @@ disk partition and modifies the <guimenuitem>EFI Boot Manager</guimenuitem>
 menu in the firmware to point to the files in the EFI partition.
 The <command>elilo</command> boot loader is really in two parts.
 The <filename>/usr/sbin/elilo</filename> command manages the partition and
-copies file into it.
+copies files into it.
 The <filename>elilo.efi</filename> program is copied into the EFI
-partition and then run by the <quote>EFI Boot Manager</quote> to actually
-do the work of loading and starting the Linux kernel.
+partition and then run by the <quote>EFI Boot Manager</quote> to
+do the actual work of loading and starting the Linux kernel.
 
 </para><para>
 
@@ -41,7 +41,7 @@ filesystem with its <emphasis>boot</emphasis> flag set.
 &d-i; may show multiple choices depending on what it finds from scanning
 all of the disks of the system including EFI partitions of other system
 disks and EFI diagnostic partitions.
-Remember, the <command>elilo</command> may format the partition during
+Remember, <command>elilo</command> may format the partition during
 the installation, erasing any previous contents!
 
 </para></warning>
diff --git a/en/using-d-i/modules/lowmem.xml b/en/using-d-i/modules/lowmem.xml
index 013379199..81c1b905f 100644
--- a/en/using-d-i/modules/lowmem.xml
+++ b/en/using-d-i/modules/lowmem.xml
@@ -13,9 +13,13 @@ you to install &debian; on your system.
 
 </para><para>
 
-During a low memory install, not all components will be available.
-One of the limitations is that you won't be able to choose a
-language for the installation.
+The first measure taken to reduce memory consumption by the installer
+is to disable translations. If that is not sufficient, the installer
+will only load components essential to complete a basic installation
+by default. This reduces the functionality of the installation system.
+You will be given the opportunity to load additional components manually,
+but you should be aware that each component you select will use
+additional memory and thus may cause the installation to fail.
 
 </para>
-   </sect3>
\ No newline at end of file
+   </sect3>
diff --git a/en/using-d-i/modules/mdcfg.xml b/en/using-d-i/modules/mdcfg.xml
index 3fb9ec46f..710c38845 100644
--- a/en/using-d-i/modules/mdcfg.xml
+++ b/en/using-d-i/modules/mdcfg.xml
@@ -27,7 +27,7 @@ etc.).
 
 </para><para>
 
-The benefit you gain depends on a type of a MD device you are
+What benefits this brings depends on the type of MD device you are
 creating. Currently supported are:
 
 <variablelist>
@@ -38,7 +38,7 @@ creating. Currently supported are:
 Is mainly aimed at performance.  RAID0 splits all incoming data into
 <firstterm>stripes</firstterm> and distributes them equally over each
 disk in the array. This can increase the speed of read/write
-operations, but when one of the disks fails, you will loose
+operations, but when one of the disks fails, you will lose
 <emphasis>everything</emphasis> (part of the information is still on
 the healthy disk(s), the other part <emphasis>was</emphasis> on the
 failed disk).
@@ -54,12 +54,12 @@ The typical use for RAID0 is a partition for video editing.
 <term>RAID1</term><listitem><para>
 
 Is suitable for setups where reliability is the first concern.  It
-consists of several (usually two) equally sized partitions where every
+consists of several (usually two) equally-sized partitions where every
 partition contains exactly the same data. This essentially means three
 things.  First, if one of your disks fails, you still have the data
 mirrored on the remaining disks. Second, you can use only a fraction
 of the available capacity (more precisely, it is the size of the
-smallest partition in the RAID). Third, file reads are load balanced among
+smallest partition in the RAID). Third, file-reads are load-balanced among
 the disks, which can improve performance on a server, such as a file
 server, that tends to be loaded with more disk reads than writes.
 
@@ -75,8 +75,8 @@ place of the failed disk in the case of failure.
 <term>RAID5</term><listitem><para>
 
 Is a good compromise between speed, reliability and data redundancy.
-RAID5 splits all incomming data into stripes and distributes them
-equally on all but one disks (similar to RAID0). Unlike RAID0, RAID5
+RAID5 splits all incoming data into stripes and distributes them
+equally on all but one disk (similar to RAID0). Unlike RAID0, RAID5
 also computes <firstterm>parity</firstterm> information, which gets
 written on the remaining disk. The parity disk is not static (that
 would be called RAID4), but is changing periodically, so the parity
@@ -88,9 +88,9 @@ which will take the place of the failed disk in the case of failure.
 
 </para><para>
 
-As you can see, RAID5 has similar degree of reliability like RAID1
-while achieving less redundancy. On the other hand it might be a bit
-slower on write operation than RAID0 due to computation of parity
+As you can see, RAID5 has a similar degree of reliability to RAID1
+while achieving less redundancy. On the other hand, it might be a bit
+slower on write operations than RAID0 due to computation of parity
 information.
 
 </para></listitem>
@@ -143,7 +143,7 @@ To sum it up:
 
 </para><para>
 
-If you want to know the whole truth about Software RAID, have a look
+If you want to know more about Software RAID, have a look
 at <ulink url="&url-software-raid-howto;">Software RAID HOWTO</ulink>.
 
 </para><para>
diff --git a/en/using-d-i/modules/partman.xml b/en/using-d-i/modules/partman.xml
index 6d65457e1..24e6906f4 100644
--- a/en/using-d-i/modules/partman.xml
+++ b/en/using-d-i/modules/partman.xml
@@ -202,36 +202,40 @@ in the remainder of this section.
 
 </para><para>
 
-If you select a pristine disk which has neither partitions
-nor free space on it, you will be offered to create a new partition
-table (this is needed so you can create new partitions). After this
-a new line entitled <quote>FREE SPACE</quote> should appear under the
-selected disk.
+If you select a pristine disk which has neither partitions nor free
+space on it, you will be asked if a new partition table should be
+created (this is needed so you can create new partitions). After this,
+a new line entitled <quote>FREE SPACE</quote> should appear in the table
+under the selected disk.
 
 </para><para>
 
-If you select some free space, you will be offered to create new
-partition. You will have to answer a quick series of questions about
+If you select some free space, you will have the opportunity to create a
+new partition. You will have to answer a quick series of questions about
 its size, type (primary or logical), and location (beginning or end of
-the free space). After this, you will be presented with detailed
-overview of your new partition. There are options like mountpoint,
-mount options, bootable flag, or way of usage. If you don't like the
+the free space). After this, you will be presented with a detailed
+overview of your new partition. The main setting is <guimenuitem>Use
+as:</guimenuitem>, which determines if the partition will have a file
+system on it, or be used for swap, software RAID, LVM, an encrypted
+file system, or not be used at all. Other settings include
+mountpoint, mount options, and bootable flag; which settings are shown
+depends on how the partition is to be used. If you don't like the
 preselected defaults, feel free to change them to your liking. E.g. by
 selecting the option <guimenuitem>Use as:</guimenuitem>, you can
-choose different filesystem for this partition including the
-possibility to use the partition for swap, software RAID, LVM, or not
-use it at all. Other nice feature is the possibility to copy data from
-existing partition onto this one.
+choose different filesystem for this partition including options
+to use the partition for swap, software RAID, LVM, or not
+use it at all. Another nice feature is the ability to copy data from
+an existing partition onto this one.
 When you are satisfied with your new partition, select
-<guimenuitem>Done setting up the partition</guimenuitem> and you will be
-thrown back to <command>partman</command>'s main screen.
+<guimenuitem>Done setting up the partition</guimenuitem> and you will
+return to <command>partman</command>'s main screen.
 
 </para><para>
 
 If you decide you want to change something about your partition,
 simply select the partition, which will bring you to the partition
-configuration menu. Because this is the same screen like when creating
-a new partition, you can change the same set of options. One thing
+configuration menu. This is the same screen like when creating
+a new partition, so you can change the same settings. One thing
 which might not be very obvious at a first glance is that you can
 resize the partition by selecting the item displaying the size of the
 partition. Filesystems known to work are at least fat16, fat32, ext2,
diff --git a/en/using-d-i/modules/shell.xml b/en/using-d-i/modules/shell.xml
index 57081c7a2..796744900 100644
--- a/en/using-d-i/modules/shell.xml
+++ b/en/using-d-i/modules/shell.xml
@@ -3,39 +3,60 @@
 
    <sect3 id="shell">
    <title>Using the Shell and Viewing the Logs</title>
-   <!-- TODO: There is nothing about logs in this section! -->
 
 <para>
 
-There is an <guimenuitem>Execute a Shell</guimenuitem> item on the
-menu. If the menu is not available when you need to use the shell,
-press <keycombo><keycap>Left Alt</keycap> <keycap>F2</keycap></keycombo>
-(on a Mac keyboard, <keycombo><keycap>Option</keycap> <keycap>F2</keycap>
-</keycombo>) to switch to the second <emphasis>virtual
-console</emphasis>. That's the <keycap>Alt</keycap> key on the
-left-hand side of the <keycap>space bar</keycap>, and the
-<keycap>F2</keycap> function key, at the same time. This is a separate
-window running a Bourne shell clone called <command>ash</command>.
+There are several methods you can use to get a shell while running an
+installation. On most systems, and if you are not installing over
+serial console, the easiest method is to switch to the second
+<emphasis>virtual console</emphasis> by pressing <keycombo><keycap>Left
+Alt</keycap> <keycap>F2</keycap></keycombo><footnote>
+
+<para>
+That is: press the <keycap>Alt</keycap> key on the left-hand side of the
+<keycap>space bar</keycap> and the <keycap>F2</keycap> function key
+at the same time.
+</para>
+
+</footnote> (on a Mac keyboard, <keycombo><keycap>Option</keycap>
+<keycap>F2</keycap></keycombo>). Use <keycombo><keycap>Left Alt</keycap>
+<keycap>F1</keycap></keycombo> to switch back to installer itself.
+
+</para><para>
+
+If you cannot switch consoles, there is also an <guimenuitem>Execute
+a Shell</guimenuitem> item on the main menu that can be used to start
+a shell. To get back to the installer itself, type
+<userinput>exit</userinput> to close the shell.
 
 </para><para>
 
 At this point you are booted from the RAM disk, and there is a limited
 set of Unix utilities available for your use. You can see what
 programs are available with the command <command>ls /bin /sbin /usr/bin
-/usr/sbin</command> and by typing <command>help</command>. The
-text editor is <command>nano</command>. The shell has some nice features
-like autocompletion and history.
+/usr/sbin</command> and by typing <command>help</command>. 
+The shell is a Bourne shell clone called <command>ash</command> and has
+some nice features like autocompletion and history.
 
 </para><para>
 
-Use the menus to perform any task that they are able to do &mdash; the
-shell and commands are only there in case something goes wrong.  In
-particular, you should always use the menus, not the shell, to
-activate your swap partition, because the menu software can't detect
-that you've done this from the shell. Press <keycombo><keycap>Left
-Alt</keycap> <keycap>F1</keycap></keycombo> to get back to menus, or
-type <command>exit</command> if you used a menu item to open the
-shell.
+To edit and view files, use the text editor <command>nano</command>.
+Log files for the installation system can be found in the
+<filename>/var/log</filename> directory.
 
 </para>
+<note><para>
+
+Although you can do basically anything in a shell that the available
+commands allow you to do, the option to use a shell is really only there
+in case something goes wrong and for debugging.
+
+</para><para>
+
+Doing things manually from the shell may interfere with the installation
+process and result in errors or an incomplete installation.
+In particular, you should always use let the installer activate your swap
+partition and not do this yourself from a shell.
+
+</para></note>
    </sect3>
diff --git a/en/using-d-i/modules/x86/lilo-installer.xml b/en/using-d-i/modules/x86/lilo-installer.xml
index 87053e2bf..4c0547244 100644
--- a/en/using-d-i/modules/x86/lilo-installer.xml
+++ b/en/using-d-i/modules/x86/lilo-installer.xml
@@ -24,7 +24,7 @@ systems like GNU/Linux and GNU/Hurd after the installation.
 </para></note>
 <para>
 
-&d-i; presents you three choices where to install the
+&d-i; offers you three choices on where to install the
 <command>LILO</command> boot loader:
 
 <variablelist>