Tweaking the texts for build time and disk space.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3188 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

27 files changed, 64 insertions, 52 deletions

diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 579e518a1..01fd720de 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -2,8 +2,8 @@
 <title>Installing Bash-&bash-version;</title>
 <?dbhtml filename="bash.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bash-time-tools; 
-Estimated required disk space:  &bash-compsize-tools;</screen>
+<screen>&buildtime; &bash-time-tools; 
+&diskspace; &bash-compsize-tools;</screen>
 
 &aa-bash-down;
 &aa-bash-dep;
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index 15dc47cc1..00a824fd9 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 1</title>
 <?dbhtml filename="binutils-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-time-tools-pass1;
-Estimated required disk space:  &binutils-compsize-tools-pass1;</screen>
+<screen>&buildtime; &binutils-time-tools-pass1;
+&diskspace; &binutils-compsize-tools-pass1;</screen>
 
 &aa-binutils-down;
 &aa-binutils-dep;
diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml
index de0280e47..36cb2f228 100644
--- a/chapter05/binutils-pass2.xml
+++ b/chapter05/binutils-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing Binutils-&binutils-version; - Pass 2</title>
 <?dbhtml filename="binutils-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &binutils-time-tools-pass2;
-Estimated required disk space:  &binutils-compsize-tools-pass2;</screen>
+<screen>&buildtime; &binutils-time-tools-pass2;
+&diskspace; &binutils-compsize-tools-pass2;</screen>
 
 &aa-binutils-down;
 &aa-binutils-dep;
diff --git a/chapter05/bzip2.xml b/chapter05/bzip2.xml
index fb65ad101..a7d0d1a1e 100644
--- a/chapter05/bzip2.xml
+++ b/chapter05/bzip2.xml
@@ -2,8 +2,8 @@
 <title>Installing Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &bzip2-time-tools;
-Estimated required disk space:  &bzip2-compsize-tools;</screen>
+<screen>&buildtime; &bzip2-time-tools;
+&diskspace; &bzip2-compsize-tools;</screen>
 
 &aa-bzip2-down;
 &aa-bzip2-dep;
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index b49c41468..365fd3ef7 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -316,6 +316,18 @@ issue the following commands to add the new user:</para>
 <screen><userinput>useradd -s /bin/bash -m -k /dev/null lfs
 passwd lfs</userinput></screen>
 
+<para>The meaning of the switches:</para>
+
+<itemizedlist>
+<listitem><para><userinput>-s /bin/bash</userinput>: This makes
+<userinput>bash</userinput> the default shell for user
+<emphasis>lfs</emphasis>.</para></listitem>
+
+<listitem><para><userinput>-m -k /dev/null</userinput>: These create a home
+directory for <emphasis>lfs</emphasis>, while preventing the files from a
+possible <filename>/etc/skel</filename> being copied into it.</para></listitem>
+</itemizedlist>
+
 <para>Now grant this new user <emphasis>lfs</emphasis> full access to
 <filename class="directory">$LFS/tools</filename> by giving it ownership
 of the directory:</para>
diff --git a/chapter05/coreutils.xml b/chapter05/coreutils.xml
index bd273a6f7..a9c90c3e2 100644
--- a/chapter05/coreutils.xml
+++ b/chapter05/coreutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &coreutils-time-tools;
-Estimated required disk space:  &coreutils-compsize-tools;</screen>
+<screen>&buildtime; &coreutils-time-tools;
+&diskspace; &coreutils-compsize-tools;</screen>
 
 <literallayout>Official download location for Coreutils (&coreutils-version;):
 <ulink url="ftp://ftp.gnu.org/gnu/coreutils/"/>
diff --git a/chapter05/dejagnu.xml b/chapter05/dejagnu.xml
index d4b3143cc..e8b2b3cd7 100644
--- a/chapter05/dejagnu.xml
+++ b/chapter05/dejagnu.xml
@@ -4,8 +4,8 @@
 
 <para>The DejaGnu package contains a framework for testing other programs.</para>
 
-<screen>Estimated build time:           &dejagnu-time-tools; 
-Estimated required disk space:  &dejagnu-compsize-tools;</screen>
+<screen>&buildtime; &dejagnu-time-tools; 
+&diskspace; &dejagnu-compsize-tools;</screen>
 
 &aa-dejagnu-down;
 &aa-dejagnu-dep;
diff --git a/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 2316576e5..123be7682 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &diffutils-time-tools;
-Estimated required disk space:  &diffutils-compsize-tools;</screen>
+<screen>&buildtime; &diffutils-time-tools;
+&diskspace; &diffutils-compsize-tools;</screen>
 
 &aa-diffutils-down;
 &aa-diffutils-dep;
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 1fdd78b4f..81a175a8a 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -5,8 +5,8 @@
 <para>The Expect package contains a program for doing scripted dialogues with
 other interactive programs.</para>
 
