-diff -urN gcc-2.95.1.orig/gcc/cpp.texi gcc-2.95.1/gcc/cpp.texi
---- gcc-2.95.1.orig/gcc/cpp.texi Tue May 18 01:37:18 1999
-+++ gcc-2.95.1/gcc/cpp.texi Thu Aug 19 12:46:15 1999
+--- a/gcc/doc/cpp.texi 2004-09-17 10:22:36.000000000 +0200
++++ b/gcc/doc/cpp.texi 2004-09-26 10:58:58.166721432 +0200
+@@ -50,9 +50,9 @@
+ @set cppmanual
+
+ @ifinfo
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* Cpp: (cpp). The GNU C preprocessor.
++* Cpp: (cpp). The GNU C preprocessor
+ @end direntry
+ @end ifinfo
+
+--- a/gcc/doc/cppinternals.texi 2004-07-03 01:57:11.000000000 +0200
++++ b/gcc/doc/cppinternals.texi 2004-09-26 10:58:58.208715048 +0200
@@ -3,9 +3,9 @@
- @settitle The C Preprocessor
+ @settitle The GNU C Preprocessor Internals
@ifinfo
--@dircategory Programming
-+@dircategory Programming tools:
+-@dircategory Software development
++@dircategory Programming Languages:
@direntry
--* Cpp: (cpp). The GNU C preprocessor.
-+* Cpp: (cpp) The GNU C preprocessor
+-* Cpplib: (cppinternals). Cpplib internals.
++* Cpplib: (cppinternals). Cpplib internals
@end direntry
@end ifinfo
-diff -urN gcc-2.95.1.orig/gcc/f/g77.texi gcc-2.95.1/gcc/f/g77.texi
---- gcc-2.95.1.orig/gcc/f/g77.texi Mon Jun 21 13:58:54 1999
-+++ gcc-2.95.1/gcc/f/g77.texi Thu Aug 19 12:46:15 1999
-@@ -71,9 +71,9 @@
- @c @end tex
+--- a/gcc/doc/gcc.texi 2004-07-22 22:12:20.000000000 +0200
++++ b/gcc/doc/gcc.texi 2004-09-26 10:58:58.218713528 +0200
+@@ -62,10 +62,10 @@
+ funds for GNU development.
+ @end copying
+ @ifnottex
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* gcc: (gcc). The GNU Compiler Collection.
+-* g++: (gcc). The GNU C++ compiler.
++* gcc: (gcc). The GNU Compiler Collection
++* g++: (gcc). The GNU C++ compiler
+ * gcov: (gcc) Gcov. @command{gcov}---a test coverage program.
+ @end direntry
+ This file documents the use of the GNU compilers.
+--- a/gcc/doc/gccint.texi 2004-05-24 00:54:29.000000000 +0200
++++ b/gcc/doc/gccint.texi 2004-09-26 10:58:58.222712920 +0200
+@@ -46,9 +46,9 @@
+ funds for GNU development.
+ @end copying
+ @ifnottex
+-@dircategory Software development
++@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
+--- a/gcc/ada/gnat-style.texi 2004-09-01 13:51:52.000000000 +0200
++++ b/gcc/ada/gnat-style.texi 2004-09-26 10:58:58.342694680 +0200
+@@ -28,9 +28,9 @@
+ @setchapternewpage odd
+
+
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* gnat-style: (gnat-style). GNAT Coding Style
++* gnat-style: (gnat-style). GNAT Coding Style
+ @end direntry
+
+ @macro syntax{element}
+--- a/gcc/ada/gnat_ugn.texi 2005-12-06 23:45:52.983574000 +0100
++++ b/gcc/ada/gnat_ugn.texi 2005-12-11 02:35:45.580878360 +0100
+@@ -109,9 +109,9 @@
+
+
+ @settitle @value{EDITION} User's Guide @value{TITLESUFFIX}
+-@dircategory GNU Ada tools
++@dircategory Programming Languages:
+ @direntry
+-* @value{EDITION} User's Guide: (gnat_ugn). @value{PLATFORM}
++* GNAT User's Guide (gnat_ugn_unw). GNAT User's Guide
+ @end direntry
+
+ @include gcc-common.texi
+--- a/gcc/fortran/gfortran.texi 2004-09-16 15:13:39.000000000 +0200
++++ b/gcc/fortran/gfortran.texi 2004-09-26 11:05:50.258074024 +0200
+@@ -62,9 +62,9 @@
+ @end copying
@ifinfo
--@dircategory Programming
-+@dircategory Programming tools:
+-@dircategory Software development
++@dircategory Programming Languages:
@direntry
--* g77: (g77). The GNU Fortran compiler.
-+* g77: (g77) The GNU Fortran compiler
+-* gfortran: (gfortran). The GNU Fortran Compiler.
++* gfortran: (gfortran). The GNU Fortran Compiler
@end direntry
- @ifset INTERNALS
- @ifset USING
-diff -urN gcc-2.95.1.orig/gcc/gcc.texi gcc-2.95.1/gcc/gcc.texi
---- gcc-2.95.1.orig/gcc/gcc.texi Mon Aug 9 08:47:01 1999
-+++ gcc-2.95.1/gcc/gcc.texi Thu Aug 19 12:47:17 1999
-@@ -80,9 +80,9 @@
- @c @end tex
+ This file documents the use and the internals of
+ the GNU Fortran compiler, (@command{gfortran}).
+--- a/gcc/java/gcj.texi 2006-07-02 15:30:47.000000000 +0200
++++ b/gcc/java/gcj.texi 2006-07-02 21:15:25.663463500 +0200
+@@ -53,29 +53,22 @@
@ifinfo
--@dircategory Programming
+ @format
+-@dircategory Software development
++@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
--* gcc: (gcc). The GNU Compiler Collection.
-+* gcc: (gcc). The GNU Compiler Collection.
+-* 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.
+-* gc-analyze: (gcj)Invoking gc-analyze.
+- Analyze Garbage Collector (GC) memory dumps.
+-* aot-compile: (gcj)Invoking aot-compile.
+- Compile bytecode to native and generate databases.
+-* rebuild-gcj-db: (gcj)Invoking rebuild-gcj-db.
+- Merge the per-solib databases made by aot-compile
+- into one system-wide database.
++* 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.
++* gc-analyze: (gcj)gc-analyze. Analyze Garbage Collector (GC) memory dumps.
++* aot-compile: Compile bytecode to native and generate databases.
++* rebuild-gcj-db: Merge the per-solib databases made by aot-compile into one system-wide database.
+ @end direntry
+ @end format
+
+@@ -108,33 +101,31 @@
+ @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}
+-* Compatibility:: Compatibility between gcj and other tools for Java
+-* 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 gc-analyze:: Analyze Garbage Collector (GC) memory dumps.
+-* Invoking aot-compile:: Compile bytecode to native and generate databases.
+-* Invoking rebuild-gcj-db:: Merge the per-solib databases made by aot-compile
+- into one system-wide database.
+-* About CNI:: Description of the Compiled Native Interface
+-* System properties:: Modifying runtime behavior of the libgcj library
+-* Resources:: Where to look for more information
+-* Index:: Index.
++ How you can share and copy this manual
++* gcj:: Compiler options supported by @command{gcj}
++* Compatibility:: Compatibility between gcj and other tools for Java
++* jcf-dump:: Print information about class files
++* gij:: Interpreting Java bytecodes
++* gcj-dbtool:: Tool for manipulating class file databases.
++* jv-convert:: Converting from one encoding to another
++* grmic:: Generate stubs for Remote Method Invocation.
++* gc-analyze:: Analyze Garbage Collector (GC) memory dumps.
++* aot-compile:: Compile bytecode to native and generate databases.
++* rebuild-gcj-db:: Merge the per-solib databases made by aot-compile into one system-wide database.
++* About CNI:: Description of the Compiled Native Interface
++* System properties:: Modifying runtime behavior of the libgcj library
++* Resources:: Where to look for more information
++* Index:: Index.
+ @end menu
+
+-
+ @include gpl_v3.texi
+
+ @include fdl.texi
+
+
+-@node Invoking gcj
++@node gcj
+ @chapter Invoking gcj
+
+ @c man title gcj Ahead-of-time compiler for the Java language
+@@ -678,8 +669,8 @@
+ @code{-findirect-dispatch} then add them to the system-wide
+ classmap.db file using @code{gcj-dbtool}, they will be automatically
+ loaded by the @code{libgcj} system classloader. This is the new,
+-preferred classname-to-library resolution mechanism. @xref{Invoking
+-gcj-dbtool}, for more information on using the classmap database.
++preferred classname-to-library resolution mechanism. @xref{gcj-dbtool},
++for more information on using the classmap database.
+
+ @item
+ The old classname-to-library lookup mechanism is still supported
+@@ -726,7 +717,7 @@
+ @end itemize
+
+
+-@node Invoking jcf-dump
++@node jcf-dump
+ @chapter Invoking jcf-dump
+
+ @c man title jcf-dump print information about Java class files
+@@ -786,7 +777,7 @@
+
+ @c man end
+
+-@node Invoking gij
++@node gij
+ @chapter Invoking gij
+
+ @c man title gij GNU interpreter for Java bytecode
+@@ -915,7 +906,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
+@@ -1006,7 +997,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
+@@ -1065,7 +1056,7 @@
+
+ @c man end
+
+-@node Invoking grmic
++@node grmic
+ @chapter Invoking grmic
+
+ @c man title grmic Generate stubs for Remote Method Invocation
+@@ -1144,7 +1135,7 @@
+ @c man end
+
+
+-@node Invoking gc-analyze
++@node gc-analyze
+ @chapter Invoking gc-analyze
+
+ @c man title gc-analyze Analyze Garbage Collector (GC) memory dumps
+@@ -1227,7 +1218,7 @@
+
+ @c man end
+
+-@node Invoking aot-compile
++@node aot-compile
+ @chapter Invoking aot-compile
+
+ @c man title aot-compile Compile bytecode to native and generate databases
+@@ -1285,7 +1276,7 @@
+
+ @c man end
+
+-@node Invoking rebuild-gcj-db
++@node rebuild-gcj-db
+ @chapter Invoking rebuild-gcj-db
+
+ @c man title rebuild-gcj-db Merge the per-solib databases made by aot-compile into one system-wide database.
+--- a/gcc/ada/gnat_rm.texi 2005-11-30 12:12:06.000000000 +0100
++++ b/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
+--- a/gcc/doc/install.texi 2005-11-30 12:02:42.000000000 +0100
++++ b/gcc/doc/install.texi 2005-12-11 02:44:22.598279768 +0100
+@@ -87,9 +87,9 @@
+ @ifinfo
+ @insertcopying
+ @end ifinfo
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* gccinstall: (gccinstall). Installing the GNU Compiler Collection.
++* gccinstall: (gccinstall). Installing the GNU Compiler Collection
@end direntry
- @ifset INTERNALS
- @ifset USING
+
+ @c Part 3 Titlepage and Copyright
+--- gcc-4.6.2/gcc/go/gccgo.texi.orig 2011-02-14 05:42:53.000000000 +0100
++++ gcc-4.6.2/gcc/go/gccgo.texi 2011-10-31 18:27:12.670749858 +0100
+@@ -48,9 +48,9 @@
+
+ @ifinfo
+ @format
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* Gccgo: (gccgo). A GCC-based compiler for the Go language
++* Gccgo: (gccgo). A GCC-based compiler for the Go language
+ @end direntry
+ @end format
+