Index: general/prog/gcc/gcc-desc.xml
===================================================================
--- general/prog/gcc/gcc-desc.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gcc-desc.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -2,16 +2,16 @@
 <title>Contents</title>
 
-<para>The gcc package contains <userinput>c++</userinput>,
-<userinput>c++filt</userinput>, <userinput>cpp</userinput>,
-<userinput>g++</userinput>, <userinput>g77</userinput>,
-<userinput>gcc</userinput>, <userinput>gccbug</userinput>,
-<userinput>gcov</userinput>, <userinput>glob</userinput>,
-<userinput>gnat</userinput>, <userinput>gnatbind</userinput>,
-<userinput>gnatbl</userinput>, <userinput>gnatchop</userinput>,
-<userinput>gnatfind</userinput>, <userinput>gnatkr</userinput>,
-<userinput>gnatlink</userinput>, <userinput>gnatls</userinput>,
-<userinput>gnatmake</userinput>, <userinput>gnatprep</userinput>,
-<userinput>gnatpsta</userinput>, <userinput>gnatpsys</userinput>,
-<userinput>gnatxref</userinput> and <filename>gcc</filename> libraries.</para>
+<para>The gcc package contains <command>c++</command>,
+<command>c++filt</command>, <command>cpp</command>,
+<command>g++</command>, <command>g77</command>,
+<command>gcc</command>, <command>gccbug</command>,
+<command>gcov</command>, <command>glob</command>,
+<command>gnat</command>, <command>gnatbind</command>,
+<command>gnatbl</command>, <command>gnatchop</command>,
+<command>gnatfind</command>, <command>gnatkr</command>,
+<command>gnatlink</command>, <command>gnatls</command>,
+<command>gnatmake</command>, <command>gnatprep</command>,
+<command>gnatpsta</command>, <command>gnatpsys</command>,
+<command>gnatxref</command> and <filename>gcc</filename> libraries.</para>
 
 </sect2>
@@ -20,79 +20,79 @@
 
 <para>The programs and libraries whose descriptions are missing here
-have been described in the LFS gcc-&gcc-version; page.</para>
+have been described in the <acronym>LFS</acronym> gcc-&gcc-version; page.</para>
 
 <sect3><title>g77</title>
-<para>g77 is the Fortran compiler invoked by gcc.</para></sect3>
+<para><command>g77</command> is the Fortran compiler invoked by gcc.</para></sect3>
 
 <sect3><title>add2line</title>
-<para>add2line converts the ASCII form of the 2-line orbital elements in
+<para><command>add2line</command> converts the ASCII form of the 2-line orbital elements in
 a file to binary form and appends them to the orbdata files. </para></sect3>
 
 <sect3><title>gcov</title>
-<para>gcov is a test coverage program.</para></sect3>
+<para><command>gcov</command> is a test coverage program.</para></sect3>
 
 <sect3><title>gdb</title>
-<para>gdb is the GNAT debugger.</para></sect3>
+<para><command>gdb</command> is the GNAT debugger.</para></sect3>
 
 <sect3><title>gnatbind</title>
-<para>gnatbind is used to bind compiled objects.</para></sect3>
+<para><command>gnatbind</command> is used to bind compiled objects.</para></sect3>
 
 <sect3><title>gnatbl</title>
-<para>gnatbl is the Ada linker. </para></sect3>
+<para><command>gnatbl</command> is the Ada linker. </para></sect3>
 
 <sect3><title>gnatchop</title>
-<para>gnatchop is useful for renaming files to meet the standard Ada
+<para><command>gnatchop</command> is useful for renaming files to meet the standard Ada
 default file naming conventions.</para></sect3>
 
 <sect3><title>gnatelim</title>
-<para>gnatelim is used to detect and eliminate unused subprograms in an
+<para><command>gnatelim</command> is used to detect and eliminate unused subprograms in an
 Ada partition.</para></sect3>
 
 <sect3><title>gnatfind</title>
