From ec64d2804f88801eb4289d8dc5809ff87dc9a320 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Wed, 19 Dec 2012 19:57:20 +0000 Subject: [PATCH] Minor text fixes git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10894 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/genlib.xml | 4 ++-- general/genlib/libatomic_ops.xml | 12 +++++++----- gnome/core/gnome-session.xml | 10 +++++----- introduction/important/building-notes.xml | 10 +++++----- introduction/important/libraries.xml | 2 +- introduction/important/locale-issues.xml | 2 +- introduction/welcome/packages.xml | 2 +- introduction/welcome/which.xml | 2 +- multimedia/libdriv/libdvdnav.xml | 5 +++-- multimedia/libdriv/libdvdread.xml | 5 +++-- networking/netutils/wicd.xml | 20 ++++++++++++++------ postlfs/config/bootdisk.xml | 2 +- postlfs/config/inputrc.xml | 2 +- postlfs/config/profile.xml | 2 +- postlfs/filesystems/aboutlvm.xml | 2 +- postlfs/filesystems/aboutraid.xml | 4 ++-- postlfs/virtualization/qemu-kvm.xml | 2 +- pst/printing/gs.xml | 6 +++--- xsoft/graphweb/firefox.xml | 13 +++++++------ xsoft/office/libreoffice.xml | 4 ++-- xsoft/other/rox-filer.xml | 6 +++--- 21 files changed, 65 insertions(+), 52 deletions(-) diff --git a/general/genlib/genlib.xml b/general/genlib/genlib.xml index 5733f4636d..2e5f393e9e 100644 --- a/general/genlib/genlib.xml +++ b/general/genlib/genlib.xml @@ -40,8 +40,8 @@ $Date$ details of the program's requirements. There are certain libraries which nearly everyone - will need at some point. In this chapter we list these and some others and - explain why you may want to install them. + 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. diff --git a/general/genlib/libatomic_ops.xml b/general/genlib/libatomic_ops.xml index d7c29d5b2a..daf3cbe553 100644 --- a/general/genlib/libatomic_ops.xml +++ b/general/genlib/libatomic_ops.xml @@ -103,14 +103,16 @@ make Command Explanations - sed -i 's#AC_PROG_RANLIB ...: These seds massage the - autotool files so that a shared library is built, the tests pass and the - docs are installed where we want. + sed -i 's#AC_PROG_RANLIB ...: These + seds massage the autotool files so that a shared + library is built, the tests pass, and the docs are installed in an + appropriate directory. - autoreconf -i: This regenerates the configure script - and the Makefile.in files and installs a missing file. + autoreconf -i: This regenerates the + configure script and the Makefile.in + files and installs a missing file. Configuration Information - If you are not using gdm to start your + If you are not using GDM to start your GNOME desktop, you will need to invoke gnome-session instead of invoking a window-manager directly. All of the packages in the 'Desktop' section of @@ -152,10 +152,10 @@ make When gnome-session is run, it invokes the necessary daemons and either Metacity or gnome-shell. A desktop manager such as - gdm will invoke ConsoleKit + GDM will invoke ConsoleKit before the window manager, but if you use startx 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. @@ -163,8 +163,8 @@ make window manager when you issue the startx command, backup your current ~/.xinitrc before proceeding. Note that you will be able to invoke GNOME Terminal - from the menu, so there is no reason to invoke xterm here. Create a new - .xinitrc using this command: + from the menu, so there is no reason to invoke xterm here. + Create a new .xinitrc using this command: diff --git a/introduction/important/building-notes.xml b/introduction/important/building-notes.xml index ea9ed3cfef..734e1a3d58 100644 --- a/introduction/important/building-notes.xml +++ b/introduction/important/building-notes.xml @@ -16,14 +16,14 @@ Notes on Building Software 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. 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. + 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. 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 diff --git a/introduction/important/libraries.xml b/introduction/important/libraries.xml index 3a8a4765fc..5a0672d5cb 100644 --- a/introduction/important/libraries.xml +++ b/introduction/important/libraries.xml @@ -28,7 +28,7 @@ These are described as static libraries (libfoo.a). On some old operating systems they are the only type available. - On almost all Linux platforms we also have shared libraries + 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. diff --git a/introduction/important/locale-issues.xml b/introduction/important/locale-issues.xml index c86866229f..b672b62018 100644 --- a/introduction/important/locale-issues.xml +++ b/introduction/important/locale-issues.xml @@ -281,7 +281,7 @@ do && 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 diff --git a/introduction/welcome/packages.xml b/introduction/welcome/packages.xml index 76564715ec..5b676abe30 100644 --- a/introduction/welcome/packages.xml +++ b/introduction/welcome/packages.xml @@ -29,7 +29,7 @@ you can't find the BLFS package you need, get it there. 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 diff --git a/introduction/welcome/which.xml b/introduction/welcome/which.xml index b37ac1b3fb..f32d2ea803 100644 --- a/introduction/welcome/which.xml +++ b/introduction/welcome/which.xml @@ -18,7 +18,7 @@ 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. diff --git a/multimedia/libdriv/libdvdnav.xml b/multimedia/libdriv/libdvdnav.xml index 36552287dd..ed824339ce 100644 --- a/multimedia/libdriv/libdvdnav.xml +++ b/multimedia/libdriv/libdvdnav.xml @@ -88,8 +88,9 @@ make Command Explanations ./autogen.sh: This package does not come with the - normal configure script, so we need to use the autogen.sh - script to generate and run configure. + normal configure script, so + the autogen.sh script is used to generate and run + configure. diff --git a/multimedia/libdriv/libdvdread.xml b/multimedia/libdriv/libdvdread.xml index 09ddaa81ee..d27bd9a1fd 100644 --- a/multimedia/libdriv/libdvdread.xml +++ b/multimedia/libdriv/libdvdread.xml @@ -82,8 +82,9 @@ make Command Explanations ./autogen.sh: This package does not come with the - normal configure script, so we need to use the autogen.sh - script to generate and run configure. + normal configure script, so the + autogen.sh script is used to generate and run + configure. diff --git a/networking/netutils/wicd.xml b/networking/netutils/wicd.xml index 821323223a..68ab63ed50 100644 --- a/networking/netutils/wicd.xml +++ b/networking/netutils/wicd.xml @@ -131,18 +131,26 @@ python setup.py configure --no-install-kde \ Command Explanations - sed -i '/wpath...: The sed prevents installation of logrotate - and systemd configuration files. You may omit it if you use these utilities. - : Prevent installation of + + sed -i '/wpath...: This sed + prevents installation of logrotate and systemd + configuration files. You may omit it if you use these utilities. + + : Prevent installation of an autostart desktop file for KDE. If you use KDE, you should instead install the Wicd KDE Client. + : Prevent installation of - suspend and resume scripts for acpid. Omit this option if you use acpid. + suspend and resume scripts for acpid. + Omit this option if you use acpid. + : Prevent installation of hooks for pm-utils. Omit this option if you use pm-utils. + : Prevent installation of any init scripts, - as we install our own bootscript. + as a bootscript is installed later in the instructions. + : The group that will have permission to use the Wicd client (default is the users group). @@ -185,7 +193,7 @@ python setup.py configure --no-install-kde \ 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 /etc/wicd. 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. Be sure to add all users who are to have rights to open and close network diff --git a/postlfs/config/bootdisk.xml b/postlfs/config/bootdisk.xml index 20cb9ee4d2..b51aa5969e 100644 --- a/postlfs/config/bootdisk.xml +++ b/postlfs/config/bootdisk.xml @@ -29,7 +29,7 @@ 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. Building a complete rescue device is a challenging task. In many diff --git a/postlfs/config/inputrc.xml b/postlfs/config/inputrc.xml index 542d73b5de..135bd4d92f 100644 --- a/postlfs/config/inputrc.xml +++ b/postlfs/config/inputrc.xml @@ -62,7 +62,7 @@ cat > /etc/inputrc << "EOF" # 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 diff --git a/postlfs/config/profile.xml b/postlfs/config/profile.xml index 7ed53c7695..b39cce9b92 100644 --- a/postlfs/config/profile.xml +++ b/postlfs/config/profile.xml @@ -272,7 +272,7 @@ EOF the user name and group name are not the same. cat > /etc/profile.d/umask.sh << "EOF" -# By default we want the umask to get set. +# By default, the umask should be set. if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then umask 002 else diff --git a/postlfs/filesystems/aboutlvm.xml b/postlfs/filesystems/aboutlvm.xml index 1f4cb0f0a1..5d27dde25a 100644 --- a/postlfs/filesystems/aboutlvm.xml +++ b/postlfs/filesystems/aboutlvm.xml @@ -57,7 +57,7 @@ - To give a concrete example, suppose that we have two 2 TB disks. + 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 /srv/mysql. This is what the initial set of partitions would look like: diff --git a/postlfs/filesystems/aboutraid.xml b/postlfs/filesystems/aboutraid.xml index b86a4b86dd..ce5656d303 100644 --- a/postlfs/filesystems/aboutraid.xml +++ b/postlfs/filesystems/aboutraid.xml @@ -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 sdd2: 300 GB fd Linux raid auto /home (RAID 5) /dev/md2 - Is this arrangement, we are creating a separate boot partition as the + 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 /home 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. All mdadm commands must be run diff --git a/postlfs/virtualization/qemu-kvm.xml b/postlfs/virtualization/qemu-kvm.xml index 3679a08f0a..85396baee3 100644 --- a/postlfs/virtualization/qemu-kvm.xml +++ b/postlfs/virtualization/qemu-kvm.xml @@ -178,7 +178,7 @@ make terminal. 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-x86_64-Live-LXDE.iso in the current directory. Run the following: diff --git a/pst/printing/gs.xml b/pst/printing/gs.xml index fbfd70640e..e73896a252 100644 --- a/pst/printing/gs.xml +++ b/pst/printing/gs.xml @@ -247,7 +247,7 @@ ln -v -s ghostscript /usr/include/ps own version of OpenJpeg for JPEG 2000 files 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 lcms2 so the lcms source is not needed. Zlib was installed as part of LFS. @@ -259,8 +259,8 @@ ln -v -s ghostscript /usr/include/ps - LIBS=-lz: We use the LIBS variable to tell the - linker (ld) to link against the system installed + LIBS=-lz: Use the LIBS variable to + tell the linker (ld) to link against the system installed zlib. diff --git a/xsoft/graphweb/firefox.xml b/xsoft/graphweb/firefox.xml index 59d554b008..064ffc5ce8 100644 --- a/xsoft/graphweb/firefox.xml +++ b/xsoft/graphweb/firefox.xml @@ -316,23 +316,24 @@ cp -v dom/plugins/base/*.h /usr/include/npapi - ln -sfv ... /usr/bin/firefox: this puts a symbolic link - to the firefox executable in your ${PATH}. + ln -sfv ... /usr/bin/firefox: This puts a symbolic link + to the firefox executable in your PATH + variable. - mkdir -p /usr/lib/mozilla/plugins: this checks + mkdir -p /usr/lib/mozilla/plugins: This checks that /usr/lib/mozilla/plugins exists. - ln -sv ... /usr/lib/firefox-&firefox-version;: this + ln -sv ... /usr/lib/firefox-&firefox-version;: This makes a symbolic link to /usr/lib/mozilla/plugins. It's not - really needed, Firefox checks + really needed, as Firefox checks /usr/lib/mozilla/plugins 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. diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml index 31a2cf5c92..51a66ef997 100644 --- a/xsoft/office/libreoffice.xml +++ b/xsoft/office/libreoffice.xml @@ -314,8 +314,8 @@ gtk-update-icon-cache /usr/share/icons/hicolor ./download: The build process runs the download 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. diff --git a/xsoft/other/rox-filer.xml b/xsoft/other/rox-filer.xml index 323026a61f..b622b7a351 100644 --- a/xsoft/other/rox-filer.xml +++ b/xsoft/other/rox-filer.xml @@ -209,11 +209,11 @@ HERE_DOC chmod 755 /path/to/hostname/AppRun - That works fine for mounting, but to unmount it we need to run the - command fusermount -u ${MOUNTPOINT}. You could set + That works fine for mounting, but to unmount it the + command fusermount -u ${MOUNTPOINT} 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 fusermount -u ${MOUNTPOINT} and everything else with umount. As the root user: