cvs commit: LFS/BOOK/stylesheets/xhtml lfs-mixed.xsl

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat May 29 13:00:54 PDT 2004


manuel      04/05/29 14:00:54

  Modified:    BOOK/chapter01 administrativa.xml askforhelp.xml
               BOOK/chapter02 creatingfilesystem.xml creatingpartition.xml
                        mounting.xml
               BOOK/chapter03 introduction.xml
               BOOK/chapter04 aboutlfs.xml aboutsbus.xml addinguser.xml
                        creatingtoolsdir.xml settingenviron.xml
               BOOK/stylesheets lfs.css
               BOOK/stylesheets/xhtml lfs-mixed.xsl
  Log:
  Tagging corrections in chapters 1 to 4.
  
  Revision  Changes    Path
  1.3       +5 -5      LFS/BOOK/chapter01/administrativa.xml
  
  Index: administrativa.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/administrativa.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- administrativa.xml	13 May 2004 22:55:00 -0000	1.2
  +++ administrativa.xml	29 May 2004 20:00:53 -0000	1.3
  @@ -26,8 +26,8 @@
   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 <emphasis>irc.linuxfromscratch.org</emphasis> or 
  -<emphasis>irc.linux-phreak.net</emphasis> port 6667. The support channel is
  +network at <uri>irc.linuxfromscratch.org</uri> or
  +<uri>irc.linux-phreak.net</uri> port 6667. The support channel is
   named #LFS-support.</para>
   
   </sect2>
  @@ -36,7 +36,7 @@
   <sect2 id="ch-scatter-maillists" xreflabel="Chapter 1 - Mailing lists">
   <title>Mailing lists</title>
   
  -<para>The <emphasis>linuxfromscratch.org</emphasis> server is hosting a number
  +<para>The <uri>linuxfromscratch.org</uri> 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.</para>
   
  @@ -49,12 +49,12 @@
   <sect2 id="ch-scatter-newsserver">
   <title>News server</title>
   
  -<para>All the mailing lists hosted at <emphasis>linuxfromscratch.org</emphasis>
  +<para>All the mailing lists hosted at <uri>linuxfromscratch.org</uri>
   are also accessible via the NNTP server. All messages posted to a mailing list
   are copied to the corresponding newsgroup, and vice versa.</para>
   
   <para>The news server can be reached at
  -<emphasis>news.linuxfromscratch.org</emphasis>.</para>
  +<uri>news.linuxfromscratch.org</uri>.</para>
   
   </sect2>
   
  
  
  
  1.4       +5 -5      LFS/BOOK/chapter01/askforhelp.xml
  
  Index: askforhelp.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter01/askforhelp.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- askforhelp.xml	3 May 2004 10:59:40 -0000	1.3
  +++ askforhelp.xml	29 May 2004 20:00:53 -0000	1.4
  @@ -33,9 +33,9 @@
   <listitem><para>whether you have deviated from the book at all.</para></listitem>
   </itemizedlist>
   
  -<para>(Note that saying that you've deviated from the book doesn't mean
  +<note><para>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.)</para>
  +help us to see other possible causes of your problem.</para></note>
   
   </sect2>
   
  @@ -59,7 +59,7 @@
   include the whole thing but, on the other hand, don't include too little.
   As an example, here is some screen output from make:</para>
   
  -<screen>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
  +<screen><computeroutput>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]: 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</screen>
  +make: *** [all-recursive-am] Error 2</computeroutput></screen>
   
   <para>In this case, many people just include the bottom section where it
   says:</para>
   
  -<screen>make [2]: *** [make] Error 1</screen>
  +<screen><computeroutput>make [2]: *** [make] Error 1</computeroutput></screen>
   
   <para>and onwards. This isn't enough for us to diagnose the problem because it
   only tells us that <emphasis>something</emphasis> went wrong, not
  
  
  
  1.2       +5 -5      LFS/BOOK/chapter02/creatingfilesystem.xml
  
  Index: creatingfilesystem.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter02/creatingfilesystem.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- creatingfilesystem.xml	3 May 2004 10:59:40 -0000	1.1
  +++ creatingfilesystem.xml	29 May 2004 20:00:53 -0000	1.2
  @@ -16,18 +16,18 @@
   
   <para>To create an ext2 file system on the LFS partition run the following:</para>
   
  -<screen><userinput>mke2fs /dev/xxx</userinput></screen>
  +<screen><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
   
  -<para>Replace <filename>xxx</filename> with the name of the LFS partition
  +<para>Replace <replaceable>[xxx]</replaceable> with the name of the LFS partition
   (something like <filename>hda5</filename>).</para>
   
   <para>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
  -<userinput>mke2fs</userinput>) by running:</para>
  +<command>mke2fs</command>) by running:</para>
   
  -<screen><userinput>mkswap /dev/yyy</userinput></screen>
  +<screen><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
   
  -<para>Replace <filename>yyy</filename> with the name of the swap
  +<para>Replace <replaceable>[yyy]</replaceable> with the name of the swap
   partition.</para>
   
   </sect1>
  
  
  
  1.2       +3 -3      LFS/BOOK/chapter02/creatingpartition.xml
  
  Index: creatingpartition.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter02/creatingpartition.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- creatingpartition.xml	3 May 2004 10:59:40 -0000	1.1
  +++ creatingpartition.xml	29 May 2004 20:00:53 -0000	1.2
  @@ -28,12 +28,12 @@
   system, so you won't have to create another if your host system already uses
   a swap partition.</para>
   
  -<para>Start a disk partitioning program such as <userinput>cfdisk</userinput>
  -or <userinput>fdisk</userinput> with an argument naming the hard disk upon
  +<para>Start a disk partitioning program such as <command>cfdisk</command>
  +or <command>fdisk</command> with an argument naming the hard disk upon
   which the new partition must be created -- for example
   <filename>/dev/hda</filename> for the primary IDE disk. Create a Linux native
   partition and a swap partition, if needed. Please refer to the man pages of
  -<userinput>cfdisk</userinput> or <userinput>fdisk</userinput> if you don't yet
  +<command>cfdisk</command> or <command>fdisk</command> if you don't yet
   know how to use the programs.</para>
   
   <para>Remember the designation of your new partition -- something like
  
  
  
  1.2       +9 -9      LFS/BOOK/chapter02/mounting.xml
  
  Index: mounting.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter02/mounting.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mounting.xml	3 May 2004 10:59:40 -0000	1.1
  +++ mounting.xml	29 May 2004 20:00:53 -0000	1.2
  @@ -10,7 +10,7 @@
   <para>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
  -<filename>/mnt/lfs</filename>, but it doesn't matter what directory
  +<filename class="directory">/mnt/lfs</filename>, but it doesn't matter what directory
   you choose.</para>
   
   <para>Choose a mount point and assign it to the LFS environment variable
  @@ -21,22 +21,22 @@
   <para>Now create the mount point and mount the LFS file system by running:</para>
   
   <screen><userinput>mkdir -p $LFS
  -mount /dev/xxx $LFS</userinput></screen>
  +mount /dev/<replaceable>[xxx]</replaceable> $LFS</userinput></screen>
   
  -<para>Replace <filename>xxx</filename> with the designation of the LFS
  +<para>Replace <replaceable>[xxx]</replaceable> with the designation of the LFS
   partition.</para>
   
   <para>If you have decided to use multiple partitions for LFS (say one for
  -<filename>/</filename> and another for <filename>/usr</filename>), mount
  -them like this:</para>
  +<filename class="directory">/</filename> and another for 
  +<filename class="directory">/usr</filename>), mount them like this:</para>
   
   <screen><userinput>mkdir -p $LFS
  -mount /dev/xxx $LFS
  +mount /dev/<replaceable>[xxx]</replaceable> $LFS
   mkdir $LFS/usr
  -mount /dev/yyy $LFS/usr</userinput></screen>
  +mount /dev/<replaceable>[yyy]</replaceable> $LFS/usr</userinput></screen>
   
  -<para>Of course, replace <filename>xxx</filename> and <filename>yyy</filename>
  -with the appropriate partition names.</para>
  +<para>Of course, replace <replaceable>[xxx]</replaceable> and
  +<replaceable>[yyy]</replaceable> with the appropriate partition names.</para>
   
   <para>You should also ensure that this new partition is not mounted with
   permissions that are too restrictive (such as the nosuid, nodev or noatime
  
  
  
  1.14      +1 -1      LFS/BOOK/chapter03/introduction.xml
  
  Index: introduction.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter03/introduction.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- introduction.xml	3 May 2004 10:59:40 -0000	1.13
  +++ introduction.xml	29 May 2004 20:00:53 -0000	1.14
  @@ -31,7 +31,7 @@
   <para>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 <filename>$LFS/sources</filename> as the place to store
  +works well is to use <filename class="directory">$LFS/sources</filename> as the place to store
   the tarballs and patches, <emphasis>and</emphasis> 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.</para>
  
  
  
  1.2       +4 -4      LFS/BOOK/chapter04/aboutlfs.xml
  
  Index: aboutlfs.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/aboutlfs.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aboutlfs.xml	3 May 2004 10:59:40 -0000	1.1
  +++ aboutlfs.xml	29 May 2004 20:00:53 -0000	1.2
  @@ -22,12 +22,12 @@
   <screen><userinput>export LFS=/mnt/lfs</userinput></screen>
   
   <para>Having this variable set means that if you are told to run a command like
  -<userinput>mkdir $LFS/tools</userinput>, 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.</para>
  +<command>mkdir $LFS/tools</command>, you can type it literally. Your shell
  +will replace <quote>$LFS</quote> with <quote>/mnt/lfs</quote> (or whatever 
  +you set the variable to) when it processes the command line.</para>
   
   <para>Don't forget to check that <quote>$LFS</quote> is set whenever you leave and
  -reenter the environment (as when doing an <quote>su</quote> to root or another user).
  +reenter the environment (as when doing a <quote>su</quote> to root or another user).
   </para>
   
   </sect1>
  
  
  
  1.3       +1 -1      LFS/BOOK/chapter04/aboutsbus.xml
  
  Index: aboutsbus.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/aboutsbus.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- aboutsbus.xml	18 May 2004 18:30:50 -0000	1.2
  +++ aboutsbus.xml	29 May 2004 20:00:53 -0000	1.3
  @@ -8,7 +8,7 @@
   <?dbhtml filename="aboutsbus.html"?>
   
   <para>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 <quote>Linux from Scratch</quote> 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
  
  
  
  1.2       +17 -8     LFS/BOOK/chapter04/addinguser.xml
  
  Index: addinguser.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/addinguser.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- addinguser.xml	3 May 2004 10:59:40 -0000	1.1
  +++ addinguser.xml	29 May 2004 20:00:53 -0000	1.2
  @@ -19,19 +19,28 @@
   
   <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
  +<variablelist>
  +<varlistentry>
  +<term><parameter>-s /bin/bash</parameter></term>
  +<listitem><para>This makes
  +<command>bash</command> the default shell for user
   <emphasis>lfs</emphasis>.</para></listitem>
  +</varlistentry>
   
  -<listitem><para><userinput>-m</userinput>: This creates a home
  +<varlistentry>
  +<term><parameter>-m</parameter></term>
  +<listitem><para>This creates a home
   directory for <emphasis>lfs</emphasis>.</para></listitem>
  +</varlistentry>
   
  -<listitem><para><userinput>-k /dev/null</userinput>: This parameter
  +<varlistentry>
  +<term><parameter>-k /dev/null</parameter></term>
  +<listitem><para>This parameter
   prevents possible copying of files from a skeleton directory (default
  -is <filename>/etc/skel</filename>) by changing the input location to
  +is <filename class="directory">/etc/skel</filename>) by changing the input location to
   the special null device.</para></listitem>
  -</itemizedlist>
  +</varlistentry>
  +</variablelist>
   
   <para>If you want to be able to log in as <emphasis>lfs</emphasis>, then give
   <emphasis>lfs</emphasis> a password:</para>
  @@ -55,7 +64,7 @@
   
   <screen><userinput>su - lfs</userinput></screen>
   
  -<para>The <quote><command>-</command></quote> instructs <command>su</command> to
  +<para>The <quote><parameter>-</parameter></quote> instructs <command>su</command> to
   start a <emphasis>login</emphasis> shell.</para>
   
   </sect1>
  
  
  
  1.3       +1 -1      LFS/BOOK/chapter04/creatingtoolsdir.xml
  
  Index: creatingtoolsdir.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/creatingtoolsdir.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- creatingtoolsdir.xml	18 May 2004 18:25:36 -0000	1.2
  +++ creatingtoolsdir.xml	29 May 2004 20:00:53 -0000	1.3
  @@ -38,7 +38,7 @@
   reporting what you may think is an error.</para></note>
   
   <para>The created symlink enables us to compile our toolchain so that it always
  -refers to <filename>/tools</filename>, meaning that the compiler, assembler
  +refers to <filename class="directory">/tools</filename>, meaning that the compiler, assembler
   and linker will work both in this chapter (when we are still using some tools
   from the host) <emphasis>and</emphasis> in the next (when we are <quote>chrooted</quote> to
   the LFS partition).</para>
  
  
  
  1.2       +5 -5      LFS/BOOK/chapter04/settingenviron.xml
  
  Index: settingenviron.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter04/settingenviron.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- settingenviron.xml	3 May 2004 10:59:40 -0000	1.1
  +++ settingenviron.xml	29 May 2004 20:00:53 -0000	1.2
  @@ -12,9 +12,9 @@
   user <emphasis>lfs</emphasis>, issue the following command to create a new
   <filename>.bash_profile</filename>:</para>
   
  -<screen><userinput>cat > ~/.bash_profile << "EOF"</userinput>
  +<screen><userinput>cat > ~/.bash_profile << <quote>EOF<quote>
   exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash
  -<userinput>EOF</userinput></screen>
  +EOF</userinput></screen>
   
   <para>Normally, when you log on as user <emphasis>lfs</emphasis>,
   the initial shell is a <emphasis>login</emphasis> shell which reads the
  @@ -32,14 +32,14 @@
   <filename>.bash_profile</filename> files, but reads the
   <filename>.bashrc</filename> file instead. Create this latter file now:</para>
   
  -<screen><userinput>cat > ~/.bashrc << "EOF"</userinput>
  +<screen><userinput>cat > ~/.bashrc << <quote>EOF<quote>
   set +h
   umask 022
   LFS=/mnt/lfs
   LC_ALL=POSIX
   PATH=/tools/bin:/bin:/usr/bin
   export LFS LC_ALL PATH
  -<userinput>EOF</userinput></screen>
  +EOF</userinput></screen>
   
   <para>The <command>set +h</command> command turns off
   <command>bash</command>'s hash function. Normally hashing is a useful
  @@ -68,7 +68,7 @@
   (or <quote>C</quote>, the two are equivalent) we ensure that
   everything will work as expected in the chroot environment.</para>
   
  -<para>We prepend <filename>/tools/bin</filename> to the standard PATH so
  +<para>We prepend <filename class="directory">/tools/bin</filename> 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.</para>
   
  
  
  
  1.12      +13 -33    LFS/BOOK/stylesheets/lfs.css
  
  Index: lfs.css
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/stylesheets/lfs.css,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- lfs.css	27 May 2004 17:48:41 -0000	1.11
  +++ lfs.css	29 May 2004 20:00:53 -0000	1.12
  @@ -129,26 +129,13 @@
   }
   
   /* 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 @@
     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 @@
     margin: 0 0 1em 3em;
     padding: 0;
   }
  -
   div.variablelist dd {
     margin-bottom: 1em;
   }
  @@ -196,10 +173,6 @@
     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 @@
     font-family: monospace;
   }
   
  -pre.screen {
  +pre.userinput {
     color: #101310;
     background-color: #e5e5e5;
     border: 1px solid #050505;
  @@ -231,17 +204,24 @@
     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.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;
   }
   
  
  
  
  1.8       +1 -2      LFS/BOOK/stylesheets/xhtml/lfs-mixed.xsl
  
  Index: lfs-mixed.xsl
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/stylesheets/xhtml/lfs-mixed.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- lfs-mixed.xsl	20 May 2004 21:48:55 -0000	1.7
  +++ lfs-mixed.xsl	29 May 2004 20:00:54 -0000	1.8
  @@ -7,9 +7,8 @@
       <!-- screen -->
     <xsl:template match="screen">
       <xsl:choose>
  -        <!-- Temporally hack -->
         <xsl:when test="child::* = userinput">
  -        <pre class="{name(.)}">
  +        <pre class="userinput">
             <kbd class="command">
               <xsl:value-of select="."/>
             </kbd>
  
  
  



More information about the lfs-book mailing list