Minor text fixes

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10894 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Randy McMurchy 2012-12-19 19:57:20 +00:00
parent 4abd884171
commit ec64d2804f
21 changed files with 65 additions and 52 deletions

View File

@ -40,8 +40,8 @@ $Date$
details of the program's requirements.</para> details of the program's requirements.</para>
<para>There are certain libraries which nearly <emphasis>everyone</emphasis> <para>There are certain libraries which nearly <emphasis>everyone</emphasis>
will need at some point. In this chapter we list these and some others and will need at some point. In this chapter these and some others are listed and
explain why you may want to install them.</para> it is explained why you may want to install them.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/>

View File

@ -103,14 +103,16 @@ make</userinput></screen>
<title>Command Explanations</title> <title>Command Explanations</title>
<para> <para>
<command>sed -i 's#AC_PROG_RANLIB ...</command>: These seds massage the <command>sed -i 's#AC_PROG_RANLIB ...</command>: These
autotool files so that a shared library is built, the tests pass and the <command>sed</command>s massage the autotool files so that a shared
docs are installed where we want. library is built, the tests pass, and the docs are installed in an
appropriate directory.
</para> </para>
<para> <para>
<command>autoreconf -i</command>: This regenerates the configure script <command>autoreconf -i</command>: This regenerates the
and the Makefile.in files and installs a missing file. <command>configure</command> script and the <filename>Makefile.in</filename>
files and installs a missing file.
</para> </para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

View File

@ -138,7 +138,7 @@ make</userinput></screen>
<title>Configuration Information</title> <title>Configuration Information</title>
<para> <para>
If you are not using <application>gdm</application> to start your If you are not using <application>GDM</application> to start your
<application>GNOME</application> desktop, you will need to invoke <application>GNOME</application> desktop, you will need to invoke
<command>gnome-session</command> <emphasis>instead of</emphasis> invoking <command>gnome-session</command> <emphasis>instead of</emphasis> invoking
a window-manager directly. All of the packages in the 'Desktop' section of a window-manager directly. All of the packages in the 'Desktop' section of
@ -152,10 +152,10 @@ make</userinput></screen>
When <command>gnome-session</command> is run, it invokes the necessary When <command>gnome-session</command> is run, it invokes the necessary
daemons and either <application>Metacity</application> or daemons and either <application>Metacity</application> or
<application>gnome-shell</application>. A desktop manager such as <application>gnome-shell</application>. A desktop manager such as
<application>gdm</application> will invoke <application>ConsoleKit</application> <application>GDM</application> will invoke <application>ConsoleKit</application>
before the window manager, but if you use <command>startx</command> the first before the window manager, but if you use <command>startx</command> the first
invocation after booting may fail because the daemon is not already running, invocation after booting may fail because the daemon is not already running,
so we will invoke it first. so it is invoked first.
</para> </para>
<para> <para>
@ -163,8 +163,8 @@ make</userinput></screen>
window manager when you issue the <command>startx</command> command, window manager when you issue the <command>startx</command> command,
backup your current <filename>~/.xinitrc</filename> before proceeding. backup your current <filename>~/.xinitrc</filename> before proceeding.
Note that you will be able to invoke <application>GNOME Terminal</application> Note that you will be able to invoke <application>GNOME Terminal</application>
from the menu, so there is no reason to invoke xterm here. Create a new from the menu, so there is no reason to invoke <command>xterm</command> here.
<filename>.xinitrc</filename> using this command: Create a new <filename>.xinitrc</filename> using this command:
</para> </para>
<indexterm zone="metacity gnome-session-config"> <indexterm zone="metacity gnome-session-config">

View File