-<para>gnatfind is the GNAT definition/use finder.</para></sect3>
+<para><command>gnatfind</command> is the GNAT definition/use finder.</para></sect3>
 
 <sect3><title>gnatgcc</title>
-<para>gnatgcc is the compiler.</para></sect3>
+<para><command>gnatgcc</command> is the compiler.</para></sect3>
 
 <sect3><title>gnathtml.pl</title>
-<para>gnathtml.pl converts Ada source files to html for viewing in Web
+<para><command>gnathtml.pl</command> converts Ada source files to html for viewing in Web
 browsers.</para></sect3>
 
 <sect3><title>gnatkr</title>
-<para>gnatkr is used to determine the crunched name for a given file,
+<para><command>gnatkr</command> is used to determine the crunched name for a given file,
 when crunched to a specified maximum length.</para></sect3>
 
 <sect3><title>gnatlink</title>
-<para>gnatlink is used to link programs and build an executable file.</para></sect3>
+<para><command>gnatlink</command> is used to link programs and build an executable file.</para></sect3>
 
 <sect3><title>gnatls</title>
-<para>gnatls is the compiled unit browser.</para></sect3>
+<para><command>gnatls</command> is the compiled unit browser.</para></sect3>
 
 <sect3><title>gnatemake</title>
-<para>gnatmake is an automatic make facility.</para></sect3>
+<para><command>gnatmake</command> is an automatic make facility.</para></sect3>
 
 <sect3><title>gnatmem</title>
-<para>gnatmem is the GNAT utility that monitors dynamic allocation and
+<para><command>gnatmem</command> is the GNAT utility that monitors dynamic allocation and
 deallocation activity in a program.</para></sect3>
 
 <sect3><title>gnatprep</title>
-<para>gnatprep is the GNAT external preprocessor.</para></sect3>
+<para><command>gnatprep</command> is the GNAT external preprocessor.</para></sect3>
 
 <sect3><title>gnatpsta</title>
-<para>gnatpsta determines the values of all the relevant parameters in
+<para><command>gnatpsta</command> determines the values of all the relevant parameters in
 Standard and outputs to stdout.</para></sect3>
 
 <sect3><title>gnatpsys</title>
-<para>gnatpsys determines the values of all the relevant parameters in
+<para><command>gnatpsys</command> determines the values of all the relevant parameters in
 System and outputs to stdout.</para></sect3>
 
 <sect3><title>gnatstub</title>
-<para>gnatstub is a generator of body stubs.</para></sect3>
+<para><command>gnatstub</command> is a generator of body stubs.</para></sect3>
 
 <sect3><title>gnatxref</title>
-<para>gnatxref is the GNAT cross-referencer.</para></sect3>
+<para><command>gnatxref</command> is the GNAT cross-referencer.</para></sect3>
 
 <sect3><title>gvd</title>
-<para>gvd is the GNU Visual Debugger.</para></sect3>
+<para><command>gvd</command> is the GNU Visual Debugger.</para></sect3>
 
 </sect2>
Index: general/prog/gcc/gcc-exp.xml
===================================================================
--- general/prog/gcc/gcc-exp.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gcc-exp.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -2,28 +2,32 @@
 <title>Command explanations</title>
 
-<para><userinput>PATH_HOLD=$PATH</userinput> : This command
+<para><command>PATH_HOLD=$PATH</command> : This command
 stores your current path before it's modified so that it can be restored after
 installation.</para>
 
-<para><userinput>export PATH=$PATH:/opt/gnat/bin</userinput> : This
+<para><command>export PATH=/opt/gnat/bin:$PATH</command> : This
 command allows the build to find gnat's Ada compiler to build
 Ada.</para>
 
-<para><userinput>touch treeprs.ads [es]info.h nmake.ad[bs]</userinput> :
+<para><command>touch treeprs.ads [es]info.h nmake.ad[bs]</command> :
 This command creates necessary files for the Ada build. This step
 may be skipped if you don't want to compile the ada frontend.</para>
 
