Author: randy Date: 2012-12-19 12:57:20 -0700 (Wed, 19 Dec 2012) New Revision: 10894
Modified: trunk/BOOK/general/genlib/genlib.xml trunk/BOOK/general/genlib/libatomic_ops.xml trunk/BOOK/gnome/core/gnome-session.xml trunk/BOOK/introduction/important/building-notes.xml trunk/BOOK/introduction/important/libraries.xml trunk/BOOK/introduction/important/locale-issues.xml trunk/BOOK/introduction/welcome/packages.xml trunk/BOOK/introduction/welcome/which.xml trunk/BOOK/multimedia/libdriv/libdvdnav.xml trunk/BOOK/multimedia/libdriv/libdvdread.xml trunk/BOOK/networking/netutils/wicd.xml trunk/BOOK/postlfs/config/bootdisk.xml trunk/BOOK/postlfs/config/inputrc.xml trunk/BOOK/postlfs/config/profile.xml trunk/BOOK/postlfs/filesystems/aboutlvm.xml trunk/BOOK/postlfs/filesystems/aboutraid.xml trunk/BOOK/postlfs/virtualization/qemu-kvm.xml trunk/BOOK/pst/printing/gs.xml trunk/BOOK/xsoft/graphweb/firefox.xml trunk/BOOK/xsoft/office/libreoffice.xml trunk/BOOK/xsoft/other/rox-filer.xml Log: Minor text fixes Modified: trunk/BOOK/general/genlib/genlib.xml =================================================================== --- trunk/BOOK/general/genlib/genlib.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/general/genlib/genlib.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -40,8 +40,8 @@ details of the program's requirements.</para> <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 - explain why you may want to install them.</para> + will need at some point. In this chapter these and some others are listed and + 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="aspell.xml"/> Modified: trunk/BOOK/general/genlib/libatomic_ops.xml =================================================================== --- trunk/BOOK/general/genlib/libatomic_ops.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/general/genlib/libatomic_ops.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -103,14 +103,16 @@ <title>Command Explanations</title> <para> - <command>sed -i 's#AC_PROG_RANLIB ...</command>: These seds massage the - autotool files so that a shared library is built, the tests pass and the - docs are installed where we want. + <command>sed -i 's#AC_PROG_RANLIB ...</command>: These + <command>sed</command>s massage the autotool files so that a shared + library is built, the tests pass, and the docs are installed in an + appropriate directory. </para> <para> - <command>autoreconf -i</command>: This regenerates the configure script - and the Makefile.in files and installs a missing file. + <command>autoreconf -i</command>: This regenerates the + <command>configure</command> script and the <filename>Makefile.in</filename> + files and installs a missing file. </para> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; Modified: trunk/BOOK/gnome/core/gnome-session.xml =================================================================== --- trunk/BOOK/gnome/core/gnome-session.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/gnome/core/gnome-session.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -138,7 +138,7 @@ <title>Configuration Information</title> <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 <command>gnome-session</command> <emphasis>instead of</emphasis> invoking a window-manager directly. All of the packages in the 'Desktop' section of @@ -152,10 +152,10 @@ When <command>gnome-session</command> is run, it invokes the necessary daemons and either <application>Metacity</application> or <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 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> @@ -163,8 +163,8 @@ window manager when you issue the <command>startx</command> command, backup your current <filename>~/.xinitrc</filename> before proceeding. 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 - <filename>.xinitrc</filename> using this command: + from the menu, so there is no reason to invoke <command>xterm</command> here. + Create a new <filename>.xinitrc</filename> using this command: </para> <indexterm zone="metacity gnome-session-config"> Modified: trunk/BOOK/introduction/important/building-notes.xml =================================================================== --- trunk/BOOK/introduction/important/building-notes.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/introduction/important/building-notes.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -16,14 +16,14 @@ <title>Notes on Building Software</title> <para>Those people who have built an LFS system may be aware - of the general principles of downloading and unpacking software. We will - however repeat some of that information here for those new to building + of the general principles of downloading and unpacking software. Some + of that information is repeated here for those new to building their own software.</para> <para>Each set of installation instructions contains a URL from which you - can download the package. We do however keep a selection of patches - available via HTTP. These are referenced as needed in the installation - instructions.</para> + can download the package. The patches; however, are stored on the LFS + servers and are available via HTTP. These are referenced as needed in the + installation instructions.</para> <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 Modified: trunk/BOOK/introduction/important/libraries.xml =================================================================== --- trunk/BOOK/introduction/important/libraries.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/introduction/important/libraries.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -28,7 +28,7 @@ These are described as static libraries (libfoo.a). On some old operating 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 shared by all the programs which call any of its functions. This is space efficient.</para> Modified: trunk/BOOK/introduction/important/locale-issues.xml =================================================================== --- trunk/BOOK/introduction/important/locale-issues.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/introduction/important/locale-issues.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -281,7 +281,7 @@ && continue # Non-UTF-8 manual page is OK iconv -f UTF-8 -t UTF-8 "$a" >/dev/null 2>&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" >&2 done # End checkman.sh Modified: trunk/BOOK/introduction/welcome/packages.xml =================================================================== --- trunk/BOOK/introduction/welcome/packages.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/introduction/welcome/packages.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -29,7 +29,7 @@ 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 - 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 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 Modified: trunk/BOOK/introduction/welcome/which.xml =================================================================== --- trunk/BOOK/introduction/welcome/which.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/introduction/welcome/which.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -18,7 +18,7 @@ <para>Unlike the Linux From Scratch book, BLFS isn't designed to be 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 - 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 destination. Choice is very much involved.</para> Modified: trunk/BOOK/multimedia/libdriv/libdvdnav.xml =================================================================== --- trunk/BOOK/multimedia/libdriv/libdvdnav.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/multimedia/libdriv/libdvdnav.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -88,8 +88,9 @@ <title>Command Explanations</title> <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> - script to generate and run <command>configure</command>.</para> + normal <command>configure</command> script, so + the <command>autogen.sh</command> script is used to generate and run + <command>configure</command>.</para> </sect2> <sect2 role="content"> Modified: trunk/BOOK/multimedia/libdriv/libdvdread.xml =================================================================== --- trunk/BOOK/multimedia/libdriv/libdvdread.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/multimedia/libdriv/libdvdread.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -82,8 +82,9 @@ <title>Command Explanations</title> <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> - script to generate and run <command>configure</command>.</para> + normal <command>configure</command> script, so the + <command>autogen.sh</command> script is used to generate and run + <command>configure</command>.</para> </sect2> <sect2 role="content"> Modified: trunk/BOOK/networking/netutils/wicd.xml =================================================================== --- trunk/BOOK/networking/netutils/wicd.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/networking/netutils/wicd.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -131,18 +131,26 @@ <sect2 role="commands"> <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><option>--no-install-kde</option>: Prevent installation of + + <para><command>sed -i '/wpath...</command>: This <command>sed</command> + 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 <ulink url="http://projects.kde.org/projects/extragear/network/wicd-kde";>Wicd KDE Client</ulink>. </para> + <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 pm-utils. Omit this option if you use pm-utils.</para> + <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><group></replaceable></option>: The group that will have permission to use the Wicd client (default is the <systemitem class="groupname">users</systemitem> group).</para> @@ -185,7 +193,7 @@ <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 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> <para>Be sure to add all users who are to have rights to open and close network Modified: trunk/BOOK/postlfs/config/bootdisk.xml =================================================================== --- trunk/BOOK/postlfs/config/bootdisk.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/postlfs/config/bootdisk.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -29,7 +29,7 @@ <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. 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> <para>Building a complete rescue device is a challenging task. In many Modified: trunk/BOOK/postlfs/config/inputrc.xml =================================================================== --- trunk/BOOK/postlfs/config/inputrc.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/postlfs/config/inputrc.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -62,7 +62,7 @@ <screen role="root"><userinput>cat > /etc/inputrc << "EOF" <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 # Enable 8bit input Modified: trunk/BOOK/postlfs/config/profile.xml =================================================================== --- trunk/BOOK/postlfs/config/profile.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/postlfs/config/profile.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -272,7 +272,7 @@ the user name and group name are not the same.</para> <screen role="root"><userinput>cat > /etc/profile.d/umask.sh << "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 umask 002 else Modified: trunk/BOOK/postlfs/filesystems/aboutlvm.xml =================================================================== --- trunk/BOOK/postlfs/filesystems/aboutlvm.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/postlfs/filesystems/aboutlvm.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -57,7 +57,7 @@ </varlistentry> </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, mounted on <filename class='directory'>/srv/mysql</filename>. This is what the initial set of partitions would look like:</para> Modified: trunk/BOOK/postlfs/filesystems/aboutraid.xml =================================================================== --- trunk/BOOK/postlfs/filesystems/aboutraid.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/postlfs/filesystems/aboutraid.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -113,12 +113,12 @@ 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> - <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, both mirrored. The third partition is a large (about 1TB) array for the <filename class='directory'>/home</filename> directory. This provides 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> <note><para>All <application>mdadm</application> commands must be run Modified: trunk/BOOK/postlfs/virtualization/qemu-kvm.xml =================================================================== --- trunk/BOOK/postlfs/virtualization/qemu-kvm.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/postlfs/virtualization/qemu-kvm.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -178,7 +178,7 @@ terminal.</para></note> <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 <filename>Fedora-16-x86_64-Live-LXDE.iso</filename> in the current directory. Run the following:</para> Modified: trunk/BOOK/pst/printing/gs.xml =================================================================== --- trunk/BOOK/pst/printing/gs.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/pst/printing/gs.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -247,7 +247,7 @@ 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 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 <application>lcms</application> source is not needed. <application>Zlib</application> was installed as part of LFS. @@ -259,8 +259,8 @@ </para> <para> - <parameter>LIBS=-lz</parameter>: We use the LIBS variable to tell the - linker (ld) to link against the system installed + <parameter>LIBS=-lz</parameter>: Use the <envar>LIBS</envar> variable to + tell the linker (ld) to link against the system installed <application>zlib</application>. </para> Modified: trunk/BOOK/xsoft/graphweb/firefox.xml =================================================================== --- trunk/BOOK/xsoft/graphweb/firefox.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/xsoft/graphweb/firefox.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -316,23 +316,24 @@ </para> <para> - <command>ln -sfv ... /usr/bin/firefox</command>: this puts a symbolic link - to the <command>firefox</command> executable in your ${PATH}. + <command>ln -sfv ... /usr/bin/firefox</command>: This puts a symbolic link + to the <command>firefox</command> executable in your <envar>PATH</envar> + variable. </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> exists. </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 <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 - 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. </para> </sect2> Modified: trunk/BOOK/xsoft/office/libreoffice.xml =================================================================== --- trunk/BOOK/xsoft/office/libreoffice.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/xsoft/office/libreoffice.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -314,8 +314,8 @@ <para> <command>./download</command>: The build process runs the <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 - start so we can make a backup copy of the downloaded files. + tarballs. The download script is ran to get it out of the way at the + start so a backup copy of the downloaded files are on hand. </para> <para> Modified: trunk/BOOK/xsoft/other/rox-filer.xml =================================================================== --- trunk/BOOK/xsoft/other/rox-filer.xml 2012-12-18 20:00:42 UTC (rev 10893) +++ trunk/BOOK/xsoft/other/rox-filer.xml 2012-12-19 19:57:20 UTC (rev 10894) @@ -209,11 +209,11 @@ chmod 755 /path/to/hostname/AppRun</userinput></screen> <para> - That works fine for mounting, but to unmount it we need to run the - command <command>fusermount -u ${MOUNTPOINT}</command>. You could set + That works fine for mounting, but to unmount it the + command <command>fusermount -u ${MOUNTPOINT}</command> is ran. You could set that as your default umount command in your rox preferences, but you 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>umount</command>. As the <systemitem class="username">root</systemitem> user: -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
