From 17476c5481ff8ebced096511eb66134c68f6f042 Mon Sep 17 00:00:00 2001 From: Alex Gronenwoud Date: Mon, 26 Jan 2004 22:23:41 +0000 Subject: [PATCH] Removing some excess white space. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3186 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/gettext-desc.xml | 2 +- appendixa/groff-desc.xml | 2 +- appendixa/kernel-desc.xml | 2 +- appendixa/modutils-desc.xml | 2 +- appendixa/sysvinit-desc.xml | 4 ++-- appendixb/appendixb.xml | 8 ++++---- chapter01/how.xml | 6 +++--- chapter02/askforhelp.xml | 2 +- chapter03/chapter03.xml | 2 +- chapter05/binutils-pass2.xml | 2 +- chapter05/chapter05.xml | 10 +++++----- chapter05/gcc-pass1.xml | 2 +- chapter05/gcc-pass2.xml | 10 +++++----- chapter05/grep.xml | 6 +++--- chapter05/utillinux.xml | 2 +- chapter06/chapter06.xml | 2 +- chapter06/coreutils.xml | 2 +- chapter06/groff.xml | 2 +- chapter06/ncurses.xml | 2 +- chapter06/procinfo.xml | 2 +- chapter08/grub.xml | 2 +- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/appendixa/gettext-desc.xml b/appendixa/gettext-desc.xml index 76897aece..be027bbdf 100644 --- a/appendixa/gettext-desc.xml +++ b/appendixa/gettext-desc.xml @@ -51,7 +51,7 @@ from a translation catalog. msggrep extracts all messages of a translation catalog that match a given pattern or belong to some given source files. -msginit creates a new .po +msginit creates a new .po file, initializing the meta information with values from the user's environment. diff --git a/appendixa/groff-desc.xml b/appendixa/groff-desc.xml index 87a3dbea3..fbb001851 100644 --- a/appendixa/groff-desc.xml +++ b/appendixa/groff-desc.xml @@ -73,7 +73,7 @@ within troff or TeX input files into commands understood by TeX or troff. pic2graph converts a PIC diagram into a cropped image. -pre-grohtml translates the output of GNU troff +pre-grohtml translates the output of GNU troff to html. post-grohtml translates the output of GNU troff diff --git a/appendixa/kernel-desc.xml b/appendixa/kernel-desc.xml index 3114f603f..89d16ee3f 100644 --- a/appendixa/kernel-desc.xml +++ b/appendixa/kernel-desc.xml @@ -6,7 +6,7 @@ system that gets loaded. It detects and initializes all the components of your computer's hardware, then makes these components available as a tree of files to the software, and turns a single CPU into a multi-tasking machine capable of running scores of programs seemingly at the same time. - + The kernel headers define the interface to the services that the kernel provides. The headers in your system's include directory should always be diff --git a/appendixa/modutils-desc.xml b/appendixa/modutils-desc.xml index e455bcbb7..4209b166d 100644 --- a/appendixa/modutils-desc.xml +++ b/appendixa/modutils-desc.xml @@ -1,7 +1,7 @@ Short descriptions depmod creates a dependency file, based on the -symbols it finds in the existing set of modules. This dependency file is used +symbols it finds in the existing set of modules. This dependency file is used by modprobe to automatically load the required modules. genksyms generates symbol version information. diff --git a/appendixa/sysvinit-desc.xml b/appendixa/sysvinit-desc.xml index 94d504659..b4113a382 100644 --- a/appendixa/sysvinit-desc.xml +++ b/appendixa/sysvinit-desc.xml @@ -32,7 +32,7 @@ switch off the computer. But see halt. But see halt. runlevel reports the previous and the current -runlevel, as noted in the last runlevel record in +runlevel, as noted in the last runlevel record in /var/run/utmp. shutdown brings the system down in a secure way, @@ -43,7 +43,7 @@ normally invoked by init when the system goes into single user mode. telinit tells init which runlevel to enter. -utmpdump displays the content of the given login +utmpdump displays the content of the given login file in a friendlier format. wall writes a message to all logged-in users. diff --git a/appendixb/appendixb.xml b/appendixb/appendixb.xml index 8d81d72d0..da39ec722 100644 --- a/appendixb/appendixb.xml +++ b/appendixb/appendixb.xml @@ -5,7 +5,7 @@ This is a list of all the programs and library files that are installed in this book, each with a link to the package in Appendix A to which it belongs. - + a2p : @@ -127,7 +127,7 @@ to which it belongs. elisp-comp : elvtune : env : -envsubst : +envsubst : enc2xs : eqn : e2n2graph : @@ -294,7 +294,7 @@ to which it belongs. libncurses* : libnetcfg : libnsl : -libnss* : +libnss* : libopcodes : libpanel : libpcprofile : @@ -556,7 +556,7 @@ to which it belongs. swap : swapoff : swapon : -symlink-tree : +symlink-tree : sync : sysctl : sysklogd : diff --git a/chapter01/how.xml b/chapter01/how.xml index dc6e91fe5..2b737ac2d 100644 --- a/chapter01/how.xml +++ b/chapter01/how.xml @@ -23,7 +23,7 @@ a compiler you need a compiler. The first thing to be done in is build a first pass of the toolchain, made up of Binutils and GCC. The programs from -these packages will be linked statically in order for them to be usable +these packages will be linked statically in order for them to be usable independently of the host system. The second thing to do is build Glibc, the C library. Glibc will be compiled by the toolchain programs we just built in the first pass. The third thing to do is build a second pass of the toolchain. @@ -40,7 +40,7 @@ is provided at the start of , including some notes on the differences between statically and dynamically linked programs. In your real LFS system will be built. The -chroot (change root) program is used to enter a virtual environment and start +chroot (change root) program is used to enter a virtual environment and start a new shell whose root directory will be set to the LFS partition. This is very similar to rebooting and instructing the kernel to mount the LFS partition as the root partition. The reason that you don't actually reboot, but instead @@ -54,7 +54,7 @@ would. To finish the installation, the bootscripts are set up in , the kernel and bootloader are set up in , and contains some -pointers to help you after you finish the book. Then, finally, you're ready to +pointers to help you after you finish the book. Then, finally, you're ready to reboot your computer into your new LFS system. This is the process in a nutshell. Detailed information on the steps you diff --git a/chapter02/askforhelp.xml b/chapter02/askforhelp.xml index 9f9884c22..939e19805 100644 --- a/chapter02/askforhelp.xml +++ b/chapter02/askforhelp.xml @@ -39,7 +39,7 @@ help us to see other possible causes of your problem.) When something goes wrong during the stage where the configure script is run, look through the config.log file. This file may contain errors encountered during configure which weren't printed to -the screen. Include those relevant lines if you decide to ask for +the screen. Include those relevant lines if you decide to ask for help. diff --git a/chapter03/chapter03.xml b/chapter03/chapter03.xml index 8b6f3b173..3e9b5dfe0 100644 --- a/chapter03/chapter03.xml +++ b/chapter03/chapter03.xml @@ -122,7 +122,7 @@ with the appropriate partition names. You should also ensure that this new partition is not mounted with permissions that are too restrictive (such as the nosuid, nodev or noatime -options). You can run the mount command without any +options). You can run the mount command without any parameters to see with what options the LFS partition is mounted. If you see nosuid, nodev or noatime, you will need to remount it. diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 5b521f033..de0280e47 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -54,7 +54,7 @@ should be easy to spot. The output shown will contain something like:
make[1]: *** [check-binutils] Error 2
-And install the package: +And install the package: make install diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 235dddce6..b49c41468 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -308,7 +308,7 @@ the LFS partition). When logged in as root, making a single mistake can damage or even wreck your system. Therefore we recommend that you build the packages in this chapter as an unprivileged user. You could -of course use your own user name, but to make it easier to set up a clean +of course use your own user name, but to make it easier to set up a clean work environment we'll create a new user lfs and use this one during the installation process. As root, issue the following commands to add the new user: @@ -382,7 +382,7 @@ export LFS LC_ALL PATH feature: bash uses a hash table to remember the full pathnames of executable files to avoid searching the PATH time and time again to find the same executable. However, we'd like the new tools to be -used as soon as they are installed. By switching off the hash function, our +used as soon as they are installed. By switching off the hash function, our "interactive" commands (make, patch, sed, cp and so forth) will always use @@ -400,7 +400,7 @@ making their messages follow the conventions of a specified country. If your host system uses a version of Glibc older than 2.2.4, having LC_ALL set to something other than "POSIX" or "C" during this chapter may cause trouble if you exit the chroot environment and wish to return later. -By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that +By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that everything will work as expected in the chroot environment. We prepend /tools/bin to the standard PATH so @@ -454,7 +454,7 @@ Binutils build and source directories. to the new dynamic linker. A simple sed will accomplish this: - + SPECFILE=/tools/lib/gcc-lib/*/*/specs && sed -e 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \     $SPECFILE > tempspecfile && @@ -476,7 +476,7 @@ name of your platform's dynamic linker in the above commands. Refer back to Lastly, there is a possibility that some include files from the host system have found their way into GCC's private include dir. This can happen because of GCC's "fixincludes" process which runs as part of the GCC build. -We'll explain more about this further on in this chapter. For now, run the +We'll explain more about this further on in this chapter. For now, run the following commands to eliminate this possibility: rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h} diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index a0d4af5c7..525da689f 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -40,7 +40,7 @@ cd ../gcc-build The meaning of the configure options: ---with-local-prefix=/tools: The +--with-local-prefix=/tools: The purpose of this switch is to remove /usr/local/include from gcc's include search path. This is not absolutely essential; however, we want to try to minimize the influence of the host diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 762ce0d17..314f88019 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -44,12 +44,12 @@ same working directory. They will all unfold into a single patch -Np1 -i ../&gcc-nofixincludes-patch; patch -Np1 -i ../&gcc-specs-patch; -The first patch disables the GCC "fixincludes" script. We mentioned this +The first patch disables the GCC "fixincludes" script. We mentioned this briefly earlier, but a slightly more in-depth explanation of the fixincludes -process is warranted here. Under normal circumstances, the GCC fixincludes -script scans your system for header files that need to be fixed. It might find +process is warranted here. Under normal circumstances, the GCC fixincludes +script scans your system for header files that need to be fixed. It might find that some Glibc header files on your host system need to be fixed, fix them and -put them in the GCC private include directory. Then, later on in +put them in the GCC private include directory. Then, later on in , after we've installed the newer Glibc, this private include directory would be searched before the system include directory, resulting in GCC finding the fixed headers from the host system, @@ -159,7 +159,7 @@ usually aware of them but haven't yet gotten around to fixing them. In short, unless your results are vastly different from those at the above URL, it is safe to continue on. -And finally install the package: +And finally install the package: make install diff --git a/chapter05/grep.xml b/chapter05/grep.xml index 931d09671..cdeff1166 100644 --- a/chapter05/grep.xml +++ b/chapter05/grep.xml @@ -23,11 +23,11 @@ Estimated required disk space: &grep-compsize-tools; --disable-perl-regexp: This makes sure that grep does not get linked against a PCRE library -that may be present on the host, but would not be available once we enter the +that may be present on the host and would not be available once we enter the chroot environment. --with-included-regex: This ensures that -Grep uses its internal regular expression code. Without it, it will use -the code from Glibc, which is known to be slightly buggy. +Grep uses its internal regular expression code. Without this switch, Grep will +use the code from Glibc, which is known to be slightly buggy. Compile the programs: diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml index 845bc53db..302255758 100644 --- a/chapter05/utillinux.xml +++ b/chapter05/utillinux.xml @@ -14,7 +14,7 @@ Estimated required disk space: &util-linux-compsize-tools; Installation of Util-linux Util-linux doesn't use the freshly installed headers and libraries from -the /tools directory. This is fixed by altering the +the /tools directory. This is fixed by altering the configure script: cp configure configure.backup diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 2797dcffc..bee839e57 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -101,7 +101,7 @@ the chroot command. Notice that /tools/bin comes last in the PATH. This means that a temporary tool will not be used any more -as soon as its final version is installed. Well, at least when the shell +as soon as its final version is installed. Well, at least when the shell doesn't remember the locations of executed binaries -- for this reason hashing is switched off by passing the +h option to bash. diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 815a272c5..10ebcf631 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -53,7 +53,7 @@ makes some assumptions with regards to the presence of non-root users and groups that don't apply this early into the LFS build. We therefore create a dummy system user and two dummy groups to allow the tests to run properly. Should you choose not to run the test suite, skip down to -"Install the package". The following commands will prepare us for the test +"Install the package". The following commands will prepare us for the test suite. Create two dummy groups and a dummy user name: echo "dummy1:x:1000" >> /etc/group diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 3985420a3..18cfbcbde 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -16,7 +16,7 @@ Estimated required disk space: &groff-compsize; Installation of Groff Groff expects the environment variable PAGE to contain the default paper -size. For those in the United States, the command below is appropriate. If you +size. For those in the United States, the command below is appropriate. If you live elsewhere, you may want to change PAGE=letter to PAGE=A4. diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 3435c8061..0b044b362 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -3,7 +3,7 @@ The Ncurses package contains libraries for the terminal-independent -handling of character screens. +handling of character screens. Estimated build time: &ncurses-time; Estimated required disk space: &ncurses-compsize; diff --git a/chapter06/procinfo.xml b/chapter06/procinfo.xml index 6cee65215..cb3e097ea 100644 --- a/chapter06/procinfo.xml +++ b/chapter06/procinfo.xml @@ -22,7 +22,7 @@ Estimated required disk space: &procinfo-compsize; The meaning of the make parameter: LDLIBS=-lncurses: This tells Procinfo -to use the libncurses library instead of the +to use the libncurses library instead of the long-obsolete libtermcap. diff --git a/chapter08/grub.xml b/chapter08/grub.xml index dcc11dc4b..6869eaece 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -97,7 +97,7 @@ wrong which can lead to problems in some circumstances. It's best to disable this functionality and let the kernel determine the amount of memory itself, hence the use of the --no-mem-option above. -You may want to add an entry for your host distribution. It might look +You may want to add an entry for your host distribution. It might look like this: cat >> /boot/grub/menu.lst << "EOF"