--- /dev/null
+--- gcc-4.0-20040919.orig/gcc/doc/cpp.texi 2004-09-17 10:22:36.000000000 +0200
++++ gcc-4.0-20040919/gcc/doc/cpp.texi 2004-09-26 10:58:58.166721432 +0200
+@@ -52,9 +52,9 @@
+ @set cppmanual
+
+ @ifinfo
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* Cpp: (cpp). The GNU C preprocessor.
++* Cpp: (cpp). The GNU C preprocessor
+ @end direntry
+ @end ifinfo
+
+--- gcc-4.0-20040919.orig/gcc/doc/cppinternals.texi 2004-07-03 01:57:11.000000000 +0200
++++ gcc-4.0-20040919/gcc/doc/cppinternals.texi 2004-09-26 10:58:58.208715048 +0200
+@@ -3,9 +3,9 @@
+ @settitle The GNU C Preprocessor Internals
+
+ @ifinfo
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* Cpplib: (cppinternals). Cpplib internals.
++* Cpplib: (cppinternals). Cpplib internals
+ @end direntry
+ @end ifinfo
+
+--- gcc-4.0-20040919.orig/gcc/doc/gcc.texi 2004-07-22 22:12:20.000000000 +0200
++++ gcc-4.0-20040919/gcc/doc/gcc.texi 2004-09-26 10:58:58.218713528 +0200
+@@ -62,9 +62,9 @@
+ funds for GNU development.
+ @end copying
+ @ifnottex
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gcc: (gcc). The GNU Compiler Collection.
++* gcc: (gcc). The GNU Compiler Collection
+ @end direntry
+ This file documents the use of the GNU compilers.
+ @sp 1
+--- gcc-4.0-20040919.orig/gcc/doc/gccint.texi 2004-05-24 00:54:29.000000000 +0200
++++ gcc-4.0-20040919/gcc/doc/gccint.texi 2004-09-26 10:58:58.222712920 +0200
+@@ -46,9 +46,9 @@
+ funds for GNU development.
+ @end copying
+ @ifnottex
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gccint: (gccint). Internals of the GNU Compiler Collection.
++* gccint: (gccint). Internals of the GNU Compiler Collection
+ @end direntry
+ This file documents the internals of the GNU compilers.
+ @sp 1
+--- gcc-4.0-20040919.orig/gcc/ada/gnat-style.texi 2004-09-01 13:51:52.000000000 +0200
++++ gcc-4.0-20040919/gcc/ada/gnat-style.texi 2004-09-26 10:58:58.342694680 +0200
+@@ -28,9 +28,9 @@
+ @setchapternewpage odd
+
+
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gnat-style: (gnat-style). GNAT Coding Style
++* gnat-style: (gnat-style). GNAT Coding Style
+ @end direntry
+
+ @macro syntax{element}
+--- gcc-4_1-branch/gcc/ada/gnat_ugn.texi.orig 2005-12-06 23:45:52.983574000 +0100
++++ gcc-4_1-branch/gcc/ada/gnat_ugn.texi 2005-12-11 02:35:45.580878360 +0100
+@@ -99,9 +99,9 @@
+ @end ifset
+
+ @settitle @value{EDITION} User's Guide @value{PLATFORM}
+-@dircategory GNU Ada tools
++@dircategory Programming Languages:
+ @direntry
+-* @value{EDITION} User's Guide (@value{FILE}) @value{PLATFORM}
++* GNAT User's Guide (gnat_ugn_unw). GNAT User's Guide
+ @end direntry
+
+ @include gcc-common.texi
+--- gcc-4.0-20040919.orig/gcc/fortran/gfortran.texi 2004-09-16 15:13:39.000000000 +0200
++++ gcc-4.0-20040919/gcc/fortran/gfortran.texi 2004-09-26 11:05:50.258074024 +0200
+@@ -62,9 +62,9 @@
+ @end copying
+
+ @ifinfo
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gfortran: (gfortran). The GNU Fortran 95 Compiler.
++* gfortran: (gfortran). The GNU Fortran 95 Compiler
+ @end direntry
+ This file documents the use and the internals of
+ the GNU Fortran 95 compiler, (@command{gfortran}).
+--- gcc-4.0-20050507/gcc/java/gcj.texi.orig 2005-05-07 00:53:37.000000000 +0200
++++ gcc-4.0-20050507/gcc/java/gcj.texi 2005-05-08 13:09:27.000000000 +0200
+@@ -50,30 +50,22 @@
+
+ @ifinfo
+ @format
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* Gcj: (gcj). Ahead-of-time compiler for the Java language
++* Gcj: (gcj). Ahead-of-time compiler for the Java language
+ @end direntry
+
+-@dircategory Individual utilities
++@dircategory Programming tools:
+ @direntry
+-* gcjh: (gcj)Invoking gcjh.
+- Generate header files from Java class files
+-* gjnih: (gcj)Invoking gjnih.
+- Generate JNI header files from Java class files
+-* jv-scan: (gcj)Invoking jv-scan.
+- Print information about Java source files
+-* jcf-dump: (gcj)Invoking jcf-dump.
+- Print information about Java class files
+-* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode
+-* gcj-dbtool: (gcj)Invoking gcj-dbtool.
+- Tool for manipulating class file databases.
+-* jv-convert: (gcj)Invoking jv-convert.
+- Convert file from one encoding to another
+-* grmic: (gcj)Invoking grmic.
+- Generate stubs for Remote Method Invocation.
+-* grmiregistry: (gcj)Invoking grmiregistry.
+- The remote object registry.
++* gcjh: (gcj)gcjh. Generate header files from Java class files
++* gjnih: (gcj)Invoking gjnih. Generate JNI header files from Java class files
++* jv-scan: (gcj)jv-scan. Print information about Java source files
++* jcf-dump: (gcj)jcf-dump. Print information about Java class files
++* gij: (gcj)gij. GNU interpreter for Java bytecode
++* jv-convert: (gcj)jv-convert. Convert file from one encoding to another
++* gcj-dbtool: (gcj)gcj-dbtool. Db tool.
++* grmic: (gcj)grmic. Generate stubs for Remote Method Invocation.
++* grmiregistry: (gcj)grmiregistry. The remote object registry.
+ @end direntry
+ @end format
+
+@@ -107,20 +99,20 @@
+ @file{.class} files.
+
+ @menu
+-* Copying:: The GNU General Public License
++* Copying:: The GNU General Public License
+ * GNU Free Documentation License::
+ How you can share and copy this manual
+-* Invoking gcj:: Compiler options supported by @command{gcj}
++* gcj:: Compiler options supported by @command{gcj}
+ * Compatibility:: Compatibility between gcj and other tools for Java
+-* Invoking gcjh:: Generate header files from class files
+-* Invoking gjnih:: Generate JNI header files from class files
+-* Invoking jv-scan:: Print information about source files
+-* Invoking jcf-dump:: Print information about class files
+-* Invoking gij:: Interpreting Java bytecodes
+-* Invoking gcj-dbtool:: Tool for manipulating class file databases.
+-* Invoking jv-convert:: Converting from one encoding to another
+-* Invoking grmic:: Generate stubs for Remote Method Invocation.
+-* Invoking grmiregistry:: The remote object registry.
++* gcjh:: Generate header files from class files
++* gjnih:: Generate JNI header files from class files
++* jv-scan:: Print information about source files
++* jcf-dump:: Print information about class files
++* gij:: Interpreting Java bytecodes
++* jv-convert:: Converting from one encoding to another
++* gcj-dbtool:: Db tool.
++* grmic:: Generate stubs for Remote Method Invocation.
++* grmiregistry:: The remote object registry.
+ * About CNI:: Description of the Compiled Native Interface
+ * System properties:: Modifying runtime behavior of the libgcj library
+ * Resources:: Where to look for more information
+@@ -132,7 +124,7 @@
+ @include fdl.texi
+
+
+-@node Invoking gcj
++@node gcj
+ @chapter Invoking gcj
+
+ @c man title gcj Ahead-of-time compiler for the Java language
+@@ -659,7 +651,7 @@
+ @end itemize
+
+
+-@node Invoking gcjh
++@node gcjh
+ @chapter Invoking gcjh
+
+ @c man title gcjh generate header files from Java class files
+@@ -775,7 +767,7 @@
+
+ @c man end
+
+-@node Invoking gjnih
++@node gjnih
+ @chapter Invoking gjnih
+
+ @c man title gjnih generate JNI header files from Java class files
+@@ -889,7 +881,7 @@
+
+ @c man end
+
+-@node Invoking jv-scan
++@node jv-scan
+ @chapter Invoking jv-scan
+
+ @c man title jv-scan print information about Java source file
+@@ -952,7 +944,7 @@
+
+ @c man end
+
+-@node Invoking jcf-dump
++@node jcf-dump
+ @chapter Invoking jcf-dump
+
+ @c man title jcf-dump print information about Java class files
+@@ -1012,7 +1004,7 @@
+
+ @c man end
+
+-@node Invoking gij
++@node gij
+ @chapter Invoking gij
+
+ @c man title gij GNU interpreter for Java bytecode
+@@ -1132,7 +1124,7 @@
+
+ @c man end
+
+-@node Invoking gcj-dbtool
++@node gcj-dbtool
+ @chapter Invoking gcj-dbtool.
+
+ @c man title gcj-dbtool Manipulate class file mapping databases for libgcj
+@@ -1223,7 +1215,7 @@
+
+ @c man end
+
+-@node Invoking jv-convert
++@node jv-convert
+ @chapter Invoking jv-convert
+
+ @c man title jv-convert Convert file from one encoding to another
+@@ -1282,7 +1274,7 @@
+
+ @c man end
+
+-@node Invoking grmic
++@node grmic
+ @chapter Invoking grmic
+
+ @c man title grmic Generate stubs for Remote Method Invocation
+@@ -1361,7 +1353,7 @@
+ @c man end
+
+
+-@node Invoking grmiregistry
++@node grmiregistry
+ @chapter Invoking grmiregistry
+
+ @c man title grmiregistry Remote object registry
+--- gcc-4_1-branch/gcc/ada/gnat_rm.texi.orig 2005-11-30 12:12:06.000000000 +0100
++++ gcc-4_1-branch/gcc/ada/gnat_rm.texi 2005-12-11 02:36:14.863426736 +0100
+@@ -26,9 +26,9 @@
+
+ @include gcc-common.texi
+
+-@dircategory GNU Ada tools
++@dircategory Programming Languages:
+ @direntry
+-* GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools.
++* GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools
+ @end direntry
+
+ @copying
+--- gcc-4_1-branch/fastjar/fastjar.texi.orig 2005-11-30 12:19:45.000000000 +0100
++++ gcc-4_1-branch/fastjar/fastjar.texi 2005-12-11 02:41:00.190050496 +0100
+@@ -17,17 +17,11 @@
+
+ @ifinfo
+ @format
+-@dircategory Programming
++@dircategory Programming tools:
+ @direntry
+-* fastjar: (fastjar). GNU jar utilities
+-@end direntry
+-
+-@dircategory Individual utilities
+-@direntry
+-* fastjar: (fastjar)Invoking fastjar.
+- An archive tool for Java archives
+-* grepjar: (fastjar)Invoking grepjar.
+- Search files in a jar file for a pattern
++* fastjar: (fastjar). GNU jar utilities
++* fastjar: (fastjar)fastjar. An archive tool for Java archives
++* grepjar: (fastjar)grepjar. Search files in a jar file for a pattern
+ @end direntry
+ @end format
+
+@@ -77,12 +71,12 @@
+ This manual describes how to use @command{fastjar} and @command{grepjar}.
+
+ @menu
+-* Invoking fastjar:: Options supported by @command{fastjar}
+-* Invoking grepjar:: Options supported by @command{grepjar}
++* fastjar:: Options supported by @command{fastjar}
++* grepjar:: Options supported by @command{grepjar}
+ * Copying:: The GNU General Public License
+ @end menu
+
+-@node Invoking fastjar
++@node fastjar
+ @chapter Invoking fastjar
+
+ @c man title fastjar archive tool for Java archives
+@@ -172,7 +166,7 @@
+
+ @c man end
+
+-@node Invoking grepjar
++@node grepjar
+ @chapter Invoking grepjar
+
+ @c man title grepjar search files in a jar file for a pattern
+--- gcc-4_1-branch/gcc/doc/install.texi.orig 2005-11-30 12:02:42.000000000 +0100
++++ gcc-4_1-branch/gcc/doc/install.texi 2005-12-11 02:44:22.598279768 +0100
+@@ -87,9 +87,9 @@
+ @ifinfo
+ @insertcopying
+ @end ifinfo
+-@dircategory Programming
++@dircategory Programming Languages:
+ @direntry
+-* gccinstall: (gccinstall). Installing the GNU Compiler Collection.
++* gccinstall: (gccinstall). Installing the GNU Compiler Collection
+ @end direntry
+
+ @c Part 3 Titlepage and Copyright