-<para><userinput>--enable-languages=c,c++,objc,f77,ada,java</userinput>
+<para><command>CC=/usr/bin/gcc</command> : This command works around the
+new <envar>PATH</envar> which puts <application>gnat</application>'s
+<command>gcc</command> as the primary compiler.</para>
+
+<para><command>--enable-languages=c,c++,objc,f77,ada,java</command>
 : This command builds all available languages in the gcc package.
 You may modify this command to remove unwanted languages.</para>
 
-<para><userinput>--enable-shared --enable-threads=posix
---enable-__cxa_atexit</userinput> : These commands are required to build
+<para><command>--enable-shared --enable-threads=posix
+--enable-__cxa_atexit</command> : These commands are required to build
 the C++ libraries to published standards.</para>
 
-<para><userinput>--enable-clocale=gnu</userinput> : This command is a
+<para><command>--enable-clocale=gnu</command> : This command is a
 failsafe for incomplete locale data.</para>
 
-<para><userinput>make gnatlib_and tools</userinput> : This command
+<para><command>make gnatlib_and tools</command> : This command
 completes the Ada build process. Skip this step if you have not enabled
 ADA as one of the languages.</para>
Index: general/prog/gcc/gcc-inst.xml
===================================================================
--- general/prog/gcc/gcc-inst.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gcc-inst.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,9 +1,12 @@
 <sect2>
-<title>Installation of gcc</title>
+<title>Installation of <application>gcc</application></title>
 
-<para>Install gcc by running the following commands:</para>
+<para>Patch the source files with the following command:</para>
+<screen><userinput><command>patch -Np1 -i ../gcc-3.3.1-no_fixincludes-2.patch</command></userinput></screen>
 
-<para><screen><userinput>PATH_HOLD=$PATH &amp;&amp;
-export PATH=$PATH:/opt/gnat/bin &amp;&amp;
+<para>Install <application>gcc</application> by running the following commands:</para>
+
+<screen><userinput><command>PATH_HOLD=$PATH &amp;&amp;
+export PATH=/opt/gnat/bin:$PATH &amp;&amp;
 cd gcc/ada &amp;&amp;
 touch treeprs.ads [es]info.h nmake.ad[bs] &amp;&amp;
@@ -11,15 +14,15 @@
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
-../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
+CC=/usr/bin/gcc ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
 --enable-languages=c,c++,objc,f77,ada,java --enable-threads=posix \
 --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
 make bootstrap &amp;&amp;
 make -C gcc gnatlib_and_tools &amp;&amp;
-make install-no-fixedincludes &amp;&amp;
+make install &amp;&amp;
 ln -sf g77 /usr/bin/f77 &amp;&amp;
-export PATH=$PATH_HOLD</userinput></screen></para>
+export PATH=$PATH_HOLD</command></userinput></screen>
 
-<para>You may remove the gnat installation:</para>
-<para><screen><userinput>rm -rf /opt/gnat</userinput></screen></para>
+<para>You may remove the <application>gnat</application> installation:</para>
+<screen><userinput><command>rm -rf /opt/gnat</command></userinput></screen>
 
 </sect2>
Index: general/prog/gcc/gcc-intro.xml
===================================================================
--- general/prog/gcc/gcc-intro.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gcc-intro.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,14 +1,25 @@
 <sect2>
-<title>Introduction to gcc</title>
-
-<screen>Download location (HTTP):       <ulink url="&gcc-download-http;"/>
-Download location (FTP):        <ulink url="&gcc-download-ftp;"/>
-Version used:                   &gcc-version;
-Package size:                   &gcc-size;
-Estimated Disk space required:  &gcc-buildsize;</screen>
+<title>Introduction to <application>gcc</application></title>
 
 <para>The gcc package contains GNU compilers. This is useful for
