---- 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 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
--* 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.