diff --git a/chapter01/administrativa.xml b/chapter01/administrativa.xml
index c21d010d0..2b63714cd 100644
--- a/chapter01/administrativa.xml
+++ b/chapter01/administrativa.xml
@@ -26,8 +26,8 @@ consult the FAQ (Frequently Asked Questions) at
IRC (Internet Relay Chat) network. Before you utilize this mode of support, we
ask that you've at least checked the LFS FAQ (see above) and the mailing list
archives (see below) for the answer to your question. You can find the IRC
-network at irc.linuxfromscratch.org or
-irc.linux-phreak.net port 6667. The support channel is
+network at irc.linuxfromscratch.org or
+irc.linux-phreak.net port 6667. The support channel is
named #LFS-support.
@@ -36,7 +36,7 @@ named #LFS-support.
Mailing lists
-The linuxfromscratch.org server is hosting a number
+The linuxfromscratch.org server is hosting a number
of mailing lists used for the development of the LFS project. These lists
include, among others, the main development and support lists.
@@ -49,12 +49,12 @@ their archive locations, and so on, visit .
News server
-All the mailing lists hosted at linuxfromscratch.org
+All the mailing lists hosted at linuxfromscratch.org
are also accessible via the NNTP server. All messages posted to a mailing list
are copied to the corresponding newsgroup, and vice versa.
The news server can be reached at
-news.linuxfromscratch.org.
+news.linuxfromscratch.org.
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index 747a74b92..16517e54f 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -33,9 +33,9 @@ LFS,
whether you have deviated from the book at all.
-(Note that saying that you've deviated from the book doesn't mean
+Saying that you've deviated from the book doesn't mean
that we won't help you. After all, LFS is about choice. It'll just
-help us to see other possible causes of your problem.)
+help us to see other possible causes of your problem.
@@ -59,7 +59,7 @@ the ./configure script and the make run can be useful. Don't blindly
include the whole thing but, on the other hand, don't include too little.
As an example, here is some screen output from make:
-gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
+gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
-DLOCALEDIR=\"/mnt/lfs/usr/share/locale\" -DLIBDIR=\"/mnt/lfs/usr/lib\"
-DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
-g -O2 -c getopt1.c
@@ -73,12 +73,12 @@ make[2]: *** [make] Error 1
make[2]: Leaving directory `/lfs/tmp/make-3.79.1'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/lfs/tmp/make-3.79.1'
-make: *** [all-recursive-am] Error 2
+make: *** [all-recursive-am] Error 2
In this case, many people just include the bottom section where it
says:
-make [2]: *** [make] Error 1
+make [2]: *** [make] Error 1
and onwards. This isn't enough for us to diagnose the problem because it
only tells us that something went wrong, not
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index 3745679b8..ae1f5b8c6 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -16,18 +16,18 @@ system, but build instructions for other file systems can be found at
To create an ext2 file system on the LFS partition run the following:
-mke2fs /dev/xxx
+mke2fs /dev/[xxx]
-Replace xxx with the name of the LFS partition
+Replace [xxx] with the name of the LFS partition
(something like hda5).
If you created a (new) swap partition you need to initialize it as a
swap partition too (also known as formatting, like you did above with
-mke2fs) by running:
+mke2fs) by running:
-mkswap /dev/yyy
+mkswap /dev/[yyy]
-Replace yyy with the name of the swap
+Replace [yyy] with the name of the swap
partition.
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index fd317876e..82b4184e4 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -28,12 +28,12 @@ The swap partition for your LFS system can be the same one as for your host
system, so you won't have to create another if your host system already uses
a swap partition.
-Start a disk partitioning program such as cfdisk
-or fdisk with an argument naming the hard disk upon
+Start a disk partitioning program such as cfdisk
+or fdisk with an argument naming the hard disk upon
which the new partition must be created -- for example
/dev/hda for the primary IDE disk. Create a Linux native
partition and a swap partition, if needed. Please refer to the man pages of
-cfdisk or fdisk if you don't yet
+cfdisk or fdisk if you don't yet
know how to use the programs.
Remember the designation of your new partition -- something like
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index 610ccf652..87331dcfb 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -10,7 +10,7 @@
Now that we've created a file system, we want to be able to access
the partition. For that, we need to mount it, and have to choose a mount
point. In this book we assume that the file system is mounted under
-/mnt/lfs, but it doesn't matter what directory
+/mnt/lfs, but it doesn't matter what directory
you choose.
Choose a mount point and assign it to the LFS environment variable
@@ -21,22 +21,22 @@ by running:
Now create the mount point and mount the LFS file system by running:
mkdir -p $LFS
-mount /dev/xxx $LFS
+mount /dev/[xxx] $LFS
-Replace xxx with the designation of the LFS
+Replace [xxx] with the designation of the LFS
partition.
If you have decided to use multiple partitions for LFS (say one for
-/ and another for /usr), mount
-them like this:
+/ and another for
+/usr), mount them like this:
mkdir -p $LFS
-mount /dev/xxx $LFS
+mount /dev/[xxx] $LFS
mkdir $LFS/usr
-mount /dev/yyy $LFS/usr
+mount /dev/[yyy] $LFS/usr
-Of course, replace xxx and yyy
-with the appropriate partition names.
+Of course, replace [xxx] and
+[yyy] 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
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index 031d05c6e..b2ac8da14 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -31,7 +31,7 @@ or, better yet, try one of the alternative means of downloading listed on
You'll need to store all the downloaded packages and patches somewhere
that is conveniently available throughout the entire build. You'll also need a
working directory in which to unpack the sources and build them. A scheme that
-works well is to use $LFS/sources as the place to store
+works well is to use $LFS/sources as the place to store
the tarballs and patches, and as a working directory.
This way everything you need will be located on the LFS partition and available
during all stages of the building process.
diff --git a/chapter04/aboutlfs.xml b/chapter04/aboutlfs.xml
index fa39b8873..3d320c3a3 100644
--- a/chapter04/aboutlfs.xml
+++ b/chapter04/aboutlfs.xml
@@ -22,12 +22,12 @@ with:
export LFS=/mnt/lfs
Having this variable set means that if you are told to run a command like
-mkdir $LFS/tools, you can type it literally. Your shell
-will replace "$LFS" with "/mnt/lfs" (or whatever you set the variable to) when
-it processes the command line.
+mkdir $LFS/tools, you can type it literally. Your shell
+will replace $LFS
with /mnt/lfs
(or whatever
+you set the variable to) when it processes the command line.
Don't forget to check that $LFS
is set whenever you leave and
-reenter the environment (as when doing an su
to root or another user).
+reenter the environment (as when doing a su
to root or another user).
diff --git a/chapter04/aboutsbus.xml b/chapter04/aboutsbus.xml
index f39754433..e8983711f 100644
--- a/chapter04/aboutsbus.xml
+++ b/chapter04/aboutsbus.xml
@@ -8,7 +8,7 @@
Most people would like to know beforehand approximately how long it
-takes to compile and install each package. But "Linux from Scratch" is built
+takes to compile and install each package. But Linux from Scratch
is built
on so many different systems, it is not possible to give actual times that are
anywhere near accurate: the biggest package (Glibc) won't take more than
twenty minutes on the fastest systems, but will take something like three days
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index 5763b04c5..0a2688efc 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -19,19 +19,28 @@ issue the following command to add the new user:
The meaning of the switches:
-
--s /bin/bash: This makes
-bash the default shell for user
+
+
+-s /bin/bash
+This makes
+bash the default shell for user
lfs.
+
--m: This creates a home
+
+-m
+This creates a home
directory for lfs.
+
--k /dev/null: This parameter
+
+-k /dev/null
+This parameter
prevents possible copying of files from a skeleton directory (default
-is /etc/skel) by changing the input location to
+is /etc/skel) by changing the input location to
the special null device.
-
+
+
If you want to be able to log in as lfs, then give
lfs a password:
@@ -55,7 +64,7 @@ user command:
su - lfs
-The -
instructs su to
+The -
instructs su to
start a login shell.
diff --git a/chapter04/creatingtoolsdir.xml b/chapter04/creatingtoolsdir.xml
index 4b8569210..4bb0ef3b2 100644
--- a/chapter04/creatingtoolsdir.xml
+++ b/chapter04/creatingtoolsdir.xml
@@ -38,7 +38,7 @@ has a few syntactic variations, so be sure to check the info page before
reporting what you may think is an error.
The created symlink enables us to compile our toolchain so that it always
-refers to /tools, meaning that the compiler, assembler
+refers to /tools, meaning that the compiler, assembler
and linker will work both in this chapter (when we are still using some tools
from the host) and in the next (when we are chrooted
to
the LFS partition).
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index 79bc3225b..d43de93e5 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -12,9 +12,9 @@ startup files for the bash shell. While logged in as
user lfs, issue the following command to create a new
.bash_profile:
-cat > ~/.bash_profile << "EOF"
+cat > ~/.bash_profile << EOF
exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash
-EOF
+EOF
Normally, when you log on as user lfs,
the initial shell is a login shell which reads the
@@ -32,14 +32,14 @@ which doesn't read the /etc/profile or
.bash_profile files, but reads the
.bashrc file instead. Create this latter file now:
-cat > ~/.bashrc << "EOF"
+cat > ~/.bashrc << EOF
set +h
umask 022
LFS=/mnt/lfs
LC_ALL=POSIX
PATH=/tools/bin:/bin:/usr/bin
export LFS LC_ALL PATH
-EOF
+EOF
The set +h command turns off
bash's hash function. Normally hashing is a useful
@@ -68,7 +68,7 @@ environment and wish to return later. 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
+We prepend /tools/bin to the standard PATH so
that, as we move along through this chapter, the tools we build will get used
during the rest of the building process.
diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index 3de1aba17..0ba33057a 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -129,26 +129,13 @@ div.toc ul li h3, div.toc ul li h4 {
}
/* Admonitions */
-div.note, div.tip {
+div.admonition {
background-color: #fffff6;
- border: 2px solid #dbddec;
+ border: medium solid #600;
width: 90%;
margin: .5em auto;
}
-div.important, div.warning, div.caution {
- background-color: #fffff6;
- border: medium solid #400;
- width: 90%;
- margin: 1.5em auto;
- color: #600;
- font-size: larger;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
- color: #900;
-}
-
div.admonhead img {
padding: .3em;
}
@@ -162,15 +149,6 @@ div.admonbody {
margin: .5em;
}
-div.important em, div.warning em, div.caution em {
- color: #000;
- font-weight: bold;
-}
-
-div.important tt, div.warning tt, div.caution tt {
- font-weight: bold;
-}
-
/* variablelist & segmentedlist */
dl {
margin: 0;
@@ -187,7 +165,6 @@ dd {
margin: 0 0 1em 3em;
padding: 0;
}
-
div.variablelist dd {
margin-bottom: 1em;
}
@@ -196,10 +173,6 @@ div.variablelist dd p {
margin-top: 0px;
}
-dl.materials dt, div.installation dt, div.configuration dt, div.sect2 dt {
- display: list-item;
-}
-
dl.materials dd {
margin-left: 0px;
}
@@ -222,7 +195,7 @@ tt, code, kbd, pre, .command {
font-family: monospace;
}
-pre.screen {
+pre.userinput {
color: #101310;
background-color: #e5e5e5;
border: 1px solid #050505;
@@ -231,17 +204,24 @@ pre.screen {
font-weight: bold;
}
+pre.screen {
+ background-color: #e9e9e9;
+ border: 1px solid #050505;
+ padding: .5em 1em;
+ margin: 0 2em;
+}
+
/* Sections */
div.wrap h1 {
background: #f5f6f7;
- padding: 1em 0 0.5em 0;
+ padding: 0.5em 0 0.5em 0;
margin: 0px auto;
}
div.package {
background: #f5f6f7;
border-bottom: 0.2em solid #dbddec;
- padding: 0.5em 0.5em 0.3em 0.5em;
+ padding: 0 0.5em 0.3em 0.5em;
margin: 0px auto;
}
@@ -260,7 +240,7 @@ div.configuration {
div.content {
background: #f5f6f7;
border-top: 0.2em solid #dbddec;
- padding: 0.5em 0.5em 1em 0.5em;
+ padding: 0.5em 0.5em 0.5em 0.5em;
margin: 0.5em 0 .5em 0;
}
diff --git a/stylesheets/xhtml/lfs-mixed.xsl b/stylesheets/xhtml/lfs-mixed.xsl
index 2d9a3cbfa..c4dbd04dd 100644
--- a/stylesheets/xhtml/lfs-mixed.xsl
+++ b/stylesheets/xhtml/lfs-mixed.xsl
@@ -7,9 +7,8 @@
-
-
+