XML changes

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

5 files changed, 55 insertions, 109 deletions

diff --git a/chapter03/creatingdirs.xml b/chapter03/creatingdirs.xml
index d581f3ffd..a37be20bd 100644
--- a/chapter03/creatingdirs.xml
+++ b/chapter03/creatingdirs.xml
@@ -1,16 +1,12 @@
 <sect1 id="ch04-creatingdirs">
 <title>Creating directories</title>
 
-<para>
-Let's create the directory tree on the LFS partition based on the FHS
+<para>Let's create the directory tree on the LFS partition based on the FHS
 standard, which can be found at <ulink
 url="http://www.pathname.com/fhs/">http://www.pathname.com/fhs/</ulink>.
-Issuing the following commands will create a default directory layout:
-</para>
+Issuing the following commands will create a default directory layout:</para>
  
-<para>
-<screen>
-<userinput>cd $LFS</userinput>
+<para><screen><userinput>cd $LFS</userinput>
 <userinput>mkdir -p bin boot dev/pts etc/opt home lib mnt proc root sbin tmp var opt</userinput>
 <userinput>for dirname in $LFS/usr $LFS/usr/local</userinput>
 <userinput><literal>&nbsp;&nbsp;&nbsp;do</literal></userinput>
@@ -30,50 +26,38 @@ Issuing the following commands will create a default directory layout:
 <userinput>cd $LFS/opt</userinput>
 <userinput>mkdir bin doc include info lib man</userinput>
 <userinput>cd $LFS/usr</userinput>
-<userinput>ln -s ../var/tmp tmp</userinput>
-</screen></para>
+<userinput>ln -s ../var/tmp tmp</userinput></screen></para>
 
-<para>
-Normally, directories are created with permission mode 755, which isn't
+<para>Normally, directories are created with permission mode 755, which isn't
 desired for all directories. The first change is a mode 0750 for the 
 $LFS/root directory. This is to make sure that not just everybody can 
 enter the /root directory (the same a user would do with /home/username 
 directories). The second change is a mode 1777 for the tmp 
 directories. This way, any user can write data to the /tmp or /var/tmp 
 directory but cannot remove another user's files (the latter is caused 
-by the so-called "sticky bit" - bit 1 of the 1777 bit mask).
-</para>
+by the so-called "sticky bit" - bit 1 of the 1777 bit mask).</para>
 
-<para>
-<screen>
-<userinput>cd $LFS &amp;&amp;</userinput>
+<para><screen><userinput>cd $LFS &amp;&amp;</userinput>
 <userinput>chmod 0750 root &amp;&amp;</userinput>
-<userinput>chmod 1777 tmp var/tmp</userinput>
-</screen>
-</para>
+<userinput>chmod 1777 tmp var/tmp</userinput></screen></para>
 
-<para>
-Now that the directories are created, copy the source files that were
+<para>Now that the directories are created, copy the source files that were
 downloaded in chapter 3 to some subdirectory under $LFS/usr/src (you
-will need to create the desired directory yourself).
-</para>
+will need to create the desired directory yourself).</para>
 
 <sect2>
 <title>FHS compliance notes</title>
 
-<para>
-The FHS stipulates that the /usr/local directory should contain the bin, games,
-include, lib, man, sbin, and share subdirectories. You can alter your /usr/local
-directory yourself if you want your system to be FHS-compliant.
-</para>
+<para>The FHS stipulates that the /usr/local directory should contain the 
+bin, games,include, lib, man, sbin, and share subdirectories. You can 
+alter your /usr/local directory yourself if you want your system 
+to be FHS-compliant.</para>
 
-<para>
-Also, the standard says that there should exist a /usr/share/games directory,
-which we don't much like for a base system. But feel free to make your system
-FHS-compliant if you wish. The FHS isn't precise as to the structure of the
-/usr/local/share subdirectories, so we took the liberty of creating the
-directories that we felt needed.
-</para>
+<para>Also, the standard says that there should exist a /usr/share/games 
+directory, which we don't much like for a base system. But feel free to 
+make your system FHS-compliant if you wish. The FHS isn't precise as 
+to the structure of the /usr/local/share subdirectories, so we took the 
+liberty of creating the directories that we felt needed.</para>
 
 </sect2>
 
diff --git a/chapter03/creatingfs.xml b/chapter03/creatingfs.xml
index 00130a99b..69e799205 100644
--- a/chapter03/creatingfs.xml
+++ b/chapter03/creatingfs.xml
@@ -1,29 +1,19 @@
 <sect1 id="ch04-creatingfs">
 <title>Creating a file system on the new partition</title>
 
-<para>
-Once the partition is created, we have to create a new file system on
+<para>Once the partition is created, we have to create a new file system on
 that partition. The standard file system used these days is the ext2
 file system, but the socalled journaling file systems are becoming
 increasingly popular too. It's of course up to you to decide which file
 system you want to create, but because we have to assume and work with
-something, we will assume you chose the ext2 file system.
-</para>
+something, we will assume you chose the ext2 file system.</para>
 
-<para>
-To create an ext2 file system, use the mke2fs command. The LFS partition
-is used as the only option to the command and the file system is created.
-</para>
+<para>To create an ext2 file system, use the mke2fs command. The LFS partition
+is used as the only option to the command and the file system is created.</para>
 
-<para>
-<screen>
-<userinput>mke2fs /dev/xxx</userinput>
-</screen>
-</para>
+<para><screen><userinput>mke2fs /dev/xxx</userinput></screen></para>
 
