---- 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 @@
+--- 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 Programming
-+@dircategory Programming Languages
+-@dircategory Software development
++@dircategory Programming Languages:
@direntry
--* Cpp: (cpp). The GNU C preprocessor.
-+* Cpp: (cpp). The GNU C preprocessor.
+-* 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
+--- 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 GNU C Preprocessor Internals
@ifinfo
--@dircategory Programming
-+@dircategory Programming Languages
+-@dircategory Software development
++@dircategory Programming Languages:
@direntry
-* Cpplib: (cppinternals). Cpplib internals.
-+* 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 @@
+--- 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 Programming
+-@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
@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
+--- 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 Programming
+-@dircategory Software development
+@dircategory Programming Languages:
@direntry
-* 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
+--- 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 Programming
-+@dircategory Programming Languages
+-@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}
---- gcc-4.0-20040919.orig/gcc/ada/gnat_ugn.texi 2004-09-13 12:18:41.000000000 +0200
-+++ gcc-4.0-20040919/gcc/ada/gnat_ugn.texi 2004-09-26 10:58:58.509669296 +0200
-@@ -124,6 +124,11 @@
- ``GNU Free Documentation License''.
- @end copying
+--- 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 @@
+ @end macro
+ @settitle @value{EDITION} User's Guide @value{PLATFORM}
+-@dircategory GNU Ada tools
+@dircategory Programming Languages:
-+@direntry
-+* gnat_ug: (gnat_ug). GNAT User's Guide
-+@end direntry
-+
- @titlepage
-
- @title @value{EDITION} User's Guide
---- 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
+ @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 Software development
+@dircategory Programming Languages:
@direntry
--* gfortran: (gfortran). The GNU Fortran 95 Compiler.
-+* gfortran: (gfortran). The GNU Fortran 95 Compiler.
+-* gfortran: (gfortran). The GNU Fortran Compiler.
++* gfortran: (gfortran). The GNU Fortran 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 @@
+ 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
@format
--@dircategory Programming
+-@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 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
- 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
+-* 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.
-+* grmiregistry: (gcj)grmiregistry. The remote object registry.
++* 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
-@@ -107,20 +99,20 @@
+@@ -108,33 +101,31 @@
@file{.class} files.
@menu
--* Copying:: The GNU General Public License
+-* 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
+- 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 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
+-* 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
-+* 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 @@
++* 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
@chapter Invoking gcj
@c man title gcj Ahead-of-time compiler for the Java language
-@@ -659,7 +651,7 @@
+@@ -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 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 @@
+@@ -786,7 +777,7 @@
@c man end
@chapter Invoking gij
@c man title gij GNU interpreter for Java bytecode
-@@ -1132,7 +1124,7 @@
+@@ -915,7 +906,7 @@
@c man end
@chapter Invoking gcj-dbtool.
@c man title gcj-dbtool Manipulate class file mapping databases for libgcj
-@@ -1223,7 +1215,7 @@
+@@ -1006,7 +997,7 @@
@c man end
@chapter Invoking jv-convert
@c man title jv-convert Convert file from one encoding to another
-@@ -1282,7 +1274,7 @@
+@@ -1065,7 +1056,7 @@
@c man end
@chapter Invoking grmic
@c man title grmic Generate stubs for Remote Method Invocation
-@@ -1361,7 +1353,7 @@
+@@ -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 @@
--@node Invoking grmiregistry
-+@node grmiregistry
- @chapter Invoking grmiregistry
+ @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
- @c man title grmiregistry Remote object registry
+ @c Part 3 Titlepage and Copyright