diff --git a/content/databases/mysql/mysql-config.xml b/content/databases/mysql/mysql-config.xml
index 4b89aa41f4..7d66b5818a 100644
--- a/content/databases/mysql/mysql-config.xml
+++ b/content/databases/mysql/mysql-config.xml
@@ -32,22 +32,22 @@ chown -R mysql:mysql /var/lib/mysql</command></userinput></screen>
 So here we will login and set one. We strongly suggest changing
 'new-password' to your own.</para>
 
-<screen><userinput><command>mysql -uroot mysql
+<screen><userinput><command>mysql -uroot mysql</command></userinput>
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 2 to server version: 3.23.51-log
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 
-mysql&gt; UPDATE user SET password=password('new-password') WHERE user='root';
+<prompt>mysql&gt;</prompt> <userinput><command>UPDATE user SET password=password('<replaceable>new-password</replaceable>') WHERE user='root';</command></userinput>
 Query OK, 2 rows affected (0.00 sec)
 Rows matched: 2  Changed: 2  Warnings: 0
 
-mysql&gt; FLUSH PRIVILEGES;
+<prompt>mysql&gt;</prompt> <userinput><command>FLUSH PRIVILEGES;</command></userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql&gt; EXIT;
+<prompt>mysql&gt;</prompt> <userinput><command>EXIT;</command></userinput>
 bye
-</command></userinput></screen>
+</screen>
 
 <para>Now that we are done with the configuration of the server, we can
 shut it down.</para>
diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml
index fee5fd001e..760ec07891 100644
--- a/general/prog/gcc.xml
+++ b/general/prog/gcc.xml
@@ -2,10 +2,12 @@
 <?dbhtml filename="gcc.html" dir="general"?>
 <title>GCC-&gcc-version;</title>
 
-&gnat-intro;
-&gnat-inst;
 &gcc-intro;
 &gcc-inst;
+<!--&gnat-intro;
+&gnat-inst; 
+&gcc-intro;
+&gcc-inst; -->
 &gcc-exp;
 &gcc-desc;
 
diff --git a/general/prog/gcc/gcc-inst.xml b/general/prog/gcc/gcc-inst.xml
index acc5210b76..cf37b3235b 100644
--- a/general/prog/gcc/gcc-inst.xml
+++ b/general/prog/gcc/gcc-inst.xml
@@ -1,6 +1,11 @@
 <sect2>
 <title>Installation of <application><acronym>GCC</acronym></application></title>
 
+&gnat-intro;
+</sect2>
+&gnat-inst;
+<sect2><title>Return to Installation of <application><acronym>GCC</acronym></application></title>
+
 <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>
 
diff --git a/general/prog/gcc/gnat-intro.xml b/general/prog/gcc/gnat-intro.xml
index 9661ed0b53..513e049765 100644
--- a/general/prog/gcc/gnat-intro.xml
+++ b/general/prog/gcc/gnat-intro.xml
@@ -1,4 +1,4 @@
-<sect2>
+<!-- <sect2>
 <title>Introduction to <application><acronym>GNAT</acronym></application> 
 (binary version)</title>
 
@@ -10,6 +10,13 @@ GCC</acronym></application> to include <application>Ada</application>.</para>
 <para>You may skip installation of <application><acronym>GNAT</acronym>
 </application> if you do not want to recompile <application><acronym>GCC
 </acronym></application> with <application>Ada</application> support.</para>
+-->
+<para>If you plan to compile Ada, you will need to install
+<application><acronym>GNAT</acronym></application> temporarily to
+satisfy the circular dependency when you recompile
+<application><acronym>
+GCC</acronym></application> to include
+<application>Ada</application>.</para>
 
 
 <sect3><title>Package information</title>
@@ -32,4 +39,3 @@ url="&gnat-download-ftp;"/></para></listitem>
 <para><xref linkend="tcsh"/></para></sect4>
 </sect3>
 
-</sect2>