Nicer indices

svn path=/trunk/; revision=7665

diff --git a/ChangeLog b/ChangeLog
index 90614b1c941a40bc8074baed43ac2fa9bd148ffa..22b1f824a94b2c317b8d261f67dcda247a90b11f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-21  Matthias Clasen <mclasen@redhat.com>
+
+       * configure.in: Bump gtk-doc dependency to 1.11 for
+       nicer index-generation.
+
 2008-11-14  Matthias Clasen <mclasen@redhat.com>
 
        * NEWS: Updates

diff --git a/configure.in b/configure.in
index 6b6c7eb7fb9559a609c826c5a6f779f75447a58d..52b0935015eb7a6d501ca5c15ebe8eb0456867fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2591,7 +2591,7 @@ dnl **************************
 dnl *** Checks for gtk-doc ***
 dnl **************************
 
-GTK_DOC_CHECK([1.8])
+GTK_DOC_CHECK([1.11])
 
 AC_ARG_ENABLE(man,
               [AC_HELP_STRING([--enable-man],

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 21d34eee561b3768b291493323419de363c3960f..b10413a085e99e8c447820d3c322ae12c81eb055 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/Makefile.am:
+       * gobject/Makefile.am:
+       * gio/Makefile.am: Use a new gtk-doc feature to generate
+       much nicer indices.
+
 2008-11-14  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/glib-sections.txt: Add G_STATIC_ASSERT and friends

diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 1227397aa1b8351b2b18e8aed0826379d9061983..43e003f417e65b49cec8f14f296b1ed9cff042e5 100644 (file)
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -85,7 +85,7 @@ GTKDOC_LIBS = \
        $(NULL)
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS = --output-format=xml --sgml-mode
+MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=g
 
 # Images to copy into HTML directory
 HTML_IMAGES =                  \

diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 1a3e836828844ec72860d202293cccfa62a13607..1c82f32f6083a1c96d7ad56d31de4e29f7eae91c 100644 (file)
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -16,7 +16,7 @@ DOC_SOURCE_DIR=../../..
 SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h

diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index c582e79272a98a5234a45c9e93c7dd096e016c9d..0c88234394094449e71bdd59643d42351746fe3e 100644 (file)
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -17,7 +17,7 @@ SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" \
        --ignore-decorators=G_GNUC_INTERNAL
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/gobject/*.h