-compiling programs written in Ada, C, C++, Fortran, Java and Objective C.</para>
+compiling programs written in Ada, C, C++, Fortran, Java and Objective
+C.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gcc-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gcc-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gcc-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gcc-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gcc-time;</para></listitem></itemizedlist>
+</sect3>
+<sect3><title>Additional Downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink url="http://downloads.linuxfromscratch.org/gcc-3.3.1-no_fixincludes-2.patch"/></para></listitem>
+</itemizedlist></sect3>
 
 </sect2>
Index: general/prog/gcc/gcc.ent
===================================================================
--- general/prog/gcc/gcc.ent	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gcc.ent	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -6,7 +6,8 @@
 <!ENTITY gcc-desc SYSTEM "gcc-desc.xml">
 <!ENTITY gcc-config SYSTEM "gcc-config.xml">
-<!ENTITY gcc-buildsize "591 MB">
-<!ENTITY gcc-version "3.2.1">
-<!ENTITY gcc-download-http "http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.2.1/gcc-3.2.1.tar.bz2">
-<!ENTITY gcc-download-ftp "ftp://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.2.1/gcc-3.2.1.tar.bz2">
-<!ENTITY gcc-size "20.1 MB">
+<!ENTITY gcc-buildsize "889 MB">
+<!ENTITY gcc-version "3.3.1">
+<!ENTITY gcc-download-http "http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
+<!ENTITY gcc-download-ftp "ftp://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
+<!ENTITY gcc-size "23 MB">
+<!ENTITY gcc-time "29.3 SBU">
Index: general/prog/gcc/gnat-inst.xml
===================================================================
--- general/prog/gcc/gnat-inst.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gnat-inst.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,14 +1,16 @@
 <sect2>
-<title>Installation of gnat</title>
+<title>Installation of <application>gnat</application></title>
 
-<para>Install gnat by running the following commands:</para>
+<para>Install <application>gnat</application> by running the following commands:</para>
 
-<para><screen><userinput>./doconfig</userinput></screen></para>
+<screen><userinput><command>./doconfig</command></userinput></screen>
 
 <para>The above script will ask you how and where you would like to install
-gnat. To avoid conflicts with the system gcc, the package will be installed
+<application>gnat</application>. To avoid conflicts with the system
+<command>gcc</command>, the package will be installed
 in a separate directory, that can later be removed from the system.</para>
 
-<para>In response to the questions asked by the doconfig script, enter
+<para>In response to the questions asked by the
+<command>doconfig</command> script, enter
 <userinput>3</userinput> in response to the first question
 and <userinput>/opt/gnat</userinput> in response to the
@@ -16,13 +18,15 @@
 
 <para>To finish the install, run</para>
-<para><screen><userinput>./doinstall</userinput></screen></para>
+<screen><userinput><command>./doinstall</command></userinput></screen>
 
-<para>The gnat compiler can be invoked by executing the gcc binary
-installed by the above script. To avoid conflicts with the system
-gcc, we will rename the gcc command.</para>
-<para><screen><userinput>cd /opt/gnat/bin &amp;&amp;
+<para>The <application>gnat</application> compiler can be invoked by
+executing the <command>gcc</command> binary
+installed by the above script. <!-- To avoid conflicts with the system
+<command>gcc</command>, we will rename the <command>gcc</command>
+command.--></para>
+<!-- <screen><userinput><command>cd /opt/gnat/bin &amp;&amp;
 mv gcc gnatgcc &amp;&amp;
 cd real &amp;&amp;
-mv gcc gnatgcc</userinput></screen></para>
+mv gcc gnatgcc</command></userinput></screen> -->
 
 </sect2>
Index: general/prog/gcc/gnat-intro.xml
===================================================================
--- general/prog/gcc/gnat-intro.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gnat-intro.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,20 +1,33 @@
 <sect2>
