From 79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc Mon Sep 17 00:00:00 2001
From: Pete Woods <pete.woods@canonical.com>
Date: Tue, 20 Aug 2013 11:38:10 +0100
Subject: Re-do merge

---
 doc/reference/Makefile.am                | 3 +--
 doc/reference/messaging-menu-docs.xml.in | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc/reference')

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 814a939..3993b41 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -11,8 +11,7 @@ HFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.h
 CFILE_GLOB = $(top_srcdir)/libmessaging-menu/*.c
 
 IGNORE_HFILES= \
-	indicator-messages-service.h \
-	gtupleaction.h
+	indicator-messages-service.h
 
 INCLUDES=-I$(top_srcdir)/libmessaging-menu $(GIO_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/libmessaging-menu/libmessaging-menu.la
diff --git a/doc/reference/messaging-menu-docs.xml.in b/doc/reference/messaging-menu-docs.xml.in
index 742d37b..4c1cec1 100644
--- a/doc/reference/messaging-menu-docs.xml.in
+++ b/doc/reference/messaging-menu-docs.xml.in
@@ -18,7 +18,8 @@
 
   <chapter>
     <title>API Reference</title>
-    <xi:include href="xml/messaging-menu.xml"/>
+    <xi:include href="xml/messaging-menu-app.xml" />
+    <xi:include href="xml/messaging-menu-message.xml" />
   </chapter>
 
   <chapter id="object-tree">
-- 
cgit v1.2.3