Parcourir la source

Tags corrections. Finished my firt full review
of the XML code and updated prologue/typography.xml acordongly.


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

Manuel Canales Esparcia il y a 21 ans
Parent
commit
0719866479
5 fichiers modifiés avec 41 ajouts et 43 suppressions
  1. 13 12
      chapter08/fstab.xml
  2. 16 16
      chapter08/grub.xml
  3. 1 1
      chapter08/introduction.xml
  4. 6 6
      chapter08/kernel.xml
  5. 5 8
      prologue/typography.xml

+ 13 - 12
chapter08/fstab.xml

@@ -14,35 +14,36 @@ determine where file systems are to be mounted by default, which
 must be checked and in which order. Create a new file systems table like
 this:</para>
 
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
 # Begin /etc/fstab
 
 # file system  mount-point  fs-type  options         dump  fsck-order
 
-/dev/xxx      /            fff      defaults        1     1
-/dev/yyy      swap         swap     pri=1           0     0
+/dev/<replaceable>[xxx]</replaceable>      /            <replaceable>[fff]</replaceable>      defaults        1     1
+/dev/<replaceable>[yyy]</replaceable>      swap         swap     pri=1           0     0
 proc          /proc        proc     defaults        0     0
 sysfs         /sys         sysfs    defaults        0     0
 devpts        /dev/pts     devpts   gid=4,mode=620  0     0
 shm           /dev/shm     tmpfs    defaults        0     0
 # End /etc/fstab
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
-<para>Of course, replace <filename>xxx</filename>, <filename>yyy</filename>
-and <filename>fff</filename> with the values appropriate for your system --
-for example <filename>hda2</filename>, <filename>hda5</filename> and
-<filename>reiserfs</filename>. For all the details on the six fields in this
+<para>Of course, replace <replaceable>[xxx]</replaceable>, <replaceable>[yyy]</replaceable>
+and <replaceable>[fff]</replaceable> with the values appropriate for your system --
+for example <filename class="partition">hda2</filename>, <filename class="partition">hda5</filename> and
+<systemitem class="filesystem">reiserfs</systemitem>. For all the details on the six fields in this
 table, see <command>man 5 fstab</command>.</para>
 
-<para>When using a reiserfs partition, the <emphasis>1 1</emphasis> at the
-end of the line should be replaced with <emphasis>0 0</emphasis>, as such a
+<para>When using a reiserfs partition, the <parameter>1 1</parameter> at the
+end of the line should be replaced with <parameter>0 0</parameter>, as such a
 partition does not need to be dumped or checked</para>
 
-<para>The <filename>/dev/shm</filename> mount point for tmpfs is included to
+<para>The <filename class="directory">/dev/shm</filename> mount point for
+<systemitem class="filesystem">tmpfs</systemitem> is included to
 allow enabling POSIX shared memory. Your kernel must have the required support
 built into it for this to work -- more about this in the next section. Please
 note that currently very little software actually uses POSIX shared memory.
-Therefore you can consider the <filename>/dev/shm</filename> mount point
+Therefore you can consider the <filename class="directory">/dev/shm</filename> mount point
 optional. For more information, see
 <filename>Documentation/filesystems/tmpfs.txt</filename> in the kernel source
 tree.</para>

+ 16 - 16
chapter08/grub.xml

@@ -34,23 +34,23 @@ Insert a blank floppy diskette and run the following commands:</para>
 dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
 
 <para>Remove the diskette and store it somewhere safe. Now we'll run the
-<userinput>grub</userinput> shell:</para>
+<command>grub</command> shell:</para>
 
 <screen><userinput>grub</userinput></screen>
 
 <para>Grub uses its own naming structure for drives and partitions, in the form
 of (hdn,m), where <emphasis>n</emphasis> is the hard drive number, and
 <emphasis>m</emphasis> the partition number, both starting from zero. This
