Merge branch 'rworkman'

Conflicts:
	chapter_02.xml

1 files changed, 0 insertions, 11 deletions

diff --git a/chapter_02.xml b/chapter_02.xml
index 5e331ab..f723612 100644
--- a/chapter_02.xml
+++ b/chapter_02.xml
@@ -129,7 +129,6 @@ limited Linux distribution loaded into your system's RAM.  This
 limited distribution is then used to run all the installation programs
 manually, or can be used in emergencies to fix a broken system that
 fails to boot. Now that you're logged in as root (there is no password
-<<<<<<< HEAD
 within the installer) it's time to start setting up your disks. At this
 point, you may setup software RAID or LVM support if you wish or even
 an encrypted root partition, but
@@ -139,16 +138,6 @@ refer to the excellent <filename>README_RAID.TXT</filename>,
 <filename>README_CRYPT.TXT</filename> files on your CD if you desire to
 setup your system with these advanced tools. Most users won't have any
 need to do so and should proceed directly to partitioning.
-=======
-within the installer), it's time to start setting up your disks. At this
-point, you may setup software RAID, LVM, or LUKS (encryption) support if 
-you wish, but those topics are outside of the scope of this book.  I 
-encourage you to refer to the excellent <filename>README_RAID.TXT</filename>,
-<filename>README_LVM.TXT</filename>, and <filename>README_CRYPT.TXT</filename>
-files on your CD if you wish to set up your system with one or more of those.
-Most users won't have any need to do so and thus should proceed directly to 
-partitioning.
->>>>>>> chapger_02.xml: Mention README_CRYPT.TXT for LUKS usage
 </para>
 
 </section>