@ -16,14 +16,14 @@
<title>Notes on Building Software</title> <title>Notes on Building Software</title>
<para>Those people who have built an LFS system may be aware <para>Those people who have built an LFS system may be aware
of the general principles of downloading and unpacking software. We will of the general principles of downloading and unpacking software. Some
however repeat some of that information here for those new to building of that information is repeated here for those new to building
their own software.</para> their own software.</para>
<para>Each set of installation instructions contains a URL from which you <para>Each set of installation instructions contains a URL from which you
can download the package. We do however keep a selection of patches can download the package. The patches; however, are stored on the LFS
available via HTTP. These are referenced as needed in the installation servers and are available via HTTP. These are referenced as needed in the
instructions.</para> installation instructions.</para>
<para>While you can keep the source files anywhere you like, we assume that <para>While you can keep the source files anywhere you like, we assume that
you have unpacked the package and changed into the directory created by the you have unpacked the package and changed into the directory created by the

View File

@ -28,7 +28,7 @@
These are described as static libraries (libfoo.a). On some old operating These are described as static libraries (libfoo.a). On some old operating
systems they are the only type available.</para> systems they are the only type available.</para>
<para>On almost all Linux platforms we also have shared libraries <para>On almost all Linux platforms there are also shared libraries
(libfoo.so) - one copy of the library is loaded into virtual memory, and (libfoo.so) - one copy of the library is loaded into virtual memory, and
shared by all the programs which call any of its functions. This is space shared by all the programs which call any of its functions. This is space
efficient.</para> efficient.</para>

View File

@ -281,7 +281,7 @@ do
&amp;&amp; continue &amp;&amp; continue
# Non-UTF-8 manual page is OK # Non-UTF-8 manual page is OK
iconv -f UTF-8 -t UTF-8 "$a" >/dev/null 2>&amp;1 || continue iconv -f UTF-8 -t UTF-8 "$a" >/dev/null 2>&amp;1 || continue
# If we got here, we found UTF-8 manual page, bad. # Found a UTF-8 manual page, bad.
echo "UTF-8 manual page: $a" >&amp;2 echo "UTF-8 manual page: $a" >&amp;2
done done
# End checkman.sh # End checkman.sh

View File

@ -29,7 +29,7 @@
you can't find the BLFS package you need, get it there.</para> you can't find the BLFS package you need, get it there.</para>
<para>We would like to ask a favor, however. Although this is a public <para>We would like to ask a favor, however. Although this is a public
resource for you to use, we do not want to abuse it. We have already had one resource for you to use, please do not abuse it. We have already had one
unthinking individual download over 3 GB of data, including multiple copies of unthinking individual download over 3 GB of data, including multiple copies of
the same files that are placed at different locations (via symlinks) to make the same files that are placed at different locations (via symlinks) to make
finding the right package easier. This person clearly did not know what files finding the right package easier. This person clearly did not know what files

View File

@ -18,7 +18,7 @@
<para>Unlike the Linux From Scratch book, BLFS isn't designed to be <para>Unlike the Linux From Scratch book, BLFS isn't designed to be
followed in a linear manner. This is because LFS provides instructions followed in a linear manner. This is because LFS provides instructions
on how to create a base system which is capable of turning into anything on how to create a base system which is capable of turning into anything
from a web server to a multimedia desktop system. BLFS is where we try from a web server to a multimedia desktop system. BLFS attempts
to guide you in the process of going from the base system to your intended to guide you in the process of going from the base system to your intended
destination. Choice is very much involved.</para> destination. Choice is very much involved.</para>

View File

@ -88,8 +88,9 @@ make</userinput></screen>
<title>Command Explanations</title> <title>Command Explanations</title>
<para><command>./autogen.sh</command>: This package does not come with the <para><command>./autogen.sh</command>: This package does not come with the
normal configure script, so we need to use the <command>autogen.sh</command> normal <command>configure</command> script, so
script to generate and run <command>configure</command>.</para> the <command>autogen.sh</command> script is used to generate and run
<command>configure</command>.</para>
</sect2> </sect2>
<sect2 role="content"> <sect2 role="content">

View File

@ -82,8 +82,9 @@ make</userinput></screen>
<title>Command Explanations</title> <title>Command Explanations</title>
<para><command>./autogen.sh</command>: This package does not come with the <para><command>./autogen.sh</command>: This package does not come with the
normal configure script, so we need to use the <command>autogen.sh</command> normal <command>configure</command> script, so the
script to generate and run <command>configure</command>.</para> <command>autogen.sh</command> script is used to generate and run
<command>configure</command>.</para>
</sect2> </sect2>
<sect2 role="content"> <sect2 role="content">