-<para>
-Replace "xxx" by the partition's designation (like hda11).
-</para>
+<para>Replace "xxx" by the partition's designation (like hda11).</para>
 
 </sect1>
 
diff --git a/chapter03/creatingpart.xml b/chapter03/creatingpart.xml
index f12cedbd7..90b2568fb 100644
--- a/chapter03/creatingpart.xml
+++ b/chapter03/creatingpart.xml
@@ -1,43 +1,35 @@
 <sect1 id="ch04-creatingpart">
 <title>Creating a new partition</title>
 
-<para>
-First, let me tell you that it is possible to build LFS on only one partition,
-which is where your original distribution is installed. This is not recommended
-if it is the first time you try LFS, but may be useful if you are short on disk
-space. If you feel brave, take a look at the one partition hint at 
+<para>First, let me tell you that it is possible to build LFS on only 
+one partition, which is where your original distribution is installed. This 
+is not recommended if it is the first time you try LFS, but may be useful 
+if you are short on disk space. If you feel brave, take a look at the 
+one partition hint at 
 <ulink 
-url="http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt">
-http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt</ulink>.
-</para>
+url="http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt">http://archive.linuxfromscratch.org/lfs-hints/one-partition-hint.txt</ulink>.</para>
 
-<para>
-Before we can build our new Linux system, we need to have an empty Linux
+<para>Before we can build our new Linux system, we need to have an empty Linux
 partition on which we can build our new system. I recommend a partition size
 of at least 750 MB. This gives enough space to store all the tarballs and 
 to compile all packages without worrying about running out of the necessary 
 temporary disk space. But you probably want more space than that if you
 plan to use the LFS system as your primary Linux system. If that's the
 case you'd want more space so you can install additional software. If a 
-Linux Native partition is already available, this subsection can be skipped.
-</para>
+Linux Native partition is already available, this subsection can be skipped.</para>
 
-<para>
-The cfdisk program (or another fdisk like program you prefer)) is
+<para>The cfdisk program (or another fdisk like program you prefer)) is
 started with the appropriate hard disk as the option (like /dev/hda if a
 new partition is to be created on the primary master IDE disk). It is used 
 to create a Linux Native partition, write the partition table and exit the 
 cfdisk program. Please refer to the documentation that comes with your
 fdisk program of choice (the man pages are often a good place to start)
 and read the procedures about how to create a new Linux native
-partition and how to write the partition table.
-</para>
+partition and how to write the partition table.</para>
 
-<para>
-The new partition's designation should be remembered. It 
+<para>The new partition's designation should be remembered. It 
 could be something like hda11. This newly created partition will be 
-referred to as the LFS partition in this book.
-</para>
+referred to as the LFS partition in this book.</para>
 
 </sect1>
 
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index 92b7d6d17..336d1d901 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -1,12 +1,10 @@
 <sect1 id="ch04-introduction">
 <title>Introduction</title>
 
-<para>
-In this chapter, the partition that is going to host the LFS system is
+<para>In this chapter, the partition that is going to host the LFS system is
 going to be prepared. We will be creating the partition itself, a file
 system and the directory structure. When this is done, we can move on
-to the next chapter and start the actual building process.
-</para>
+to the next chapter and start the actual building process.</para>
 
 </sect1>
 
diff --git a/chapter03/mounting.xml b/chapter03/mounting.xml
index d6c3b08e5..3832af808 100644
--- a/chapter03/mounting.xml
+++ b/chapter03/mounting.xml
@@ -1,44 +1,26 @@
 <sect1 id="ch04-mounting">
 <title>Mounting the new partition</title>
 
-<para>
-Now that we have created a file system, it is ready for use. All we have
+<para>Now that we have created a file system, it is ready for use. All we have
 to do to be able to access the partition (as in reading data from and writing 
 data to) is mount it. If it is mounted under /mnt/lfs, this partition can 
 be accessed by cd'ing to the /mnt/lfs directory. This book will assume 
 that the partition was mounted under /mnt/lfs. It doesn't matter which 
-directory is chosen, just make sure you remember what you chose.
-</para>
-
-<para>
-Create the /mnt/lfs directory by running:
-</para>
-
-<para>
-<screen>
-<userinput>mkdir -p /mnt/lfs</userinput>
-</screen>
-</para>
-
-<para>
-Now mount the LFS partition by running:
-</para>
-
-<para>
-<screen>
-<userinput>mount /dev/xxx /mnt/lfs</userinput>
-</screen>
-</para>
-
-<para>
-Replace <quote>xxx</quote> by the partition's designation (like hda11).
-</para>
-
-<para>
-This directory (/mnt/lfs) is the $LFS variable you have read about earlier.
-If you were planning to make use of the $LFS environment variable, 
-<userinput>export LFS=/mnt/lfs</userinput> has to be executed now.
-</para>
+directory is chosen, just make sure you remember what you chose.</para>
+
+<para>Create the /mnt/lfs directory by running:</para>
+
+<para><screen><userinput>mkdir -p /mnt/lfs</userinput></screen></para>
+
+<para>Now mount the LFS partition by running:</para>
+
+<para><screen><userinput>mount /dev/xxx /mnt/lfs</userinput></screen></para>
+
+<para>Replace <quote>xxx</quote> by the partition's designation (like hda11).</para>
+
+<para>This directory (/mnt/lfs) is the $LFS variable you have read about 
+earlier. If you were planning to make use of the $LFS environment variable, 
+<userinput>export LFS=/mnt/lfs</userinput> has to be executed now.</para>
 
 </sect1>