-<title>Introduction to gnat (binary version)</title>
+<title>Introduction to <application>gnat</application> (binary version)</title>
 
-<screen>Download location (HTTP):       <ulink url="&gnat-download-http;"/>
-Download location (FTP):        <ulink url="&gnat-download-ftp;"/>
-Version used:                   &gnat-version;
-Package size:                   &gnat-size;
-Estimated Disk space required:  &gnat-buildsize;</screen>
+<para>The <application>gnat</application> package contains a precompiled Ada compiler.
+This package is used to satisfy the circular
+dependency when you recompile <application>gcc</application> to include ada.</para>
 
-<para>The gnat package contains a precompiled Ada compiler.
-This package is used to satisfy the circular
-dependency when you recompile gcc to include ada.</para>
-
-<para>You may skip installation of gnat if you do not want to recompile gcc
+<para>You may skip installation of <application>gnat</application> if you do not want to recompile
+gcc
 with ada support.</para>
 
-<screen>gnat depends on:
-<xref linkend="tcsh"/></screen>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnat-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnat-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnat-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnat-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnat-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+
+<sect3><title><application>gnat</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="tcsh"/></para></sect4>
+</sect3>
 
 </sect2>
Index: general/prog/gcc/gnat.ent
===================================================================
--- general/prog/gcc/gnat.ent	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ general/prog/gcc/gnat.ent	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -2,7 +2,8 @@
 <!ENTITY gnat-intro SYSTEM "gnat-intro.xml">
 <!ENTITY gnat-inst SYSTEM "gnat-inst.xml">
-<!ENTITY gnat-buildsize "40 MB">
-<!ENTITY gnat-version "3.14p">
+<!ENTITY gnat-buildsize "48.9 MB">
+<!ENTITY gnat-version "3.15p">
 <!ENTITY gnat-download-http "">
-<!ENTITY gnat-download-ftp "ftp://cs.nyu.edu/pub/gnat/3.14p/gnat-3.14p-i686-pc-linux-gnu-bin.tar.gz">
-<!ENTITY gnat-size "10.5 MB">
+<!ENTITY gnat-download-ftp "ftp://cs.nyu.edu/pub/gnat/3.15p/gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.gz">
+<!ENTITY gnat-size "13.2 MB">
+<!ENTITY gnat-time "0.01 SBU">
Index: index.xml
===================================================================
--- index.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ index.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "20030829">
-<!ENTITY releasedate "August 29th, 2003">
+<!ENTITY version "20030830">
+<!ENTITY releasedate "August 30th, 2003">
 
 <!ENTITY % book SYSTEM "book/book.ent">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ introduction/welcome/changelog.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -11,4 +11,10 @@
 <itemizedlist>
 
+<listitem><para>August 30, 2003 [larry]: postlfs: update intro section
+of tcsh.</para></listitem>
+
+<listitem><para>August 30, 2003 [larry]: general: update to gcc-3.3.1
+and gnat-3.15p.</para></listitem>
+
 <listitem><para>August 29, 2003 [larry]: pst: updated intro to sgml-dtd
 V3.1 and V4.2.</para></listitem>
Index: postlfs/shells/tcsh/tcsh-config.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-config.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ postlfs/shells/tcsh/tcsh-config.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring tcsh</title>
+<title>Configuring <application>tcsh</application></title>
 
 <sect3><title>Config files</title>
Index: postlfs/shells/tcsh/tcsh-desc.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-desc.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ postlfs/shells/tcsh/tcsh-desc.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The tcsh package contains <userinput>tcsh</userinput>.</para>
+<para>The <application>tcsh</application> package contains
+<command>tcsh</command>.</para>
 
 </sect2>
@@ -9,5 +10,5 @@
 
 <sect3><title>tcsh</title>
-<para>tcsh is an enhanced but completely compatible version of the
+<para><command>tcsh</command> is an enhanced but completely compatible version of the
 Berkeley UNIX C shell, csh.  It is usable as both an interactive shell
 and a script processor.</para></sect3>
