diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/configure java-gnome-2.6.0-neu/configure
--- java-gnome-2.6.0-orig/configure	2004-04-13 14:39:17.000000000 +0200
+++ java-gnome-2.6.0-neu/configure	2004-04-13 22:12:00.000000000 +0200
@@ -2877,28 +2877,28 @@
         echo "*** Your version of pkg-config is too old. You need version 0.7.0 or newer."
         echo "*** See http://www.freedesktop.org/software/pkgconfig"
      else
-        echo $ac_n "checking for gconf-2.0 >= 2.6.1""... $ac_c" 1>&6
-echo "configure:2882: checking for gconf-2.0 >= 2.6.1" >&5
+        echo $ac_n "checking for gconf-2.0 >= 2.6.0""... $ac_c" 1>&6
+echo "configure:2882: checking for gconf-2.0 >= 2.6.0" >&5
 
-        if $PKG_CONFIG --exists "gconf-2.0 >= 2.6.1" ; then
+        if $PKG_CONFIG --exists "gconf-2.0 >= 2.6.0" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking GCONF_CFLAGS""... $ac_c" 1>&6
 echo "configure:2889: checking GCONF_CFLAGS" >&5
-            GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.6.1"`
+            GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.6.0"`
             echo "$ac_t""$GCONF_CFLAGS" 1>&6
 
             echo $ac_n "checking GCONF_LIBS""... $ac_c" 1>&6
 echo "configure:2894: checking GCONF_LIBS" >&5
-            GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.6.1"`
+            GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.6.0"`
             echo "$ac_t""$GCONF_LIBS" 1>&6
         else
             GCONF_CFLAGS=""
             GCONF_LIBS=""
             ## If we have a custom action on failure, don't print errors, but 
             ## do set a variable so people can do so.
-            GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.6.1"`
+            GCONF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.6.0"`
             echo $GCONF_PKG_ERRORS
         fi
 
@@ -2910,7 +2910,7 @@
   if test $succeeded = yes; then
      :
   else
-     { echo "configure: error: Library requirements (gconf-2.0 >= 2.6.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
+     { echo "configure: error: Library requirements (gconf-2.0 >= 2.6.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
   fi
 
 
diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-core/Makefile.in java-gnome-2.6.0-neu/doc-core/Makefile.in
--- java-gnome-2.6.0-orig/doc-core/Makefile.in	2004-04-13 14:39:17.000000000 +0200
+++ java-gnome-2.6.0-neu/doc-core/Makefile.in	2004-04-13 22:29:38.000000000 +0200
@@ -96,7 +96,7 @@
 # Install targets
 install: faq api
 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
-	$(INSTALL) -m644 build-faq/t1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
+	$(INSTALL) -m644 build-faq/index.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
 	$(INSTALL) -m644 tutorial/*.java $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
 	# TODO: create a makefile in the following place, linking to the jar files,
 	# setting ld-library-path, etc. as determined by the configure script.
diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-core/Makefile.in.in java-gnome-2.6.0-neu/doc-core/Makefile.in.in
--- java-gnome-2.6.0-orig/doc-core/Makefile.in.in	2004-04-13 14:39:17.000000000 +0200
+++ java-gnome-2.6.0-neu/doc-core/Makefile.in.in	2004-04-13 22:29:45.000000000 +0200
@@ -43,7 +43,7 @@
 # Install targets
 install: faq api
 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
-	$(INSTALL) -m644 build-faq/t1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
+	$(INSTALL) -m644 build-faq/index.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/faq.html
 	$(INSTALL) -m644 tutorial/*.java $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/core/
 	# TODO: create a makefile in the following place, linking to the jar files,
 	# setting ld-library-path, etc. as determined by the configure script.
diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-gnome/Makefile.in java-gnome-2.6.0-neu/doc-gnome/Makefile.in
--- java-gnome-2.6.0-orig/doc-gnome/Makefile.in	2004-04-13 14:39:17.000000000 +0200
+++ java-gnome-2.6.0-neu/doc-gnome/Makefile.in	2004-04-13 22:41:21.000000000 +0200
@@ -87,7 +87,7 @@
 # Install targets
 install: tutorial api
 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/
-	$(INSTALL) -m644 build-tutorial/book1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/tutorial.html
+	$(INSTALL) -m644 build-tutorial/index.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/tutorial.html
 	# TODO: create a makefile in the following place, linking to the jar files,
 	# setting ld-library-path, etc. as determined by the configure script.
 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/class-use/
diff -U 3 -H -d -r -N -- java-gnome-2.6.0-orig/doc-gnome/Makefile.in.in java-gnome-2.6.0-neu/doc-gnome/Makefile.in.in
--- java-gnome-2.6.0-orig/doc-gnome/Makefile.in.in	2004-04-13 14:39:17.000000000 +0200
+++ java-gnome-2.6.0-neu/doc-gnome/Makefile.in.in	2004-04-13 22:41:32.000000000 +0200
@@ -34,7 +34,7 @@
 # Install targets
 install: tutorial api
 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/
-	$(INSTALL) -m644 build-tutorial/book1.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/tutorial.html
+	$(INSTALL) -m644 build-tutorial/index.html $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/doc/gnome/tutorial.html
 	# TODO: create a makefile in the following place, linking to the jar files,
 	# setting ld-library-path, etc. as determined by the configure script.
 	-$(INSTALL) -d -m755 $(DESTDIR)$(datadir)/doc/java-gnome-$(apiversion)/api/gnome/org/gnu/gnome/class-use/