-<screen>Estimated build time:           &expect-time-tools; 
-Estimated required disk space:  &expect-compsize-tools;</screen>
+<screen>&buildtime; &expect-time-tools; 
+&diskspace; &expect-compsize-tools;</screen>
 
 &aa-expect-down;
 &aa-expect-dep;
diff --git a/chapter05/findutils.xml b/chapter05/findutils.xml
index 53fd69bc0..f91c4caa1 100644
--- a/chapter05/findutils.xml
+++ b/chapter05/findutils.xml
@@ -2,8 +2,8 @@
 <title>Installing Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &findutils-time-tools;
-Estimated required disk space:  &findutils-compsize-tools;</screen>
+<screen>&buildtime; &findutils-time-tools;
+&diskspace; &findutils-compsize-tools;</screen>
 
 &aa-findutils-down;
 &aa-findutils-dep;
diff --git a/chapter05/gawk.xml b/chapter05/gawk.xml
index 02c614071..a805e5d91 100644
--- a/chapter05/gawk.xml
+++ b/chapter05/gawk.xml
@@ -2,8 +2,8 @@
 <title>Installing Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gawk-time-tools;
-Estimated required disk space:  &gawk-compsize-tools;</screen>
+<screen>&buildtime; &gawk-time-tools;
+&diskspace; &gawk-compsize-tools;</screen>
 
 <literallayout>Official download location for Gawk (&gawk-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gawk/"/></literallayout>
diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 525da689f..cbd70989d 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 1</title>
 <?dbhtml filename="gcc-pass1.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-tools-pass1;
-Estimated required disk space:  &gcc-compsize-tools-pass1;</screen>
+<screen>&buildtime; &gcc-time-tools-pass1;
+&diskspace; &gcc-compsize-tools-pass1;</screen>
 
 <literallayout>Official download location for GCC (&gcc-version;): 
 <ulink url="ftp://ftp.gnu.org/pub/gnu/gcc/"/></literallayout>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index f25add08b..145345399 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -2,8 +2,8 @@
 <title>Installing GCC-&gcc-version; - Pass 2</title>
 <?dbhtml filename="gcc-pass2.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gcc-time-tools-pass2;
-Estimated required disk space:  &gcc-compsize-tools-pass2;</screen>
+<screen>&buildtime; &gcc-time-tools-pass2;
+&diskspace; &gcc-compsize-tools-pass2;</screen>
 
 &aa-gcc-down;
 &aa-gcc-dep;
diff --git a/chapter05/gettext.xml b/chapter05/gettext.xml
index 726e1d6e4..3229af9e6 100644
--- a/chapter05/gettext.xml
+++ b/chapter05/gettext.xml
@@ -2,8 +2,8 @@
 <title>Installing Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gettext-time-tools;
-Estimated required disk space:  &gettext-compsize-tools;</screen>
+<screen>&buildtime; &gettext-time-tools;
+&diskspace; &gettext-compsize-tools;</screen>
 
 &aa-gettext-down;
 &aa-gettext-dep;
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 58f198917..67b99eb2a 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -2,8 +2,8 @@
 <title>Installing Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &glibc-time-tools;
-Estimated required disk space:  &glibc-compsize-tools;</screen>
+<screen>&buildtime; &glibc-time-tools;
+&diskspace; &glibc-compsize-tools;</screen>
 
 &aa-glibc-down;
 &aa-glibc-dep;
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index cdeff1166..9728609ee 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -2,8 +2,8 @@
 <title>Installing Grep-&grep-version;</title>
 <?dbhtml filename="grep.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &grep-time-tools;
-Estimated required disk space:  &grep-compsize-tools;</screen>
+<screen>&buildtime; &grep-time-tools;
+&diskspace; &grep-compsize-tools;</screen>
 
 &aa-grep-down;
 &aa-grep-dep;
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 746be866e..cd9f13d14 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -2,8 +2,8 @@
 <title>Installing Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &gzip-time-tools;
-Estimated required disk space:  &gzip-compsize-tools;</screen>
+<screen>&buildtime; &gzip-time-tools;
+&diskspace; &gzip-compsize-tools;</screen>
 
 &aa-gzip-down;
 &aa-gzip-dep;
diff --git a/chapter05/kernelheaders.xml b/chapter05/kernelheaders.xml
index 8d4d2b40e..5bac98be5 100644
--- a/chapter05/kernelheaders.xml
+++ b/chapter05/kernelheaders.xml
@@ -2,8 +2,8 @@
 <title>Installing Linux-&kernel-version; headers</title>
 <?dbhtml filename="kernel-headers.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &kernel-time-headers;
-Estimated required disk space:  &kernel-compsize-headers;</screen>
+<screen>&buildtime; &kernel-time-headers;
+&diskspace; &kernel-compsize-headers;</screen>
 
 <sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
 
diff --git a/chapter05/make.xml b/chapter05/make.xml
index a330b02fa..c166116b7 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -2,8 +2,8 @@
 <title>Installing Make-&make-version;</title>
 <?dbhtml filename="make.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &make-time-tools;
-Estimated required disk space:  &make-compsize-tools;</screen>
+<screen>&buildtime; &make-time-tools;
+&diskspace; &make-compsize-tools;</screen>
 
 &aa-make-down;
 &aa-make-dep;
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 8fdbf856b..b7c71f2c6 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -2,8 +2,8 @@
 <title>Installing Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &ncurses-time-tools;
-Estimated required disk space:  &ncurses-compsize-tools;</screen>
+<screen>&buildtime; &ncurses-time-tools;
+&diskspace; &ncurses-compsize-tools;</screen>
 
 &aa-ncurses-down;
 &aa-ncurses-dep;
diff --git a/chapter05/patch.xml b/chapter05/patch.xml
index f80e0aedd..fe3ff0e40 100644
--- a/chapter05/patch.xml
+++ b/chapter05/patch.xml
@@ -2,8 +2,8 @@
 <title>Installing Patch-&patch-version;</title>
 <?dbhtml filename="patch.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &patch-time-tools;
-Estimated required disk space:  &patch-compsize-tools;</screen>
+<screen>&buildtime; &patch-time-tools;
+&diskspace; &patch-compsize-tools;</screen>
 
 &aa-patch-down;
 &aa-patch-dep;
diff --git a/chapter05/perl.xml b/chapter05/perl.xml
index 81f619c21..20e3d2562 100644
--- a/chapter05/perl.xml
+++ b/chapter05/perl.xml
@@ -2,8 +2,8 @@
 <title>Installing Perl-&perl-version;</title>
 <?dbhtml filename="perl.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &perl-time-tools;
-Estimated required disk space:  &perl-compsize-tools;</screen>
+<screen>&buildtime; &perl-time-tools;
+&diskspace; &perl-compsize-tools;</screen>
 
 &aa-perl-down;
 &aa-perl-dep;
diff --git a/chapter05/sed.xml b/chapter05/sed.xml
index 297f788b9..abee6d58c 100644
--- a/chapter05/sed.xml
+++ b/chapter05/sed.xml
@@ -2,8 +2,8 @@
 <title>Installing Sed-&sed-version;</title>
 <?dbhtml filename="sed.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &sed-time-tools;
-Estimated required disk space:  &sed-compsize-tools;</screen>
+<screen>&buildtime; &sed-time-tools;
+&diskspace; &sed-compsize-tools;</screen>
 
 &aa-sed-down;
 &aa-sed-dep;
diff --git a/chapter05/tar.xml b/chapter05/tar.xml
index 422da02ad..4906cb51e 100644
--- a/chapter05/tar.xml
+++ b/chapter05/tar.xml
@@ -2,8 +2,8 @@
 <title>Installing Tar-&tar-version;</title>
 <?dbhtml filename="tar.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &tar-time-tools;
-Estimated required disk space:  &tar-compsize-tools;</screen>
+<screen>&buildtime; &tar-time-tools;
+&diskspace; &tar-compsize-tools;</screen>
 
 &aa-tar-down;
 &aa-tar-dep;
diff --git a/chapter05/tcl.xml b/chapter05/tcl.xml
index 92250ecec..75f1338b8 100644
--- a/chapter05/tcl.xml
+++ b/chapter05/tcl.xml
@@ -4,8 +4,8 @@
 
 <para>The Tcl package contains the Tool Command Language.</para>
 
-<screen>Estimated build time:           &tcl-time-tools; 
-Estimated required disk space:  &tcl-compsize-tools;</screen>
+<screen>&buildtime; &tcl-time-tools; 
+&diskspace; &tcl-compsize-tools;</screen>
 
 &aa-tcl-down;
 &aa-tcl-dep;
diff --git a/chapter05/texinfo.xml b/chapter05/texinfo.xml
index 14bbcfba2..92b737105 100644
--- a/chapter05/texinfo.xml
+++ b/chapter05/texinfo.xml
@@ -2,8 +2,8 @@
 <title>Installing Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &texinfo-time-tools;
-Estimated required disk space:  &texinfo-compsize-tools;</screen>
+<screen>&buildtime; &texinfo-time-tools;
+&diskspace; &texinfo-compsize-tools;</screen>
 
 &aa-texinfo-down;
 &aa-texinfo-dep;
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 302255758..ba18e33e9 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -2,8 +2,8 @@
 <title>Installing Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html" dir="chapter05"?>
 
-<screen>Estimated build time:           &util-linux-time-tools;
-Estimated required disk space:  &util-linux-compsize-tools;</screen>
+<screen>&buildtime; &util-linux-time-tools;
+&diskspace; &util-linux-compsize-tools;</screen>
 
 &aa-utillinux-down;
 &aa-utillinux-dep;