View File

@ -131,18 +131,26 @@ python setup.py configure --no-install-kde \
<sect2 role="commands"> <sect2 role="commands">
<title>Command Explanations</title> <title>Command Explanations</title>
<para><command>sed -i '/wpath...</command>: The sed prevents installation of logrotate
and systemd configuration files. You may omit it if you use these utilities.</para> <para><command>sed -i '/wpath...</command>: This <command>sed</command>
<para><option>--no-install-kde</option>: Prevent installation of prevents installation of <command>logrotate</command> and systemd
configuration files. You may omit it if you use these utilities.</para>
<para><option>--no-install-kde</option>: Prevent installation of an
autostart desktop file for KDE. If you use KDE, you should instead install the autostart desktop file for KDE. If you use KDE, you should instead install the
<ulink url="http://projects.kde.org/projects/extragear/network/wicd-kde">Wicd KDE Client</ulink>. <ulink url="http://projects.kde.org/projects/extragear/network/wicd-kde">Wicd KDE Client</ulink>.
</para> </para>
<para><option>--no-install-acpi</option>: Prevent installation of <para><option>--no-install-acpi</option>: Prevent installation of
suspend and resume scripts for acpid. Omit this option if you use acpid.</para> <command>suspend</command> and <command>resume</command> scripts for acpid.
Omit this option if you use acpid.</para>
<para><option>--no-install-pmutils</option>: Prevent installation of hooks for <para><option>--no-install-pmutils</option>: Prevent installation of hooks for
pm-utils. Omit this option if you use pm-utils.</para> pm-utils. Omit this option if you use pm-utils.</para>
<para><option>--no-install-init</option>: Prevent installation of any init scripts, <para><option>--no-install-init</option>: Prevent installation of any init scripts,
as we install our own bootscript.</para> as a bootscript is installed later in the instructions.</para>
<para><option>--wicdgroup=<replaceable>&lt;group&gt;</replaceable></option>: <para><option>--wicdgroup=<replaceable>&lt;group&gt;</replaceable></option>:
The group that will have permission to use the Wicd client (default is the The group that will have permission to use the Wicd client (default is the
<systemitem class="groupname">users</systemitem> group).</para> <systemitem class="groupname">users</systemitem> group).</para>
@ -185,7 +193,7 @@ python setup.py configure --no-install-kde \
<para>No manual configuration of Wicd is needed if you use the graphical <para>No manual configuration of Wicd is needed if you use the graphical
frontends. If you are only going to use Wicd from command-line, you can configure frontends. If you are only going to use Wicd from command-line, you can configure
it using the configuration files in <filename>/etc/wicd</filename>. For a list of it using the configuration files in <filename>/etc/wicd</filename>. For a list of
available options, take a look at the man-pages for: wicd-manager-settings.conf, available options, look at the man-pages for: wicd-manager-settings.conf,
wicd-wired-settings.conf and wicd-wireless-settings.conf.</para> wicd-wired-settings.conf and wicd-wireless-settings.conf.</para>
<para>Be sure to add all users who are to have rights to open and close network <para>Be sure to add all users who are to have rights to open and close network

View File

@ -29,7 +29,7 @@
<para>In a modern system, there are many devices that can be <para>In a modern system, there are many devices that can be
used as a rescue device: floppy, cdrom, usb drive, or even a network card. used as a rescue device: floppy, cdrom, usb drive, or even a network card.
Which one you use depends on your hardware and your BIOS. In the past, Which one you use depends on your hardware and your BIOS. In the past,
we usually thought of rescue device as a floppy disk. Today, many a rescue device was thought to be a floppy disk. Today, many
systems do not even have a floppy drive.</para> systems do not even have a floppy drive.</para>
<para>Building a complete rescue device is a challenging task. In many <para>Building a complete rescue device is a challenging task. In many

View File