-means, for instance, that partition <filename>hda1</filename> is (hd0,0) to
-Grub, and <filename>hdb2</filename> is (hd1,1). In contrast to Linux, Grub
+means, for instance, that partition <filename class="partition">hda1</filename> is (hd0,0) to
+Grub, and <filename class="partition">hdb2</filename> is (hd1,1). In contrast to Linux, Grub
 doesn't consider CD-ROM drives to be hard drives, so if you have a CD on
-<filename>hdb</filename>, for example, and a second hard drive on
-<filename>hdc</filename>, that second hard drive would still be (hd1).</para>
+<filename class="partition">hdb</filename>, for example, and a second hard drive on
+<filename class="partition">hdc</filename>, that second hard drive would still be (hd1).</para>
 
 <para>Using the above information, determine the appropriate designator for
 your root partition (or boot partition, if you use a separate one). For the
 following example, we'll assume your root (or separate boot) partition is
-<filename>hda4</filename>.</para>
+<filename class="partition">hda4</filename>.</para>
 
 <para>First, tell Grub where to search for its <filename>stage{1,2}</filename>
 files -- you can use the Tab key everywhere to make Grub show the alternatives:</para>
@@ -67,19 +67,19 @@ would become: <userinput>setup (hd0,3)</userinput>.</para></warning>
 
 
 <para>Tell Grub to install itself into the MBR (Master Boot Record) of
-<filename>hda</filename>:</para>
+<filename class="partition">hda</filename>:</para>
 
 <screen><userinput>setup (hd0)</userinput></screen>
 
 <para>If all is well, Grub will have reported finding its files in
-<filename>/boot/grub</filename>. That's all there is to it:</para>
+<filename class="directory">/boot/grub</filename>. That's all there is to it:</para>
 
 <screen><userinput>quit</userinput></screen>
 
 <para>Now we need to create a <quote>menu list</quote> file, defining Grub's
 boot menu:</para>
 
-<screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"
 # Begin /boot/grub/menu.lst
 
 # By default boot the first menu entry.
@@ -95,33 +95,33 @@ color green/black light-green/black
 title LFS &version;
 root (hd0,3)
 kernel /boot/lfskernel-&linux-version; root=/dev/hda4
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
-<note><para>By default, Grub will automatically pass a <quote>mem=xxx</quote>
+<note><para>By default, Grub will automatically pass a <parameter>mem=xxx</parameter>
 command line argument to the kernel. However, Grub occasionally gets the amount
 of memory 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 <emphasis>--no-mem-option</emphasis> above.</para>
+itself, hence the use of the <parameter>--no-mem-option</parameter> above.</para>
 </note>
 
 <para>You may want to add an entry for your host distribution. It might look
 like this:</para>
 
-<screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"
 title Red Hat
 root (hd0,2)
 kernel /boot/kernel-2.4.20 root=/dev/hda3
 initrd /boot/initrd-2.4.20
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 <para>Also, if you happen to dual-boot Windows, the following entry should
 allow booting it:</para>
 
-<screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"
 title Windows
 rootnoverify (hd0,0)
 chainloader +1
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 <para>If <command>info grub</command> doesn't tell you all you want to
 know, you can find more information regarding Grub on its website, located at:

+ 1 - 1
chapter08/introduction.xml

@@ -8,7 +8,7 @@
 <?dbhtml filename="introduction.html"?>
 
 <para>This chapter will make LFS bootable. This chapter deals with creating a
-fstab file, building a
+<filename>fstab</filename> file, building a
 kernel for the new LFS system and installing the Grub bootloader
 so that the LFS system can be selected for booting at startup.</para>
 

+ 6 - 6
chapter08/kernel.xml

@@ -52,7 +52,7 @@ to userspace until userspace specifies that it is ready:</para>
 
 <screen><userinput>make menuconfig</userinput></screen>
 
-<para><userinput>make oldconfig</userinput> may be more appropriate in some
+<para><command>make oldconfig</command> may be more appropriate in some
 situations. See the <filename>README</filename> file for more
 information.</para>
 
