aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gronenwoud <alex@linuxfromscratch.org>2004-02-10 22:06:21 +0000
committerAlex Gronenwoud <alex@linuxfromscratch.org>2004-02-10 22:06:21 +0000
commit5cd6caad33aed7430be8c2f1612a053d8d51ffe4 (patch)
tree913c145766c62dbfd450c9ec37f67279dd39479f
parent418e6cc0ff44e3bbaf3386e20f523edc8a97bc3c (diff)
Another mix of minor text adjustments.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3247 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml7
-rw-r--r--chapter04/chapter04.xml4
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/makedev.xml18
-rw-r--r--chapter08/grub.xml11
-rw-r--r--entities/makedev.ent6
-rw-r--r--index.xml4
7 files changed, 28 insertions, 24 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 01705ab51..d1d14c5c3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,8 +6,11 @@
<itemizedlist>
-<listitem><para>February 8th, 2004 [matt]: Chapter 6 - Updated to man-pages-1.66
-</para></listitem>
+<listitem><para>February 9th, 2004 [alex]: Chapter 6 - Moved the Bootscripts
+installation section to chapter 7.</para></listitem>
+
+<listitem><para>February 8th, 2004 [matt]: Chapter 6 - Updated to
+man-pages-1.66.</para></listitem>
<listitem><para>February 7th, 2004 [alex]: Chapter 1 - Moved the Conventions
and Acknowledgements sections to the Preface.</para></listitem>
diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml
index 3e6bbd470..038038944 100644
--- a/chapter04/chapter04.xml
+++ b/chapter04/chapter04.xml
@@ -24,9 +24,9 @@ project websites, mailing lists, FAQs, changelogs and more.</para>
<para>We can't guarantee that these download locations are always available.
In case a download location has changed since this book was published, please
try to google for the package. Should you remain unsuccessful with this, you
-can consult the book's errata page at <ulink url="&lfs-root;/lfs/print/"/>
+can consult the book's errata page at <ulink url="&lfs-root;lfs/print/"/>
or, better yet, try one of the alternative means of downloading listed on
-<ulink url="&lfs-root;/lfs/packages.html"/>.</para>
+<ulink url="&lfs-root;lfs/packages.html"/>.</para>
<para>You'll need to store all the downloaded packages and patches somewhere
that is conveniently available throughout the entire build. You'll also need a
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index be329ce99..1012b15a5 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -312,7 +312,7 @@ audio:x:11:
<para>The created groups aren't part of any standard -- they are some of the
groups that the <command>make_devices</command> script in the next section
-uses. The LSB (<ulink url="http://www.linuxbase.org">Linux Standard
+uses. The LSB (<ulink url="http://www.linuxbase.org/">Linux Standard
Base</ulink>) recommends only that, beside the group "root" with a GID of 0, a
group "bin" with a GID of 1 be present. All other group names and GIDs can
be chosen freely by the system administrator, since well-written packages don't
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index 59be742ce..271ebef80 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -27,14 +27,14 @@ contains only a shell script.</para>
chmod 754 /dev/make_devices</userinput></screen>
<para>Device nodes are special files: things that can generate or receive data.
-They usually correspond to physical pieces of hardware, and can be created by
-issuing commands of the form: <command>mknod -m mode name type major
+They usually correspond to physical pieces of hardware. Device nodes can be
+created by issuing commands of the form: <command>mknod -m mode name type major
minor</command>. In such a command, <emphasis>mode</emphasis> is the usual
octal read/write/execute permissions triplet, and <emphasis>name</emphasis> is
the name of the device file to be created. It may seem surprising, but the
device name is actually arbitrary, except that most programs rely on devices
such as <filename>/dev/null</filename> having their usual names. The remaining
-three parameters tell the kernel what piece of hardware the device node
+three parameters tell the kernel what device the node
actually refers to. The <emphasis>type</emphasis> is a letter, either b or c,
indicating whether the device is accessed in blocks (such as a hard disk) or
character by character (such as the console). And <emphasis>major</emphasis>
@@ -44,7 +44,7 @@ numbers for Linux can be found in the file <filename>devices.txt</filename> in
the <filename class="directory">Documentation</filename> subdirectory of the
kernel sources.</para>
-<para>Note that the same major/minor combination are usually assigned to both a
+<para>Note that the same major/minor combination is usually assigned to both a
block and a character device. These are, however, completely unrelated devices
that cannot be interchanged. A device is identified by the type/major/minor
triple, not just the major/minor pair, so when creating a device node it is
@@ -79,11 +79,11 @@ system.</para>
<para>If that didn't work either, the only option left is to create a few ptyXX
and ttyXX device nodes. To do this, open <filename>make_devices</filename> in
your editor, go to the section "Pseudo-TTY masters" and enable as many ptyXX
-devices as you think you will need (one for every active xterm, ssh connection,
-telnet connection, and so on). In the immediately following section "Pseudo-TTY
-slaves", enable the corresponding ttyXX devices. When you are done, rerun
-<command>./make_devices</command> from inside <filename>/dev</filename> to have
-it create the new devices.</para>
+devices as you think you will need (every xterm, ssh connection, telnet
+connection, and the like, uses one of these pseudo terminals). In the
+immediately following section "Pseudo-TTY slaves", enable the corresponding
+ttyXX devices. When you are done, rerun <command>./make_devices</command> from
+inside <filename>/dev</filename> to have it create the new devices.</para>
</sect2>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index e934b7c9f..1a14968b8 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -3,8 +3,8 @@
<?dbhtml filename="grub.html" dir="chapter08"?>
<para>Your shiny new LFS system is almost complete. One of the last things to
-do is ensure you can boot it. The instructions below apply only to computers
-of IA-32 architecture, i.e. mainstream PC's. Information on "boot loading" for
+do is ensure you can boot it. The instructions below apply only to computers of
+IA-32 architecture, meaning mainstream PCs. Information on "boot loading" for
other architectures should be available in the usual resource specific
locations for those architectures.</para>
@@ -39,8 +39,9 @@ doesn't consider CD-ROM drives to be hard drives, so if you have a CD on
<filename>hdc</filename>, that second hard drive would still be (hd1).</para>
<para>Using the above information, determine the appropriate designator for
-your root partition. For the following example, we'll assume your root
-partition is <filename>hda4</filename>.</para>
+your root partition (or boot partition, if you use a separate one). For the
+following example, we'll assume your root (or separate boot) partition is
+<filename>hda4</filename>.</para>
<para>First, tell Grub where to search for its <filename>stage{1,2}</filename>
files -- you can use Tab everywhere to make Grub show the alternatives:</para>
@@ -118,7 +119,7 @@ chainloader +1
<para>If <command>info grub</command> doesn't tell you all you want to
know, you can find more information regarding Grub on its website, located at:
-<ulink url="http://www.gnu.org/software/grub"/>.</para>
+<ulink url="http://www.gnu.org/software/grub/"/>.</para>
</sect1>
diff --git a/entities/makedev.ent b/entities/makedev.ent
index 2426a9259..c1def5115 100644
--- a/entities/makedev.ent
+++ b/entities/makedev.ent
@@ -5,9 +5,9 @@
<!ENTITY aa-makedev-dep SYSTEM "../appendixa/makedev-dep.xml">
<!ENTITY aa-makedev-down SYSTEM "../appendixa/makedev-down.xml">
-<!ENTITY makedev-version "1.1">
-<!ENTITY makedev-depversion "1.1">
-<!ENTITY makedev-contversion "1.1">
+<!ENTITY makedev-version "1.2">
+<!ENTITY makedev-depversion "1.2">
+<!ENTITY makedev-contversion "1.2">
<!ENTITY makedev-package "Make_devices-&makedev-version;.bz2">
<!ENTITY makedev-size "20 KB">
diff --git a/index.xml b/index.xml
index 2d569282f..1b97821f3 100644
--- a/index.xml
+++ b/index.xml
@@ -2,8 +2,8 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"/usr/share/docbook/docbookx.dtd" [
-<!ENTITY version "CVS-2004-02-07">
-<!ENTITY releasedate "February 7th, 2004">
+<!ENTITY version "CVS-2004-02-10">
+<!ENTITY releasedate "February 10th, 2004">
<!ENTITY milestone "5.2">
<!ENTITY nbsp " ">