Index: postlfs/shells/tcsh/tcsh-exp.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-exp.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ postlfs/shells/tcsh/tcsh-exp.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -2,7 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>cp tcsh.man /usr/share/man/man1/tcsh.1</userinput> : tcsh doesn't install its man page correctly, so we do it manually.</para>
+<para><command>cp tcsh.man /usr/share/man/man1/tcsh.1</command> :
+<application>tcsh</application> doesn't install its man page correctly, so we do it manually.</para>
 
-<para><userinput>ln -s /usr/bin/tcsh /bin/csh</userinput> : The FHS states that
+<para><command>ln -s /usr/bin/tcsh /bin/csh</command> : The
+<acronym>FHS</acronym> states that
 if there is a C shell installed, there should be a symlink from
 <filename>/bin/csh</filename> to it.  This creates that symlink.</para>
Index: postlfs/shells/tcsh/tcsh-inst.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-inst.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ postlfs/shells/tcsh/tcsh-inst.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,12 +1,12 @@
 <sect2>
-<title>Installation of tcsh</title>
+<title>Installation of <application>tcsh</application></title>
 
-<para>Install tcsh by running the following commands:</para>
+<para>Install <application>tcsh</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
 cp tcsh.man /usr/share/man/man1/tcsh.1 &amp;&amp;
-ln -s /usr/bin/tcsh /bin/csh</userinput></screen></para>
+ln -s /usr/bin/tcsh /bin/csh</command></userinput></screen>
 
 </sect2>
Index: postlfs/shells/tcsh/tcsh-intro.xml
===================================================================
--- postlfs/shells/tcsh/tcsh-intro.xml	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ postlfs/shells/tcsh/tcsh-intro.xml	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -1,11 +1,4 @@
 <sect2>
-<title>Introduction to tcsh</title>
-
-<screen>Download location (HTTP):       <ulink url="&tcsh-download-http;"/>
-Download location (FTP):        <ulink url="&tcsh-download-ftp;"/>
-Version used:                   &tcsh-version;
-Package size:                   &tcsh-size;
-Estimated Disk space required:  &tcsh-buildsize;
-Estimated build time:           &tcsh-time;</screen>
+<title>Introduction to <application>tcsh</application></title>
 
 <para>The tcsh package contains "an enhanced but completely compatible
@@ -15,3 +8,16 @@
 install.</para>
 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&tcsh-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&tcsh-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &tcsh-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&tcsh-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&tcsh-time;</para></listitem></itemizedlist>
+</sect3>
+
 </sect2>
Index: postlfs/shells/tcsh/tcsh.ent
===================================================================
--- postlfs/shells/tcsh/tcsh.ent	(revision 0be83224ea4f12f4add8d893e8c8e3d8480d1471)
+++ postlfs/shells/tcsh/tcsh.ent	(revision d8e2e7ce541b4c60801281e884d878c56b4ed70e)
@@ -5,8 +5,8 @@
 <!ENTITY tcsh-desc SYSTEM "tcsh-desc.xml">
 <!ENTITY tcsh-config SYSTEM "tcsh-config.xml">
-<!ENTITY tcsh-buildsize "5.9 MB">
-<!ENTITY tcsh-version "6.12">
+<!ENTITY tcsh-buildsize "9.0 MB">
+<!ENTITY tcsh-version "6.12.00">
 <!ENTITY tcsh-download-http "">
-<!ENTITY tcsh-download-ftp "ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-6.12.00.tar.gz">
+<!ENTITY tcsh-download-ftp "ftp://ftp.funet.fi/pub/unix/shells/tcsh/tcsh-&tcsh-version;.tar.gz">
 <!ENTITY tcsh-size "804 KB">
-<!ENTITY tcsh-time "0.77 SBU">
+<!ENTITY tcsh-time "0.16 SBU">