@@ -69,8 +69,8 @@ scratch.</para>
 the <quote>File systems</quote> menu and is normally enabled by default.</para>
 
 <para>LFS bootscripts make the assumption that you either compile
-both "Support for Host-side USB" and
-"USB device filesystem" directly into the kernel, or don't compile them at
+both <quote>Support for Host-side USB</quote> and
+<quote>USB device filesystem</quote> directly into the kernel, or don't compile them at
 all. Bootscripts will not work properly if it is a module (usbcore.ko).</para>
 
 <note><para>NPTL requires the kernel to be compiled with GCC 3.x, in this case
@@ -120,7 +120,7 @@ isn't worth the trouble, but if you're really pressed for space, then have a loo
 <ulink url="http://www.linux-mips.org/archives/linux-mips/2002-04/msg00031.html"/>.</para>
 
 <para>Kernel compilation has finished but more steps are required to complete
-the installation. Some files need to be copied to the <filename>/boot</filename>
+the installation. Some files need to be copied to the <filename class="directory">/boot</filename>
 directory.</para>
 
 <para>The path to the kernel image may vary depending on the platform you're
@@ -154,7 +154,7 @@ person would have write access to the kernel source.</para>
 
 <para>If you are going to keep the kernel source tree around, you may want to
 run <userinput>chown -R 0:0</userinput> on the
-<filename>linux-&linux-version;</filename> directory to ensure all files are
+<filename class="directory">linux-&linux-version;</filename> directory to ensure all files are
 owned by user <emphasis>root</emphasis>.</para>
 
 </sect2>
@@ -189,7 +189,7 @@ of running scores of programs seemingly at the same time.</para>
 <indexterm zone="ch-bootable-kernel kernel-headers"><primary sortas="e-kernel-headers">kernel headers</primary></indexterm>
 <para>define the interface to the
 services that the kernel provides. The headers in your system's
-<filename>include</filename> directory should <emphasis>always</emphasis> be
+<filename class="directory">include</filename> directory should <emphasis>always</emphasis> be
 the ones against which Glibc was compiled and should therefore
 <emphasis>not</emphasis> be replaced when upgrading the kernel.</para>
 </listitem>

+ 5 - 8
prologue/typography.xml

@@ -17,8 +17,7 @@ as seen unless otherwise noted in the surrounding text. It is also used
 in the explanation sections to identify which of the commands is being 
 referenced.</para></blockquote>
 
-<para><filename>install-info: unknown option 
-`--dir-file=/mnt/lfs/usr/info/dir'</filename></para>
+<screen><computeroutput>install-info: unknown option `--dir-file=/mnt/lfs/usr/info/dir'</computeroutput></screen>
 
 <blockquote><para>This form of text (fixed width text) is showing screen 
 output, probably as the result of commands issued, and is also used to 
@@ -27,8 +26,7 @@ show filenames, such as <filename>/etc/ld.so.conf</filename>.</para></blockquote
 <para><emphasis>Emphasis</emphasis></para>
 
 <blockquote><para>This form of text is used for several purposes in the 
-book, mainly to emphasize important points, and to give examples of
-what to type.</para></blockquote>
+book, mainly to emphasize important points or items.</para></blockquote>
 
 <para><ulink url="&lfs-root;"/></para>
 
@@ -36,16 +34,15 @@ what to type.</para></blockquote>
 book and to external pages such as HOWTOs, download locations and
 websites.</para></blockquote>
 
-<screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; $LFS/etc/group &lt;&lt; "EOF"
 root:x:0:
 bin:x:1:
 ......
-<userinput>EOF</userinput>
-</screen>
+EOF</userinput></screen>
 
 <blockquote><para>This type of section is used mainly when creating 
 configuration files. The first command tells the system to create 
-the file $LFS/etc/group from whatever is typed on the following lines until 
+the file <filename>$LFS/etc/group</filename> from whatever is typed on the following lines until 
 the sequence EOF is encountered. Therefore, this whole section is generally 
 typed as seen.</para></blockquote>