@ -62,7 +62,7 @@
<screen role="root"><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF" <screen role="root"><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
<literal># Begin /etc/inputrc <literal># Begin /etc/inputrc
# Make sure we don't output everything on the 1 line # Make sure everything is not output to one line
set horizontal-scroll-mode Off set horizontal-scroll-mode Off
# Enable 8bit input # Enable 8bit input

View File

@ -272,7 +272,7 @@ EOF</userinput></screen>
the user name and group name are not the same.</para> the user name and group name are not the same.</para>
<screen role="root"><userinput>cat &gt; /etc/profile.d/umask.sh &lt;&lt; "EOF" <screen role="root"><userinput>cat &gt; /etc/profile.d/umask.sh &lt;&lt; "EOF"
<literal># By default we want the umask to get set. <literal># By default, the umask should be set.
if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
umask 002 umask 002
else else

View File

@ -57,7 +57,7 @@
</varlistentry> </varlistentry>
</variablelist> </variablelist>
<para>To give a concrete example, suppose that we have two 2 TB disks. <para>To give a concrete example, suppose that you have two 2 TB disks.
Also suppose a really large amount of space is required for a very large database, Also suppose a really large amount of space is required for a very large database,
mounted on <filename class='directory'>/srv/mysql</filename>. This is what mounted on <filename class='directory'>/srv/mysql</filename>. This is what
the initial set of partitions would look like:</para> the initial set of partitions would look like:</para>

View File

@ -113,12 +113,12 @@ sdc2: 300 GB fd Linux raid auto /home (RAID 5) /dev/md2
sdd1: 12 GB fd Linux raid auto /usr/src (RAID 0) /dev/md3 sdd1: 12 GB fd Linux raid auto /usr/src (RAID 0) /dev/md3
sdd2: 300 GB fd Linux raid auto /home (RAID 5) /dev/md2 </literal></screen> sdd2: 300 GB fd Linux raid auto /home (RAID 5) /dev/md2 </literal></screen>
<para>Is this arrangement, we are creating a separate boot partition as the <para>Is this arrangement, a separate boot partition is created as the
first small RAID array and a root filesystem as the secong RAID array, first small RAID array and a root filesystem as the secong RAID array,
both mirrored. The third partition is a large (about 1TB) array for the both mirrored. The third partition is a large (about 1TB) array for the
<filename class='directory'>/home</filename> directory. This provides <filename class='directory'>/home</filename> directory. This provides
an ability to stripe data across multiple devices, improving speed for an ability to stripe data across multiple devices, improving speed for
botih reading and writing large files. Finally, we create a fourth array botih reading and writing large files. Finally, a fourth array is created
that concatenates two partitions into a larger device.</para> that concatenates two partitions into a larger device.</para>
<note><para>All <application>mdadm</application> commands must be run <note><para>All <application>mdadm</application> commands must be run

View File

@ -178,7 +178,7 @@ make</userinput></screen>
terminal.</para></note> terminal.</para></note>
<para>To install an operating system, download an iso of your choice or use <para>To install an operating system, download an iso of your choice or use
a pre-intalled cdrom device. For the purposes of this example, we will use a pre-intalled cdrom device. For the purposes of this example, use
Fedora 16 that is downloaded as Fedora 16 that is downloaded as
<filename>Fedora-16-x86_64-Live-LXDE.iso</filename> in the current <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> in the current
directory. Run the following:</para> directory. Run the following:</para>

View File

