Index: general/prog/gcc-ada.xml
===================================================================
--- general/prog/gcc-ada.xml	(revision 122ded14adc3f5892715ac05f16b7da8f2865a06)
+++ general/prog/gcc-ada.xml	(revision e9355271a673843f370cdc2d251fadc080b753d0)
@@ -32,5 +32,5 @@
 
   <indexterm zone="gcc-ada">
-    <primary sortas="a-gcc-4-0">GCC-Ada&gcc-ada-version;</primary>
+    <primary sortas="a-gcc-ada">GCC-Ada-&gcc-ada-version;</primary>
   </indexterm>
 
Index: general/prog/gcc-java.xml
===================================================================
--- general/prog/gcc-java.xml	(revision 122ded14adc3f5892715ac05f16b7da8f2865a06)
+++ general/prog/gcc-java.xml	(revision e9355271a673843f370cdc2d251fadc080b753d0)
@@ -29,6 +29,6 @@
   <title>GCC-Java-&gcc-java-version;</title>
 
-  <indexterm zone="gcc">
-    <primary sortas="a-gcc-java-5-0">GCC-Java-&gcc-java-version;</primary>
+  <indexterm zone="gcc-java">
+    <primary sortas="a-gcc-java">GCC-Java-&gcc-java-version;</primary>
   </indexterm>
 
@@ -381,5 +381,5 @@
             <command>gcj</command> to compile it to native code.
           </para>
-          <indexterm zone="gcc aot-compile">
+          <indexterm zone="gcc-java aot-compile">
             <primary sortas="b-aot-compile">aot-compile</primary>
           </indexterm>
@@ -393,5 +393,5 @@
             is the Eclipse Java compiler.
           </para>
-          <indexterm zone="gcc ecj">
+          <indexterm zone="gcc-java ecj">
             <primary sortas="b-ecj">ecj</primary>
           </indexterm>
@@ -405,5 +405,5 @@
             loads and run a <application>Java</application> applet.
           </para>
-          <indexterm zone="gcc gappletviewer">
+          <indexterm zone="gcc-java gappletviewer">
             <primary sortas="b-gappletviewer">gappletviewer</primary>
           </indexterm>
@@ -418,5 +418,5 @@
             <application>Java</application> code.
           </para>
-          <indexterm zone="gcc gc-analyze">
+          <indexterm zone="gcc-java gc-analyze">
             <primary sortas="b-gc-analyze">gc-analyze</primary>
           </indexterm>
@@ -431,5 +431,5 @@
             language.
           </para>
-          <indexterm zone="gcc gcj">
+          <indexterm zone="gcc-java gcj">
             <primary sortas="b-gcj">gcj</primary>
           </indexterm>
@@ -443,5 +443,5 @@
             is a tool for creating and manipulating class file mapping databases.
           </para>
-          <indexterm zone="gcc gcj-dbtool">
+          <indexterm zone="gcc-java gcj-dbtool">
             <primary sortas="b-gcj-dbtool">gcj-dbtool</primary>
           </indexterm>
@@ -455,5 +455,5 @@
             generates header files from <application>Java</application> class files.
           </para>
-          <indexterm zone="gcc gcjh">
+          <indexterm zone="gcc-java gcjh">
             <primary sortas="b-gcjh">gcjh</primary>
           </indexterm>
@@ -467,5 +467,5 @@
             is the GNU interpreter for <application>Java</application> bytecode.
           </para>
-          <indexterm zone="gcc gij">
+          <indexterm zone="gcc-java gij">
             <primary sortas="b-gij">gij</primary>
           </indexterm>
@@ -480,5 +480,5 @@
             utility that comes with Sun's JDK.
           </para>
-          <indexterm zone="gcc gjar">
+          <indexterm zone="gcc-java gjar">
             <primary sortas="b-gjar">gjar</primary>
           </indexterm>
@@ -492,5 +492,5 @@
             is a Java ARchive (JAR) file signing and verification tool.
           </para>
