浏览代码

Miscellaneous adjustments.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3244 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Alex Gronenwoud 21 年之前
父节点
当前提交
c76accc624

+ 0 - 11
chapter01/versions.xml

@@ -1,11 +0,0 @@
-<sect1 id="ch-scatter-version" xreflabel="Chapter 1 - Book Version">
-<title>Book version</title>
-<?dbhtml filename="version.html" dir="chapter01"?>
-
-<para>This is version &version; of the Linux From Scratch book, dated
-&releasedate;. If this book is more than three months old, a newer and better
-version is probably already available. To find out, check one of the mirrors
-listed on <ulink url="&lfs-root;"/>.</para>
-
-</sect1>
-

+ 1 - 1
chapter04/chapter04.xml

@@ -170,7 +170,7 @@ Make (&make-version;) - &make-size;:
 <ulink url="http://freshmeat.net/projects/gnumake"/>
 <ulink url="http://freshmeat.net/projects/gnumake"/>
 
 
 Make_devices (&makedev-version;) - &makedev-size;:
 Make_devices (&makedev-version;) - &makedev-size;:
-<ulink url="&http-down;~alex/Make_devices-&makedev-version;.bz2"/>
+<ulink url="&lfs-root;~alex/make_devices-&makedev-version;.bz2"/>
 
 
 Man (&man-version;) - &man-size;:
 Man (&man-version;) - &man-size;:
 <ulink url="http://freshmeat.net/projects/man/"/>
 <ulink url="http://freshmeat.net/projects/man/"/>

+ 4 - 4
chapter05/glibc.xml

@@ -58,10 +58,10 @@ strangely enough insists on linking against the host's libraries (libgd,
 libpng, libz, and so forth).</para></listitem>
 libpng, libz, and so forth).</para></listitem>
 
 
 <listitem><para><userinput>--without-cvs</userinput>: This is meant to prevent
 <listitem><para><userinput>--without-cvs</userinput>: This is meant to prevent
-the Makefiles from attempting automatic CVS commits when using a CVS snapshot.
-But it's not actually needed these days. We use it because it silences an
-annoying but harmless warning about a missing <filename>autoconf</filename>
-program.</para></listitem>
+the Makefiles from attempting automatic CVS checkouts when using a CVS
+snapshot. But it's not actually needed these days. We use it because it
+suppresses an annoying but harmless warning about a missing
+<command>autoconf</command> program.</para></listitem>
 </itemizedlist>
 </itemizedlist>
 
 
 <para>During this stage you might see the following warning:</para>
 <para>During this stage you might see the following warning:</para>

+ 1 - 2
chapter06/autoconf.xml

@@ -24,8 +24,7 @@ can automatically configure source code.</para>
 <screen><userinput>make</userinput></screen>
 <screen><userinput>make</userinput></screen>
 
 
 <para>To have the results tested, issue:
 <para>To have the results tested, issue:
-<userinput>make check</userinput>.This takes a long time, about 2 SBUs,
-and is strictly optional.</para>
+<userinput>make check</userinput>. This takes a long time, about 2 SBUs.</para>
 
 
 <para>And install the package:</para>
 <para>And install the package:</para>
 
 

+ 1 - 2
chapter06/automake.xml

@@ -25,8 +25,7 @@ with Autoconf.</para>
 <screen><userinput>make</userinput></screen>
 <screen><userinput>make</userinput></screen>
 
 
 <para>To have the results tested, issue:
 <para>To have the results tested, issue:
-<userinput>make check</userinput>. This takes a long time, about 4 SBUs,
-and is strictly optional.</para>
+<userinput>make check</userinput>. This takes a long time, about 5 SBUs.</para>
 
 
 <para>Install the package:</para>
 <para>Install the package:</para>
 
 

+ 9 - 8
chapter06/chapter06.xml

@@ -255,16 +255,17 @@ dialout:x:10:
 audio:x:11:
 audio:x:11:
 <userinput>EOF</userinput></screen>
 <userinput>EOF</userinput></screen>
 
 
-<para>The created groups aren't part of any standard -- they are the groups 
-that the MAKEDEV script in the next section uses. Besides the group "root", the 
-LSB (<ulink url="http://www.linuxbase.org"/>) recommends only a group "bin", 
-with a GID of 1, be present. All other group names and GIDs can be chosen 
-freely by the user, as well-written packages don't depend on GID numbers but 
-use the group's name.</para>
+<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
+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
+depend on GID numbers but use the group's name.</para>
 
 
 <para>To get rid of the "I have no name!" prompt, we will start a new shell.
 <para>To get rid of the "I have no name!" prompt, we will start a new shell.
-Since we installed a full Glibc in <xref linkend="chapter-temporary-tools"/>, and have just
-created the <filename>/etc/passwd</filename> and
+Since we installed a full Glibc in <xref linkend="chapter-temporary-tools"/>,
+and have just created the <filename>/etc/passwd</filename> and
 <filename>/etc/group</filename> files, user name and group name resolution
 <filename>/etc/group</filename> files, user name and group name resolution
 will now work.</para>
 will now work.</para>
 
 

+ 3 - 5
chapter06/ed.xml

@@ -23,11 +23,9 @@ days.</para></note>
 <para>Ed normally uses the <emphasis>mktemp</emphasis> function to create
 <para>Ed normally uses the <emphasis>mktemp</emphasis> function to create
 temporary files in <filename class="directory">/tmp</filename>, but this
 temporary files in <filename class="directory">/tmp</filename>, but this
 function contains a vulnerability (see the section on Temporary Files in <ulink
 function contains a vulnerability (see the section on Temporary Files in <ulink
-url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). The
-following patch makes Ed use <emphasis>mkstemp</emphasis> instead, which is
-the recommended way to create temporary files.</para>
-
-<para>Apply the patch:</para>
+url="http://en.tldp.org/HOWTO/Secure-Programs-HOWTO/avoid-race.html"/>). Apply
+the following patch to make Ed use <emphasis>mkstemp</emphasis> instead, a
+secure way to create temporary files:</para>
 
 
 <screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen>
 <screen><userinput>patch -Np1 -i ../&ed-patch;</userinput></screen>
 
 

+ 0 - 5
chapter06/makedev.xml

@@ -63,11 +63,6 @@ you are satisfied, run the script to create the device files:</para>
 <screen><userinput>cd /dev
 <screen><userinput>cd /dev
 ./make_devices</userinput></screen>
 ./make_devices</userinput></screen>
 
 
-<para>(The FHS states that there should be a <filename>MAKEDEV</filename>
-script present in the <filename class="directory">/dev</filename> directory.
-But the FHS is mistaken: it should not dictate anything about files, and limit
-itself to directories.)</para>
-
 <para>If you had success with mounting the devpts file system earlier in <xref
 <para>If you had success with mounting the devpts file system earlier in <xref
 linkend="ch-system-proc"/>, you can continue with the next section. If you were
 linkend="ch-system-proc"/>, you can continue with the next section. If you were
 unable to mount devpts, now is the time to try the alternatives. If your kernel
 unable to mount devpts, now is the time to try the alternatives. If your kernel

+ 1 - 2
chapter06/tar.xml

@@ -17,8 +17,7 @@
 
 
 <para>Prepare Tar for compilation:</para>
 <para>Prepare Tar for compilation:</para>
 
 
-<screen><userinput>./configure --prefix=/usr --bindir=/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/sbin</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
 
 
 <para>Compile the package:</para>
 <para>Compile the package:</para>