@ -247,7 +247,7 @@ ln -v -s ghostscript /usr/include/ps</userinput></screen>
own version of <ulink url="http://www.openjpeg.org/">OpenJpeg</ulink> for own version of <ulink url="http://www.openjpeg.org/">OpenJpeg</ulink> for
JPEG 2000 files <!-- I can't get it to compile using a system installed JPEG 2000 files <!-- I can't get it to compile using a system installed
version of openjpeg. It seems the ghostscript version has been heavily version of openjpeg. It seems the ghostscript version has been heavily
modified... --> so we can all remove the jasper source. The default color modified... --> so jasper source can be removed. The default color
management system is now <application>lcms2</application> so the management system is now <application>lcms2</application> so the
<application>lcms</application> source is not needed. <application>lcms</application> source is not needed.
<application>Zlib</application> was installed as part of LFS. <application>Zlib</application> was installed as part of LFS.
@ -259,8 +259,8 @@ ln -v -s ghostscript /usr/include/ps</userinput></screen>
</para> </para>
<para> <para>
<parameter>LIBS=-lz</parameter>: We use the LIBS variable to tell the <parameter>LIBS=-lz</parameter>: Use the <envar>LIBS</envar> variable to
linker (ld) to link against the system installed tell the linker (ld) to link against the system installed
<application>zlib</application>. <application>zlib</application>.
</para> </para>

View File

@ -316,23 +316,24 @@ cp -v dom/plugins/base/*.h /usr/include/npapi</userinput></screen>
</para> </para>
<para> <para>
<command>ln -sfv ... /usr/bin/firefox</command>: this puts a symbolic link <command>ln -sfv ... /usr/bin/firefox</command>: This puts a symbolic link
to the <command>firefox</command> executable in your ${PATH}. to the <command>firefox</command> executable in your <envar>PATH</envar>
variable.
</para> </para>
<para> <para>
<command>mkdir -p /usr/lib/mozilla/plugins</command>: this checks <command>mkdir -p /usr/lib/mozilla/plugins</command>: This checks
that <filename class="directory">/usr/lib/mozilla/plugins</filename> that <filename class="directory">/usr/lib/mozilla/plugins</filename>
exists. exists.
</para> </para>
<para> <para>
<command>ln -sv ... /usr/lib/firefox-&firefox-version;</command>: this <command>ln -sv ... /usr/lib/firefox-&firefox-version;</command>: This
makes a symbolic link to makes a symbolic link to
<filename class="directory">/usr/lib/mozilla/plugins</filename>. It's not <filename class="directory">/usr/lib/mozilla/plugins</filename>. It's not
really needed, <application>Firefox</application> checks really needed, as <application>Firefox</application> checks
<filename class="directory">/usr/lib/mozilla/plugins</filename> by <filename class="directory">/usr/lib/mozilla/plugins</filename> by
default, we make the symbolic link to keep all the plugins installed in default, but the symbolic link is made to keep all the plugins installed in
one folder. one folder.
</para> </para>
</sect2> </sect2>

View File

@ -314,8 +314,8 @@ gtk-update-icon-cache /usr/share/icons/hicolor</userinput></screen>
<para> <para>
<command>./download</command>: The build process runs the <command>./download</command>: The build process runs the
<command>download</command> script which downloads some 470 MB of <command>download</command> script which downloads some 470 MB of
tarballs. We run the download script to get it out of the way at the tarballs. The download script is ran to get it out of the way at the
start so we can make a backup copy of the downloaded files. start so a backup copy of the downloaded files are on hand.
</para> </para>
<para> <para>

View File

@ -209,11 +209,11 @@ HERE_DOC
chmod 755 /path/to/hostname/AppRun</userinput></screen> chmod 755 /path/to/hostname/AppRun</userinput></screen>
<para> <para>
That works fine for mounting, but to unmount it we need to run the That works fine for mounting, but to unmount it the
command <command>fusermount -u ${MOUNTPOINT}</command>. You could set command <command>fusermount -u ${MOUNTPOINT}</command> is ran. You could set
that as your default umount command in your rox preferences, but you that as your default umount command in your rox preferences, but you
would then be unable to unmount any normal mountpoints (that need would then be unable to unmount any normal mountpoints (that need
umount). What we need is a script that will unmount a Fuse mountpoint umount). A script is needed that will unmount a Fuse mountpoint
with <command>fusermount -u ${MOUNTPOINT}</command> and everything else with <command>fusermount -u ${MOUNTPOINT}</command> and everything else
with <command>umount</command>. As the with <command>umount</command>. As the
<systemitem class="username">root</systemitem> user: <systemitem class="username">root</systemitem> user: