cvs commit: ALFS/docs/syntax_doc/alfs_dtd elem_digest.xml elem_download.xml elem_environment.xml elem_execute.xml elem_file.xml elem_find.xml elem_if.xml elem_item.xml elem_link.xml elem_list.xml elem_make.xml elem_mkdir.xml elem_move.xml elem_name.xml elem_option.xml elem_ownership.xml elem_package.xml elem_packageinfo.xml elem_para.xml elem_param.xml elem_patch.xml elem_permissions.xml elem_reference.xml elem_remove.xml elem_replace.xml elem_requires.xml elem_root.xml elem_search_replace.xml elem_source.xml elem_stage.xml elem_stageinfo.xml elem_target.xml elem_textdump.xml elem_unpack.xml elem_url.xml elem_user.xml elem_utilizes.xml elem_variable.xml elem_version.xml

jwrober at linuxfromscratch.org jwrober at linuxfromscratch.org
Sun Feb 22 19:53:52 PST 2004


jwrober     04/02/22 20:53:52

  Modified:    docs/syntax_doc/alfs_dtd elem_digest.xml elem_download.xml
                        elem_environment.xml elem_execute.xml elem_file.xml
                        elem_find.xml elem_if.xml elem_item.xml
                        elem_link.xml elem_list.xml elem_make.xml
                        elem_mkdir.xml elem_move.xml elem_name.xml
                        elem_option.xml elem_ownership.xml elem_package.xml
                        elem_packageinfo.xml elem_para.xml elem_param.xml
                        elem_patch.xml elem_permissions.xml
                        elem_reference.xml elem_remove.xml elem_replace.xml
                        elem_requires.xml elem_root.xml
                        elem_search_replace.xml elem_source.xml
                        elem_stage.xml elem_stageinfo.xml elem_target.xml
                        elem_textdump.xml elem_unpack.xml elem_url.xml
                        elem_user.xml elem_utilizes.xml elem_variable.xml
                        elem_version.xml
  Log:
  render fix
  
  Revision  Changes    Path
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_digest.xml
  
  Index: elem_digest.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_digest.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_digest.xml	23 Feb 2004 03:09:37 -0000	1.6
  +++ elem_digest.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -34,12 +34,12 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><download>
  +<screen><userinput><download>
   	<file>kbd-1.08.tar.gz</file>
   	<url>ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</url>
   	<destination>/tmp/</destination>
   	<digest>924e6a05e52715dc0f96385b35f2f680</digest>
  -</download></screen></userinput>
  +</download></userinput></screen>
   
   <para>There is no equivalent Bash script example for this element.</para>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_download.xml
  
  Index: elem_download.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_download.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_download.xml	23 Feb 2004 03:09:37 -0000	1.6
  +++ elem_download.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -62,12 +62,12 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><download>
  +<screen><userinput><download>
   	<file>kbd-1.08.tar.gz</file>
   	<url>ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</url>
   	<destination>/tmp/</destination>
   	<digest>924e6a05e52715dc0f96385b35f2f680</digest>
  -</download></screen></userinput>
  +</download></userinput></screen>
   
   <para>There is no equivalent Bash script example for this element.</para>
   
  
  
  
  1.9       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_environment.xml
  
  Index: elem_environment.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_environment.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- elem_environment.xml	23 Feb 2004 03:09:50 -0000	1.8
  +++ elem_environment.xml	23 Feb 2004 03:53:51 -0000	1.9
  @@ -39,7 +39,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><stage>
  +<screen><userinput><stage>
   	<stageinfo>
   		<base>/usr/src/gzip.1.2.4a</base>
   	<environment>
  @@ -56,11 +56,11 @@
   	<make>
   		<param>install</param>
   	</make>
  -</stage></screen></userinput>
  +</stage></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Stage
  +<screen><userinput>echo Stage
   
   export GCCFLAGS=-O2
   export PATH=/usr/src/gzip.1.2.4a:$PATH
  @@ -78,7 +78,7 @@
   cd /usr/src/gzip.1.2.4a
   <command>make install</command>
   
  -echo Exiting stage</screen></userinput>
  +echo Exiting stage</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +6 -6      ALFS/docs/syntax_doc/alfs_dtd/elem_execute.xml
  
  Index: elem_execute.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_execute.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_execute.xml	23 Feb 2004 03:09:50 -0000	1.6
  +++ elem_execute.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -57,19 +57,19 @@
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Executing 'umount'
  -<command>umount</command></screen></userinput>
  +<screen><userinput>echo Executing 'umount'
  +<command>umount</command></userinput></screen>
   
   <para>The second example is an execute command with one parameter.</para>
   
  -<userinput><screen><execute command="mount">
  +<screen><userinput><execute command="mount">
   	<param>/mnfs/lfs</param>
  -</execute></screen></userinput>
  +</execute></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Executing 'mount'
  -<command>mount /mnfs/lfs</command></screen></userinput>
  +<screen><userinput>echo Executing 'mount'
  +<command>mount /mnfs/lfs</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_file.xml
  
  Index: elem_file.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_file.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_file.xml	23 Feb 2004 03:10:09 -0000	1.6
  +++ elem_file.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -47,7 +47,7 @@
   
   <para>The second example is a textdump.</para>
   
  -<userinput><screen><textdump base="/etc">
  +<screen><userinput><textdump base="/etc">
   	<file>group</file>
   
   	<content>
  @@ -64,11 +64,11 @@
   		=dialout:x:10:
   		=audio:x:11:
   	</content>
  -</textdump></screen></userinput>
  +</textdump></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Generating file group
  +<screen><userinput>echo Generating file group
   cd /etc
   
   <command>cat > group << 'EOF'</command>
  @@ -84,7 +84,7 @@
   lp:x:9:
   dialout:x:10:
   audio:x:11:
  -<command>EOF</command></screen></userinput>
  +<command>EOF</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -5      ALFS/docs/syntax_doc/alfs_dtd/elem_find.xml
  
  Index: elem_find.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_find.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_find.xml	23 Feb 2004 03:10:09 -0000	1.6
  +++ elem_find.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -26,19 +26,18 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><search_replace
  -	base = "/usr/src/mypackage">
  +<screen><userinput><search_replace base="/usr/src/mypackage">
   	<file>runit.sh</file>
   	<find>BINDIR</find>
   	<replace>/bin</replace>
  -</search_replace></screen></userinput>
  +</search_replace></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Performing substitution in runit.sh
  +<screen><userinput>echo Performing substitution in runit.sh
   cd /usr/src/mypackage
   cp runit.sh /tmp/foo.$$
  -<command>sed -e 's/BINDIR/\/bin/' /tmp/foo.$$ > runit.sh</command></screen></userinput>
  +<command>sed -e 's/BINDIR/\/bin/' /tmp/foo.$$ > runit.sh</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +8 -8      ALFS/docs/syntax_doc/alfs_dtd/elem_if.xml
  
  Index: elem_if.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_if.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_if.xml	23 Feb 2004 03:10:22 -0000	1.6
  +++ elem_if.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -60,33 +60,33 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen>
  +<screen><userinput>
   <if test="0">
   <then><execute command="echo this should be executed." /></then>
   <else><execute command="echo this should not be executed." /></else>
   </if>
  -</screen></userinput>
  +</userinput></screen>
   
  -<userinput><screen>
  +<screen><userinput>
   <execute command="touch /tmp/foo" />
   <if test="[-r /tmp/foo">
   <then><execute command="echo this should be executed." /></then>
   <else><execute command="echo this should not be executed." /></else>
   </if>
  -</screen></userinput>
  +</userinput></screen>
   
  -<userinput><screen>
  +<screen><userinput>
   <if package="bison">
   <then><execute command="echo this should be executed if bison is build." /></then>
   <else><execute command="echo this should not be executed if bison is build." /></else>
   </if>
  -</screen></userinput>
  +</userinput></screen>
   
  -<userinput><screen>
  +<screen><userinput>
   <if package="bison" condition="ge" version="1.875">
   <then><execute command="echo this should be executed if bison 1.875 or greater is build." /></then>
   </if>
  -</screen></userinput>
  +</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_item.xml
  
  Index: elem_item.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_item.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_item.xml	23 Feb 2004 03:10:22 -0000	1.6
  +++ elem_item.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -30,7 +30,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen> <package name="gimp" version="1.2.3">
  +<screen><userinput><package name="gimp" version="1.2.3">
           <packageinfo>
   	        <description>
                       <para>The gimp package contains the GNU Image Manipulation Program.
  @@ -57,7 +57,7 @@
   
       </package>
   
  -</screen></userinput>
  +</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_link.xml
  
  Index: elem_link.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_link.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_link.xml	23 Feb 2004 03:10:34 -0000	1.6
  +++ elem_link.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -64,17 +64,17 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><link>
  +<screen><userinput><link>
   	<target>share/man</target>
   	<target>share/doc</target>
   	<target>share/info</target>
   	<name>/usr/local</name>
  -</link></screen></userinput>
  +</link></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo 'Linking  share/man share/doc share/info into /usr/local'
  -<command>ln -s  share/man share/doc share/info /usr/local</command></screen></userinput>
  +<screen><userinput>echo 'Linking  share/man share/doc share/info into /usr/local'
  +<command>ln -s  share/man share/doc share/info /usr/local</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_list.xml
  
  Index: elem_list.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_list.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_list.xml	23 Feb 2004 03:10:34 -0000	1.6
  +++ elem_list.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -32,7 +32,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><package name="gimp" version="1.2.3">
  +<screen><userinput><package name="gimp" version="1.2.3">
   	<packageinfo>
   		<description>
   		<para>The gimp package contains the GNU Image Manipulation Program.
  @@ -57,7 +57,7 @@
   
   	....
   
  -</package></screen></userinput>
  +</package></userinput</screen>
   
   </sect2>
   
  
  
  
  1.7       +7 -7      ALFS/docs/syntax_doc/alfs_dtd/elem_make.xml
  
  Index: elem_make.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_make.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_make.xml	23 Feb 2004 03:11:37 -0000	1.6
  +++ elem_make.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -45,24 +45,24 @@
   
   <para>The first example is a make without parameter</para>
   
  -<userinput><screen><make /></screen></userinput>
  +<screen><userinput><make /></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Executing make
  -<command>make</command></screen></userinput>
  +<screen><userinput>echo Executing make
  +<command>make</command></userinput></screen>
   
   <para>The second example is a make with a parameter</para>
   
  -<userinput><screen><make base="/usr/src/mypackage">
  +<screen><userinput><make base="/usr/src/mypackage">
   	<param>install</param>
  -</make></screen></userinput>
  +</make></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Executing make
  +<screen><userinput>echo Executing make
   cd /usr/src/mypackage
  -<command>make install</command></screen></userinput>
  +<command>make install</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_mkdir.xml
  
  Index: elem_mkdir.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_mkdir.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_mkdir.xml	23 Feb 2004 03:13:31 -0000	1.6
  +++ elem_mkdir.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -49,16 +49,16 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><mkdir base="/usr/local/lib">
  +<screen><userinput><mkdir base="/usr/local/lib">
   	<option>parents</option>
   	<name>X11</name>
  -</mkdir></screen></userinput>
  +</mkdir></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>cd /usr/local/lib
  +<screen><userinput>cd /usr/local/lib
   echo Making directory X11
  -<command>mkdir -p X11</command></screen></userinput>
  +<command>mkdir -p X11</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_move.xml
  
  Index: elem_move.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_move.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_move.xml	23 Feb 2004 03:13:31 -0000	1.6
  +++ elem_move.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -59,15 +59,15 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><move>
  +<screen><userinput><move>
   	<source>/usr/src/mypackage/config.txt</source>
   	<destination>/opt/mypackage/config.txt</destination>
  -</move></screen></userinput>
  +</move></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Move ' /usr/src/mypackage/config.txt /opt/mypackage/config.txt'
  -<command>mv /usr/src/mypackage/config.txt /opt/mypackage/config.txt</command></screen></userinput>
  +<screen><userinput>echo Move ' /usr/src/mypackage/config.txt /opt/mypackage/config.txt'
  +<command>mv /usr/src/mypackage/config.txt /opt/mypackage/config.txt</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_name.xml
  
  Index: elem_name.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_name.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_name.xml	23 Feb 2004 03:14:43 -0000	1.6
  +++ elem_name.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -37,16 +37,16 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><mkdir base="/usr/local/lib">
  +<screen><userinput><mkdir base="/usr/local/lib">
   	<option>parents</option>
   	<name>X11</name>
  -</mkdir></screen></userinput>
  +</mkdir></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>cd /usr/local/lib
  +<screen><userinput>cd /usr/local/lib
   echo Making directory X11
  -<command>mkdir -p X11</command></screen></userinput>
  +<command>mkdir -p X11</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_option.xml
  
  Index: elem_option.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_option.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_option.xml	23 Feb 2004 03:14:56 -0000	1.6
  +++ elem_option.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -31,16 +31,16 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><mkdir base="/usr/local/lib">
  +<screen><userinput><mkdir base="/usr/local/lib">
   	<option>parents</option>
   	<name>X11</name>
  -</mkdir></screen></userinput>
  +</mkdir></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>cd /usr/local/lib
  +<screen><userinput>cd /usr/local/lib
   echo Making directory X11
  -<command>mkdir -p X11</command></screen></userinput>
  +<command>mkdir -p X11</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +8 -8      ALFS/docs/syntax_doc/alfs_dtd/elem_ownership.xml
  
  Index: elem_ownership.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_ownership.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_ownership.xml	23 Feb 2004 03:14:56 -0000	1.6
  +++ elem_ownership.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -53,15 +53,15 @@
   
   <para>The first example uses symbolic names.</para>
   
  -<userinput><screen><ownership user="root" group="root">
  +<screen><userinput><ownership user="root" group="root">
   	<option>recursive</option>
   	<name>/etc/rc.d</name>
   	<name>/etc/sysconfig</name>
  -</ownership></screen></userinput>
  +</ownership></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Changing group of /etc/rc.d into root
  +<screen><userinput>echo Changing group of /etc/rc.d into root
   <command>chgrp -R root /etc/rc.d</command>
   
   echo Changing owner of /etc/rc.d into root
  @@ -71,19 +71,19 @@
   <command>chgrp -R root /etc/sysconfig</command>
   
   echo Changing owner of /etc/sysconfig into root
  -<command>chown -R root /etc/sysconfig</command></screen></userinput>
  +<command>chown -R root /etc/sysconfig</command></userinput></screen>
   
   <para>The second example uses numeric values (0 = root).</para>
   
  -<userinput><screen><ownership user="0" group="0">
  +<screen><userinput><ownership user="0" group="0">
   	<option>recursive</option>
   	<name>/etc/rc.d</name>
   	<name>/etc/sysconfig</name>
  -</ownership></screen></userinput>
  +</ownership></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Changing group of /etc/rc.d into 0
  +<screen><userinput>echo Changing group of /etc/rc.d into 0
   <command>chgrp -R 0 /etc/rc.d</command>
   
   echo Changing owner of /etc/rc.d into 0
  @@ -93,7 +93,7 @@
   <command>chgrp -R 0 /etc/sysconfig</command>
   
   echo Changing owner of /etc/sysconfig into 0
  -<command>chown -R 0 /etc/sysconfig</command></screen></userinput>
  +<command>chown -R 0 /etc/sysconfig</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_package.xml
  
  Index: elem_package.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_package.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_package.xml	23 Feb 2004 03:15:20 -0000	1.6
  +++ elem_package.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -44,7 +44,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><package name="zlib"
  +<screen><userinput><package name="zlib"
   version="1.1.4">
   	<stage name="Unpacking a package.">
   		<unpack>
  @@ -55,11 +55,11 @@
   
   	.....
   
  -</package></screen></userinput>
  +</package></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Generating package zlib 1.1.4
  +<screen><userinput>echo Generating package zlib 1.1.4
   
   #-----------------------------------------
   echo Stage "Unpacking a package."
  @@ -76,7 +76,7 @@
   
   ...
   
  -echo End of generating package zlib 1.1.4</screen></userinput>
  +echo End of generating package zlib 1.1.4</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_packageinfo.xml
  
  Index: elem_packageinfo.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_packageinfo.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_packageinfo.xml	23 Feb 2004 03:15:20 -0000	1.6
  +++ elem_packageinfo.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -44,7 +44,7 @@
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Generating package zlib 1.1.4
  +<screen><userinput>echo Generating package zlib 1.1.4
   
   #-----------------------------------------
   echo Stage "Unpacking a package."
  @@ -61,7 +61,7 @@
   
   ...
   
  -echo End of generating package zlib 1.1.4</screen></userinput>
  +echo End of generating package zlib 1.1.4</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_para.xml
  
  Index: elem_para.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_para.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_para.xml	23 Feb 2004 03:15:32 -0000	1.6
  +++ elem_para.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -26,7 +26,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><package name="gimp" version="1.2.3">
  +<screen><userinput><package name="gimp" version="1.2.3">
   	<packageinfo;>
   		<description;>
   			<para;>The gimp package contains the GNU Image Manipulation Program.
  @@ -47,7 +47,7 @@
   
   	......
   
  -</package;></screen></userinput>
  +</package;></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_param.xml
  
  Index: elem_param.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_param.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_param.xml	23 Feb 2004 03:15:32 -0000	1.6
  +++ elem_param.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -29,14 +29,14 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><make>
  +<screen><userinput><make>
   	<param>install</param>
  -</make></screen></userinput>
  +</make></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Executing make
  -<command>make install</command></screen></userinput>
  +<screen><userinput>echo Executing make
  +<command>make install</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_patch.xml
  
  Index: elem_patch.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_patch.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_patch.xml	23 Feb 2004 03:15:43 -0000	1.6
  +++ elem_patch.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -40,16 +40,16 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><patch>
  +<screen><userinput><patch>
   	<param>-N</param>
   	<param>-p1</param>
   	<param>-i ../gawk-3.1.1.patch</param>
  -</patch></screen></userinput>
  +</patch></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo 'patch -N -p1 -i ../gawk-3.1.1.patch'
  -<command>patch -N -p1 -i ../gawk-3.1.1.patch</command></screen></userinput>
  +<screen><userinput>echo 'patch -N -p1 -i ../gawk-3.1.1.patch'
  +<command>patch -N -p1 -i ../gawk-3.1.1.patch</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_permissions.xml
  
  Index: elem_permissions.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_permissions.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_permissions.xml	23 Feb 2004 03:15:54 -0000	1.6
  +++ elem_permissions.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -42,14 +42,14 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><permissions mode="755">
  +<screen><userinput><permissions mode="755">
       <name>/usr/bin/lex</name>
  -</permissions></screen></userinput>
  +</permissions></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Changing permissions of /usr/bin/lex to 755
  -<command>chmod 755 /usr/bin/lex</command></screen></userinput>
  +<screen><userinput>echo Changing permissions of /usr/bin/lex to 755
  +<command>chmod 755 /usr/bin/lex</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_reference.xml
  
  Index: elem_reference.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_reference.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_reference.xml	23 Feb 2004 03:16:21 -0000	1.6
  +++ elem_reference.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -27,15 +27,15 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><unpack>
  +<screen><userinput><unpack>
   	<reference>ftp://ftp.gnu.org/gnu/gzip/gzip.1.2.4a.tar.gz</reference>
   	<archive>/usr/src/lfs-packages/gzip.1.2.4a</archive>
   	<destination>/usr/src</destination>
  -</unpack></screen></userinput>
  +</unpack></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>cho Unpacking /usr/src/lfs-packages/gzip.1.2.4a.tar.gz into /usr/src
  +<screen><userinput>echo Unpacking /usr/src/lfs-packages/gzip.1.2.4a.tar.gz into /usr/src
   [[ ! -f /usr/src/lfs-packages/gzip.1.2.4a.tar.gz ]] &&
     echo Retrieving  ftp://ftp.gnu.org/gnu/gzip/gzip.1.2.4a.tar.gz
   [[ ! -f /usr/src/lfs-packages/gzip.1.2.4a.tar.gz ]] &&
  @@ -44,7 +44,7 @@
     echo Archive does not exist && exit 3
   
   cd /usr/src
  -<command>tar xzvf /usr/src/lfs-packages/gzip.1.2.4a.tar.gz</command></screen></userinput>
  +<command>tar xzvf /usr/src/lfs-packages/gzip.1.2.4a.tar.gz</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +3 -3      ALFS/docs/syntax_doc/alfs_dtd/elem_remove.xml
  
  Index: elem_remove.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_remove.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_remove.xml	23 Feb 2004 03:16:32 -0000	1.6
  +++ elem_remove.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -30,12 +30,12 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><remove>/usr/src/mypackage</remove></screen></userinput>
  +<screen><userinput><remove>/usr/src/mypackage</remove></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Removing /usr/src/mypackage
  -<command>rm -rf /usr/src/mypackage</command></screen></userinput>
  +<screen><userinput>echo Removing /usr/src/mypackage
  +<command>rm -rf /usr/src/mypackage</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_replace.xml
  
  Index: elem_replace.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_replace.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_replace.xml	23 Feb 2004 03:16:42 -0000	1.6
  +++ elem_replace.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -26,18 +26,18 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><search_replace base="/usr/src/mypackage">
  +<screen><userinput><search_replace base="/usr/src/mypackage">
   	<file>runit.sh</file>
   	<find>BINDIR</find>
   	<replace>/bin</replace>
  -</search_replace></screen></userinput>
  +</search_replace></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Performing substitution in runit.sh
  +<screen><userinput>echo Performing substitution in runit.sh
   cd /usr/src/mypackage
   cp runit.sh /tmp/foo.$$
  -<command>sed -e 's/BINDIR/\/bin/' /tmp/foo.$$ > runit.sh</command></screen></userinput>
  +<command>sed -e 's/BINDIR/\/bin/' /tmp/foo.$$ > runit.sh</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_requires.xml
  
  Index: elem_requires.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_requires.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_requires.xml	23 Feb 2004 03:16:53 -0000	1.6
  +++ elem_requires.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -36,7 +36,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><package name="librep" version="0.16.1">
  +<screen><userinput><package name="librep" version="0.16.1">
   	<packageinfo>
   		<requires><name>gmp</name></requires>
   		<requires><name>gdbm</name></requires>
  @@ -51,11 +51,11 @@
   
   	......
   
  -</package></screen></userinput>
  +</package></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>#-----------------------------------------
  +<screen><userinput>#-----------------------------------------
   # processing package librep 0.16.1
   
   echo Generating package librep 0.16.1
  @@ -74,7 +74,7 @@
   
   ....
   
  -echo End of generating package librep 0.16.1</screen></userinput>
  +echo End of generating package librep 0.16.1</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +6 -6      ALFS/docs/syntax_doc/alfs_dtd/elem_root.xml
  
  Index: elem_root.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_root.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_root.xml	23 Feb 2004 03:17:04 -0000	1.6
  +++ elem_root.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -26,24 +26,24 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><stage>
  +<screen><userinput><stage>
   	<stageinfo>
   		<root>/mnt/lfs</root>
   		<base>/usr/src/gzip.1.2.4a</base>
   	</stageinfo>
   
  -	<configure />
  +	<configure />
   
  -	<make />
  +	<make />
   
   	<make>
   		<param>install</param>
   	</make>
  -</stage></screen></userinput>
  +</stage></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Creating file /mnt/lfs/_nalfs_tmp.1...
  +<screen><userinput>echo Creating file /mnt/lfs/_nalfs_tmp.1...
   cat > /mnt/lfs/_nalfs_tmp.1 << 'EOF1'
   echo Executing configure
   cd /usr/src/gzip.1.2.4a
  @@ -66,7 +66,7 @@
       PATH='/bin:/usr/bin:/sbin:/usr/sbin:/static/bin' \
       HOME='/root' /static/bin/bash -c ./_nalfs_tmp.1
   
  -echo Exiting stage</screen></userinput>
  +echo Exiting stage</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_search_replace.xml
  
  Index: elem_search_replace.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_search_replace.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_search_replace.xml	23 Feb 2004 03:17:23 -0000	1.6
  +++ elem_search_replace.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -45,18 +45,18 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><search_replace base="/usr/src/mypackage">
  +<screen><userinput><search_replace base="/usr/src/mypackage">
   	<file>runit.sh</file>
   	<find>BINDIR</find>
   	<replace>/bin</replace>
  -</search_replace></screen></userinput>
  +</search_replace></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Performing substitution in runit.sh
  +<screen><userinput>echo Performing substitution in runit.sh
   cd /usr/src/mypackage
   cp runit.sh /tmp/foo.$$
  -<command>sed -e 's/BINDIR/\/bin/' /tmp/foo.$$ > runit.sh</command></screen></userinput>
  +<command>sed -e 's/BINDIR/\/bin/' /tmp/foo.$$ > runit.sh</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_source.xml
  
  Index: elem_source.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_source.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_source.xml	23 Feb 2004 03:17:34 -0000	1.6
  +++ elem_source.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -30,17 +30,17 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><copy base="/usr/src/mypackage">
  +<screen><userinput><copy base="/usr/src/mypackage">
   	<option>force</option>
   	<source>config.txt</source>
   	<destination>/opt/mypackage/config.txt</destination>
  -</copy></screen></userinput>
  +</copy></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Copying 'config.txt into /opt/mypackage/config.txt'
  +<screen><userinput>echo Copying 'config.txt into /opt/mypackage/config.txt'
   cd /usr/src/mypackage
  -<command>cp -f  config.txt /opt/mypackage/config.txt</command></screen></userinput>
  +<command>cp -f  config.txt /opt/mypackage/config.txt</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.6       +51 -56    ALFS/docs/syntax_doc/alfs_dtd/elem_stage.xml
  
  Index: elem_stage.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_stage.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- elem_stage.xml	4 Nov 2003 03:07:50 -0000	1.5
  +++ elem_stage.xml	23 Feb 2004 03:53:51 -0000	1.6
  @@ -6,40 +6,38 @@
   <title>Syntax</title>
   
   <synopsis>
  -<!ELEMENT stage          (stageinfo?,(configure|copy|download|execute|
  -                                       if|link|make|mkdir|move|ownership|package|
  -                                       patch|permissions|remove|search_replace|
  -                                       stage|textdump|unpack)*)>
  +<!ELEMENT stage          (stageinfo?, (alfs | configure | copy | download | 
  +                             execute | link | make | mkdir | move | ownership |
  +                             package | patch | permissions | remove | 
  +                             search_replace | stage | textdump | unpack)*)>
   <!ATTLIST stage
  -          name           CDATA #IMPLIED>
  +             name           CDATA #IMPLIED>
   </synopsis>
   
  -<para>This element occurs in the elements
  -<link linkend="elem_alfs">alfs</link>,
  -<link linkend="elem_alfs">else</link>,
  -<link linkend="elem_stage">stage</link>.
  -and <link linkend="elem_then">then</link>
  +<para>This element occurs in the elements :  
  +<xref linkend="elem_alfs"/>  |  
  +<xref linkend="elem_stage"/>
   </para>
   
  -<para>See also :
  -<link linkend="elem_configure">configure</link>,
  -<link linkend="elem_copy">copy</link>,
  -<link linkend="elem_download">download</link>,
  -<link linkend="elem_execute">execute</link>,
  -<link linkend="elem_if">if</link>,
  -<link linkend="elem_link">link</link>,
  -<link linkend="elem_make">make</link>,
  -<link linkend="elem_mkdir">mkdir</link>,
  -<link linkend="elem_move">move</link>,
  -<link linkend="elem_ownership">ownership</link>,
  -<link linkend="elem_package">package</link>,
  -<link linkend="elem_patch">patch</link>,
  -<link linkend="elem_permissions">permissions</link>,
  -<link linkend="elem_remove">remove</link>,
  -<link linkend="elem_search_replace">search_replace</link>,
  -<link linkend="elem_stageinfo">stageinfo</link>,
  -<link linkend="elem_textdump">textdump</link>,
  -<link linkend="elem_unpack">unpack</link>.
  +<para>See also :  
  +<xref linkend="elem_alfs"/>  |  
  +<xref linkend="elem_configure"/>  |  
  +<xref linkend="elem_copy"/>  |  
  +<xref linkend="elem_download"/>  |  
  +<xref linkend="elem_execute"/>  |  
  +<xref linkend="elem_link"/>  |  
  +<xref linkend="elem_make"/>>  |  
  +<xref linkend="elem_mkdir"/>  |  
  +<xref linkend="elem_move"/>  |  
  +<xref linkend="elem_ownership"/>  |  
  +<xref linkend="elem_package"/>  |  
  +<xref linkend="elem_patch"/>  |  
  +<xref linkend="elem_permissions"/>  |  
  +<xref linkend="elem_remove"/>  |  
  +<xref linkend="elem_search_replace"/>  |  
  +<xref linkend="elem_stageinfo"/>  |  
  +<xref linkend="elem_textdump"/>  |  
  +<xref linkend="elem_unpack"/>
   </para>
   
   </sect2>
  @@ -47,49 +45,46 @@
   <sect2>
   <title>Description</title>
   
  -<para>The element <token>stage</token> allows to regroup commands,
  -give a name to this group, through the attribute <token>name</token>,
  -and optionally modify the execution context through the element
  -<token>stageinfo</token>.</para>
  +<para>The element <filename>stage</filename> is one of the many main
  +operation elements.  It allows one to regroup commands, give a name to this
  +group, through the attribute <filename>name</filename>, and optionally
  +modify the execution context through the element
  +<filename>stageinfo</filename>.</para>
   
   </sect2>
   
   <sect2>
   <title>Examples</title>
   
  -<programlisting>
  -<stage>
  -    <stageinfo>
  -        <base>/usr/src/gzip.1.2.4a</base>
  -    </stageinfo>
  -
  -    <configure />
  -
  -    <make />
  -
  -    <make>
  -        <param>install</param>
  -    </make>
  -</stage>
  -</programlisting>
  +<screen><userinput><stage>
  +	<stageinfo>
  +		<base>/usr/src/gzip.1.2.4a</base>
  +	</stageinfo>
   
  -<para>The equivalent bash script is :</para>
  +	<configure />
   
  -<programlisting>
  -echo Executing configure
  +	<make />
  +
  +	<make>
  +		<param>install</param>
  +	</make>
  +</stage></userinput></screen>
  +
  +<para>The equivalent bash script is :</para>
  +
  +<screen><userinput>echo Executing configure
   cd /usr/src/gzip.1.2.4a
  -./configure
  +<command>./configure</command>
   
   echo Executing make
   cd /usr/src/gzip.1.2.4a
  -make
  +<command>make</command>
   
   echo Executing make
   cd /usr/src/gzip.1.2.4a
  -make install
  +<command>make install</command>
   
  -echo Exiting stage
  -</programlisting>
  +echo Exiting stage</userinput></screen>
   
   </sect2>
   
  
  
  
  1.6       +46 -49    ALFS/docs/syntax_doc/alfs_dtd/elem_stageinfo.xml
  
  Index: elem_stageinfo.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_stageinfo.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- elem_stageinfo.xml	4 Nov 2003 03:07:50 -0000	1.5
  +++ elem_stageinfo.xml	23 Feb 2004 03:53:51 -0000	1.6
  @@ -6,18 +6,18 @@
   <title>Syntax</title>
   
   <synopsis>
  -<!ELEMENT stageinfo      (root?,environment?,user?,base?)>
  +<!ELEMENT stageinfo      (root?, user?, environment?, base?)>
   </synopsis>
   
  -<para>This element occurs in the element
  -<link linkend="elem_stage">stage</link>.
  +<para>This element occurs in the element :  
  +<xref linkend="elem_stage"/>
   </para>
   
  -<para>See also :
  -<link linkend="elem_root">root</link>,
  -<link linkend="elem_base">base</link>.
  -<link linkend="elem_environment">environment</link>.
  -<link linkend="elem_user">user</link>.
  +<para>See also :  
  +<xref linkend="elem_root"/>  |  
  +<xref linkend="elem_base"/>  |  
  +<xref linkend="elem_environment"/>  |  
  +<xref linkend="elem_user"/>
   </para>
   
   </sect2>
  @@ -25,63 +25,60 @@
   <sect2>
   <title>Description</title>
   
  -<para>The element <token>stageinfo</token> allows to specify several
  -context informations used to process the commands of the stage
  -to which the stageinfo belongs.</para>
  -
  -<para>The <token>base</token> sub-element specify a base directory that will be
  -used by all the commands of the stage, unless that command redefines
  -the base locally.</para>
  -
  -<para>The <token>user</token> sub-element specify a user name that will be used as
  -the effective user ID of the current process for all the commands of the stage</para>
  -
  -<para>The <token>root</token> sub-element specify a directory name
  -in which the commands of the stage will be performed (using a chroot command).
  -</para>
  -
  -<para>The <token>environment</token> sub-element allow to specify a environment variable
  -that will be added to the current environment when processing
  -the commands of the stage.</para>
  +<para>The element <filename>stageinfo</filename> allows to specify several
  +context informations used to process the commands of the stage to which the
  +stageinfo belongs.</para>
  +
  +<para>The <filename>base</filename> sub-element specify a base directory
  +that will be used by all the commands of the stage, unless that command
  +redefines the base locally.</para>
  +
  +<para>The <filename>user</filename> sub-element specify a user name that
  +will be used as the effective user ID of the current process for all the
  +commands of the stage</para>
  +
  +<para>The <filename>root</filename> sub-element specify a directory name in
  +which the commands of the stage will be performed (using a chroot
  +command).</para>
  +
  +<para>The <filename>environment</filename> sub-element allow to specify a
  +environment variable that will be added to the current environment when
  +processing the commands of the stage.</para>
   
   </sect2>
   
   <sect2>
   <title>Examples</title>
   
  -<programlisting>
  -<stage>
  -    <stageinfo>
  -        <base>/usr/src/gzip.1.2.4a</base>
  -    </stageinfo>
  -
  -    <configure />
  -
  -    <make />
  -
  -    <make>
  -        <param>install</param>
  -    </make>
  -</stage>
  -</programlisting>
  +<screen><userinput><stage>
  +	<stageinfo>
  +		<base>/usr/src/gzip.1.2.4a</base>
  +	</stageinfo>
  +
  +	<configure />
  +
  +	<make />
  +
  +	<make>
  +		<param>install</param>
  +	</make>
  +</stage></userinput></screen>
   
  -<para>The equivalent bash script is :</para>
  +<para>The equivalent bash script is :</para>
   
  -<programlisting>
  -echo Executing configure
  +<screen><userinput>echo Executing configure
   cd /usr/src/gzip.1.2.4a
  -./configure
  +<command>./configure</command>
   
   echo Executing make
   cd /usr/src/gzip.1.2.4a
  -make
  +<command>make</command>
   
   echo Executing make
   cd /usr/src/gzip.1.2.4a
  -make install
  +<command>make install</command>
   
  -echo Exiting stage
  -</programlisting>
  +echo Exiting stage</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_target.xml
  
  Index: elem_target.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_target.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_target.xml	23 Feb 2004 03:17:46 -0000	1.6
  +++ elem_target.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -26,17 +26,17 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><link>
  +<screen><userinput><link>
   	<target>share/man</target>
   	<target>share/doc</target>
   	<target>share/info</target>
   	<name>/usr/local</name>
  -</link></screen></userinput>
  +</link></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo 'Linking  share/man share/doc share/info into /usr/local'
  -<command>ln -s  share/man share/doc share/info /usr/local</command></screen></userinput>
  +<screen><userinput>echo 'Linking  share/man share/doc share/info into /usr/local'
  +<command>ln -s  share/man share/doc share/info /usr/local</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +8 -8      ALFS/docs/syntax_doc/alfs_dtd/elem_textdump.xml
  
  Index: elem_textdump.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_textdump.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_textdump.xml	23 Feb 2004 03:17:46 -0000	1.6
  +++ elem_textdump.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -48,7 +48,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><textdump base="/etc">
  +<screen><userinput><textdump base="/etc">
   	<file>group</file>
   
   	<content>
  @@ -65,11 +65,11 @@
   		=dialout:x:10:
   		=audio:x:11:
   	</content>
  -</textdump></screen></userinput>
  +</textdump></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>cd /etc
  +<screen><userinput>cd /etc
   cat > group << 'EOF'
   root:x:0:
   bin:x:1:
  @@ -83,23 +83,23 @@
   lp:x:9:
   dialout:x:10:
   audio:x:11:
  -EOF</screen></userinput>
  +EOF</userinput></screen>
   
  -<userinput><screen><textdump mode="append">
  +<screen><userinput><textdump mode="append">
           <file>/etc/sysconfig/network</file>
           <content>
                   =GATEWAY=192.168.123.254
                   =GATEWAY_IF=eth0
           </content>
  -</textdump></screen></userinput>
  +</textdump></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Generating file /etc/sysconfig/network
  +<screen><userinput>echo Generating file /etc/sysconfig/network
   cat >> /etc/sysconfig/network << 'EOF'
   GATEWAY=192.168.123.254
   GATEWAY_IF=eth0
  -EOF</screen></userinput>
  +EOF</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -5      ALFS/docs/syntax_doc/alfs_dtd/elem_unpack.xml
  
  Index: elem_unpack.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_unpack.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_unpack.xml	23 Feb 2004 03:18:11 -0000	1.6
  +++ elem_unpack.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -61,17 +61,16 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><unpack>
  +<screen><userinput><unpack>
       <digest>cbe9f79450aeecfb06d5e856af16c2cf</digest>
       <reference>ftp://ftp.gnu.org/gnu/gzip/gzip.1.2.4a.tar.gz</reference>
       <archive>/usr/src/lfs-packages/gzip.1.2.4a.tar.gz</archive>
       <destination>/usr/src</destination>
  -</unpack></screen></userinput>
  +</unpack></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>
  -echo Unpacking /usr/src/lfs-packages/gzip.1.2.4a.tar.gz into /usr/src
  +<screen><userinput>echo Unpacking /usr/src/lfs-packages/gzip.1.2.4a.tar.gz into /usr/src
   [[ ! -f /usr/src/lfs-packages/gzip.1.2.4a.tar.gz ]] &&
     echo Retrieving  ftp://ftp.gnu.org/gnu/gzip/gzip.1.2.4a.tar.gz
   [[ ! -f /usr/src/lfs-packages/gzip.1.2.4a.tar.gz ]] &&
  @@ -80,7 +79,7 @@
     echo Archive does not exist && exit 3
   
   cd /usr/src
  -<command>tar xzvf /usr/src/lfs-packages/gzip.1.2.4a.tar.gz</command></screen></userinput>
  +<command>tar xzvf /usr/src/lfs-packages/gzip.1.2.4a.tar.gz</command></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_url.xml
  
  Index: elem_url.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_url.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_url.xml	23 Feb 2004 03:18:21 -0000	1.6
  +++ elem_url.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -27,12 +27,12 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><download>
  +<screen><userinput><download>
   	<file>kbd-1.08.tar.gz</file>
   	<url>ftp://ftp.win.tue.nl/pub/linux-local/utils/kbd/</url>
   	<destination>/tmp/</destination>
   	<digest>924e6a05e52715dc0f96385b35f2f680</digest>
  -</download></screen></userinput>
  +</download></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_user.xml
  
  Index: elem_user.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_user.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_user.xml	23 Feb 2004 03:18:32 -0000	1.6
  +++ elem_user.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -31,7 +31,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><stage>
  +<screen><userinput><stage>
   	<stageinfo>
   		<base>/usr/src/mypackage</base>
   		<user>lfs</user>
  @@ -40,11 +40,11 @@
   	<make>
   		<param>install</param>
   	</make>
  -</stage></screen></userinput>
  +</stage></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Stage
  +<screen><userinput>echo Stage
   
   echo Creating file ./_nalfs_tmp.1...
   cat > ./_nalfs_tmp.1 << 'EOF1'
  @@ -62,7 +62,7 @@
   
   echo Finished execution as user lfs
   
  -echo Exiting stage</screen></userinput>
  +echo Exiting stage</userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_utilizes.xml
  
  Index: elem_utilizes.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_utilizes.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_utilizes.xml	23 Feb 2004 03:18:43 -0000	1.6
  +++ elem_utilizes.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -37,7 +37,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><package name="gimp" version="1.2.3">
  +<screen><userinput><package name="gimp" version="1.2.3">
   <packageinfo>
   	<requires><name>gtk+</name></requires>
   
  @@ -52,7 +52,7 @@
   
   	....
   
  -</package></screen></userinput>
  +</package></userinput></screen>
   
   </sect2>
   
  
  
  
  1.7       +4 -4      ALFS/docs/syntax_doc/alfs_dtd/elem_variable.xml
  
  Index: elem_variable.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_variable.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- elem_variable.xml	23 Feb 2004 03:19:05 -0000	1.6
  +++ elem_variable.xml	23 Feb 2004 03:53:51 -0000	1.7
  @@ -39,7 +39,7 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><stage>
  +<screen><userinput><stage>
   	<stageinfo>
   		<base>/usr/src/gzip.1.2.4a</base>
   		<environment>
  @@ -55,11 +55,11 @@
   	<make>
   		<param>install</param>
   	</make>
  -</stage></screen></userinput>
  +</stage></userinput></screen>
   
   <para>The equivalent bash script is :</para>
   
  -<userinput><screen>echo Stage
  +<screen><userinput>echo Stage
   
   export GCCFLAGS=-O2
   export PATH=${PATH}:/opt/foo
  @@ -75,7 +75,7 @@
   cd /usr/src/gzip.1.2.4a
   make install
   
  -echo Exiting stage</screen></userinput>
  +echo Exiting stage</userinput></screen>
   
   </sect2>
   
  
  
  
  1.8       +2 -2      ALFS/docs/syntax_doc/alfs_dtd/elem_version.xml
  
  Index: elem_version.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/docs/syntax_doc/alfs_dtd/elem_version.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- elem_version.xml	23 Feb 2004 03:19:05 -0000	1.7
  +++ elem_version.xml	23 Feb 2004 03:53:51 -0000	1.8
  @@ -50,12 +50,12 @@
   <sect2>
   <title>Examples</title>
   
  -<userinput><screen><packageinfo>
  +<screen><userinput><packageinfo>
   	<requires>
   		<name>guile</name>
   		<version condition="ge">1.5</version>
   	</requires>
  -</packageinfo></screen></userinput>
  +</packageinfo></userinput></screen>
   
   <para>This signifies that the package being build requires
   <filename>guile</filename> in its
  
  
  



More information about the alfs-log mailing list