- Various corrections suggested by Clytie Siddall.

- Update instructions on how to set module parameters for PLIP installation.
- Update chroot install instructions to use aptitude instead of apt-get.

3 files changed, 24 insertions, 30 deletions

diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index aa15b8dc4..aacc62271 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -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/en/appendix/files.xml b/en/appendix/files.xml
index b8facd70e..a4ec9d2bd 100644
--- a/en/appendix/files.xml
+++ b/en/appendix/files.xml
@@ -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/en/appendix/plip.xml b/en/appendix/plip.xml
index 0946d0ae0..a8acd8e76 100644
--- a/en/appendix/plip.xml
+++ b/en/appendix/plip.xml
@@ -6,7 +6,7 @@
 
 <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>