-          <indexterm zone="gcc gjarsigner">
+          <indexterm zone="gcc-java gjarsigner">
             <primary sortas="b-gjarsigner">gjarsigner</primary>
           </indexterm>
@@ -504,5 +504,5 @@
             generates header files from Java class files.
           </para>
-          <indexterm zone="gcc gjavah">
+          <indexterm zone="gcc-java gjavah">
             <primary sortas="b-gjavah">gjavah</primary>
           </indexterm>
@@ -516,5 +516,5 @@
             is a documentation tool similar to <command>javadoc</command>.
           </para>
-          <indexterm zone="gcc gjdoc">
+          <indexterm zone="gcc-java gjdoc">
             <primary sortas="b-gjdoc">gjdoc</primary>
           </indexterm>
@@ -529,5 +529,5 @@
             <application>Java</application> environment.
           </para>
-          <indexterm zone="gcc gkeytool">
+          <indexterm zone="gcc-java gkeytool">
             <primary sortas="b-gkeytool">gkeytool</primary>
           </indexterm>
@@ -541,5 +541,5 @@
             is an encoding converter for <application>Java</application>.
           </para>
-          <indexterm zone="gcc gnative2ascii">
+          <indexterm zone="gcc-java gnative2ascii">
             <primary sortas="b-gnative2ascii">gnative2ascii</primary>
           </indexterm>
@@ -553,5 +553,5 @@
             is an object request broker daemon.
           </para>
-          <indexterm zone="gcc gorbd">
+          <indexterm zone="gcc-java gorbd">
             <primary sortas="b-gorbd">gorbd</primary>
           </indexterm>
@@ -565,5 +565,5 @@
             generates stubs for Remote Method Invocation.
           </para>
-          <indexterm zone="gcc grmic-gcc">
+          <indexterm zone="gcc-java grmic-gcc">
             <primary sortas="b-grmic">grmic</primary>
           </indexterm>
@@ -577,5 +577,5 @@
             RMI activation system daemon.
           </para>
-          <indexterm zone="gcc grmid-gcc">
+          <indexterm zone="gcc-java grmid-gcc">
             <primary sortas="b-grmid">grmid</primary>
           </indexterm>
@@ -589,5 +589,5 @@
             starts a remote object registry on the current host.
           </para>
-          <indexterm zone="gcc grmiregistry-gcc">
+          <indexterm zone="gcc-java grmiregistry-gcc">
             <primary sortas="b-grmiregistry">grmiregistry</primary>
           </indexterm>
@@ -601,5 +601,5 @@
             prints the serialVersionUID of the specified class.
           </para>
-          <indexterm zone="gcc gserialver">
+          <indexterm zone="gcc-java gserialver">
             <primary sortas="b-gserialver">gserialver</primary>
           </indexterm>
@@ -613,5 +613,5 @@
             starts a naming service.
           </para>
-          <indexterm zone="gcc gtnameserv">
+          <indexterm zone="gcc-java gtnameserv">
             <primary sortas="b-gtnameserv">gtnameserv</primary>
           </indexterm>
@@ -626,5 +626,5 @@
             class files.
           </para>
-          <indexterm zone="gcc jcf-dump">
+          <indexterm zone="gcc-java jcf-dump">
             <primary sortas="b-jcf-dump">jcf-dump</primary>
           </indexterm>
@@ -638,5 +638,5 @@
             converts files from one encoding to another.
           </para>
-          <indexterm zone="gcc jv-convert">
+          <indexterm zone="gcc-java jv-convert">
             <primary sortas="b-jv-convert">jv-convert</primary>
           </indexterm>
@@ -652,5 +652,5 @@
             database.
           </para>
-          <indexterm zone="gcc rebuild-gcj-db">
+          <indexterm zone="gcc-java rebuild-gcj-db">
             <primary sortas="b-rebuild-gcj-db">rebuild-gcj-db</primary>
           </indexterm>
