Merge branch 'doxygenate' into dbus-1.4

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Conflicts:
	configure.ac
	doc/Makefile.am

diff --cc configure.ac
Simple merge

diff --cc doc/Makefile.am
index 7fe0dc1,28b2ddf..adac743
--- 1/doc/Makefile.am
--- 2/doc/Makefile.am
+++ b/doc/Makefile.am
@@@ -1,8 -1,8 +1,10 @@@
 -man_MANS = \
+ apidir = @htmldir@/api
+ 
 +# automake normally assumes that man pages are generated files;
 +# these ones aren't, so we need the dist_ prefix to say that they're
 +# their own source code
 +dist_man1_MANS = \
        dbus-cleanup-sockets.1 \
 -      dbus-daemon.1 \
        dbus-launch.1 \
        dbus-monitor.1 \
        dbus-send.1 \
@@@ -40,8 -36,9 +42,9 @@@ STATIC_DOCS = 
  
  EXTRA_DIST = \
        file-boilerplate.c \
+       doxygen_to_devhelp.xsl \
        $(STATIC_DOCS) \
 -      $(MAN_IN_FILES) $(man_MANS)
 +      $(MAN_IN_FILES)
  
  HTML_FILES=                                   \
        dbus-faq.html                           \