From 0cc9d4e38318a886fe497fc3ffdffc0ab04d9dd4 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sat, 23 Mar 2013 13:51:58 +0000
Subject: [PATCH] Merge trunk r3603, 3648, 3673, 3677

---
 README                            | 3 ---
 common/common-functions           | 2 +-
 common/libs/func_check_version.sh | 2 +-
 common/makefile-functions         | 5 ++---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 82935bf..d33cc83 100644
--- a/README
+++ b/README
@@ -105,9 +105,6 @@ $Id$
        - Give the user read and write privileges over the $TRACKING_DIR
          directory and the files that it contains.
 
-       - If you think that you may need the libxml2/libxslt Python modules,
-         remove the libxml2 and libxslt entries found in $TRACKING_FILE.
-
        - Configure sudo, adding the needed privileges for the user. For
          newer sudo version, do not forget to add a line Defaults secure_path=
          containing /sbin and /usr/sbin (in /etc/sudoers), otherwise some
diff --git a/common/common-functions b/common/common-functions
index 1ea2359..8707cd0 100644
--- a/common/common-functions
+++ b/common/common-functions
@@ -71,7 +71,7 @@ if [ "${CLEAN}" = "y" ]; then
       if [ -d $BUILDDIR/sys ] ; then
         sudo rmdir $BUILDDIR/sys || exit 1
       fi
-      sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt}
+      sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt,run}
       sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
       if [[ "${BLFS_TOOL}" = "y" ]] ; then 
         sudo rm -rf $BUILDDIR/$BLFS_ROOT
diff --git a/common/libs/func_check_version.sh b/common/libs/func_check_version.sh
index 3ea6318..7f60523 100644
--- a/common/libs/func_check_version.sh
+++ b/common/libs/func_check_version.sh
@@ -61,7 +61,7 @@ inline_doc
   set -- $tst_version # Set positional parameters to test version values
   # Values beginning with zero are taken as octal, so that for example
   # 2.07.08 gives an error because 08 cannot be octal. The ## stuff supresses
-  # leading sero's
+  # leading zero's
   major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)}
   #
   # Compare against minimum acceptable version..
diff --git a/common/makefile-functions b/common/makefile-functions
index 89b93b4..f16583d 100644
--- a/common/makefile-functions
+++ b/common/makefile-functions
@@ -33,9 +33,8 @@ endef
 define echo_SU_request
   @echo $(BOLD)--------------------------------------------------------------------------------
   @echo $(BLUE)$@
-  @echo $(WHITE)ROOT privilege is required to perform a number commands
-  @echo sudo will request a password to all high privilege cmds to execute correctly
-endef
+  @echo $(WHITE)ROOT privilege is required to perform a number of commands
+  @echo sudo will request a password in order to execute all high privilege commands
 
 define echo_SULUSER_request
   @echo $(BOLD)--------------------------------------------------------------------------------