Author: manuel
Date: 2005-04-11 14:51:30 -0600 (Mon, 11 Apr 2005)
New Revision: 4926
Modified:
branches/multi-arch/BOOK/chapter01/changelog.xml
branches/multi-arch/BOOK/chapter05/glibc.xml
branches/multi-arch/BOOK/chapter06/hotplug.xml
branches/multi-arch/BOOK/chapter06/iproute2.xml
branches/multi-arch/BOOK/chapter06/man.xml
branches/multi-arch/BOOK/chapter06/module-init-tools.xml
branches/multi-arch/BOOK/chapter06/readjusting.xml
branches/multi-arch/BOOK/chapter06/shadow.xml
branches/multi-arch/BOOK/chapter06/sysklogd.xml
branches/multi-arch/BOOK/chapter06/tar.xml
branches/multi-arch/BOOK/chapter06/util-linux.xml
branches/multi-arch/BOOK/chapter06/zlib.xml
branches/multi-arch/BOOK/chapter07/udev.xml
branches/multi-arch/BOOK/general.ent
Log:
Ported form trink the appliccable changes in revisions r4896 to r4919.
Modified: branches/multi-arch/BOOK/chapter01/changelog.xml
===================================================================
--- branches/multi-arch/BOOK/chapter01/changelog.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter01/changelog.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -84,6 +84,14 @@
<listitem><para>Changelog Entries:</para>
<itemizedlist>
+<listitem><para>April 11, 2005 [manuel]</para>
+<itemizedlist>
+<listitem><para>Fixed: Arch: All - Tags and text corrections ported from
trunk.</para></listitem>
+</itemizedlist>
+</listitem>
+</itemizedlist>
+
+<itemizedlist>
<listitem><para>April 6, 2005 [jim]</para>
<itemizedlist>
<listitem><para>Removed: Arch: All - Removed the Iproute2 patch and replaced
with sed (Ryan Oliver).</para></listitem>
Modified: branches/multi-arch/BOOK/chapter05/glibc.xml
===================================================================
--- branches/multi-arch/BOOK/chapter05/glibc.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter05/glibc.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -116,9 +116,9 @@
<varlistentry>
<term><parameter>--disable-selinux</parameter></term>
<listitem><para>When building from hosts using SELinux functionality
-(i.e. Fedora Core 3), glibc will try to integrate this functionality into
+(i.e. Fedora Core 3), Glibc will try to integrate this functionality into
itself, but will fail, because we do not have this functionality in the LFS
-tools enviornment. This option will disable this, allowing glibc to build
+tools environment. This option will disable this, allowing Glibc to build
correctly, but will not otherwise affect the build.</para></listitem>
</varlistentry>
<!-- -->
Modified: branches/multi-arch/BOOK/chapter06/hotplug.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/hotplug.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter06/hotplug.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -51,7 +51,8 @@
<screen><userinput>touch /var/log/hotplug/events</userinput></screen>
-<para>Create a directory for storing firmware that can be loaded by
hotplug:</para>
+<para>Create a directory for storing firmware that can be loaded by
+<command>hotplug</command>:</para>
<screen><userinput>mkdir /lib/firmware</userinput></screen>
@@ -80,7 +81,7 @@
<indexterm zone="ch-system-hotplug hotplug"><primary
sortas="b-hotplug">hotplug</primary></indexterm>
<para>This script is called by default by the Linux kernel when something
-changes in its internal state (e.g., a new device is added or removed).</para>
+changes in its internal state (e.g., a new device is added or removed)</para>
</listitem>
</varlistentry>
@@ -94,7 +95,7 @@
<filename>hotplug</filename> initscript that comes from the LFS-Bootscripts
package. The <command>*.rc</command> scripts try to recover hotplug events
that
were lost during system boot because, for example, the root filesystem was not
-mounted by the kernel.</para>
+mounted by the kernel</para>
</listitem>
</varlistentry>
@@ -106,8 +107,7 @@
<para>These scripts are called by <command>hotplug</command>
in response to different types of hotplug events generated by the kernel.
Their action is to insert corresponding kernel modules and call any
-user-provided scripts.
-</para>
+user-provided scripts</para>
</listitem>
</varlistentry>
@@ -117,8 +117,7 @@
<indexterm zone="ch-system-hotplug hotplug-blacklist"><primary
sortas="e-/etc/hotplug/blacklist">/etc/hotplug/blacklist</primary></indexterm>
<para>This file contains the list of modules that should never be inserted into
-the kernel by the hotplug scripts.
-</para>
+the kernel by the Hotplug scripts</para>
</listitem>
</varlistentry>
@@ -128,8 +127,7 @@
<indexterm zone="ch-system-hotplug hotplug-functions"><primary
sortas="e-/etc/hotplug/hotplug.functions">/etc/hotplug/hotplug.functions</primary></indexterm>
<para>This file contains common functions used by other scripts in the Hotplug
-package.
-</para>
+package</para>
</listitem>
</varlistentry>
@@ -138,8 +136,7 @@
<listitem>
<indexterm zone="ch-system-hotplug hotplug-subdirs"><primary
sortas="e-/etc/hotplug/{pci,usb}">/etc/hotplug/{pci,usb}</primary></indexterm>
-<para>These directories contain user-written handlers for hotplug events.
-</para>
+<para>These directories contain user-written handlers for hotplug events</para>
</listitem>
</varlistentry>
@@ -149,8 +146,7 @@
<indexterm zone="ch-system-hotplug hotplug-usb.usermap"><primary
sortas="e-/etc/hotplug/usb.usermap">/etc/hotplug/usb.usermap</primary></indexterm>
<para>This file contains rules that determine which user-defined handlers to
-call for each USB device, based on its vendor ID and other attributes.
-</para>
+call for each USB device, based on its vendor ID and other attributes</para>
</listitem>
</varlistentry>
@@ -161,7 +157,7 @@
sortas="e-/etc/hotplug.d">/etc/hotplug.d</primary></indexterm>
<para>This directory contains programs (or symlinks to them) that are
interested
in receiving hotplug events. For example, <application>Udev</application> puts
-its symlink here during installation.</para>
+its symlink here during installation</para>
</listitem>
</varlistentry>
@@ -171,7 +167,7 @@
<indexterm zone="ch-system-hotplug hotplug-firmware"><primary
sortas="e-/lib/firmware">/lib/firmware</primary></indexterm>
<para>This directory contains the firmware for devices that need to have their
-firmware loaded before use.</para>
+firmware loaded before use</para>
</listitem>
</varlistentry>
@@ -180,8 +176,8 @@
<listitem>
<indexterm zone="ch-system-hotplug hotplug-events"><primary
sortas="e-/var/log/hotplug/events">/var/log/hotplug/events</primary></indexterm>
-<para>This file contains all the events that hotplug has called since bootup.
-</para>
+<para>This file contains all the events that <command>hotplug</command> has
+called since bootup</para>
</listitem>
</varlistentry>
Modified: branches/multi-arch/BOOK/chapter06/iproute2.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/iproute2.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter06/iproute2.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -4,14 +4,14 @@
%general-entities;
]>
<sect1 id="ch-system-iproute2" role="wrap">
- <title>Iproute2-&iproute2-version;</title>
+ <title>IPRoute2-&iproute2-version;</title>
<?dbhtml filename="iproute2.html"?>
<indexterm zone="ch-system-iproute2">
- <primary sortas="a-iproute2">Iproute2</primary>
+ <primary sortas="a-IPRoute2">IPRoute2</primary>
</indexterm>
<sect2 role="package">
<title/>
- <para>The Iproute2 package contains programs for basic and advanced
+ <para>The IPRoute2 package contains programs for basic and advanced
IPV4-based networking.
</para>
<segmentedlist>
@@ -30,7 +30,7 @@
</segmentedlist>
</sect2>
<sect2 role="installation">
- <title>Installation of Iproute2</title>
+ <title>Installation of IPRoute2</title>
<para>The <command>arpd</command> binary included in this package is
dependent on Berkeley DB. Because <command>arpd</command> is not a
very
common requirement on a base Linux system, remove the dependency on
@@ -42,7 +42,7 @@
<screen><userinput>sed -i '/^TARGETS/[EMAIL PROTECTED]@@g'
misc/Makefile</userinput></screen>
- <para>Prepare Iproute2 for compilation:</para>
+ <para>Prepare IPRoute2 for compilation:</para>
<screen><userinput>./configure </userinput></screen>
<para>Compile the package:</para>
@@ -54,9 +54,9 @@
<variablelist>
<varlistentry>
<term><parameter>SBINDIR=/sbin</parameter></term>
- <listitem><para>This makes sure that the Iproute2 binaries will install
into
+ <listitem><para>This makes sure that the IPRoute2 binaries will install
into
<filename class="directory">/sbin</filename>. This is the correct
- location according to the FHS, because some of the Iproute2 binaries are
used
+ location according to the FHS, because some of the IPRoute2 binaries are
used
in the bootscripts.</para>
</listitem>
</varlistentry>
@@ -69,7 +69,7 @@
</sect2>
<sect2 id="contents-iproute2" role="content">
- <title>Contents of Iproute2</title>
+ <title>Contents of IPRoute2</title>
<segmentedlist>
<segtitle>Installed programs</segtitle>
<seglistitem>
@@ -87,7 +87,7 @@
<command>ctstat</command>
</term>
<listitem>
- <para>Connection status utility.</para>
+ <para>Connection status utility</para>
<indexterm zone="ch-system-iproute2 ctstat">
<primary sortas="b-cstat">ctstat</primary>
</indexterm>
@@ -99,7 +99,7 @@
<command>ifcfg</command>
</term>
<listitem>
- <para>A shell script wrapper for the <command>ip</command>
command.</para>
+ <para>A shell script wrapper for the <command>ip</command>
command</para>
<indexterm zone="ch-system-iproute2 ifcfg">
<primary sortas="b-ifcfg">ifcfg</primary>
</indexterm>
@@ -112,7 +112,7 @@
</term>
<listitem>
<para>Shows the interfaces statistic, including the amount of
transmitted
- and received packages by interface.</para>
+ and received packages by interface</para>
<indexterm zone="ch-system-iproute2 ifstat">
<primary sortas="b-ifstat">ifstat</primary>
</indexterm>
@@ -128,40 +128,40 @@
<para>The main executable. It has several different functions:</para>
<para><command>ip link <replaceable>[device]</replaceable></command>
- allows users to look at the state of devices and to make
changes.
+ allows users to look at the state of devices and to make
changes
</para>
<para><command>ip addr</command> allows users to look at addresses
and
- their properties, add new addresses, and delete old ones.
+ their properties, add new addresses, and delete old ones
</para>
<para><command>ip neighbor</command> allows users to look at
neighbor bindings and their properties, add new
- neighbor entries, and delete old ones.
+ neighbor entries, and delete old ones
</para>
<para><command>ip rule</command> allows users to look at the routing
- policies and change them.
+ policies and change them
</para>
<para><command>ip route</command> allows users to look at the routing
- table and change routing table rules.
+ table and change routing table rules
</para>
<para><command>ip tunnel</command> allows users to look at the IP
- tunnels and their properties, and change them.
+ tunnels and their properties, and change them
</para>
<para><command>ip maddr</command> allows users to look at the
multicast
- addresses and their properties, and change them.
+ addresses and their properties, and change them
</para>
<para><command>ip mroute</command> allows users to set, change, or
- delete the multicast routing.
+ delete the multicast routing
</para>
<para><command>ip monitor</command> allows users to
- continously monitor the state of devices, addresses and routes.
+ continously monitor the state of devices, addresses and routes
</para>
<indexterm zone="ch-system-iproute2 ip">
<primary sortas="b-ip">ip</primary>
@@ -176,7 +176,7 @@
<listitem>
<para>Provides Linux network statistics. It is a generalized and
more
feature-complete replacement for the old
- <command>rtstat</command> program.</para>
+ <command>rtstat</command> program</para>
<indexterm zone="ch-system-iproute2 lnstat">
<primary sortas="b-cstat">lnstat</primary>
</indexterm>
@@ -188,7 +188,7 @@
<command>nstat</command>
</term>
<listitem>
- <para>Shows network statistics.</para>
+ <para>Shows network statistics</para>
<indexterm zone="ch-system-iproute2 nstat">
<primary sortas="b-nstat">nstat</primary>
</indexterm>
@@ -201,7 +201,7 @@
</term>
<listitem>
<para>A component of <command>ip route</command>. This is for
flushing the routing
- tables.
+ tables
</para>
<indexterm zone="ch-system-iproute2 routef">
<primary sortas="b-routef">routef</primary>
@@ -215,7 +215,7 @@
</term>
<listitem>
<para>A component of <command>ip route</command>. This is for
listing the routing
- tables.
+ tables
</para>
<indexterm zone="ch-system-iproute2 routel">
<primary sortas="b-routel">routel</primary>
@@ -228,7 +228,7 @@
<command>rtacct</command>
</term>
<listitem>
- <para>Displays the contents of
<filename>/proc/net/rt_acct</filename>.</para>
+ <para>Displays the contents of
<filename>/proc/net/rt_acct</filename></para>
<indexterm zone="ch-system-iproute2 rtacct">
<primary sortas="b-rtacct">rtacct</primary>
</indexterm>
@@ -240,7 +240,7 @@
<command>rtmon</command>
</term>
<listitem>
- <para>Route monitoring utility.</para>
+ <para>Route monitoring utility</para>
<indexterm zone="ch-system-iproute2 rtmon">
<primary sortas="b-rtmon">rtmon</primary>
</indexterm>
@@ -265,7 +265,7 @@
<command>rtstat</command>
</term>
<listitem>
- <para>Route status utility.</para>
+ <para>Route status utility</para>
<indexterm zone="ch-system-iproute2 rtstat">
<primary sortas="b-rtstat">rtstat</primary>
</indexterm>
@@ -277,7 +277,7 @@
<command>ss</command>
</term>
<listitem>
- <para>Similar to the <command>netstat</command> command; shows
active connections.</para>
+ <para>Similar to the <command>netstat</command> command; shows
active connections</para>
<indexterm zone="ch-system-iproute2 ss">
<primary sortas="b-ss">ss</primary>
</indexterm>
Modified: branches/multi-arch/BOOK/chapter06/man.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/man.xml 2005-04-11 20:27:18 UTC (rev
4925)
+++ branches/multi-arch/BOOK/chapter06/man.xml 2005-04-11 20:51:30 UTC (rev
4926)
@@ -30,13 +30,13 @@
<para>A few adjustments need to be made to the sources of Man.</para>
-<para>This a sed substitution to add the
+<para>The first is a <command>sed</command> substitution to add the
<parameter>-R</parameter> switch to the <envar>PAGER</envar>
variable so that escape sequences are properly handled by Less:</para>
<screen><userinput>sed -i '[EMAIL PROTECTED]@&[EMAIL PROTECTED]'
configure</userinput></screen>
-<para>This a sed substitution to comment out the
+<para>The second is also a <command>sed</command> substitution to comment out
the
<quote>MANPATH /usr/man</quote> line in the
<filename>man.conf</filename> file to prevent redundant results when
using programs such as <command>whatis</command>:</para>
Modified: branches/multi-arch/BOOK/chapter06/module-init-tools.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/module-init-tools.xml 2005-04-11
20:27:18 UTC (rev 4925)
+++ branches/multi-arch/BOOK/chapter06/module-init-tools.xml 2005-04-11
20:51:30 UTC (rev 4926)
@@ -38,7 +38,7 @@
<screen><userinput>make DOCBOOKTOMAN=""</userinput></screen>
<!-- Edit me -->
-<para>The <command>DOCBOOKTOMAN</command> option allows the compile process to
+<para>The <envar>DOCBOOKTOMAN</envar> option allows the compile process to
complete without regenerating the man pages.</para>
<para>To test the results, issue:
Modified: branches/multi-arch/BOOK/chapter06/readjusting.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/readjusting.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter06/readjusting.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -54,7 +54,7 @@
<para>Remove the Binutils source and build directories now.</para>
<para>Next, amend the GCC specs file so that it points to the new
-dynamic linker. A perl command accomplishes this:</para>
+dynamic linker. A <command>perl</command> command accomplishes this:</para>
<warning><para><emphasis>Do not</emphasis> run the following command
more than once, it will adversely affect the outcome of software built
Modified: branches/multi-arch/BOOK/chapter06/shadow.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/shadow.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter06/shadow.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -29,9 +29,10 @@
<sect2 role="installation">
<title>Installation of Shadow</title>
-<para>Shadow fails to update the time of last login as noted by lastlog
-when logging into a regular console. The Port (tty) column does get updated.
-Remote logins and xterm logins seem to be not be broken, just console.
+<para>Shadow fails to update the time of last login as noted by
+<command>lastlog</command> when logging into a regular console.
+The Port (tty) column does get updated. Remote logins and
+<command>xterm</command> logins seem to be not be broken, just console.
The following patch properly fixes this issue:</para>
<screen><userinput>patch -Np1 -i
../shadow-&shadow-version;-fix_lastlog-1.patch</userinput></screen>
Modified: branches/multi-arch/BOOK/chapter06/sysklogd.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/sysklogd.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter06/sysklogd.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -21,7 +21,6 @@
<segmentedlist>
<segtitle>&dependencies;</segtitle>
-<!-- <segtitle>Sysklogd installation depends on</segtitle> -->
<seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
</segmentedlist>
</sect2>
@@ -56,7 +55,7 @@
following:</para>
<screen><userinput>cat > /etc/syslog.conf << "EOF"
-# Begin /etc/syslog.conf
+<literal># Begin /etc/syslog.conf
auth,authpriv.* -/var/log/auth.log
*.*;auth,authpriv.none -/var/log/sys.log
@@ -69,7 +68,7 @@
# log the bootscript output:
local2.* -/var/log/boot.log
-# End /etc/syslog.conf
+# End /etc/syslog.conf</literal>
EOF</userinput></screen>
</sect2>
@@ -90,7 +89,7 @@
<term><command>klogd</command></term>
<listitem>
<indexterm zone="ch-system-sysklogd klogd"><primary
sortas="b-klogd">klogd</primary></indexterm>
-<para>is a system daemon for intercepting and logging kernel messages.</para>
+<para>A system daemon for intercepting and logging kernel messages</para>
</listitem>
</varlistentry>
@@ -98,10 +97,10 @@
<term><command>syslogd</command></term>
<listitem>
<indexterm zone="ch-system-sysklogd syslogd"><primary
sortas="b-syslogd">syslogd</primary></indexterm>
-<para>logs the messages that system programs offer for logging. Every logged
+<para>Logs the messages that system programs offer for logging. Every logged
message contains at least a date stamp and a hostname, and normally the
program's name too, but that depends on how trusting the logging daemon is told
-to be.</para>
+to be</para>
</listitem>
</varlistentry>
</variablelist>
Modified: branches/multi-arch/BOOK/chapter06/tar.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/tar.xml 2005-04-11 20:27:18 UTC (rev
4925)
+++ branches/multi-arch/BOOK/chapter06/tar.xml 2005-04-11 20:51:30 UTC (rev
4926)
@@ -28,8 +28,8 @@
<sect2 role="installation">
<title>Installation of Tar</title>
-<para>Tar has a bug when the -S option is used with files larger
-than 4 GB. The following patch properly fixes this issue:</para>
+<para>Tar has a bug when the <parameter>-S</parameter> option is used
+with files larger than 4 GB. The following patch properly fixes this
issue:</para>
<screen><userinput>patch -Np1 -i
../tar-&tar-version;-sparse_fix-1.patch</userinput></screen>
Modified: branches/multi-arch/BOOK/chapter06/util-linux.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/util-linux.xml 2005-04-11 20:27:18 UTC
(rev 4925)
+++ branches/multi-arch/BOOK/chapter06/util-linux.xml 2005-04-11 20:51:30 UTC
(rev 4926)
@@ -45,8 +45,8 @@
<sect2 role="installation">
<title>Installation of Util-linux</title>
-<para>Util-linux has a compilation error against newer versions of the
-linux-libc-headers. The following patch properly fixes that issue</para>
+<para>Util-linux has a compilation error against newer versions of
+Linux-Libc-Headers. The following patch properly fixes that issue</para>
<screen><userinput>patch -Np1 -i
../util-linux-&util-linux-version;-cramfs-1.patch</userinput></screen>
Modified: branches/multi-arch/BOOK/chapter06/zlib.xml
===================================================================
--- branches/multi-arch/BOOK/chapter06/zlib.xml 2005-04-11 20:27:18 UTC (rev
4925)
+++ branches/multi-arch/BOOK/chapter06/zlib.xml 2005-04-11 20:51:30 UTC (rev
4926)
@@ -50,8 +50,6 @@
<screen><userinput>make install</userinput></screen>
-
-
<para>Build the static library:</para>
<screen><userinput>make clean
Modified: branches/multi-arch/BOOK/chapter07/udev.xml
===================================================================
--- branches/multi-arch/BOOK/chapter07/udev.xml 2005-04-11 20:27:18 UTC (rev
4925)
+++ branches/multi-arch/BOOK/chapter07/udev.xml 2005-04-11 20:51:30 UTC (rev
4926)
@@ -228,7 +228,7 @@
sites:</para>
<itemizedlist>
-<listitem><para remap="verbatim">A Userspace Implementation of devfs
+<listitem><para remap="verbatim">A Userspace Implementation of <systemitem
class="filesystem">devfs</systemitem>
<ulink
url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"/></para></listitem>
<listitem><para remap="verbatim">udev FAQ
Modified: branches/multi-arch/BOOK/general.ent
===================================================================
--- branches/multi-arch/BOOK/general.ent 2005-04-11 20:27:18 UTC (rev
4925)
+++ branches/multi-arch/BOOK/general.ent 2005-04-11 20:51:30 UTC (rev
4926)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "7.0-multiarch-20050409">
+<!ENTITY version "7.0-multiarch-20050411">
<!ENTITY version-x86 "&version;-x86">
<!ENTITY version-alpha "&version;-alpha">
<!ENTITY version-ppc "&version;-PowerPC">
<!ENTITY version-raq2 "&version;-RaQ2">
-<!ENTITY releasedate "April 9, 2005">
+<!ENTITY releasedate "April 11, 2005">
<!ENTITY milestone "7.0">
<!ENTITY lfs-root "http://www.linuxfromscratch.org/";>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
