From 332d3f8b154439fcd4fe07fb1b104fddddba11c6 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 13 Apr 2011 23:43:36 -0500 Subject: chapger_02.xml: Mention README_CRYPT.TXT for LUKS usage --- chapter_02.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'chapter_02.xml') diff --git a/chapter_02.xml b/chapter_02.xml index f022358..05e2810 100644 --- a/chapter_02.xml +++ b/chapter_02.xml @@ -7,7 +7,7 @@ Slackware's installation is a bit more simplistic than that of most -other Linux distributions, and is very reminiscent of installing one of the +other Linux distributions and is very reminiscent of installing one of the varieties of BSD operating systems. If you're familiar with those, you should feel right at home. If you've never installed Slackware or used a distribution that makes use of a non-graphical installer, you may @@ -124,18 +124,19 @@ slackware login: root Unlike other Linux distributions which boot you directly into a -dedicated installer program, Slackware's installer gives you a limited -Linux distribution contained in your system's RAM from the word go. This +dedicated installer program, Slackware's installer drops you into a +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 -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, but -those topics are outside of the scope of this book. I encourage you to -refer to the excellent README_RAID.TXT and -README_LVM.TXT 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 README_RAID.TXT, +README_LVM.TXT, and README_CRYPT.TXT +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. -- cgit v1.2.3 From fbd43b032a0481638aa610f23be90192c8abba3b Mon Sep 17 00:00:00 2001 From: Alan Hicks Date: Thu, 14 Apr 2011 00:45:10 -0400 Subject: Chapter_02 - Added README_CRYPT.TXT per rworkman's suggestion. --- chapter_02.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chapter_02.xml') diff --git a/chapter_02.xml b/chapter_02.xml index f022358..52c7b35 100644 --- a/chapter_02.xml +++ b/chapter_02.xml @@ -130,10 +130,12 @@ 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 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, but +point, you may setup software RAID or LVM support if you wish or even +an encrpted root partition, but those topics are outside of the scope of this book. I encourage you to -refer to the excellent README_RAID.TXT and -README_LVM.TXT files on your CD if you desire to +refer to the excellent README_RAID.TXT, +README_LVM.TXT, and +README_CRYPT.TXT 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. -- cgit v1.2.3 From 64c67fe60885493e779680cefa522e0b687743c7 Mon Sep 17 00:00:00 2001 From: Alan Hicks Date: Thu, 14 Apr 2011 00:57:50 -0400 Subject: Chapter_02 - damn typoes... encrpted -> encrypted --- chapter_02.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chapter_02.xml') diff --git a/chapter_02.xml b/chapter_02.xml index 52c7b35..fffe7a7 100644 --- a/chapter_02.xml +++ b/chapter_02.xml @@ -131,7 +131,7 @@ 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 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 encrpted root partition, but +an encrypted root partition, but those topics are outside of the scope of this book. I encourage you to refer to the excellent README_RAID.TXT, README_LVM.TXT, and -- cgit v1.2.3 From ca84b79b7c8ef9556c7b982c05dbbeec0eb146f3 Mon Sep 17 00:00:00 2001 From: Alan Hicks Date: Thu, 14 Apr 2011 01:07:48 -0400 Subject: Minor typo fixes. --- chapter_02.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'chapter_02.xml') diff --git a/chapter_02.xml b/chapter_02.xml index fffe7a7..5e331ab 100644 --- a/chapter_02.xml +++ b/chapter_02.xml @@ -7,7 +7,7 @@ Slackware's installation is a bit more simplistic than that of most -other Linux distributions, and is very reminiscent of installing one of the +other Linux distributions and is very reminiscent of installing one of the varieties of BSD operating systems. If you're familiar with those, you should feel right at home. If you've never installed Slackware or used a distribution that makes use of a non-graphical installer, you may @@ -124,11 +124,12 @@ slackware login: root Unlike other Linux distributions which boot you directly into a -dedicated installer program, Slackware's installer gives you a limited -Linux distribution contained in your system's RAM from the word go. This +dedicated installer program, Slackware's installer drops you into a +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 @@ -138,6 +139,16 @@ refer to the excellent README_RAID.TXT, README_CRYPT.TXT 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 README_RAID.TXT, +README_LVM.TXT, and README_CRYPT.TXT +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 -- cgit v1.2.3