From 33698f9a8de9894fd7e7eeaa2858659210958710 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 13 Apr 2011 23:35:58 -0500 Subject: chapter_01.xml: s/main-stream/mainstream/ --- chapter_01.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter_01.xml b/chapter_01.xml index c1e2bef..9736ed7 100644 --- a/chapter_01.xml +++ b/chapter_01.xml @@ -27,7 +27,7 @@ as well. There are a great number of differences between Slackware and other -main-stream distributions such as Red Hat, Debian, and Ubuntu. Perhaps +mainstream distributions such as Red Hat, Debian, and Ubuntu. Perhaps the greatest difference is the lack of "hand-holding" that Slackware will do for the administrator. Many of those other distributions ship with custom graphical configuration tools for all manner of services. In -- cgit v1.2.3 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(-) 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(-) 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 432e6ed2b70c6b8f2266d18563dc91fcb66ad355 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 13 Apr 2011 23:52:39 -0500 Subject: TODO: gdisk mention in Ch2 ? --- TODO | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 4e522d8..8e3fd48 100644 --- a/TODO +++ b/TODO @@ -19,8 +19,10 @@ General Chapter 2. Installation * Section 'Booting the Installer' + - Does this need to be reworked? Feels kinda kludgy and amateur. + - seems fine to me (rworkman) - Does this need to be reworked? Feels kinda kludgy and amateur. +* Need to mention gdisk (for GPT parts) in the partitioning section * At the tail end we might wish to tell the user about adduser and inform him that he can skip ahead to chapter 9 briefly if he needs -- 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(-) 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_01.xml | 2 +- chapter_02.xml | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/chapter_01.xml b/chapter_01.xml index c1e2bef..9736ed7 100644 --- a/chapter_01.xml +++ b/chapter_01.xml @@ -27,7 +27,7 @@ as well. There are a great number of differences between Slackware and other -main-stream distributions such as Red Hat, Debian, and Ubuntu. Perhaps +mainstream distributions such as Red Hat, Debian, and Ubuntu. Perhaps the greatest difference is the lack of "hand-holding" that Slackware will do for the administrator. Many of those other distributions ship with custom graphical configuration tools for all manner of services. In 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 From 2f135c3138f20243c65149ab267ab55f87c97cd2 Mon Sep 17 00:00:00 2001 From: Alan Hicks Date: Thu, 14 Apr 2011 01:36:43 -0400 Subject: Removed cruft from TODO --- TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO b/TODO index 4e522d8..2700b6f 100644 --- a/TODO +++ b/TODO @@ -20,8 +20,6 @@ Chapter 2. Installation * Section 'Booting the Installer' - Does this need to be reworked? Feels kinda kludgy and amateur. - * At the tail end we might wish to tell the user about adduser and inform him that he can skip ahead to chapter 9 briefly if he needs more info. -- cgit v1.2.3 From 26e9baa1b21e233d4e16c4359cba7b23d230727a Mon Sep 17 00:00:00 2001 From: Alan Hicks Date: Thu, 14 Apr 2011 01:46:43 -0400 Subject: preface.xml - s/it's/its/;s/changes/change's/ - Lowercase "window managers" - Expand OS to "operating systems" - set phrase off with commas and replace a conjunction that made the sentence start to sound run-on with a dash Thanks to slakmagik --- preface.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/preface.xml b/preface.xml index a60f05e..7b3aba8 100644 --- a/preface.xml +++ b/preface.xml @@ -21,11 +21,12 @@ Slackware Linux may be one of the oldest surviving Linux distributions but that does not mean it has to be left behind. While Slackware does -aim to maintain it's traditional UNIX roots and values, there is no -escaping "progress". Subsystems change, Window Managers come and go and -new ways are devised to manage the complexities of a modern OS. -While we do resist change for changes sake, it's inevitable that as -things evolve documentation becomes stale and books are no exception. +aim to maintain its traditional UNIX roots and values, there is no +escaping "progress". Subsystems change, window managers come and go and +new ways are devised to manage the complexities of a modern operating +system. +While we do resist change for change's sake, it's inevitable that as +things evolve documentation becomes stale — books are no exception. -- cgit v1.2.3 From e25613e577a3bcb1663b85169b90ad1a098dd13d Mon Sep 17 00:00:00 2001 From: mrgoblin Date: Fri, 15 Apr 2011 00:37:57 +1200 Subject: Fixed many spelling errors --- chapter_06.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/chapter_06.xml b/chapter_06.xml index a2d0426..785f4da 100644 --- a/chapter_06.xml +++ b/chapter_06.xml @@ -7,7 +7,7 @@ Slackware systems often run hundreds or thousands of programs, each of -which is refered to as a process. Managing these processes is an +which is referred to as a process. Managing these processes is an important part of system administration. So how exactly do we handle all of these seperate processes? @@ -60,7 +60,7 @@ argument. 102 ? 00:00:02 kblockd/0 105 ? 00:01:19 kacpid 106 ? 00:00:01 kacpi_notify -... many more lines ommitted ... +... many more lines omitted ... @@ -84,7 +84,7 @@ root 4 0.0 0.0 0 0 ? S Apr05 0:00 [ksoftirqd/0] root 7 0.0 0.0 0 0 ? S Apr05 0:11 [events/0] root 9 0.0 0.0 0 0 ? S Apr05 0:01 [work_on_cpu/0] root 11 0.0 0.0 0 0 ? S Apr05 0:00 [khelper] -... many more lines ommitted .... +... many more lines omitted .... @@ -101,7 +101,7 @@ parent of a child process also ends the child. We do this with the darkstar:~$ ps -ejH -... many lines ommitted ... +... many lines omitted ... 3660 3660 3660 tty1 00:00:00 bash 29947 29947 3660 tty1 00:00:00 startx 29963 29947 3660 tty1 00:00:00 xinit @@ -111,7 +111,7 @@ parent of a child process also ends the child. We do this with the 29988 29972 3660 tty1 00:00:04 xfce4-session 29997 29972 3660 tty1 00:00:16 xfwm4 29999 29972 3660 tty1 00:00:02 Thunar -... many more lines ommitted ... +... many more lines omitted ... @@ -158,7 +158,7 @@ In order to signal a process, we first need to know it's PID. You can get this easily with ps as we discused. In order to send different signals to a running process, you simply pass the signal number and -s as an argument. The -l -argument lists all the signals you can chose and their number. You can +argument lists all the signals you can choose and their number. You can also send signals by their name with -s. @@ -167,7 +167,7 @@ also send signals by their name with -s. 5) SIGTRAP 6) SIGABRT 7) SIGBUS 8) SIGFPE 9) SIGKILL 10) SIGUSR1 11) SIGSEGV 12) SIGUSR2 13) SIGPIPE 14) SIGALRM 15) SIGTERM 16) SIGSTKFLT -... many more lines ommitted ... +... many more lines omitted ... darkstar:~$ kill 1234 # SIGTERM darkstar:~$ kill -s 9 1234 # SIGKILL darkstar:~$ kill -s 1 1234 # SIGHUP @@ -308,9 +308,9 @@ paste the following commented text at the top of your own cron entries. By default, Slackware includes a number of entries and comments in root's crontab. These entries make it easier to setup periodic system tasks by creating a number of directories in /etc -corrosponding to how often the tasks should run. Any script placed +corresponding to how often the tasks should run. Any script placed within these directories will be run hourly, daily, weekly, or monthly. -The names should be self-explainatory: +The names should be self-explanatory: /etc/cron.hourly, /etc/cron.daily, /etc/cron.weekly, and -- cgit v1.2.3