Index: general/prog/gcc/gcc-exp.xml
===================================================================
--- general/prog/gcc/gcc-exp.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
+++ general/prog/gcc/gcc-exp.xml	(revision 3e0869e0bce5c9fe2aa6a0aa72780d9a234c5c10)
@@ -2,31 +2,33 @@
 <title>Command explanations</title>
 
-<para><userinput>export CC=cc :</userinput> This command allows you to
+<para><userinput>export CC=cc</userinput> : This command allows you to
 use gcc's C compiler instead of gnat's C compiler.</para>
 
-<para><userinput>export PATH_HOLD=$PATH :</userinput> This command
+<para><userinput>export PATH_HOLD=$PATH</userinput> : This command
 stores your current path before it's modified so that it can be restored after
 installation.</para>
 
-<para><userinput>export PATH=/usr/src/gnat/bin:$PATH :</userinput> This
+<para><userinput>export PATH=/usr/src/gnat/bin:$PATH</userinput> : This
 command allows the build to find gnat's Ada compiler to build
 Ada.</para>
 
-<para><userinput>--enable-languages=c,c++,objc,f77,ada :</userinput>
-This command builds all available languages in the gcc package except
+<para><userinput>--enable-languages=c,c++,objc,f77,ada,java</userinput>
+: This command builds all available languages in the gcc package except
 java.  You can modify this command to remove unwanted languages. If you
 are removing Ada, use the separate installation instructions below.</para>
 
 <para><userinput>-- enable shared --enable-threads=posix
---enable-__cxa_atexit :</userinput> These commands are required to build
+--enable-__cxa_atexit</userinput> : These commands are required to build
 the C++ libraries to published standards.</para>
 
-<para><userinput>--with-slibdir=/lib :  This command sets the path to
-libgcc_s.so.</userinput></para>
+<para><userinput>--with-slibdir=/lib</userinput> : This command sets the path to
+libgcc_s.so.</para>
 
-<para><userinput>touch treeprs.ads [es]info.h nmake.ad[bs] :</userinput>
-This command creates necessary files for the Ada build.</para>
+<para><userinput>--enable-clocale=gnu</userinput> : This command is a
+failsafe for incomplete localedata.</para>
 
-<para><userinput>make gnatlib_and tools :</userinput> This command
+<para><userinput>touch treeprs.ads [es]info.h nmake.ad[bs]</userinput> : This command creates necessary files for the Ada build.</para>
+
+<para><userinput>make gnatlib_and tools</userinput> : This command
 completes the Ada build process.</para>
 
Index: general/prog/gcc/gcc-inst.xml
===================================================================
--- general/prog/gcc/gcc-inst.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
+++ general/prog/gcc/gcc-inst.xml	(revision 3e0869e0bce5c9fe2aa6a0aa72780d9a234c5c10)
@@ -12,6 +12,6 @@
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
---enable-languages=c,c++,objc,f77,ada --enable-threads=posix \
---with-slibdir=/lib --enable-__cxa_atexit &amp;&amp;
+--enable-languages=c,c++,objc,f77,ada,java --enable-threads=posix \
+--with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
 cd ../gcc-&gcc-version;/gcc/ada &amp;&amp;
 touch treeprs.ads [es]info.h nmake.ad[bs] &amp;&amp;
Index: general/prog/gcc/gcc-inst1.xml
===================================================================
--- general/prog/gcc/gcc-inst1.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
+++ general/prog/gcc/gcc-inst1.xml	(revision 3e0869e0bce5c9fe2aa6a0aa72780d9a234c5c10)
@@ -9,6 +9,6 @@
 cd ../gcc-build &amp;&amp;
 ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \
---enable-languages=c,c++,objc,f77 --enable-threads=posix \
---with-slibdir=/lib --enable-__cxa_atexit &amp;&amp;
+--enable-languages=c,c++,objc,f77,java --enable-threads=posix \
+--with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu &amp;&amp;
 make bootstrap &amp;&amp;
 make install</userinput></screen></para>
Index: general/prog/gcc/gcc-intro.xml
===================================================================
--- general/prog/gcc/gcc-intro.xml	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
+++ general/prog/gcc/gcc-intro.xml	(revision 3e0869e0bce5c9fe2aa6a0aa72780d9a234c5c10)
@@ -9,5 +9,5 @@
 
 <para>The gcc package contains GNU compilers. This is useful for
-compiling programs written in Ada, C, C++, Fortran and Objective C.</para>
+compiling programs written in Ada, C, C++, Fortran, Java and Objective C.</para>
 
 
Index: general/prog/gcc/gcc.ent
===================================================================
--- general/prog/gcc/gcc.ent	(revision 1a310d10fa0ba2cbbbb08ab506754e3e2aadc193)
+++ general/prog/gcc/gcc.ent	(revision 3e0869e0bce5c9fe2aa6a0aa72780d9a234c5c10)
@@ -6,7 +6,7 @@
 <!ENTITY gcc-desc SYSTEM "gcc-desc.xml">
 <!ENTITY gcc-config SYSTEM "gcc-config.xml">
-<!ENTITY gcc-buildsize "585 MB">
-<!ENTITY gcc-version "3.2">
-<!ENTITY gcc-download-http "http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.2/gcc-3.2.tar.bz2">
-<!ENTITY gcc-download-ftp "ftp://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.2/gcc-3.2.tar.bz2">
-<!ENTITY gcc-size "19.6 MB">
+<!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">
