[libgit2-glib] Fix documentation build (bgo #696823)

[James Liggett <jrliggett src gnome org>]

commit 26f02d941628592237706c4557bffc684a062e0d
Author: James Liggett <jrliggett cox net>
Date:   Thu Mar 28 16:49:07 2013 -0700

    Fix documentation build (bgo #696823)

 docs/reference/libgit2-glib-1.0-docs.sgml    |    2 +-
 docs/reference/libgit2-glib-1.0-sections.txt |   40 +++++++++++++-------------
 docs/reference/libgit2-glib-1.0.types        |    4 +-
 3 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/docs/reference/libgit2-glib-1.0-docs.sgml b/docs/reference/libgit2-glib-1.0-docs.sgml
index d5deaf5..5a49a4f 100644
--- a/docs/reference/libgit2-glib-1.0-docs.sgml
+++ b/docs/reference/libgit2-glib-1.0-docs.sgml
@@ -22,7 +22,7 @@
     <xi:include href="xml/ggit-error.xml"/>
     <xi:include href="xml/ggit-index.xml"/>
     <xi:include href="xml/ggit-index-entry.xml"/>
-    <xi:include href="xml/ggit-index-entry-unmerged.xml"/>
+    <xi:include href="xml/ggit-index-entry-resolve-undo.xml"/>
     <xi:include href="xml/ggit-main.xml"/>
     <xi:include href="xml/ggit-native.xml"/>
     <xi:include href="xml/ggit-object.xml"/>
diff --git a/docs/reference/libgit2-glib-1.0-sections.txt b/docs/reference/libgit2-glib-1.0-sections.txt
index f4c40ad..f3e2eef 100644
--- a/docs/reference/libgit2-glib-1.0-sections.txt
+++ b/docs/reference/libgit2-glib-1.0-sections.txt
@@ -226,27 +226,27 @@ ggit_index_entry_get_type
 </SECTION>
 
 <SECTION>
-<FILE>ggit-index-entry-unmerged</FILE>
-<TITLE>GgitIndexEntryUnmerged</TITLE>
-GgitIndexEntriesUnmerged
-GgitIndexEntryUnmerged
-ggit_index_entries_unmerged_get
-ggit_index_entries_unmerged_get_by_file
-ggit_index_entries_unmerged_ref
-ggit_index_entries_unmerged_unref
-ggit_index_entries_unmerged_size
-ggit_index_entry_unmerged_ref
-ggit_index_entry_unmerged_unref
-ggit_index_entry_unmerged_get_mode
-ggit_index_entry_unmerged_get_id
-ggit_index_entry_unmerged_get_file
+<FILE>ggit-index-entry-resolve-undo/FILE>
+<TITLE>GgitIndexEntryResolveUndo</TITLE>
+GgitIndexEntriesResolveUndo
+GgitIndexEntryResolveUndo
+ggit_index_entries_resolve_undo_get
+ggit_index_entries_resolve_undo_get_by_file
+ggit_index_entries_resolve_undo_ref
+ggit_index_entries_resolve_undo_unref
+ggit_index_entries_resolve_undo_size
+ggit_index_entry_resolve_undo_ref
+ggit_index_entry_resolve_undo_unref
+ggit_index_entry_resolve_undo_get_mode
+ggit_index_entry_resolve_undo_get_id
+ggit_index_entry_resolve_undo_get_file
 <SUBSECTION Standard>
-GGIT_INDEX_ENTRIES_UNMERGED
-GGIT_INDEX_ENTRY_UNMERGED
-GGIT_TYPE_INDEX_ENTRIES_UNMERGED
-GGIT_TYPE_INDEX_ENTRY_UNMERGED
-ggit_index_entries_unmerged_get_type
-ggit_index_entry_unmerged_get_type
+GGIT_INDEX_ENTRIES_RESOLVE_UNDO
+GGIT_INDEX_ENTRY_RESOLVE_UNDO
+GGIT_TYPE_INDEX_ENTRIES_RESOLVE_UNDO
+GGIT_TYPE_INDEX_ENTRY_RESOLVE_UNDO
+ggit_index_entries_resolve_undo_get_type
+ggit_index_entry_resolve_undo_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/libgit2-glib-1.0.types b/docs/reference/libgit2-glib-1.0.types
index 511ce59..d103a96 100644
--- a/docs/reference/libgit2-glib-1.0.types
+++ b/docs/reference/libgit2-glib-1.0.types
@@ -8,9 +8,9 @@ ggit_diff_get_type
 ggit_diff_options_get_type
 ggit_diff_range_get_type
 ggit_index_entries_get_type
-ggit_index_entries_unmerged_get_type
+ggit_index_entries_resolve_undo_get_type
 ggit_index_entry_get_type
-ggit_index_entry_unmerged_get_type
+ggit_index_entry_resolve_undo_get_type
 ggit_index_get_type
 ggit_native_get_type
 ggit_object_factory_base_get_type