[SCM] UNNAMED PROJECT branch, master, updated. 20090201-1-26-gf563b5a

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f563b5a22bdf4a551edec86bb1607bc4e6ed4d2b
Author: Richard Nelson <unixabg at gmail.com>
Date:   Tue Feb 17 13:43:53 2009 -0600

    Cleanup on 3.3 and 3.4

diff --git a/xml/chapters/basics.xml b/xml/chapters/basics.xml
index 0c06d67..8f72f9a 100644
--- a/xml/chapters/basics.xml
+++ b/xml/chapters/basics.xml
@@ -79,9 +79,9 @@ $ wodim binary.iso
 <para>The following sequence of helper commands will create a basic USB/HDD image containing just the Debian standard system without X.org. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices.</para>
 <para>Note if you created an iso image with the previous example, you will need to clean up your working directory with the <filename>lh_clean</filename> helper (see <xref linkend="lh_clean"/>):</para>
 <screen>$ lh_clean --binary</screen>
-<para>First, we run the <filename>lh_config</filename> helper with the parameters to configure the <filename>"config/"</filename> hierarchy to create a USD/HDD image type:</para>
+<para>Run the <filename>lh_config</filename> helper with the parameters to configure the <filename>"config/"</filename> hierarchy to create a USD/HDD image type:</para>
 <screen>$ lh_config -b usb-hdd</screen>
-<para>We can then build the image with <filename>lh_build</filename> helper:</para>
+<para>Now build the image with <filename>lh_build</filename> helper:</para>
 <screen># lh_build</screen>
 
 <section>
@@ -105,12 +105,15 @@ $ qemu -hda binary.img
 <section>
 <title>Building a netboot image</title>
 
-<para>First, we configure our Live system:</para>
+<para>The following sequence of helper commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network.</para>
+<para>Note if you performed any previous examples, you will need to clean up your working directory with the <filename>lh_clean</filename> helper:</para>
+<screen>$ lh_clean --binary</screen>
+<para>Run the <filename>lh_config</filename> helper with the parameters to configure the <filename>"config/"</filename> hierarchy to create our netboot image:</para>
 <screen>$ lh_config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
 <para>In contrast with the ISO and USB hdd images, netbooting does not support serving a filesystem image with the client so the files must be served via NFS. The <replaceable>net-root-path</replaceable> and <replaceable>net-root-server</replaceable> options specify the location and server respectfully of the NFS server where the filesytem image will be located at boot-time.</para>
-<para>We can then build the image with <filename>lh_build</filename> as root:</para>
+<para>Now build the image with <filename>lh_build</filename> helper:</para>
 <screen># lh_build</screen>
-<para>In a net boot, a client runs a small piece of software, usually on the <acronym>EEPROM</acronym> of the Ethernet card, which send a <abbrev>DHCP</abbrev> request  to get an <abbrev>IP</abbrev> address and also information about what to do next : usually getting (through <abbrev>TFTP</abbrev> protocol) a higher level boot software like <application>Grub</application> or <application>PXLINUX</application>, or directly an operating system like <application>Linux</application>.</para>
+<para>In a network boot, the client runs a small piece of software, usually on the <acronym>EEPROM</acronym> of the Ethernet card, which sends a <abbrev>DHCP</abbrev> request  to get an <abbrev>IP</abbrev> address and also information about what to do next; such as getting (through <abbrev>TFTP</abbrev> protocol) a higher level boot software like <application>Grub</application> or <application>PXLINUX</application>, or directly to an operating system like <application>Linux</application>.</para>
 <para>For example, you can extract the generated <filename>binary-net.tar.gz</filename> archive in the <filename>/srv/debian-live</filename> directory; you'll get the filesystem image in <filename>live/filesystem.squashfs</filename>, the kernel, initrd and PXE Linux bootloader in <filename>tftpboot/debian-live/i386</filename>.</para>
 <para>We must now configure three services on the server:</para>
 

-- 
UNNAMED PROJECT