Merge branch 'mallard-templates'

453 files changed, 12698 insertions, 2058 deletions

diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
index 3655997f..e8edf9d1 100644
--- a/Makefile-giscanner.am
+++ b/Makefile-giscanner.am
@@ -33,8 +33,6 @@ pkgpyexec_PYTHON =			\
 	giscanner/ast.py		\
 	giscanner/cachestore.py		\
 	giscanner/codegen.py		\
-	giscanner/docbookdescription.py	\
-	giscanner/docbookwriter.py	\
 	giscanner/docmain.py	\
 	giscanner/dumper.py		\
 	giscanner/introspectablepass.py	\
@@ -44,6 +42,20 @@ pkgpyexec_PYTHON =			\
 	giscanner/libtoolimporter.py	\
 	giscanner/odict.py		\
 	giscanner/mallardwriter.py	\
+	giscanner/mallard-C-class.tmpl	\
+	giscanner/mallard-C-default.tmpl	\
+	giscanner/mallard-C-function.tmpl	\
+	giscanner/mallard-C-namespace.tmpl	\
+	giscanner/mallard-C-property.tmpl	\
+	giscanner/mallard-C-record.tmpl	\
+	giscanner/mallard-C-signal.tmpl	\
+	giscanner/mallard-Python-class.tmpl	\
+	giscanner/mallard-Python-default.tmpl	\
+	giscanner/mallard-Python-function.tmpl	\
+	giscanner/mallard-Python-namespace.tmpl	\
+	giscanner/mallard-Python-property.tmpl	\
+	giscanner/mallard-Python-record.tmpl	\
+	giscanner/mallard-Python-signal.tmpl	\
 	giscanner/maintransformer.py	\
 	giscanner/message.py		\
 	giscanner/shlibs.py		\
diff --git a/README b/README
index 0562c8ab..2a1dd1ca 100644
--- a/README
+++ b/README
@@ -37,6 +37,8 @@ Three tools are shipped with GObject Introspection:
   typelib blob.
 - g-ir-scanner, a tool which generates GIR XML files by parsing headers
   and introspecting GObject based libraries.
+- g-ir-doc-tool, generates Mallard files that can be viewed with yelp or
+  rendered to HTML with yelp-build from yelp-tools.
 
 API library
 ===========
diff --git a/configure.ac b/configure.ac
index df796457..c311f660 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,6 +272,8 @@ if test "x$os_win32" = "xyes"; then
   AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
 fi
 
+AM_CHECK_PYMOD(mako,,,[AC_MSG_ERROR(Could not find python module: mako)])
+
 # Glib documentation
 
 GLIBSRC=
diff --git a/giscanner/ast.py b/giscanner/ast.py
index 91faff88..6df356dd 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -556,6 +556,7 @@ class Callable(Node):
         self.parameters = parameters
         self.throws = not not throws
         self.instance_parameter = None # Parameter
+        self.parent = None # A Class or Interface
 
     def get_parameter_index(self, name):
         for i, parameter in enumerate(self.parameters):
@@ -1007,6 +1008,7 @@ class Property(Node):
             self.transfer = PARAM_TRANSFER_NONE
         else:
             self.transfer = transfer
+        self.parent = None # A Class or Interface
 
 
 class Callback(Callable):
diff --git a/giscanner/docbookdescription.py b/giscanner/docbookdescription.py
deleted file mode 100644
index 9ec7219d..00000000
--- a/giscanner/docbookdescription.py
+++ /dev/null
@@ -1,185 +0,0 @@
-
-TAG_PROGRAM_LISTING = '<programlisting'
-TAG_CDATA = '<![CDATA['
-TAGS = {TAG_PROGRAM_LISTING, TAG_CDATA, ']]>', '</programlisting>'}
-
-def get_formatted_description(description):
-    desc = description.replace("|[", "<informalexample><programlisting>") \
-                          .replace("]|", "</programlisting></informalexample>")
-
-    desc = "<para>%s</para>" % desc
-
-# we still need to handle this case
-#    # Handle "#include <xxxxx>"
-#    $text =~ s/#include(\s+)<([^>]+)>/#include$1&lt;$2&gt;/g;
-
-    formatted_desc = ""
-
-    inside_tags = []
-    last_offset = 0
-    for start, end, tag in _find_xml_tag_matches(desc):
-        if len(inside_tags) == 0:
-            new_desc = "\n</para>\n<para>\n".join(desc[last_offset:start].split('\n\n'))
-        else:
-            new_desc = desc[last_offset:start]
-
-        if TAG_CDATA not in inside_tags:
-            new_desc = _escape_non_cdata_section(new_desc)
-
-        formatted_desc += new_desc
-        formatted_desc += tag
-        if tag == TAG_PROGRAM_LISTING:
-            formatted_desc += '>'
-
-        if tag in (TAG_CDATA, TAG_PROGRAM_LISTING):
-            inside_tags.append(tag)
-        else:
-            try:
-                inside_tags.pop()
-            except IndexError:
-                print "Error: mismatched tag:", tag
-        last_offset = end
-
-    formatted_desc += _escape_non_cdata_section(desc[last_offset:])
-    return formatted_desc
-
-def _find_xml_tag_matches(string):
-    offset = 0
-    while True:
-        indexes = []
-        for tag in TAGS:
-            pos = string.find(tag, offset)
-            if pos != -1:
-                indexes.append((tag, pos))
-
-        if indexes:
-            tag, first = min(indexes, key=lambda x: x[1])
-            if tag == TAG_PROGRAM_LISTING:
-                end = string.find('>', first + len(tag) - 1) + 1
-            else:
-                end = first + len(tag)
-            offset = end
-            yield first, end, tag
-        else:
-            return
-
-def _escape_non_cdata_section(string):
-    string = _escape_ampersand_not_in_entity(string)
-    string = _escape_lt_not_in_xml_tag(string)
-    return _escape_gt_not_in_xml_tag(string)
-
-def _escape_ampersand_not_in_entity(string):
-    parts = string.split('&')
-
-    output = parts[0]
-    for part in parts[1:]:
-        end = part.find(';')
-        if end == -1 or not part[:end].isalpha():
-            output += "&amp;"
-        else:
-            output += "&"
-        output += part
-
-    return output
-
-def _is_valid_xml_tag_name(name):
-    if len(name) < 1:
-        return False
-    elif name.isalpha() or (name[0].isalpha() and name[1:].isalnum()):
-        return True
-
-def _is_valid_xml_tag(string):
-    # handle case where line end is between tag name and first argument.
-    # ie. <link\nlinkend="link-id">My Link</link>
-    string = string.replace('\n', ' ')
-
-    if string[-1] == '/':
-        string = string[:-1]
-
-    # string is the inner part of the tag, without < and >
-    if string[0] == '/' and _is_valid_xml_tag_name(string[1:]):
-        #valid end tag
-        return True
-    elif _is_valid_xml_tag_name(string):
-        #valid start tag with not params
-        return True
-    elif " " in string:
-        # we are looking for: <tagname arg="value" arg2="value2">
-        # TODO: handle spaces in values (between quotations)
-        tagname, rest = string.split(" ", 1)
-        if not _is_valid_xml_tag_name(tagname):
-            return False
-
-        while rest.strip():
-            rest = rest.lstrip()
-
-            if not '=' in rest:
-                return False
-            argname, rest = rest.split('=', 1)
-            if not _is_valid_xml_tag_name(argname):
-                return False
-            if rest[0] != '"':
-                return False
-            value, rest = rest[1:].split('"', 1)
-
-        return True
-
-def _escape_lt_not_in_xml_tag(string):
-    parts = string.split('<')
-
-    output = parts[0]
-    for part in parts[1:]:
-        end = part.find('>')
-        if end == -1 or not _is_valid_xml_tag(part[:end]):
-            output += "&lt;"
-        else:
-            output += "<"
-        output += part
-
-    return output
-
-def _escape_gt_not_in_xml_tag(string):
-    parts = string.split('>')
-
-    output = parts[0]
-    for part in parts[1:]:
-        start = output.rfind('<')
-        if start == -1 or not _is_valid_xml_tag(output[start+1:]):
-            output += "&gt;"
-        else:
-            output += ">"
-        output += part
-
-    return output
-
-
-def test():
-    assert _is_valid_xml_tag_name('a')
-    assert _is_valid_xml_tag_name('refsect1')
-    assert not _is_valid_xml_tag_name('1refsect')
-    assert not _is_valid_xml_tag_name('1')
-
-    assert _is_valid_xml_tag('/a')
-    assert _is_valid_xml_tag('/refsect1')
-    assert not _is_valid_xml_tag('/1')
-    assert _is_valid_xml_tag('link')
-    assert _is_valid_xml_tag('link linkend="value"')
-    assert _is_valid_xml_tag('link  linkend="value"')
-    assert _is_valid_xml_tag('link/')
-    assert _is_valid_xml_tag('link linkend="value"/')
-    assert _is_valid_xml_tag('link linkend="value" arg23="anothervalue"')
-    assert _is_valid_xml_tag('link linkend="value" arg23="anothervalue with spaces"')
-    assert not _is_valid_xml_tag('link linkend="value arg23="anothervalue with spaces"')
-    assert not _is_valid_xml_tag('link linkend')
-    assert _is_valid_xml_tag('link\nlinkend="link-id"')
-    assert _is_valid_xml_tag('xref linkend="gtkstylecontext-classes"/')
-
-    assert _is_valid_xml_tag('a href="http://www.gtk.org" title="&lt;i&gt;Our&lt;/i&gt; website"')
-    assert _is_valid_xml_tag('ulink \nurl="http://www.freedesktop.org/Standards/wm-spec"')
-
-    string = 'gtk_label_set_markup (label, "Go to the <a href="http://www.gtk.org" ' \
-        + 'title="&lt;i&gt;Our&lt;/i&gt; website">GTK+ website</a> for more...");'
-    assert _escape_lt_not_in_xml_tag(string) == string
-
-if __name__ == '__main__':
-    test()
diff --git a/giscanner/docbookwriter.py b/giscanner/docbookwriter.py
deleted file mode 100644
index d4701e68..00000000
--- a/giscanner/docbookwriter.py
+++ /dev/null
@@ -1,569 +0,0 @@
-#!/usr/bin/env python
-# -*- Mode: Python -*-
-# GObject-Introspection - a framework for introspecting GObject libraries
-# Copyright (C) 2010 Zach Goldberg
-# Copyright (C) 2011 Johan Dahlin
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-
-import sys
-
-from . import ast
-from .girparser import GIRParser
-from .xmlwriter import XMLWriter
-from .docbookdescription import get_formatted_description
-
-XMLNS = "http://docbook.org/ns/docbook"
-XMLVERSION = "5.0"
-DOCTYPE = """<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-<!ENTITY version SYSTEM "version.xml">
-]>""" #"
-
-def _space(num):
-    return " " * num
-
-class DocBookFormatter(object):
-    def __init__(self):
-        self.namespace = None
-        self.writer = None
-
-    def set_namespace(self, namespace):
-        self.namespace = namespace
-
-    def set_writer(self, writer):
-        self.writer = writer
-
-    def get_type_string(self, type):
-        return str(type.ctype)
-
-    def render_parameter(self, param_type, param_name):
-        return "%s %s" % (param_type, param_name)
-
-    def _render_parameter(self, param, extra_content=''):
-        with self.writer.tagcontext("parameter"):
-            if param.type.ctype is not None:
-                link_dest = param.type.ctype.replace("*", "")
-            else:
-                link_dest = param.type.ctype
-            with self.writer.tagcontext("link", [("linkend", "%s" % link_dest)]):
-                self.writer.write_tag("type", [], link_dest)
-            self.writer.write_line(extra_content)
-
-    def _render_parameters(self, parent, parameters):
-        self.writer.write_line(
-            "%s(" % _space(40 - len(parent.symbol)))
-
-        parent_class = parent.parent_class
-        ctype = ast.Type(parent.parent_class.ctype + '*')
-        params = []
-        params.append(ast.Parameter(parent_class.name.lower(), ctype))
-        params.extend(parameters)
-
-        first_param = True
-        for param in params:
-            if not first_param:
-                self.writer.write_line("\n%s" % _space(61))
-            else:
-                first_param = False
-
-            if not param == params[-1]:
-                comma = ", "
-            else:
-                comma = ""
-
-            if isinstance(param.type, ast.Varargs):
-                with self.writer.tagcontext("parameter"):
-                    self.writer.write_line('...%s' % comma)
-            else:
-                extra_content = " "
-                if param.type.ctype is not None and '*' in param.type.ctype:
-                    extra_content += '*'
-                extra_content += param.argname
-                extra_content += comma
-                self._render_parameter(param, extra_content)
-
-        self.writer.write_line(");\n")
-
-    def get_method_as_title(self, method):
-        return "%s ()" % method.symbol
-
-    def get_page_name(self, node):
-        # page name is only used for xml:id (not displayed to users)
-        if isinstance(node, ast.Alias) or node.gtype_name is None:
-            return node.ctype
-        return node.gtype_name
-
-    def get_class_name(self, node):
-        if node.gtype_name is None:
-            return node.ctype
-        return node.gtype_name
-
-    def get_type_name(self, node):
-        if isinstance(node, ast.Array):
-            if node.array_type == ast.Array.C:
-                return str(node.element_type) + "[]"
-            else:
-                return "%s&lt;%s&gt;" % (node.array_type, str(node.element_type))
-        elif isinstance(node, ast.Map):
-            return "GHashTable&lt;%s, %s&gt;" % (str(node.key_type), str(node.value_type))
-        elif isinstance(node, ast.List):
-            return "GList&lt;%s&gt;" % str(node.element_type)
-        else:
-            return str(node)
-
-    def render_method(self, method, link=False):
-        self.writer.disable_whitespace()
-
-        retval_type = method.retval.type
-        if retval_type.ctype:
-            link_dest = retval_type.ctype.replace("*", "")
-        else:
-            link_dest = str(retval_type)
-
-        if retval_type.target_giname:
-            ns = retval_type.target_giname.split('.')
-            if ns[0] == self.namespace.name:
-                link_dest = "%s" % (
-                    retval_type.ctype.replace("*", ""))
-
-        with self.writer.tagcontext("link", [("linkend", link_dest)]):
-            self.writer.write_tag("returnvalue", [], link_dest)
-
-        if '*' in retval_type.ctype:
-            self.writer.write_line(' *')
-
-        self.writer.write_line(
-            _space(20 - len(self.get_type_string(method.retval.type))))
-
-        if link:
-            self.writer.write_tag("link", [("linkend",
-                                            method.symbol.replace("_", "-"))],
-                                  method.symbol)
-        else:
-            self.writer.write_line(method.symbol)
-
-        self._render_parameters(method, method.parameters)
-        self.writer.enable_whitespace()
-
-    def _get_annotations(self, argument):
-        annotations = {}
-
-        if hasattr(argument.type, 'element_type') and \
-           argument.type.element_type is not None:
-            if isinstance(argument.type.element_type, ast.Array):
-                element_type = argument.type.element_type.array_type
-            else:
-                element_type = argument.type.element_type
-            annotations['element-type'] = element_type
-
-        if argument.transfer is not None and argument.transfer != 'none':
-            annotations['transfer'] = argument.transfer
-
-        if hasattr(argument, 'allow_none') and argument.allow_none:
-            annotations['allow-none'] = None
-
-        return annotations
-
-    def render_param_list(self, method):
-        self._render_param(method.parent_class.name.lower(), 'instance', [])
-
-        for param in method.parameters:
-            if isinstance(param.type, ast.Varargs):
-                argname = '...'
-            else:
-                argname = param.argname
-            self._render_param(argname, param.doc, self._get_annotations(param))
-
-        self._render_param('Returns', method.retval.doc,
-                           self._get_annotations(method.retval))
-
-    def _render_param(self, argname, doc, annotations):
-        with self.writer.tagcontext('varlistentry'):
-            with self.writer.tagcontext('term'):
-                self.writer.disable_whitespace()
-                try:
-                    with self.writer.tagcontext('parameter'):
-                        self.writer.write_line(argname)
-                    if doc is not None:
-                        self.writer.write_line('&#xA0;:')
-                finally:
-                    self.writer.enable_whitespace()
-            if doc is not None:
-                with self.writer.tagcontext('listitem'):
-                    with self.writer.tagcontext('simpara'):
-                        self.writer.write_line(doc)
-                        if annotations:
-                            with self.writer.tagcontext('emphasis', [('role', 'annotation')]):
-                                for key, value in annotations.iteritems():
-                                    self.writer.disable_whitespace()
-                                    try:
-                                        self.writer.write_line('[%s' % key)
-                                        if value is not None:
-                                            self.writer.write_line(' %s' % value)
-                                        self.writer.write_line(']')
-                                    finally:
-                                        self.writer.enable_whitespace()
-
-    def render_property(self, prop, link=False):
-        prop_name = '"%s"' % prop.name
-        prop_type = self.get_type_name(prop.type)
-
-        flags = []
-        if prop.readable:
-            flags.append("Read")
-        if prop.writable:
-            flags.append("Write")
-        if prop.construct:
-            flags.append("Construct")
-        if prop.construct_only:
-            flags.append("Construct Only")
-
-        self._render_prop_or_signal(prop_name, prop_type, flags)
-
-    def _render_prop_or_signal(self, name, type_, flags):
-        self.writer.disable_whitespace()
-
-        line = _space(2) + name + _space(27 - len(name))
-        line += str(type_) + _space(22 - len(str(type_)))
-        line += ": " + " / ".join(flags)
-
-        self.writer.write_line(line + "\n")
-
-        self.writer.enable_whitespace()
-
-
-    def render_signal(self, signal, link=False):
-        sig_name = '"%s"' % signal.name
-
-        flags = []
-        if signal.when == "first":
-            flags.append("Run First")
-        elif signal.when == "last":
-            flags.append("Run Last")
-        elif signal.when == "cleanup":
-            flags.append("Cleanup")
-
-        if signal.no_recurse:
-            flags.append('No Recursion')
-        if signal.detailed:
-            flags.append("Has Details")
-        if signal.action:
-            flags.append("Action")
-        if signal.no_hooks:
-            flags.append("No Hooks")
-
-        self._render_prop_or_signal(sig_name, "", flags)
-
-
-class DocBookFormatterPython(DocBookFormatter):
-    def get_title(self, page):
-        return "%s.%s" % (page.ast.namespace.name, page.ast.name)
-
-    def render_struct(self, page):
-        class_ = page.ast
-        try:
-            self.writer.disable_whitespace()
-            self.writer.write_line("class %s" % self.get_title(page))
-
-            if hasattr(page.ast, "parent") and page.ast.parent is not None:
-                if isinstance(page.ast.parent, ast.Type):
-                    parent_name = page.ast.parent
-                else:
-                    parent_name = "%s.%s" % (page.ast.parent.namespace.name,
-                                             page.ast.parent.name)
-            elif isinstance(page.ast, ast.Interface):
-                parent_name = "GObject.Interface"
-            else:
-                parent_name = None
-            if parent_name is not None:
-                self.writer.write_line("(%s)" % (parent_name))
-
-            self.writer.write_line(":\n")
-        finally:
-            self.writer.enable_whitespace()
-
-
-class DocBookFormatterC(DocBookFormatter):
-    def get_title(self, page):
-        return page.ast.ctype
-
-    def render_struct(self, page):
-        try:
-            self.writer.disable_whitespace()
-            self.writer.write_line("struct               ")
-            self.writer.write_tag(
-                "link",
-                [("linkend", "%s-struct" % page.name)],
-                "%s" % page.name)
-            self.writer.write_line(";\n")
-        finally:
-            self.writer.enable_whitespace()
-
-
-class DocBookPage(object):
-    def __init__(self, name, ast_node):
-        self.methods = []
-        self.properties = []
-        self.signals = []
-        self.name = name
-        self.description = ast_node.doc
-        self.ast = ast_node
-        self.id = None
-
-        if isinstance(ast_node, (ast.Class, ast.Record, ast.Interface)):
-            for method in ast_node.methods:
-                method.parent_class = ast_node
-            self.methods = ast_node.methods
-
-        if isinstance(ast_node, (ast.Class, ast.Interface)):
-            self.properties = ast_node.properties
-            self.signals = ast_node.signals
-
-    def get_methods(self):
-        return self.methods
-
-    def get_properties(self):
-        return self.properties
-
-    def get_signals(self):
-        return self.signals
-
-class DocBookWriter(object):
-    def __init__(self, formatter):
-        self._namespace = None
-        self._pages = []
-
-        self._writer = XMLWriter()
-
-        formatter.set_writer(self._writer)
-        self._formatter = formatter
-
-    def _add_page(self, page):
-        self._pages.append(page)
-
-    def add_transformer(self, transformer):
-        self._transformer = transformer
-
-        self._namespace = self._transformer._namespace
-        self._formatter.set_namespace(self._namespace)
-
-        for name, node in self._namespace.iteritems():
-            if isinstance(node, (ast.Class, ast.Record, ast.Interface, ast.Alias)):
-                page_name = self._formatter.get_page_name(node)
-                self._add_node(node, page_name)
-
-    def _add_node(self, node, name):
-        page = DocBookPage(name, node)
-        self._add_page(page)
-
-        if isinstance(node, (ast.Class, ast.Record, ast.Interface, ast.Alias)):
-            page.id = node.ctype
-
-    def write(self, output):
-        self._writer.write_line(DOCTYPE)
-        with self._writer.tagcontext("book", [
-            ("xml:id", "page_%s" % self._namespace.name),
-            ("xmlns", XMLNS),
-            ("version", XMLVERSION)]):
-            self._writer.write_tag("title", [], "%s Documentation" % (
-                self._namespace.name))
-
-            for page in self._pages:
-                self._render_page(page)
-
-        fp = open(output, 'w')
-        fp.write(self._writer.get_xml())
-        fp.close()
-
-    def _render_page(self, page):
-        with self._writer.tagcontext("chapter", [("xml:id", "ch_%s" % (
-                        page.name))]):
-            self._writer.write_tag(
-                "title", [], self._formatter.get_title(page))
-
-            with self._writer.tagcontext("refsynopsisdiv",
-                    [('id', '%s.synopsis' % page.name),
-                     ('role', 'synopsis')]):
-
-                self._writer.write_tag(
-                    "title", [("role", "synopsis.title")], "Synopsis")
-
-                if not isinstance(page.ast, ast.Alias):
-                    self._writer.write_tag("anchor", [("id", page.name)])
-
-                with self._writer.tagcontext('synopsis'):
-                    self._formatter.render_struct(page)
-
-                    for ast_node in page.get_methods():
-                        self._formatter.render_method(ast_node, link=True)
-
-            if isinstance(page.ast, (ast.Class, ast.Interface)):
-                with self._writer.tagcontext("refsect1",
-                                            [('id', '%s.object-hierarchy' % page.name),
-                                             ('role', 'object_hierarchy')]):
-                    self._writer.write_tag('title', [('role', 'object_hierarchy.title')],
-                                          "Object Hierarchy")
-                    with self._writer.tagcontext('synopsis'):
-                        self._render_page_object_hierarchy(page.ast)
-
-            if page.get_properties():
-                with self._writer.tagcontext('refsect1',
-                                            [('id', '%s.properties' % page.name),
-                                             ('role', 'properties')]):
-                    self._writer.write_tag("title", [('role', 'properties.title')],
-                                          "Properties")
-                    with self._writer.tagcontext("synopsis"):
-                        for ast_node in page.get_properties():
-                            if isinstance(ast_node.type, ast.TypeUnknown):
-                                print "Warning: ignoring property '%s' for " \
-                                      "lack of type" % ast_node.name
-                                continue
-                            self._formatter.render_property(ast_node, link=True)
-
-            if page.get_signals():
-                with self._writer.tagcontext('refsect1',
-                                            [('id', '%s.signals' % page.name),
-                                             ('role', 'signal_proto')]):
-                    self._writer.write_tag('title', [('role', 'signal_proto.title')],
-                                          "Signals")
-                    with self._writer.tagcontext('synopsis'):
-                        for ast_node in page.get_signals():
-                            self._formatter.render_signal(ast_node, link=True)
-
-            if page.description:
-                with self._writer.tagcontext('refsect1',
-                                            [('id', '%s.description' % (page.name, ))]):
-                    self._writer.write_tag(
-                        "title", [("role", "desc.title")], "Description")
-                    self._render_description(page.description)
-
-            with self._writer.tagcontext('refsect1',
-                                        [('id', "%s-details" % page.id.lower()),
-                                         ("role", "details")]):
-                self._writer.write_tag("title", [("role", "details.title")],
-                                      "Details")
-
-                if isinstance(page.ast, ast.Alias):
-                    self._render_alias_detail(page.ast)
-                else:
-                    self._render_struct_detail(page.ast)
-
-                for ast_node in page.get_methods():
-                    self._render_method(ast_node)
-
-            if page.get_properties():
-                with self._writer.tagcontext('refsect1',
-                                            [('id', '%s.property-details' % page.name),
-                                             ('role', 'property_details')]):
-                    self._writer.write_tag('title', [('role', 'property_details.title')],
-                                           "Property Details")
-                    for ast_node in page.get_properties():
-                        self._render_property(ast_node)
-
-            if page.get_signals():
-                with self._writer.tagcontext('refsect1',
-                                            [('id', '%s.signal-details' % page.name),
-                                             ('role', 'signals')]):
-                    self._writer.write_tag('title', [('role', 'signal.title')],
-                                           "Signal Details")
-                    for ast_node in page.get_signals():
-                        self._render_signal(ast_node)
-
-    def _render_alias_detail(self, alias):
-        with self._writer.tagcontext('refsect2',
-                              [('id', "%s" % alias.ctype),
-                               ('role', 'typedef')]):
-            self._writer.write_tag("title", [], "%s" % alias.ctype)
-            with self._writer.tagcontext("indexterm", [("zone", "%s" % alias.ctype)]):
-                self._writer.write_tag("primary", [("sortas", alias.name)], alias.ctype)
-            self._writer.write_tag("programlisting",
-                                   [],
-                                   "typedef %s %s" % (alias.target.ctype,
-                                                      alias.ctype))
-            self._writer.write_tag("para", [], alias.doc)
-
-    def _render_struct_detail(self, struct):
-        with self._writer.tagcontext('refsect2',
-                              [('id', "%s-struct" % struct.ctype),
-                               ('role', 'struct')]):
-            self._writer.write_tag("title", [], "struct %s" % struct.ctype)
-            with self._writer.tagcontext("indexterm", [("zone", "%s-struct" % struct.ctype)]):
-                self._writer.write_tag("primary", [("sortas", struct.name)], struct.ctype)
-            self._writer.write_tag("programlisting", [], "struct %s;" % struct.ctype)
-
-    def _render_method(self, ast_node):
-
-        link_name = ast_node.symbol.replace("_", "-")
-
-        self._writer.push_tag('refsect2',
-                              [('id', link_name),
-                               ('role', 'function')])
-        self._writer.write_tag("title", [],
-                               self._formatter.get_method_as_title(ast_node))
-
-        with self._writer.tagcontext("indexterm", [("zone", link_name)]):
-            self._writer.write_tag("primary", [], ast_node.name)
-
-        with self._writer.tagcontext("programlisting"):
-            self._formatter.render_method(ast_node)
-
-        description = ast_node.doc
-        if description:
-            self._render_description(ast_node.doc)
-
-        with self._writer.tagcontext("variablelist", [("role", "params")]):
-            self._formatter.render_param_list(ast_node)
-
-        self._writer.pop_tag()
-
-    def _render_property(self, ast_node):
-        self._writer.write_line("Not implemented yet")
-
-    def _render_signal(self, ast_node):
-        self._writer.write_line("Not implemented yet")
-
-    def _render_page_object_hierarchy(self, page_node):
-        parent_chain = self._get_parent_chain(page_node)
-        parent_chain.append(page_node)
-        lines = []
-
-        for level, parent in enumerate(parent_chain):
-            prepend = ""
-            if level > 0:
-                prepend = _space((level - 1)* 6) + " +----"
-            lines.append(_space(2) + prepend + self._formatter.get_class_name(parent))
-
-        self._writer.disable_whitespace()
-        self._writer.write_line("\n".join(lines))
-        self._writer.enable_whitespace()
-
-    def _render_description(self, description):
-        formatted_desc = get_formatted_description(description)
-        self._writer.write_line(formatted_desc)
-
-    def _get_parent_chain(self, page_node):
-        parent_chain = []
-
-        node = page_node
-        while node.parent and node.gi_name != 'GObject.Object':
-            node = self._transformer.lookup_giname(str(node.parent))
-            parent_chain.append(node)
-
-        parent_chain.reverse()
-        return parent_chain
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
index e6ae8b60..e3ef4ae4 100644
--- a/giscanner/docmain.py
+++ b/giscanner/docmain.py
@@ -21,39 +21,15 @@
 import os
 import optparse
 
-from .docbookwriter import DocBookWriter
-from .docbookwriter import DocBookFormatterC
-from .docbookwriter import DocBookFormatterPython
 from .mallardwriter import MallardWriter
-from .mallardwriter import MallardFormatterC
-from .mallardwriter import MallardFormatterPython
 from .transformer import Transformer
 
-class GIDocGenerator(object):
-
-    def parse(self, filename):
-        if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
-            top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
-            top_builddir = os.environ['UNINSTALLED_INTROSPECTION_BUILDDIR']
-            extra_include_dirs = [os.path.join(top_srcdir, 'gir'), top_builddir]
-        else:
-            extra_include_dirs = []
-        self.transformer = Transformer.parse_from_gir(filename, extra_include_dirs)
-
-    def generate(self, writer, output):
-        writer.add_transformer(self.transformer)
-        writer.write(output)
-
 def doc_main(args):
     parser = optparse.OptionParser('%prog [options] GIR-file')
 
     parser.add_option("-o", "--output",
                       action="store", dest="output",
                       help="Filename to write output")
-    parser.add_option("-f", "--format",
-                      action="store", dest="format",
-                      default="docbook",
-                      help="Output format")
     parser.add_option("-l", "--language",
                       action="store", dest="language",
                       default="Python",
@@ -66,28 +42,15 @@ def doc_main(args):
     if len(args) < 2:
         raise SystemExit("Need an input GIR filename")
 
-    if options.format == "docbook":
-        if options.language == "Python":
-            formatter = DocBookFormatterPython()
-        elif options.language == "C":
-            formatter = DocBookFormatterC()
-        else:
-            raise SystemExit("Unsupported language: %s" % (options.language, ))
-        writer = DocBookWriter(formatter)
-    elif options.format == "mallard":
-        if options.language == "Python":
-            formatter = MallardFormatterPython()
-        elif options.language == "C":
-            formatter = MallardFormatterC()
-        else:
-            raise SystemExit("Unsupported language: %s" % (options.language, ))
-        writer = MallardWriter(formatter)
+    if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+        top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
+        top_builddir = os.environ['UNINSTALLED_INTROSPECTION_BUILDDIR']
+        extra_include_dirs = [os.path.join(top_srcdir, 'gir'), top_builddir]
     else:
-        raise SystemExit("Unsupported output format: %s" % (options.format, ))
-
-    generator = GIDocGenerator()
-    generator.parse(args[1])
+        extra_include_dirs = []
+    transformer = Transformer.parse_from_gir(args[1], extra_include_dirs)
 
-    generator.generate(writer, options.output)
+    writer = MallardWriter(transformer, options.language)
+    writer.write(options.output)
 
     return 0
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index 5faaf197..a59037da 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -256,27 +256,27 @@ class GIRParser(object):
         for iface in self._find_children(node, _corens('prerequisite')):
             obj.prerequisites.append(self._namespace.type_from_name(iface.attrib['name']))
         for func_node in self._find_children(node, _corens('function')):
-            func = self._parse_function_common(func_node, ast.Function)
+            func = self._parse_function_common(func_node, ast.Function, obj)
             obj.static_methods.append(func)
         for method in self._find_children(node, _corens('method')):
-            func = self._parse_function_common(method, ast.Function)
+            func = self._parse_function_common(method, ast.Function, obj)
             func.is_method = True
             obj.methods.append(func)
         for method in self._find_children(node, _corens('virtual-method')):
-            func = self._parse_function_common(method, ast.VFunction)
+            func = self._parse_function_common(method, ast.VFunction, obj)
             self._parse_generic_attribs(method, func)
             func.is_method = True
             func.invoker = method.get('invoker')
             obj.virtual_methods.append(func)
         for ctor in self._find_children(node, _corens('constructor')):
-            func = self._parse_function_common(ctor, ast.Function)
+            func = self._parse_function_common(ctor, ast.Function, obj)
             func.is_constructor = True
             obj.constructors.append(func)
         obj.fields.extend(self._parse_fields(node))
         for prop in self._find_children(node, _corens('property')):
-            obj.properties.append(self._parse_property(prop))
+            obj.properties.append(self._parse_property(prop, obj))
         for signal in self._find_children(node, _glibns('signal')):
-            obj.signals.append(self._parse_function_common(signal, ast.Signal))
+            obj.signals.append(self._parse_function_common(signal, ast.Signal, obj))
 
     def _parse_callback(self, node):
         callback = self._parse_function_common(node, ast.Callback)
@@ -286,7 +286,7 @@ class GIRParser(object):
         function = self._parse_function_common(node, ast.Function)
         self._namespace.append(function)
 
-    def _parse_function_common(self, node, klass):
+    def _parse_function_common(self, node, klass, parent=None):
         name = node.attrib['name']
         returnnode = node.find(_corens('return-value'))
         if not returnnode:
@@ -319,6 +319,7 @@ class GIRParser(object):
         func.shadows = node.attrib.get('shadows', None)
         func.shadowed_by = node.attrib.get('shadowed-by', None)
         func.moved_to = node.attrib.get('moved-to', None)
+        func.parent = parent
 
         parameters_node = node.find(_corens('parameters'))
         if (parameters_node is not None):
@@ -377,13 +378,13 @@ class GIRParser(object):
             compound.fields.extend(self._parse_fields(node))
             for method in self._find_children(node, _corens('method')):
                 compound.methods.append(
-                    self._parse_function_common(method, ast.Function))
+                    self._parse_function_common(method, ast.Function, compound))
             for func in self._find_children(node, _corens('function')):
                 compound.static_methods.append(
-                    self._parse_function_common(func, ast.Function))
+                    self._parse_function_common(func, ast.Function, compound))
             for ctor in self._find_children(node, _corens('constructor')):
                 compound.constructors.append(
-                    self._parse_function_common(ctor, ast.Function))
+                    self._parse_function_common(ctor, ast.Function, compound))
         return compound
 
     def _parse_record(self, node, anonymous=False):
@@ -482,15 +483,15 @@ class GIRParser(object):
         if self._types_only:
             return
         for method in self._find_children(node, _corens('method')):
-            func = self._parse_function_common(method, ast.Function)
+            func = self._parse_function_common(method, ast.Function, obj)
             func.is_method = True
             obj.methods.append(func)
         for ctor in self._find_children(node, _corens('constructor')):
             obj.constructors.append(
-                self._parse_function_common(ctor, ast.Function))
+                self._parse_function_common(ctor, ast.Function, obj))
         for callback in self._find_children(node, _corens('callback')):
             obj.fields.append(
-                self._parse_function_common(callback, ast.Callback))
+                self._parse_function_common(callback, ast.Callback, obj))
 
     def _parse_field(self, node):
         type_node = None
@@ -521,7 +522,7 @@ class GIRParser(object):
         self._parse_generic_attribs(node, field)
         return field
 
-    def _parse_property(self, node):
+    def _parse_property(self, node, parent):
         prop = ast.Property(node.attrib['name'],
                         self._parse_type(node),
                         node.attrib.get('readable') != '0',
@@ -530,6 +531,7 @@ class GIRParser(object):
                         node.attrib.get('construct-only') == '1',
                         node.attrib.get('transfer-ownership'))
         self._parse_generic_attribs(node, prop)
+        prop.parent = parent
         return prop
 
     def _parse_member(self, node):
diff --git a/giscanner/mallard-C-class.tmpl b/giscanner/mallard-C-class.tmpl
new file mode 100644
index 00000000..2d739043
--- /dev/null
+++ b/giscanner/mallard-C-class.tmpl
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<page id="${node.namespace.name}.${node.name}"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="class"/>
+  </info>
+  <title>${node.ctype}</title>
+${formatter.format(node.doc)}
+% if node.version:
+<p>Since ${node.version}</p>
+% endif
+  <synopsis ui:expanded="no">
+    <title>Hierarchy</title>
+    <tree>
+      <item>
+        <code>GObjectObject</code>
+      </item>
+    </tree>
+  </synopsis>
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="property" style="linklist">
+    <title>Properties</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="signal" style="linklist">
+    <title>Signals</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.free.page b/giscanner/mallard-C-default.tmpl
index 87b8f0e8..577fa566 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.free.page
+++ b/giscanner/mallard-C-default.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<page id="GIRepository.Typelib.free"
+<page id="${namespace.name}.${node.name}"
       type="topic"
-      style="function"
+      style=""
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="GIRepository.Typelib" group="function"/>
   </info>
-  <title>g_typelib_free</title>
+  <title>${namespace.name}.${node.name}</title>
+${formatter.format(node.doc)}
 </page>
diff --git a/giscanner/mallard-C-function.tmpl b/giscanner/mallard-C-function.tmpl
new file mode 100644
index 00000000..2da4710f
--- /dev/null
+++ b/giscanner/mallard-C-function.tmpl
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<%
+page_style = 'function'
+if node.is_constructor:
+    page_style = 'constructor'
+elif node.is_method:
+    page_style = 'method'
+%>
+<page id="${page_id}"
+      type="topic"
+      style="${page_style}"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+% if node.parent is not None:
+    <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_style}"/>
+% else:
+    <link type="guide" xref="index" group="${page_style}"/>
+% endif
+    <api:function>
+      <api:returns>
+        <api:type>${formatter.format_type(node.retval.type) | x}</api:type>
+      </api:returns>
+      <api:name>${node.symbol}</api:name>
+% if node.is_method:
+      <api:arg>
+        <api:type>${node.parent.ctype} *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+% endif
+% for arg in node.parameters:
+% if arg.type.ctype == '<varargs>':
+      <api:varargs/>
+% else:
+      <api:arg>
+        <api:type>${formatter.format_type(arg.type) | x}</api:type>
+        <api:name>${arg.argname}</api:name>
+      </api:arg>
+% endif
+% endfor
+    </api:function>
+  </info>
+  <title>${node.symbol}</title>
+<synopsis><code mime="text/x-csrc">
+${node.retval.type.ctype} ${node.symbol} (\
+% if node.is_method:
+${node.parent.ctype} *self\
+%endif
+% if len(node.parameters) == 0:
+% if not node.is_method:
+void\
+%endif
+);
+% elif node.is_method:
+,
+% endif
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+% if ix != 0:
+${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\
+% endif
+% if arg.type.ctype == '<varargs>':
+...\
+% else:
+${formatter.format_type(arg.type) | x} ${arg.argname}\
+% endif
+% if ix == len(node.parameters) - 1:
+);
+% else:
+,
+%endif
+% endfor
+</code></synopsis>
+${formatter.format(node.doc)}
+
+% if node.parameters or node.retval:
+<table>
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+<tr>
+<td><p>${arg.argname} :</p></td>
+<td>${formatter.format(arg.doc)}</td>
+</tr>
+% endfor
+% if node.retval:
+<tr>
+<td><p>Returns :</p></td>
+<td>${formatter.format(node.retval.doc)}</td>
+</tr>
+% endif
+</table>
+% endif
+% if node.version:
+<p>Since ${node.version}</p>
+% endif
+</page>
diff --git a/giscanner/mallard-C-namespace.tmpl b/giscanner/mallard-C-namespace.tmpl
new file mode 100644
index 00000000..284ba238
--- /dev/null
+++ b/giscanner/mallard-C-namespace.tmpl
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<page id="index"
+      type="guide"
+      style="namespace"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+  </info>
+  <title>${node.name} Documentation</title>
+  <links type="topic" ui:expanded="yes" groups="class" style="linklist">
+    <title>Classes</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/giscanner/mallard-C-property.tmpl b/giscanner/mallard-C-property.tmpl
new file mode 100644
index 00000000..2d37ba10
--- /dev/null
+++ b/giscanner/mallard-C-property.tmpl
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<page id="${namespace.name}.${node.name}"
+      type="topic"
+      style="property"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="${namespace.name}.${node.parent.name}" group="property"/>
+    <title type="link" role="topic">${node.name}</title>
+  </info>
+  <title>${node.parent.ctype}:${node.name}</title>
+${formatter.format(node.doc)}
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.page b/giscanner/mallard-C-record.tmpl
index 4abc4f5a..a173e77a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.page
+++ b/giscanner/mallard-C-record.tmpl
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page id="GIRepository.Typelib"
+<page id="${node.namespace.name}.${node.name}"
       type="guide"
       style="record"
       xmlns="http://projectmallard.org/1.0/"
@@ -7,5 +7,6 @@
   <info>
     <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryTypelib</title>
+  <title>${node.namespace.name}${node.name}</title>
+${formatter.format(node.doc)}
 </page>
diff --git a/giscanner/mallard-C-signal.tmpl b/giscanner/mallard-C-signal.tmpl
new file mode 100644
index 00000000..7aae3ae4
--- /dev/null
+++ b/giscanner/mallard-C-signal.tmpl
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<page id="${namespace.name}.${node.name}"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="${namespace.name}.${node.parent.name}" group="signal"/>
+    <title type="link" role="topic">${node.name}</title>
+  </info>
+  <title>${node.parent.ctype}::${node.name}</title>
+${formatter.format(node.doc)}
+</page>
diff --git a/giscanner/mallard-Python-class.tmpl b/giscanner/mallard-Python-class.tmpl
new file mode 100644
index 00000000..62feb9ab
--- /dev/null
+++ b/giscanner/mallard-Python-class.tmpl
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<page id="${node.namespace.name}.${node.name}"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="class"/>
+  </info>
+  <title>${namespace.name}.${node.name}</title>
+${formatter.format(node.doc)}
+
+  <synopsis><code>
+from gi.repository import ${namespace.name}
+
+${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\
+% for property_, ix in zip(node.properties, range(len(node.properties))):
+% if property_.construct or property_.construct_only or property_.writable:
+<link xref='${namespace.name}.${node.name}-${property_.name}'>${property_.name.replace('-', '_')}</link>=value\
+% if ix != len(node.properties) - 1:
+, \
+% endif
+% endif
+% endfor
+)\
+  </code></synopsis>
+
+% if node.version:
+<p>Since ${node.version}</p>
+% endif
+  <synopsis>
+    <title>Hierarchy</title>
+    <tree>
+% for class_ in formatter.get_class_hierarchy(node):
+      <item>
+        <code>${class_.namespace.name}.${class_.name}</code>
+% endfor
+% for class_ in formatter.get_class_hierarchy(node):
+      </item>
+% endfor
+    </tree>
+  </synopsis>
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-python"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="property" style="linklist">
+    <title>Properties</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="signal" style="linklist">
+    <title>Signals</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.free.page b/giscanner/mallard-Python-default.tmpl
index 6f50f761..683adf6a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.free.page
+++ b/giscanner/mallard-Python-default.tmpl
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<page id="GIRepository.Typelib.free"
+<page id="${page_id}"
       type="topic"
-      style="function"
+      style=""
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
-    <link type="guide" xref="GIRepository.Typelib" group="function"/>
   </info>
-  <title>GIRepository.free</title>
+  <title>${namespace.name}.${node.name}</title>
+${formatter.format(node.doc)}
 </page>
diff --git a/giscanner/mallard-Python-enum.tmpl b/giscanner/mallard-Python-enum.tmpl
new file mode 100644
index 00000000..fd6ca0fb
--- /dev/null
+++ b/giscanner/mallard-Python-enum.tmpl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<page id="${node.namespace.name}.${node.name}"
+      type="guide"
+      style="enum"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index"/>
+  </info>
+  <title>${node.namespace.name}.${node.name}</title>
+  ${formatter.format(node.doc)}
+% if node.members:
+<table>
+% for member, ix in zip(node.members, range(len(node.members))):
+<tr>
+<td><p>${node.name}.${member.name.upper()} :</p></td>
+<td>${formatter.format(member.doc)}</td>
+</tr>
+% endfor
+</table>
+% endif
+
+</page>
diff --git a/giscanner/mallard-Python-function.tmpl b/giscanner/mallard-Python-function.tmpl
new file mode 100644
index 00000000..7aa25e8e
--- /dev/null
+++ b/giscanner/mallard-Python-function.tmpl
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<%
+page_style = 'function'
+if node.is_constructor:
+    page_style = 'constructor'
+elif node.is_method:
+    page_style = 'method'
+%>
+<page id="${page_id}"
+      type="topic"
+      style="${page_style}"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+% if node.parent is not None:
+    <link type="guide" xref="${namespace.name}.${node.parent.name}" group="${page_style}"/>
+% else:
+    <link type="guide" xref="index" group="${page_style}"/>
+% endif
+    <api:function>
+      <api:returns>
+        <api:type>${formatter.format_type(node.retval.type) | x}</api:type>
+      </api:returns>
+      <api:name>${node.symbol}</api:name>
+% if node.is_method:
+      <api:arg>
+        <api:type>${node.parent.ctype} *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+% endif
+% for arg in node.parameters:
+% if arg.type.ctype == '<varargs>':
+      <api:varargs/>
+% else:
+      <api:arg>
+        <api:type>${formatter.format_type(arg.type) | x}</api:type>
+        <api:name>${arg.argname}</api:name>
+      </api:arg>
+% endif
+% endfor
+    </api:function>
+  </info>
+  <title>${node.name}</title>
+<synopsis><code mime="text/x-python">
+% if len(node.parameters) != 0:
+@accepts(\
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+${formatter.format_type(arg.type) | x}\
+% if ix != len(node.parameters) - 1:
+, \
+%endif
+% endfor
+)
+% endif
+@returns(${formatter.format_type(node.retval.type) | x})
+def \
+${node.name}(\
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+${arg.argname}\
+% if ix != len(node.parameters) - 1:
+, \
+%endif
+% endfor
+)
+</code></synopsis>
+${formatter.format(node.doc)}
+
+% if node.parameters or node.retval:
+<table>
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+<tr>
+<td><p>${arg.argname} :</p></td>
+<td>${formatter.format(arg.doc)}</td>
+</tr>
+% endfor
+% if node.retval and node.retval.type.ctype != 'void':
+<tr>
+<td><p>Returns :</p></td>
+<td>${formatter.format(node.retval.doc)}</td>
+</tr>
+% endif
+</table>
+% endif
+% if node.version:
+<p>Since ${node.version}</p>
+% endif
+</page>
diff --git a/giscanner/mallard-Python-namespace.tmpl b/giscanner/mallard-Python-namespace.tmpl
new file mode 100644
index 00000000..935cd440
--- /dev/null
+++ b/giscanner/mallard-Python-namespace.tmpl
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<page id="index"
+      type="guide"
+      style="namespace"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+  </info>
+  <title>${node.name} Documentation</title>
+  <links type="topic" ui:expanded="yes" groups="class">
+    <title>Classes</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="function">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/giscanner/mallard-Python-property.tmpl b/giscanner/mallard-Python-property.tmpl
new file mode 100644
index 00000000..c4d2229e
--- /dev/null
+++ b/giscanner/mallard-Python-property.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page id="${namespace.name}.${node.parent.name}-${node.name}"
+      type="topic"
+      style="property"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="${namespace.name}.${node.parent.name}" group="property"/>
+    <title type="link" role="topic">${node.name}</title>
+  </info>
+  <title>${namespace.name}.${node.parent.name}:${node.name}</title>
+<synopsis><code mime="text/x-python">
+"${node.name}"             ${formatter.format_type(node.type)}                : ${formatter.format_property_flags(node)}
+</code></synopsis>
+${formatter.format(node.doc)}
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.page b/giscanner/mallard-Python-record.tmpl
index 946bb07f..1b00e3be 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.page
+++ b/giscanner/mallard-Python-record.tmpl
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page id="GIRepository.Typelib"
+<page id="${node.namespace.name}.${node.name}"
       type="guide"
       style="record"
       xmlns="http://projectmallard.org/1.0/"
@@ -7,5 +7,6 @@
   <info>
     <link type="guide" xref="index"/>
   </info>
-  <title>GIRepository.Typelib</title>
+  <title>${node.namespace.name}${node.name}</title>
+  <p>${node.doc}</p>
 </page>
diff --git a/giscanner/mallard-Python-signal.tmpl b/giscanner/mallard-Python-signal.tmpl
new file mode 100644
index 00000000..7dcbb0cd
--- /dev/null
+++ b/giscanner/mallard-Python-signal.tmpl
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<page id="${namespace.name}.${node.parent.name}-${node.name}"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="${namespace.name}.${node.parent.name}" group="signal"/>
+    <title type="link" role="topic">${node.name}</title>
+  </info>
+  <title>${namespace.name}.${node.parent.name}::${node.name}</title>
+<synopsis><code mime="text/x-python">
+def callback(\
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+${arg.argname}, \
+% endfor
+user_param1, ...)
+</code></synopsis>
+${formatter.format(node.doc)}
+
+% if node.parameters or node.retval:
+<table>
+% for arg, ix in zip(node.parameters, range(len(node.parameters))):
+<tr>
+<td><p>${arg.argname} :</p></td>
+<td>${formatter.format(arg.doc)}</td>
+</tr>
+% endfor
+<tr>
+<td><p>user_param1 :</p></td>
+<td><p>first user parameter (if any) specified with the connect() method</p></td>
+</tr>
+<tr>
+<td><p>... :</p></td>
+<td><p>additional user parameters (if any)</p></td>
+</tr>
+% if node.retval and \
+     node.retval.type.ctype != 'void' and \
+     node.retval.type.ctype is not None:
+<tr>
+<td><p>Returns :</p></td>
+<td>${node.retval.type.ctype} ${formatter.format(node.retval.doc)}</td>
+</tr>
+% endif
+</table>
+% endif
+% if node.version:
+<p>Since ${node.version}</p>
+% endif
+</page>
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index a71528e9..5fd97048 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -21,465 +21,225 @@
 # 02110-1301, USA.
 #
 
-import os.path
+import os
 import re
-import sys
+import tempfile
 
-from . import ast
-from .girparser import GIRParser
-from .xmlwriter import XMLWriter
+from xml.sax import saxutils
+from mako.template import Template
+from mako.runtime import supports_caller
 
-XMLNS = "http://projectmallard.org/1.0/"
-XMLNS_UI = "http://projectmallard.org/experimental/ui/"
+from . import ast
+from .utils import to_underscores
 
 def _space(num):
     return " " * num
 
 class MallardFormatter(object):
-    def __init__(self):
-        pass
-
-    def get_title(self, node, parent):
-        raise NotImplementedError('get_title not implemented')
-
-    # FIXME
-    def render_parameter(self, param_type, param_name):
-        return "%s %s" % (param_type, param_name)
-
-    def _render_parameter(self, param, extra_content=''):
-        with self._writer.tagcontext("parameter"):
-            if param.type.ctype is not None:
-                link_dest = param.type.ctype.replace("*", "")
-            else:
-                link_dest = param.type.ctype
-            with self._writer.tagcontext("link", [("linkend", "%s" % link_dest)]):
-                self._writer.write_tag("type", [], link_dest)
-            self._writer.write_line(extra_content)
-
-    def _render_parameters(self, parent, parameters):
-        self._writer.write_line(
-            "%s(" % _space(40 - len(parent.symbol)))
-
-        parent_class = parent.parent_class
-        ctype = ast.Type(parent.parent_class.ctype + '*')
-        params = []
-        params.append(ast.Parameter(parent_class.name.lower(), ctype))
-        params.extend(parameters)
-
-        first_param = True
-        for param in params:
-            if not first_param:
-                self._writer.write_line("\n%s" % _space(61))
-            else:
-                first_param = False
-
-            if not param == params[-1]:
-                comma = ", "
-            else:
-                comma = ""
-            if param.type.target_fundamental == '<varargs>':
-                extra_content = "..."
-                continue
-            extra_content = " "
-            if param.type.ctype is not None and '*' in param.type.ctype:
-                extra_content += '*'
-            if param.argname is None:
-                import pdb
-                pdb.set_trace()
-            extra_content += param.argname
-            extra_content += comma
-            self._render_parameter(param, extra_content)
+    def __init__(self, transformer):
+        self._transformer = transformer
 
-        self._writer.write_line(");\n")
+    def escape(self, text):
+        return saxutils.escape(text.encode('utf-8')).decode('utf-8')
 
-    def get_method_as_title(self, entity):
-        method = entity.get_ast()
-        return "%s ()" % method.symbol
+    def format(self, doc):
+        if doc is None:
+            return ''
 
-    def get_page_name(self, node):
-        if node.gtype_name is None:
-            return node.ctype
-        return node.gtype_name
+        result = ''
+        for para in doc.split('\n\n'):
+            result += '<p>'
+            result += self.format_inline(para)
+            result += '</p>'
+        return result
 
-    def get_class_name(self, node):
-        if node.gtype_name is None:
-            return node.ctype
-        return node.gtype_name
+    def format_inline(self, para):
+        result = ''
 
-    def get_type_name(self, node):
-        if isinstance(node, ast.Array):
-            if node.array_type == ast.Array.C:
-                return str(node.element_type) + "[]"
+        poss = []
+        poss.append((para.find('#'), '#'))
+        poss = [pos for pos in poss if pos[0] >= 0]
+        poss.sort(cmp=lambda x, y: cmp(x[0], y[0]))
+        if len(poss) == 0:
+            result += self.escape(para)
+        elif poss[0][1] == '#':
+            pos = poss[0][0]
+            result += self.escape(para[:pos])
+            rest = para[pos + 1:]
+            link = re.split('[^a-zA-Z_:-]', rest, maxsplit=1)[0]
+            if link.endswith(':'):
+                link = link[:-1]
+            namespace = self._transformer.namespace
+            if '::' in link:
+                type_name, signal_name = link.split('::')
+                if type_name in namespace.ctypes:
+                    type_ = namespace.get_by_ctype(type_name)
+                    xref = '%s.%s-%s' % (namespace.name, type_.name, signal_name)
+                    xref_name = '%s.%s::%s' % (namespace.name, type_.name, signal_name)
+                else:
+                    xref = link
+                    xref_name = link
+            elif ':' in link:
+                type_name, property_name = link.split(':')
+                if type_name in namespace.ctypes:
+                    type_ = namespace.get_by_ctype(type_name)
+                    xref = '%s.%s-%s' % (namespace.name, type_.name, property_name)
+                    xref_name = '%s.%s:%s' % (namespace.name, type_.name, property_name)
+                else:
+                    xref = link
+                    xref_name = link
+            elif link in namespace.ctypes:
+                type_ = namespace.get_by_ctype(link)
+                xref = '%s.%s' % (namespace.name, type_.name)
+                xref_name = xref
             else:
-                return "%s&lt;%s&gt;" % (node.array_type, str(node.element_type))
-        elif isinstance(node, ast.Map):
-            return "GHashTable&lt;%s, %s&gt;" % (str(node.key_type), str(node.value_type))
-        elif isinstance(node, ast.List):
-            return "GList&lt;%s&gt;" % str(node.element_type)
-        else:
-            return str(node)
-
-    def render_method(self, entity, link=False):
-        method = entity.get_ast()
-        self._writer.disable_whitespace()
-
-        retval_type = method.retval.type
-        if retval_type.ctype:
-            link_dest = retval_type.ctype.replace("*", "")
-        else:
-            link_dest = str(retval_type)
-
-        if retval_type.target_giname:
-            ns = retval_type.target_giname.split('.')
-            if ns[0] == self._namespace.name:
-                link_dest = "%s" % (
-                    retval_type.ctype.replace("*", ""))
-
-        with self._writer.tagcontext("link", [("linkend", link_dest)]):
-            self._writer.write_tag("returnvalue", [], link_dest)
-
-        if retval_type.ctype is not None and '*' in retval_type.ctype:
-            self._writer.write_line(' *')
-
-        self._writer.write_line(
-            _space(20 - len(self.get_type_string(method.retval.type))))
-
-        if link:
-            self._writer.write_tag("link", [("linkend",
-                                            method.symbol.replace("_", "-"))],
-                                  method.symbol)
-        else:
-            self._writer.write_line(method.symbol)
-
-        self._render_parameters(method, method.parameters)
-        self._writer.enable_whitespace()
-
-    def _get_annotations(self, argument):
-        annotations = {}
-
-        if hasattr(argument.type, 'element_type') and \
-           argument.type.element_type is not None:
-            annotations['element-type'] = argument.type.element_type
-
-        if argument.transfer is not None and argument.transfer != 'none':
-            annotations['transfer'] = argument.transfer
-
-        if hasattr(argument, 'allow_none') and argument.allow_none:
-            annotations['allow-none'] = None
-
-        return annotations
-
-    def render_param_list(self, entity):
-        method = entity.get_ast()
-
-        self._render_param(method.parent_class.name.lower(), 'instance', [])
-
-        for param in method.parameters:
-            self._render_param(param.argname, param.doc,
-                               self._get_annotations(param))
-
-        self._render_param('Returns', method.retval.doc,
-                           self._get_annotations(method.retval))
-
-    def _render_param(self, argname, doc, annotations):
-        if argname is None:
-            return
-        with self._writer.tagcontext('varlistentry'):
-            with self._writer.tagcontext('term'):
-                self._writer.disable_whitespace()
-                try:
-                    with self._writer.tagcontext('parameter'):
-                        self._writer.write_line(argname)
-                    if doc is not None:
-                        self._writer.write_line('&#xA0;:')
-                finally:
-                    self._writer.enable_whitespace()
-            if doc is not None:
-                with self._writer.tagcontext('listitem'):
-                    with self._writer.tagcontext('simpara'):
-                        self._writer.write_line(doc)
-                        if annotations:
-                            with self._writer.tagcontext('emphasis', [('role', 'annotation')]):
-                                for key, value in annotations.iteritems():
-                                    self._writer.disable_whitespace()
-                                    try:
-                                        self._writer.write_line('[%s' % key)
-                                        if value is not None:
-                                            self._writer.write_line(' %s' % value)
-                                        self._writer.write_line(']')
-                                    finally:
-                                        self._writer.enable_whitespace()
+                xref = link
+                xref_name = link
+            result += '<link xref="%s">%s</link>' % (xref, xref_name)
+            if len(link) < len(rest):
+                result += self.format_inline(rest[len(link):])
 
-    def render_property(self, entity, link=False):
-        prop = entity.get_ast()
+        return result
 
-        prop_name = '"%s"' % prop.name
-        prop_type = self.get_type_name(prop.type)
+    def format_type(self, type_):
+        raise NotImplementedError
 
+    def format_property_flags(self, property_):
         flags = []
-        if prop.readable:
+        if property_.readable:
             flags.append("Read")
-        if prop.writable:
+        if property_.writable:
             flags.append("Write")
-        if prop.construct:
+        if property_.construct:
             flags.append("Construct")
-        if prop.construct_only:
+        if property_.construct_only:
             flags.append("Construct Only")
 
-        self._render_prop_or_signal(prop_name, prop_type, flags)
-
-    def _render_prop_or_signal(self, name, type_, flags):
-        self._writer.disable_whitespace()
-
-        line = _space(2) + name + _space(27 - len(name))
-        line += str(type_) + _space(22 - len(str(type_)))
-        line += ": " + " / ".join(flags)
+        return " / ".join(flags)
 
-        self._writer.write_line(line + "\n")
+    def to_underscores(self, string):
+        return to_underscores(string)
 
-        self._writer.enable_whitespace()
+    def get_class_hierarchy(self, node):
+        parent_chain = []
 
+        while node.parent:
+            node = self._transformer.lookup_giname(str(node.parent))
+            parent_chain.append(node)
 
-    def render_signal(self, entity, link=False):
-        signal = entity.get_ast()
-
-        sig_name = '"%s"' % signal.name
-        flags = ["TODO: signal flags not in GIR currently"]
-        self._render_prop_or_signal(sig_name, "", flags)
+        parent_chain.reverse()
+        return parent_chain
 
 class MallardFormatterC(MallardFormatter):
-    def get_title(self, node, parent):
-        if isinstance(node, ast.Namespace):
-            return "%s Documentation" % node.name
-        elif isinstance(node, ast.Function):
-            return node.symbol
-        elif isinstance(node, ast.Property):
-            return parent.c_name + ':' + node.name
-        elif isinstance(node, ast.Signal):
-            return parent.c_name + '::' + node.name
-        else:
-            return node.c_name
 
-class MallardFormatterPython(MallardFormatter):
-    def get_title(self, node, parent):
-        if isinstance(node, ast.Namespace):
-            return "%s Documentation" % node.name
-        elif isinstance(node, ast.Function):
-            if node.is_method or node.is_constructor:
-                return "%s.%s.%s" % (node.namespace.name, parent.name, node.name)
-            else:
-                return "%s.%s" % (node.namespace.name, node.name)
-        elif isinstance(node, ast.Property):
-            return "%s" % node.name
-        elif isinstance(node, ast.Signal):
-            return "%s" % node.name
+    def format_type(self, type_):
+        if isinstance(type_, ast.Array):
+            try:
+                return self.format_type(type_.element_type) + '*'
+            except:
+                return type_.target_fundamental
+        elif type_.ctype is not None:
+            return type_.ctype
         else:
-            return "%s.%s" % (node.namespace.name, node.name)
-
-class MallardPage(object):
-    def __init__(self, writer, node, parent):
-        self.writer = writer
-        self.node = node
-        self.parent = parent
-        self.page_id = None
-        self.page_type = 'topic'
-        self.page_style = ''
+            return type_.target_fundamental
 
-        node.page = self
-        if not isinstance(node, ast.Namespace):
-            if node.namespace is None:
-                if parent is not None and parent.namespace is not None:
-                    node.namespace = parent.namespace
-
-        self.title = writer._formatter.get_title(node, parent)
-        self.links = []
-        self.linksels = []
+class MallardFormatterPython(MallardFormatter):
 
-        if isinstance(node, ast.Namespace):
-            self.page_id = 'index'
-        elif isinstance(node, ast.Property) and parent is not None:
-            self.page_id = node.namespace.name + '.' + parent.name + '-' + node.name
-        elif isinstance(node, ast.Signal) and parent is not None:
-            self.page_id = node.namespace.name + '.' + parent.name + '--' + node.name
-        elif parent is not None and not isinstance(parent, ast.Namespace):
-            self.page_id = node.namespace.name + '.' + parent.name + '.' + node.name
+    def format_type(self, type_):
+        if isinstance(type_, ast.Array):
+            return '[' + self.format_type(type_.element_type) + ']'
+        elif isinstance(type_, ast.Map):
+            return '{%s: %s}' % (self.format_type(type_.key_type),
+                                 self.format_type(type_.value_type))
+        elif type_.target_giname is not None:
+            return type_.target_giname
         else:
-            self.page_id = node.namespace.name + '.' + node.name
-
-        if getattr(node, 'symbol', None) is not None:
-            self.writer._xrefs[node.symbol] = self.page_id
-        elif isinstance(node, ast.Class):
-            self.writer._xrefs[node.c_name] = self.page_id
-
-        self.create_content()
-        self.add_child_nodes()
-
-    def add_link(self, linktype, xref, group=None):
-        self.links.append((linktype, xref, group))
-
-    def add_child_nodes(self):
-        children = []
-        if isinstance(self.node, ast.Namespace):
-            children = [node for node in self.node.itervalues()]
-        elif isinstance(self.node, (ast.Class, ast.Record)):
-            children = self.node.methods + self.node.constructors
-        elif isinstance(self.node, ast.Interface):
-            children = self.node.methods
-
-        if isinstance(self.node, (ast.Class, ast.Interface)):
-            children += self.node.properties + self.node.signals
-        for child in children:
-            self.writer._pages.append(MallardPage(self.writer, child, self.node))
+            return type_.target_fundamental
 
-    def create_content(self):
-        if isinstance(self.node, ast.Namespace):
-            self.page_type = 'guide'
-            self.page_style = 'namespace'
-            self.linksels = (('class', 'Classes'),
-                             ('function', 'Functions'),
-                             ('#first #default #last', 'Other'))
-        elif isinstance(self.node, ast.Class):
-            self.page_type = 'guide'
-            self.page_style = 'class'
-            self.linksels = (('constructor', 'Constructors'),
-                             ('method', 'Methods'),
-                             ('property', 'Properties'),
-                             ('signal', 'Signals'),
-                             ('#first #default #last', 'Other'))
-            self.add_link('guide', self.parent.page.page_id, 'class')
-        elif isinstance(self.node, ast.Record):
-            self.page_type = 'guide'
-            self.page_style = 'record'
-            self.add_link('guide', self.parent.page.page_id)
-        elif isinstance(self.node, ast.Interface):
-            self.page_type = 'guide'
-            self.page_style = 'interface'
-            self.add_link('guide', self.parent.page.page_id)
-        elif isinstance(self.node, ast.Function):
-            if self.node.is_constructor:
-                self.page_style = 'constructor'
-                self.add_link('guide', self.parent.page.page_id, 'constructor')
-            elif self.node.is_method:
-                self.page_style = 'method'
-                self.add_link('guide', self.parent.page.page_id, 'method')
-            else:
-                self.page_style = 'function'
-                self.add_link('guide', self.parent.page.page_id, 'function')
-        elif isinstance(self.node, ast.Property):
-            self.page_style = 'property'
-            self.add_link('guide', self.parent.page.page_id, 'property')
-        elif isinstance(self.node, ast.Signal):
-            self.page_style = 'signal'
-            self.add_link('guide', self.parent.page.page_id, 'signal')
-
-    def render(self, writer):
-        with writer.tagcontext('page', [
-            ('id', self.page_id),
-            ('type', self.page_type),
-            ('style', self.page_style),
-            ('xmlns', XMLNS), ('xmlns:ui', XMLNS_UI)]):
-            with writer.tagcontext('info'):
-                for linktype, xref, group in self.links:
-                    if group is not None:
-                        writer.write_tag('link', [
-                                ('type', linktype), ('xref', xref), ('group', group)])
-                    else:
-                        writer.write_tag('link', [
-                                ('type', linktype), ('xref', xref)])
-            writer.write_tag('title', [], self.title)
-            if isinstance(self.node, ast.Annotated):
-                self.render_doc(writer, self.node.doc)
-            if isinstance(self.node, ast.Class):
-                parent_chain = []
-                node = self.node
-                while node.parent:
-                    node = self.writer._transformer.lookup_giname(str(node.parent))
-                    parent_chain.append(node)
-                    if node.namespace.name == 'GObject' and node.name == 'Object':
-                        break
-                parent_chain.reverse()
-                def print_chain(chain):
-                    with writer.tagcontext('item', []):
-                        attrs = []
-                        title = self.writer._formatter.get_title(chain[0], None)
-                        if hasattr(chain[0], 'page'):
-                            attrs.append(('xref', chain[0].page.page_id))
-                        writer.write_tag('code', attrs, title)
-                        if len(chain) > 1:
-                            print_chain(chain[1:])
-                with writer.tagcontext('synopsis', [('ui:expanded', 'no')]):
-                    writer.write_tag('title', [], 'Hierarchy')
-                    with writer.tagcontext('tree', []):
-                        print_chain(parent_chain)
-            for linkstype, title in self.linksels:
-                with writer.tagcontext('links', [
-                        ('type', 'topic'), ('ui:expanded', 'yes'),
-                        ('groups', linkstype)]):
-                    writer.write_tag('title', [], title)
-
-    def render_doc(self, writer, doc):
-        if doc is not None:
-            for para in doc.split('\n\n'):
-                writer.disable_whitespace()
-                with writer.tagcontext('p', []):
-                    self.render_doc_inline(writer, para)
-                writer.enable_whitespace()
-
-    def render_doc_inline(self, writer, text):
-        poss = []
-        poss.append((text.find('#'), '#'))
-        poss = [pos for pos in poss if pos[0] >= 0]
-        poss.sort(cmp=lambda x, y: cmp(x[0], y[0]))
-        if len(poss) == 0:
-            writer.write_line(text, do_escape=True)
-        elif poss[0][1] == '#':
-            pos = poss[0][0]
-            writer.write_line(text[:pos], do_escape=True)
-            rest = text[pos + 1:]
-            link = re.split('[^a-zA-Z_:-]', rest, maxsplit=1)[0]
-            xref = self.writer._xrefs.get(link, link)
-            writer.write_tag('link', [('xref', xref)], link)
-            if len(link) < len(rest):
-                self.render_doc_inline(writer, rest[len(link):])
+    def format(self, doc):
+        doc = MallardFormatter.format(self, doc)
+        doc = doc.replace('%NULL', 'None')
+        doc = doc.replace('%TRUE', 'True')
+        doc = doc.replace('%FALSE', 'False')
+        return doc
 
 class MallardWriter(object):
-    def __init__(self, formatter):
-        self._namespace = None
-        self._index = None
-        self._pages = []
-        self._formatter = formatter
-        self._xrefs = {}
-
-    def add_transformer(self, transformer):
+    def __init__(self, transformer, language):
         self._transformer = transformer
-        self._namespace = self._transformer._namespace
-        self._index = MallardPage(self, self._namespace, None)
-
-    def write(self, output):
-        xmlwriter = XMLWriter()
-        self._index.render(xmlwriter)
-        fp = open(output, 'w')
-        fp.write(xmlwriter.get_xml())
-        fp.close()
+        self._language = language
 
-        for page in self._pages:
-            xmlwriter = XMLWriter()
-            page.render(xmlwriter)
-            fp = open(os.path.join(os.path.dirname(output), page.page_id + '.page'), 'w')
-            fp.write(xmlwriter.get_xml())
-            fp.close()
-
-    def _render_page_object_hierarchy(self, page_node):
-        parent_chain = self._get_parent_chain(page_node)
-        parent_chain.append(page_node)
-        lines = []
+        if self._language == 'C':
+            self._formatter = MallardFormatterC(self._transformer)
+        elif self._language == 'Python':
+            self._formatter = MallardFormatterPython(self._transformer)
+        else:
+            raise SystemExit("Unsupported language: %s" % language)
 
-        for level, parent in enumerate(parent_chain):
-            prepend = ""
-            if level > 0:
-                prepend = _space((level - 1)* 6) + " +----"
-            lines.append(_space(2) + prepend + self._formatter.get_class_name(parent))
+    def write(self, output):
+        nodes = [self._transformer.namespace]
+        for node in self._transformer.namespace.itervalues():
+            if isinstance(node, ast.Function) and node.moved_to is not None:
+                continue
+            if getattr(node, 'disguised', False):
+                continue
+            nodes.append(node)
+            if isinstance(node, (ast.Class, ast.Interface, ast.Record)):
+                nodes += getattr(node, 'methods', [])
+                nodes += getattr(node, 'constructors', [])
+                nodes += getattr(node, 'static_methods', [])
+                nodes += getattr(node, 'virtual_methods', [])
+                nodes += getattr(node, 'properties', [])
+                nodes += getattr(node, 'signals', [])
+        for node in nodes:
+            self._render_node(node, output)
+
+    def _render_node(self, node, output):
+        namespace = self._transformer.namespace
+        if isinstance(node, ast.Namespace):
+            template_name = 'mallard-%s-namespace.tmpl' % self._language
+            page_id = 'index'
+        elif isinstance(node, (ast.Class, ast.Interface)):
+            template_name = 'mallard-%s-class.tmpl' % self._language
+            page_id = '%s.%s' % (namespace.name, node.name)
+        elif isinstance(node, ast.Record):
+            template_name = 'mallard-%s-record.tmpl' % self._language
+            page_id = '%s.%s' % (namespace.name, node.name)
+        elif isinstance(node, ast.Function):
+            template_name = 'mallard-%s-function.tmpl' % self._language
+            if node.parent is not None:
+                page_id = '%s.%s.%s' % (namespace.name, node.parent.name, node.name)
+            else:
+                page_id = '%s.%s' % (namespace.name, node.name)
+        elif isinstance(node, ast.Enum):
+            template_name = 'mallard-%s-enum.tmpl' % self._language
+            page_id = '%s.%s' % (namespace.name, node.name)
+        elif isinstance(node, ast.Property) and node.parent is not None:
+            template_name = 'mallard-%s-property.tmpl' % self._language
+            page_id = '%s.%s-%s' % (namespace.name, node.parent.name, node.name)
+        elif isinstance(node, ast.Signal) and node.parent is not None:
+            template_name = 'mallard-%s-signal.tmpl' % self._language
+            page_id = '%s.%s-%s' % (namespace.name, node.parent.name, node.name)
+        else:
+            template_name = 'mallard-%s-default.tmpl' % self._language
+            page_id = '%s.%s' % (namespace.name, node.name)
 
-        self._writer.disable_whitespace()
-        self._writer.write_line("\n".join(lines))
-        self._writer.enable_whitespace()
+        if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+            top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
+            template_dir = os.path.join(top_srcdir, 'giscanner')
+        else:
+            template_dir = os.path.dirname(__file__)
+
+        file_name = os.path.join(template_dir, template_name)
+        file_name = os.path.abspath(file_name)
+        template = Template(filename=file_name, output_encoding='utf-8',
+                            module_directory=tempfile.gettempdir())
+        result = template.render(namespace=namespace,
+                                 node=node,
+                                 page_id=page_id,
+                                 formatter=self._formatter)
+
+        output_file_name = os.path.join(os.path.dirname(output),
+                                        page_id + '.page')
+        fp = open(output_file_name, 'w')
+        fp.write(result)
+        fp.close()
diff --git a/m4/python.m4 b/m4/python.m4
index c939c43b..74ac6ee9 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -1,4 +1,41 @@
 ## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN([AM_CHECK_PYMOD],
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+        import $1
+except ImportError:
+        sys.exit(1)
+except:
+        sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+  then
+    eval "py_cv_mod_$py_mod_var=yes"
+  else
+    eval "py_cv_mod_$py_mod_var=no"
+  fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+  AC_MSG_RESULT(yes)
+  ifelse([$3], [],, [$3
+])dnl
+else
+  AC_MSG_RESULT(no)
+  ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
 dnl a macro to check for ability to create python extensions
 dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
 dnl function also defines PYTHON_INCLUDES
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page
index 87893a98..8cddb854 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArgInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryArgInfo</title>
-<p>Represents an argument.</p></page>
+  <title>GIRepository.ArgInfo</title>
+<p>Represents an argument.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
index bb0afd47..b169ec67 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <page id="GIRepository.ArrayType"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryArrayType</title>
-<p>The type of array in a <link xref="GITypeInfo">GITypeInfo</link>.</p></page>
+  <title>GIRepository.ArrayType</title>
+<p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
index bcd5f4b1..ed856912 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
@@ -9,4 +9,5 @@
   </info>
   <title>GIRepositoryAttributeIter</title>
 <p>An opaque structure used to iterate over attributes
-in a <link xref="GIBaseInfo">GIBaseInfo</link> struct.</p></page>
+in a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
index c0aa7e80..1194cd10 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.equal.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.equal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_base_info_equal</api:name>
+      <api:arg>
+        <api:type>GIBaseInfo*</api:type>
+        <api:name>info2</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_base_info_equal</title>
-<p>Compare two <link xref="GIBaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
-different instances of <link xref="GIBaseInfo">GIBaseInfo</link> that refers to the same part of the
-TypeLib; use this function instead to do <link xref="GIBaseInfo">GIBaseInfo</link> comparisons.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_base_info_equal (GIBaseInfo* info2);
+</code></synopsis>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> comparisons.</p>
+
+<table>
+<tr>
+<td><p>info2 :</p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if and only if @info1 equals @info2.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page
index 4a98a952..caab8b8b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_attribute.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_attribute"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_attribute</api:name>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_base_info_get_attribute</title>
-<p>Retrieve an arbitrary attribute associated with this node.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_base_info_get_attribute (gchar* name);
+</code></synopsis>
+<p>Retrieve an arbitrary attribute associated with this node.</p>
+
+<table>
+<tr>
+<td><p>name :</p></td>
+<td><p>a freeform string naming an attribute</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The value of the attribute, or %NULL if no such attribute exists</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
index 71a8d55e..89acaa6c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_container.page
@@ -1,13 +1,32 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_container"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_container</api:name>
+    </api:function>
   </info>
   <title>g_base_info_get_container</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_base_info_get_container (void);
+</code></synopsis>
 <p>Obtain the container of the @info. The container is the parent
-GIBaseInfo. For instance, the parent of a <link xref="GIFunctionInfo">GIFunctionInfo</link> is an
-<link xref="GIObjectInfo">GIObjectInfo</link> or <link xref="GIInterfaceInfo">GIInterfaceInfo</link>.</p></page>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the container</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
index d4c1286b..09675891 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_name.page
@@ -1,13 +1,32 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_name"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_name</api:name>
+    </api:function>
   </info>
   <title>g_base_info_get_name</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_base_info_get_name (void);
+</code></synopsis>
 <p>Obtain the name of the @info. What the name represents depends on
-the <link xref="GIInfoType">GIInfoType</link> of the @info. For instance for <link xref="GIFunctionInfo">GIFunctionInfo</link> it is
-the name of the function.</p></page>
+the <link xref="GIRepository.InfoType">GIRepository.InfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> it is
+the name of the function.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the name of @info or %NULL if it lacks a name.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page
index 1cdeb07f..352c66e2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_namespace.page
@@ -1,11 +1,30 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_namespace"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_namespace</api:name>
+    </api:function>
   </info>
   <title>g_base_info_get_namespace</title>
-<p>Obtain the namespace of @info.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_base_info_get_namespace (void);
+</code></synopsis>
+<p>Obtain the namespace of @info.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the namespace</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page
index e9ada1f8..6c904dc1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.get_typelib.page
@@ -1,11 +1,30 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_typelib"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypelib*</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_typelib</api:name>
+    </api:function>
   </info>
   <title>g_base_info_get_typelib</title>
-<p>Obtain the typelib this @info belongs to</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypelib* g_base_info_get_typelib (void);
+</code></synopsis>
+<p>Obtain the typelib this @info belongs to</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the typelib.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page
index c8206c49..0cd6ff0f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.is_deprecated.page
@@ -1,12 +1,31 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.is_deprecated"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_base_info_is_deprecated</api:name>
+    </api:function>
   </info>
   <title>g_base_info_is_deprecated</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_base_info_is_deprecated (void);
+</code></synopsis>
 <p>Obtain whether the @info is represents a metadata which is
-deprecated or not.</p></page>
+deprecated or not.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if deprecated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
index 82ef15f0..76c6766b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.iterate_attributes.page
@@ -1,13 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.iterate_attributes"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_base_info_iterate_attributes</api:name>
+      <api:arg>
+        <api:type>GIAttributeIter*</api:type>
+        <api:name>iterator</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>char**</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>char**</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_base_info_iterate_attributes</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_base_info_iterate_attributes (GIAttributeIter* iterator,
+                                         char** name,
+                                         char** value);
+</code></synopsis>
 <p>Iterate over all attributes associated with this node.  The iterator
 structure is typically stack allocated, and must have its first
 member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
@@ -26,4 +51,24 @@ g_print ("attribute name: %s value: %s", name, value);
 }
 }
 &lt;/programlisting&gt;
-&lt;/example&gt;</p></page>
+&lt;/example&gt;</p>
+
+<table>
+<tr>
+<td><p>iterator :</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if there are more attributes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
index 1e29c309..87dd1ae2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.page
@@ -9,16 +9,16 @@
   </info>
   <title>GIRepositoryBaseInfo</title>
 <p>GIBaseInfo is the common base struct of all other *Info structs
-accessible through the <link xref="GIRepository">GIRepository</link> API.
-All other structs can be casted to a <link xref="GIBaseInfo">GIBaseInfo</link>, for instance:
+accessible through the <link xref="GIRepository.Repository">GIRepository.Repository</link> API.
+All other structs can be casted to a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, for instance:
 &lt;example&gt;
-&lt;title&gt;Casting a <link xref="GIFunctionInfo">GIFunctionInfo</link> to <link xref="GIBaseInfo">GIBaseInfo</link>&lt;/title&gt;
+&lt;title&gt;Casting a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>&lt;/title&gt;
 &lt;programlisting&gt;
 GIFunctionInfo *function_info = ...;
 GIBaseInfo *info = (GIBaseInfo*)function_info;
 &lt;/programlisting&gt;
 &lt;/example&gt;
-Most <link xref="GIRepository">GIRepository</link> APIs returning a <link xref="GIBaseInfo">GIBaseInfo</link> is actually creating a new struct, in other
+Most <link xref="GIRepository.Repository">GIRepository.Repository</link> APIs returning a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> is actually creating a new struct, in other
 words, g_base_info_unref() has to be called when done accessing the data.
 GIBaseInfos are normally accessed by calling either
 g_irepository_find_by_name(), g_irepository_find_by_gtype() or g_irepository_get_info().</p><p>&lt;example&gt;
@@ -40,4 +40,5 @@ GIBaseInfo
 +----&lt;link linkend="gi-GIRegisteredTypeInfo"&gt;GIRegisteredTypeInfo&lt;/link&gt;
 +----&lt;link linkend="gi-GITypeInfo"&gt;GITypeInfo&lt;/link&gt;
 &lt;/synopsis&gt;
-&lt;/refsect1&gt;</p></page>
+&lt;/refsect1&gt;</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page
index b25dabb8..307b6225 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.ref.page
@@ -1,11 +1,30 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.ref"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_base_info_ref</api:name>
+    </api:function>
   </info>
   <title>g_base_info_ref</title>
-<p>Increases the reference count of @info.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_base_info_ref (void);
+</code></synopsis>
+<p>Increases the reference count of @info.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the same @info.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page
index 9402169d..9a14d4ee 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.BaseInfo.unref.page
@@ -1,12 +1,31 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.unref"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>g_base_info_unref</api:name>
+    </api:function>
   </info>
   <title>g_base_info_unref</title>
+<synopsis><code mime="text/x-csrc">
+void g_base_info_unref (void);
+</code></synopsis>
 <p>Decreases the reference count of @info. When its reference count
-drops to 0, the info is freed.</p></page>
+drops to 0, the info is freed.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
index 5f1b5973..ab20f816 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
@@ -6,6 +6,7 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryCallableInfo</title>
-<p>Represents a callable, either <link xref="GIFunctionInfo">GIFunctionInfo</link>, <link xref="GICallbackInfo">GICallbackInfo</link> or
-<link xref="GIVFuncInfo">GIVFuncInfo</link>.</p></page>
+  <title>GIRepository.CallableInfo</title>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GIRepository.CallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page
index f04546f9..e5a71709 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallbackInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryCallbackInfo</title>
-<p>Represents a callback, eg arguments and return value.</p></page>
+  <title>GIRepository.CallbackInfo</title>
+<p>Represents a callback, eg arguments and return value.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page
index af0ea673..4ed05edb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ConstantInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryConstantInfo</title>
-<p>Represents a constant.</p></page>
+  <title>GIRepository.ConstantInfo</title>
+<p>Represents a constant.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
index b4eb5f3f..6378b774 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <page id="GIRepository.Direction"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryDirection</title>
-<p>The direction of a <link xref="GIArgInfo">GIArgInfo</link>.</p></page>
+  <title>GIRepository.Direction</title>
+<p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page
index 73da91d7..eebac1b0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.EnumInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryEnumInfo</title>
-<p>Represents an enum or a flag.</p></page>
+  <title>GIRepository.EnumInfo</title>
+<p>Represents an enum or a flag.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
index d9a813d8..0e90ebad 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryFieldInfo</title>
-<p>Represents a field of a <link xref="GIStructInfo">GIStructInfo</link> or a <link xref="GIUnionInfo">GIUnionInfo</link>.</p></page>
+  <title>GIRepository.FieldInfo</title>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
index 28166d74..87df966c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryFieldInfoFlags</title>
-<p>Flags for a <link xref="GIFieldInfo">GIFieldInfo</link>.</p></page>
+  <title>GIRepository.FieldInfoFlags</title>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page
index 8d45f6e4..d0b0f457 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryFunctionInfo</title>
-<p>Represents a function, eg arguments and return value.</p></page>
+  <title>GIRepository.FunctionInfo</title>
+<p>Represents a function, eg arguments and return value.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
index b19947d4..962e3ffa 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryFunctionInfoFlags</title>
-<p>Flags for a <link xref="GIFunctionInfo">GIFunctionInfo</link> struct.</p></page>
+  <title>GIRepository.FunctionInfoFlags</title>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
index d37bac04..f447a0f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InfoType.page
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <page id="GIRepository.InfoType"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryInfoType</title>
-<p>The type of a GIBaseInfo struct.</p></page>
+  <title>GIRepository.InfoType</title>
+<p>The type of a GIBaseInfo struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page
index 3623797a..27ebf8f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.InterfaceInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryInterfaceInfo</title>
-<p>Represents an interface.</p></page>
+  <title>GIRepository.InterfaceInfo</title>
+<p>Represents an interface.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page
index 09428320..fd74384c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryObjectInfo</title>
-<p>Represents an object.</p></page>
+  <title>GIRepository.ObjectInfo</title>
+<p>Represents an object.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page
index 61c9ea8e..a8a86392 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoGetValueFunction.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryObjectInfoGetValueFunction</title>
-<p>Extract an object instance out of @value</p></page>
+  <title>GIRepository.ObjectInfoGetValueFunction</title>
+<p>Extract an object instance out of @value</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page
index 1fd55579..12b8b52a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoRefFunction.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryObjectInfoRefFunction</title>
-<p>Increases the reference count of an object instance.</p></page>
+  <title>GIRepository.ObjectInfoRefFunction</title>
+<p>Increases the reference count of an object instance.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page
index 4ad842f1..3d5c677d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoSetValueFunction.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryObjectInfoSetValueFunction</title>
-<p>Update @value and attach the object instance pointer @object to it.</p></page>
+  <title>GIRepository.ObjectInfoSetValueFunction</title>
+<p>Update @value and attach the object instance pointer @object to it.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page
index d52002b3..11120095 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ObjectInfoUnrefFunction.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryObjectInfoUnrefFunction</title>
-<p>Decreases the reference count of an object instance.</p></page>
+  <title>GIRepository.ObjectInfoUnrefFunction</title>
+<p>Decreases the reference count of an object instance.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
index d24aea5d..4d383595 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryPropertyInfo</title>
-<p>Represents a property of a <link xref="GIObjectInfo">GIObjectInfo</link> or a <link xref="GIInterfaceInfo">GIInterfaceInfo</link>.</p></page>
+  <title>GIRepository.PropertyInfo</title>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page
index 14de0329..d98e976c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RegisteredTypeInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryRegisteredTypeInfo</title>
-<p>Represent a registered type.</p></page>
+  <title>GIRepository.RegisteredTypeInfo</title>
+<p>Represent a registered type.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page
new file mode 100644
index 00000000..7d674d25
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.dump.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.dump"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_irepository_dump</api:name>
+      <api:arg>
+        <api:type>char*</api:type>
+        <api:name>arg</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>g_irepository_dump</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_irepository_dump (char* arg);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>arg :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page
index c54c2174..32354748 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.enumerate_versions.page
@@ -1,12 +1,44 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.enumerate_versions"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GList*</api:type>
+      </api:returns>
+      <api:name>g_irepository_enumerate_versions</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_enumerate_versions</title>
+<synopsis><code mime="text/x-csrc">
+GList* g_irepository_enumerate_versions (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>Obtain an unordered list of versions (either currently loaded or
-available) for @namespace_ in this @repository.</p></page>
+available) for @namespace_ in this @repository.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array of versions.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page
new file mode 100644
index 00000000..b9534309
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.error_quark.page
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.error_quark"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GQuark</api:type>
+      </api:returns>
+      <api:name>g_irepository_error_quark</api:name>
+    </api:function>
+  </info>
+  <title>g_irepository_error_quark</title>
+<synopsis><code mime="text/x-csrc">
+GQuark g_irepository_error_quark (void);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
index d2e40825..56f3b93e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_error_domain.page
@@ -1,14 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.find_by_error_domain"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIEnumInfo*</api:type>
+      </api:returns>
+      <api:name>g_irepository_find_by_error_domain</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GQuark</api:type>
+        <api:name>domain</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_find_by_error_domain</title>
+<synopsis><code mime="text/x-csrc">
+GIEnumInfo* g_irepository_find_by_error_domain (GIRepository *self,
+GQuark domain);
+</code></synopsis>
 <p>Searches for the enum type corresponding to the given <link xref="GError">GError</link>
 domain. Before calling this function for a particular namespace,
 you must call g_irepository_require() once to load the namespace, or
-otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NULL</p></page>
+otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NULL</p>
+
+<table>
+<tr>
+<td><p>domain :</p></td>
+<td><p>a <link xref="GError">GError</link> domain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link> representing metadata about @domain's</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
index 26775036..07e562c4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_gtype.page
@@ -1,16 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.find_by_gtype"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_irepository_find_by_gtype</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GType</api:type>
+        <api:name>gtype</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_find_by_gtype</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_irepository_find_by_gtype (GIRepository *self,
+GType gtype);
+</code></synopsis>
 <p>Searches all loaded namespaces for a particular <link xref="GType">GType</link>.  Note that
 in order to locate the metadata, the namespace corresponding to
 the type must first have been loaded.  There is currently no
 mechanism for determining the namespace which corresponds to an
 arbitrary GType - thus, this function will operate most reliably
-when you know the GType to originate from be from a loaded namespace.</p></page>
+when you know the GType to originate from be from a loaded namespace.</p>
+
+<table>
+<tr>
+<td><p>gtype :</p></td>
+<td><p>GType to search for</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @type, or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
index 7eada692..39fe665e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.find_by_name.page
@@ -1,14 +1,55 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.find_by_name"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_irepository_find_by_name</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_find_by_name</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_irepository_find_by_name (GIRepository *self,
+gchar* namespace_,
+                                        gchar* name);
+</code></synopsis>
 <p>Searches for a particular entry in a namespace.  Before calling
 this function for a particular namespace, you must call
 g_irepository_require() once to load the namespace, or otherwise
-ensure the namespace has already been loaded.</p></page>
+ensure the namespace has already been loaded.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace which will be searched</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Entry name to find</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @name, or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page
index e23faa9d..4c7147be 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_c_prefix.page
@@ -1,14 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_c_prefix"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_c_prefix</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_c_prefix</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_c_prefix (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>This function returns the "C prefix", or the C level namespace
 associated with the given introspection namespace.  Each C symbol
 starts with this prefix, as well each <link xref="GType">GType</link> in the library.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>C namespace prefix, or %NULL if none associated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
new file mode 100644
index 00000000..07cee8c8
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_default"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_default</api:name>
+    </api:function>
+  </info>
+  <title>g_irepository_get_default</title>
+<synopsis><code mime="text/x-csrc">
+GIRepository* g_irepository_get_default (void);
+</code></synopsis>
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository.Repository</link>.  It is
+not currently supported to have multiple repositories in a
+particular process, but this function is provided in the unlikely
+eventuality that it would become possible, and as a convenience for
+higher level language bindings to conform to the GObject method
+call conventions.
+All methods on <link xref="GIRepository.Repository">GIRepository.Repository</link> also accept %NULL as an instance
+parameter to mean this default repository, which is usually more
+convenient for C.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository.Repository</link></p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page
index f88f13c9..69eab53a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_dependencies.page
@@ -1,14 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_dependencies"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_dependencies</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_dependencies</title>
+<synopsis><code mime="text/x-csrc">
+gchar** g_irepository_get_dependencies (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>Return an array of all (transitive) dependencies for namespace
 @namespace_, including version.  The returned strings are of the
 form &lt;code&gt;namespace-version&lt;/code&gt;.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace of interest</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Zero-terminated string array of versioned dependencies</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
index fbfb4eda..05beefe8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_info.page
@@ -1,15 +1,56 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_info"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_info</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>index</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_info</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_irepository_get_info (GIRepository *self,
+gchar* namespace_,
+                                    gint index);
+</code></synopsis>
 <p>This function returns a particular metadata entry in the
 given namespace @namespace_.  The namespace must have
 already been loaded before calling this function.
 See g_irepository_get_n_infos() to find the maximum number of
-entries.</p></page>
+entries.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>index :</p></td>
+<td><p>0-based offset into namespace metadata for entry</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> containing metadata</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page
index c206e892..1c42c7dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_loaded_namespaces.page
@@ -1,11 +1,34 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_loaded_namespaces"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_loaded_namespaces</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_loaded_namespaces</title>
-<p>Return the list of currently loaded namespaces.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar** g_irepository_get_loaded_namespaces (GIRepository *self);
+</code></synopsis>
+<p>Return the list of currently loaded namespaces.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>List of namespaces</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page
index dc1f6a42..c9a4ca67 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_n_infos.page
@@ -1,13 +1,45 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_n_infos"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_n_infos</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_n_infos</title>
+<synopsis><code mime="text/x-csrc">
+gint g_irepository_get_n_infos (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>This function returns the number of metadata entries in
 given namespace @namespace_.  The namespace must have
-already been loaded before calling this function.</p></page>
+already been loaded before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of metadata entries</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page
new file mode 100644
index 00000000..e3fac668
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_option_group.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_option_group"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GOptionGroup*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_option_group</api:name>
+    </api:function>
+  </info>
+  <title>g_irepository_get_option_group</title>
+<synopsis><code mime="text/x-csrc">
+GOptionGroup* g_irepository_get_option_group (void);
+</code></synopsis>
+<p>Obtain the option group for girepository, it's used
+by the dumper and for programs that wants to provide
+introspection information</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the option group</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page
new file mode 100644
index 00000000..6d3785fa
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_search_path.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_search_path"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GSList*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_search_path</api:name>
+    </api:function>
+  </info>
+  <title>g_irepository_get_search_path</title>
+<synopsis><code mime="text/x-csrc">
+GSList* g_irepository_get_search_path (void);
+</code></synopsis>
+<p>Returns the search path the GIRepository will use when looking for typelibs.
+The string is internal to GIRespository and should not be freed, nor should
+the elements.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>list of strings</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page
index 4ae1a365..203441ab 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_shared_library.page
@@ -1,15 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_shared_library"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_shared_library</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_shared_library</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_shared_library (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>This function returns the full path to the shared C library
 associated with the given namespace @namespace_. There may be no
 shared library path associated, in which case this function will
 return %NULL.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Full path to shared library, or %NULL if none associated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page
index ad702fe9..ad6046c6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_typelib_path.page
@@ -1,14 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_typelib_path"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_typelib_path</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_typelib_path</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_typelib_path (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>If namespace @namespace_ is loaded, return the full path to the
 .typelib file it was loaded from.  If the typelib for
 namespace @namespace_ was included in a shared library, return
-the special string "$lt;builtin$gt;".</p></page>
+the special string "$lt;builtin$gt;".</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Filesystem path (or $lt;builtin$gt;) if successful, %NULL if namespace is not loaded</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page
index 860bc08d..a7cc98dd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_version.page
@@ -1,13 +1,45 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_version"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_version</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_get_version</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_irepository_get_version (GIRepository *self,
+gchar* namespace_);
+</code></synopsis>
 <p>This function returns the loaded version associated with the given
 namespace @namespace_.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Loaded version</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page
index 95f2b4dc..a659800d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.is_registered.page
@@ -1,16 +1,57 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.is_registered"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_irepository_is_registered</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>version</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_is_registered</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_irepository_is_registered (GIRepository *self,
+gchar* namespace_,
+                                      gchar* version);
+</code></synopsis>
 <p>Check whether a particular namespace (and optionally, a specific
 version thereof) is currently loaded.  This function is likely to
 only be useful in unusual circumstances; in order to act upon
 metadata in the namespace, you should call g_irepository_require()
 instead which will ensure the namespace is loaded, and return as
-quickly as this function will if it has already been loaded.</p></page>
+quickly as this function will if it has already been loaded.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace of interest</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Required version, may be %NULL for latest</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if namespace-version is loaded, %FALSE otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page
index d5bdf264..6219a878 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.load_typelib.page
@@ -1,11 +1,52 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.load_typelib"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>char*</api:type>
+      </api:returns>
+      <api:name>g_irepository_load_typelib</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GITypelib*</api:type>
+        <api:name>typelib</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepositoryLoadFlags</api:type>
+        <api:name>flags</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_load_typelib</title>
+<synopsis><code mime="text/x-csrc">
+char* g_irepository_load_typelib (GIRepository *self,
+GITypelib* typelib,
+                                  GIRepositoryLoadFlags flags);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>typelib :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page
index 24e0f0b3..456c1c09 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.page
@@ -3,11 +3,13 @@
       type="guide"
       style="class"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="class"/>
   </info>
-  <title>GIRepositoryRepository</title>
+  <title>GIRepository</title>
+
   <synopsis ui:expanded="no">
     <title>Hierarchy</title>
     <tree>
@@ -16,19 +18,28 @@
       </item>
     </tree>
   </synopsis>
-  <links type="topic" ui:expanded="yes" groups="constructor">
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
     <title>Constructors</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="method">
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
     <title>Methods</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="property">
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="property" style="linklist">
     <title>Properties</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="signal">
+  <links type="topic" ui:expanded="yes" groups="signal" style="linklist">
     <title>Signals</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page
new file mode 100644
index 00000000..c3ba8309
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.prepend_search_path.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.prepend_search_path"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>g_irepository_prepend_search_path</api:name>
+      <api:arg>
+        <api:type>char*</api:type>
+        <api:name>directory</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>g_irepository_prepend_search_path</title>
+<synopsis><code mime="text/x-csrc">
+void g_irepository_prepend_search_path (char* directory);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>directory :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
index 4eea3fa3..423eaf70 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require.page
@@ -1,15 +1,65 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.require"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypelib*</api:type>
+      </api:returns>
+      <api:name>g_irepository_require</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>version</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepositoryLoadFlags</api:type>
+        <api:name>flags</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_require</title>
+<synopsis><code mime="text/x-csrc">
+GITypelib* g_irepository_require (GIRepository *self,
+gchar* namespace_,
+                                  gchar* version,
+                                  GIRepositoryLoadFlags flags);
+</code></synopsis>
 <p>Force the namespace @namespace_ to be loaded if it isn't already.
 If @namespace_ is not loaded, this function will search for a
 ".typelib" file using the repository search path.  In addition, a
 version @version of namespace may be specified.  If @version is
-not specified, the latest will be used.</p></page>
+not specified, the latest will be used.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Version of namespace, may be %NULL for latest</p></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td><p>Set of %GIRepositoryLoadFlags, may be 0</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, %NULL otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
index 3b18a06b..f539b312 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.require_private.page
@@ -1,15 +1,74 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.require_private"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypelib*</api:type>
+      </api:returns>
+      <api:name>g_irepository_require_private</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>typelib_dir</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>version</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepositoryLoadFlags</api:type>
+        <api:name>flags</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_irepository_require_private</title>
+<synopsis><code mime="text/x-csrc">
+GITypelib* g_irepository_require_private (GIRepository *self,
+gchar* typelib_dir,
+                                          gchar* namespace_,
+                                          gchar* version,
+                                          GIRepositoryLoadFlags flags);
+</code></synopsis>
 <p>Force the namespace @namespace_ to be loaded if it isn't already.
 If @namespace_ is not loaded, this function will search for a
 ".typelib" file within the private directory only. In addition, a
 version @version of namespace should be specified.  If @version is
-not specified, the latest will be used.</p></page>
+not specified, the latest will be used.</p>
+
+<table>
+<tr>
+<td><p>typelib_dir :</p></td>
+<td><p>Private directory where to find the requested typelib</p></td>
+</tr>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Version of namespace, may be %NULL for latest</p></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td><p>Set of %GIRepositoryLoadFlags, may be 0</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, %NULL otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page
index 4170b9eb..337999a7 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryClass.page
@@ -8,4 +8,5 @@
     <link type="guide" xref="index"/>
   </info>
   <title>GIRepositoryRepositoryClass</title>
+
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
index 8c5880cc..81fbd70f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryError.page
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <page id="GIRepository.RepositoryError"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryRepositoryError</title>
+  <title>GIRepository.RepositoryError</title>
+
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page
index a1a838ec..6ad05e8b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryLoadFlags.page
@@ -6,6 +6,7 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryRepositoryLoadFlags</title>
+  <title>GIRepository.RepositoryLoadFlags</title>
 <p>Flags that controlls how a typelib is loaded by
-GIRepositry, used by g_irepository_load_typelib().</p></page>
+GIRepositry, used by g_irepository_load_typelib().</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page
deleted file mode 100644
index 2d159d7f..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.RepositoryPrivate.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.RepositoryPrivate"
-      type="guide"
-      style="record"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="index"/>
-  </info>
-  <title>GIRepositoryRepositoryPrivate</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
index 14b21a70..2d9360cc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
@@ -1,12 +1,14 @@
 <?xml version="1.0"?>
 <page id="GIRepository.ScopeType"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryScopeType</title>
-<p>Scope type of a <link xref="GIArgInfo">GIArgInfo</link> representing callback, determines how the
+  <title>GIRepository.ScopeType</title>
+<p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
 callback is invoked and is used to decided when the invoke structs
-can be freed.</p></page>
+can be freed.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page
index 1b905241..24f8471c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.SignalInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositorySignalInfo</title>
-<p>Represents a signal.</p></page>
+  <title>GIRepository.SignalInfo</title>
+<p>Represents a signal.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page
index 8cc73823..5e1cb0dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.StructInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryStructInfo</title>
-<p>Represents a struct.</p></page>
+  <title>GIRepository.StructInfo</title>
+<p>Represents a struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
index 0aa94ec0..86fbf348 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <page id="GIRepository.Transfer"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryTransfer</title>
+  <title>GIRepository.Transfer</title>
 <p>The transfer is the exchange of data between two parts, from the callee to
 the caller. The callee is either a function/method/signal or an
 object/interface where a property is defined. The caller is the side
 accessing a property or calling a function.
-<link xref="GITransfer">GITransfer</link> specifies who's responsible for freeing the resources after the
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> specifies who's responsible for freeing the resources after the
 ownership transfer is complete. In case of a containing type such as a list,
 an array or a hash table the container itself is specified differently from
 the items within the container itself. Each container is freed differently,
 check the documentation for the types themselves for information on how to
-free them.</p></page>
+free them.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page
index 946b898a..5b46d876 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryTypeInfo</title>
-<p>Represents type information, direction, transfer etc.</p></page>
+  <title>GIRepository.TypeInfo</title>
+<p>Represents type information, direction, transfer etc.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
index c7f4f0ee..a2da1552 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
@@ -1,10 +1,12 @@
 <?xml version="1.0"?>
 <page id="GIRepository.TypeTag"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositoryTypeTag</title>
-<p>The type tag of a <link xref="GITypeInfo">GITypeInfo</link>.</p></page>
+  <title>GIRepository.TypeTag</title>
+<p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page
deleted file mode 100644
index 5eeca51d..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.get_namespace.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.get_namespace"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="GIRepository.Typelib" group="function"/>
-  </info>
-  <title>g_typelib_get_namespace</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page
deleted file mode 100644
index eff8ed1e..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Typelib.symbol.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.symbol"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="GIRepository.Typelib" group="function"/>
-  </info>
-  <title>g_typelib_symbol</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page
index 792f5c61..013ecb53 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnionInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryUnionInfo</title>
-<p>Represents a union.</p></page>
+  <title>GIRepository.UnionInfo</title>
+<p>Represents a union.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page
deleted file mode 100644
index c0685b45..00000000
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.UnresolvedInfo.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.UnresolvedInfo"
-      type="guide"
-      style="record"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="index"/>
-  </info>
-  <title>GIRepositoryUnresolvedInfo</title>
-<p>Represents a unresolved type in a typelib.</p></page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page
index f5009326..a864ec1d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryVFuncInfo</title>
-<p>Represents a virtual function.</p></page>
+  <title>GIRepository.VFuncInfo</title>
+<p>Represents a virtual function.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
index 44c8512a..a750dfde 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryVFuncInfoFlags</title>
-<p>Flags of a <link xref="GIVFuncInfo">GIVFuncInfo</link> struct.</p></page>
+  <title>GIRepository.VFuncInfoFlags</title>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
index 54761684..39ad0fa5 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepositoryValueInfo</title>
-<p>Represents a enum value of a <link xref="GIEnumInfo">GIEnumInfo</link>.</p></page>
+  <title>GIRepository.ValueInfo</title>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page
index ad4e308b..b5472b97 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._Argument.page
@@ -6,5 +6,6 @@
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
   </info>
-  <title>GIRepository_Argument</title>
+  <title>GIRepository._Argument</title>
+
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page
index 69fb24b7..42ab6af2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository._BaseInfoStub.page
@@ -8,4 +8,5 @@
     <link type="guide" xref="index"/>
   </info>
   <title>GIRepository_BaseInfoStub</title>
+
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
index 00102ce4..090a24e4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_closure.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_closure"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_closure</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_get_closure</title>
+<synopsis><code mime="text/x-csrc">
+gint g_arg_info_get_closure (GIArgInfo* info);
+</code></synopsis>
 <p>Obtain the index of the user data argument. This is only valid
-for arguments which are callbacks.</p></page>
+for arguments which are callbacks.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>index of the user data argument or -1 if there is none</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
index 712afa99..3c04cd1d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_destroy.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_destroy"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_destroy</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_get_destroy</title>
+<synopsis><code mime="text/x-csrc">
+gint g_arg_info_get_destroy (GIArgInfo* info);
+</code></synopsis>
 <p>Obtains the index of the <link xref="GDestroyNotify">GDestroyNotify</link> argument. This is only valid
-for arguments which are callbacks.</p></page>
+for arguments which are callbacks.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>index of the <link xref="GDestroyNotify">GDestroyNotify</link> argument or -1 if there is none</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
index 8fa3d814..eb27640d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_direction.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_direction"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIDirection</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_direction</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_get_direction</title>
-<p>Obtain the direction of the argument. Check <link xref="GIDirection">GIDirection</link> for possible
-direction values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIDirection g_arg_info_get_direction (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIRepository.Direction</link> for possible
+direction values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the direction</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
index 0b969ba3..679e068e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_ownership_transfer.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_ownership_transfer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITransfer</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_ownership_transfer</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_get_ownership_transfer</title>
+<synopsis><code mime="text/x-csrc">
+GITransfer g_arg_info_get_ownership_transfer (GIArgInfo* info);
+</code></synopsis>
 <p>Obtain the ownership transfer for this argument.
-<link xref="GITransfer">GITransfer</link> contains a list of possible values.</p></page>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the transfer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
index 3dece4c2..1367c1ef 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_scope.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_scope"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIScopeType</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_scope</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_get_scope</title>
+<synopsis><code mime="text/x-csrc">
+GIScopeType g_arg_info_get_scope (GIArgInfo* info);
+</code></synopsis>
 <p>Obtain the scope type for this argument. The scope type explains
 how a callback is going to be invoked, most importantly when
 the resources required to invoke it can be freed.
-<link xref="GIScopeType">GIScopeType</link> contains a list of possible values.</p></page>
+<link xref="GIRepository.ScopeType">GIRepository.ScopeType</link> contains a list of possible values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the scope type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
index e0096a97..abfa566d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_get_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_get_type</title>
-<p>Obtain the type information for @info.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_arg_info_get_type (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain the type information for @info.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>, free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
index d1cdd436..22aa6517 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_caller_allocates.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_caller_allocates"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_caller_allocates</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_is_caller_allocates</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_caller_allocates (GIArgInfo* info);
+</code></synopsis>
 <p>Obtain if the argument is a pointer to a struct or object that will
 receive an output of a function.  The default assumption for
 %GI_DIRECTION_OUT arguments which have allocation is that the
-callee allocates; if this is %TRUE, then the caller must allocate.</p></page>
+callee allocates; if this is %TRUE, then the caller must allocate.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if caller is required to have allocated the argument</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
index bf5482cb..42254f27 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_optional.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_optional"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_optional</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_is_optional</title>
-<p>Obtain if the argument is optional.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_optional (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain if the argument is optional.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it is an optional argument</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
index a65a74f2..90010c2e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_return_value.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_return_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_return_value</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_is_return_value</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_return_value (GIArgInfo* info);
+</code></synopsis>
 <p>Obtain if the argument is a return value. It can either be a
-parameter or a return value.</p></page>
+parameter or a return value.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it is a return value</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
index 04bf674e..10647329 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_is_skip.page
@@ -1,11 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_skip"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_skip</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_is_skip</title>
-<p>Obtain if an argument is only useful in C.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_is_skip (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain if an argument is only useful in C.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if argument is only useful in C.</p></td>
+</tr>
+</table>
+<p>Since 1.29.0</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
index 88a90d31..c5be3027 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_load_type.page
@@ -1,13 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_load_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>g_arg_info_load_type</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_load_type</title>
+<synopsis><code mime="text/x-csrc">
+void g_arg_info_load_type (GIArgInfo* info,
+                           GITypeInfo* type);
+</code></synopsis>
 <p>Obtain information about a the type of given argument @info; this
 function is a variant of g_arg_info_get_type() designed for stack
-allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>type :</p></td>
+<td><p>Initialized with information about type of @info</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
index 549622cc..ad3d6510 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.arg_info_may_be_null.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_may_be_null"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_may_be_null</api:name>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_arg_info_may_be_null</title>
-<p>Obtain if the argument accepts %NULL.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_arg_info_may_be_null (GIArgInfo* info);
+</code></synopsis>
+<p>Obtain if the argument accepts %NULL.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it accepts %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
index 214ed0e9..ab56ef96 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.base_info_get_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.base_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIInfoType</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIBaseInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_base_info_get_type</title>
-<p>Obtain the info type of the GIBaseInfo.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIInfoType g_base_info_get_type (GIBaseInfo* info);
+</code></synopsis>
+<p>Obtain the info type of the GIBaseInfo.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the info type of @info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
index 87bd9694..aa7958dd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_arg.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_arg"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIArgInfo*</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_arg</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_get_arg</title>
-<p>Obtain information about a particular argument of this callable.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIArgInfo* g_callable_info_get_arg (GICallableInfo* info,
+                                    gint n);
+</code></synopsis>
+<p>Obtain information about a particular argument of this callable.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>the argument index to fetch</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
index 3af152c7..2464f7e9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_caller_owns.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_caller_owns"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITransfer</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_caller_owns</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_get_caller_owns</title>
+<synopsis><code mime="text/x-csrc">
+GITransfer g_callable_info_get_caller_owns (GICallableInfo* info);
+</code></synopsis>
 <p>See whether the caller owns the return value of this callable.
-<link xref="GITransfer">GITransfer</link> contains a list of possible transfer values.</p></page>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible transfer values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the caller owns the return value, %FALSE otherwise.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
index 4d3ff478..7ab4bcd4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_n_args.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_n_args"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_n_args</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_get_n_args</title>
-<p>Obtain the number of arguments (both IN and OUT) for this callable.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_callable_info_get_n_args (GICallableInfo* info);
+</code></synopsis>
+<p>Obtain the number of arguments (both IN and OUT) for this callable.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The number of arguments this callable expects.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
index 9413f4b8..45290de8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_attribute.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_return_attribute"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_return_attribute</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_get_return_attribute</title>
-<p>Retrieve an arbitrary attribute associated with the return value.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_callable_info_get_return_attribute (GICallableInfo* info,
+                                             gchar* name);
+</code></synopsis>
+<p>Retrieve an arbitrary attribute associated with the return value.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a freeform string naming an attribute</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The value of the attribute, or %NULL if no such attribute exists</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
index 729d8438..b2199374 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_get_return_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_return_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_return_type</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_get_return_type</title>
-<p>Obtain the return type of a callable item as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_callable_info_get_return_type (GICallableInfo* info);
+</code></synopsis>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
index 9a76370c..2e38de20 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_iterate_return_attributes.page
@@ -1,15 +1,69 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_iterate_return_attributes"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_callable_info_iterate_return_attributes</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIAttributeIter*</api:type>
+        <api:name>iterator</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>char**</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>char**</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_iterate_return_attributes</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_callable_info_iterate_return_attributes (GICallableInfo* info,
+                                                    GIAttributeIter* iterator,
+                                                    char** name,
+                                                    char** value);
+</code></synopsis>
 <p>Iterate over all attributes associated with the return value.  The
 iterator structure is typically stack allocated, and must have its
 first member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
 and must not be freed.</p><p>See g_base_info_iterate_attributes() for an example of how to use a
-similar API.</p></page>
+similar API.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>iterator :</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if there are more attributes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
index c00ca542..9dd576a6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_arg.page
@@ -1,13 +1,58 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_load_arg"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>g_callable_info_load_arg</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgInfo*</api:type>
+        <api:name>arg</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_load_arg</title>
+<synopsis><code mime="text/x-csrc">
+void g_callable_info_load_arg (GICallableInfo* info,
+                               gint n,
+                               GIArgInfo* arg);
+</code></synopsis>
 <p>Obtain information about a particular argument of this callable; this
 function is a variant of g_callable_info_get_arg() designed for stack
-allocation.</p><p>The initialized @arg must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @arg must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>the argument index to fetch</p></td>
+</tr>
+<tr>
+<td><p>arg :</p></td>
+<td><p>Initialize with argument number @n</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
index e64c6e92..47fc89c0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_load_return_type.page
@@ -1,13 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_load_return_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>g_callable_info_load_return_type</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_load_return_type</title>
+<synopsis><code mime="text/x-csrc">
+void g_callable_info_load_return_type (GICallableInfo* info,
+                                       GITypeInfo* type);
+</code></synopsis>
 <p>Obtain information about a return value of callable; this
 function is a variant of g_callable_info_get_return_type() designed for stack
-allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>type :</p></td>
+<td><p>Initialized with return type of @info</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
index 59ef2af1..08d4639d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_may_return_null.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_may_return_null"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_callable_info_may_return_null</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_may_return_null</title>
-<p>See if a callable could return %NULL.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_callable_info_may_return_null (GICallableInfo* info);
+</code></synopsis>
+<p>See if a callable could return %NULL.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if callable could return %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
index 0e9fa95f..142d2bbd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.callable_info_skip_return.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_skip_return"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_callable_info_skip_return</api:name>
+      <api:arg>
+        <api:type>GICallableInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_callable_info_skip_return</title>
-<p>See if a callable's return value is only useful in C.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_callable_info_skip_return (GICallableInfo* info);
+</code></synopsis>
+<p>See if a callable's return value is only useful in C.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if return value is only useful in C.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
new file mode 100644
index 00000000..dd13a310
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_free_value.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.constant_info_free_value"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>g_constant_info_free_value</api:name>
+      <api:arg>
+        <api:type>GIConstantInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>g_constant_info_free_value</title>
+<synopsis><code mime="text/x-csrc">
+void g_constant_info_free_value (GIConstantInfo* info,
+                                 GIArgument* value);
+</code></synopsis>
+<p>Free the value returned from g_constant_info_get_value().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>the argument</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+<p>Since 1.30.1</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
index 9e4309b6..50ee4dfd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.constant_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_constant_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIConstantInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_constant_info_get_type</title>
-<p>Obtain the type of the constant as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_constant_info_get_type (GIConstantInfo* info);
+</code></synopsis>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
index e004e64e..c2747442 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.constant_info_get_value.page
@@ -1,13 +1,50 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.constant_info_get_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_constant_info_get_value</api:name>
+      <api:arg>
+        <api:type>GIConstantInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_constant_info_get_value</title>
-<p>Obtain the value associated with the <link xref="GIConstantInfo">GIConstantInfo</link> and store it in the
+<synopsis><code mime="text/x-csrc">
+gint g_constant_info_get_value (GIConstantInfo* info,
+                                GIArgument* value);
+</code></synopsis>
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link> and store it in the
 @value parameter. @argument needs to be allocated before passing it in.
-The size of the constant value stored in @argument will be returned.</p></page>
+The size of the constant value stored in @argument will be returned.
+Free the value with g_constant_info_free_value().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>an argument</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the constant</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page
index 6dc3ff4b..b08c6581 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_error_domain.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_error_domain"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_error_domain</api:name>
+      <api:arg>
+        <api:type>GIEnumInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_enum_info_get_error_domain</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_enum_info_get_error_domain (GIEnumInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
new file mode 100644
index 00000000..c8c0ba6f
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_method.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.enum_info_get_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIEnumInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>g_enum_info_get_method</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_enum_info_get_method (GIEnumInfo* info,
+                                        gint n);
+</code></synopsis>
+<p>Obtain an enum type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
new file mode 100644
index 00000000..99db1419
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_methods.page
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.enum_info_get_n_methods"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIEnumInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>g_enum_info_get_n_methods</title>
+<synopsis><code mime="text/x-csrc">
+gint g_enum_info_get_n_methods (GIEnumInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods that this enum type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page
index 4ff16624..6ac04975 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_n_values.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_n_values"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_n_values</api:name>
+      <api:arg>
+        <api:type>GIEnumInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_enum_info_get_n_values</title>
+<synopsis><code mime="text/x-csrc">
+gint g_enum_info_get_n_values (GIEnumInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
index 5ee1eebb..0a599f0c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_storage_type.page
@@ -1,15 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_storage_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeTag</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_storage_type</api:name>
+      <api:arg>
+        <api:type>GIEnumInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_enum_info_get_storage_type</title>
+<synopsis><code mime="text/x-csrc">
+GITypeTag g_enum_info_get_storage_type (GIEnumInfo* info);
+</code></synopsis>
 <p>Obtain the tag of the type used for the enum in the C ABI. This will
 will be a signed or unsigned integral type.
 Note that in the current implementation the width of the type is
 computed correctly, but the signed or unsigned nature of the type
-may not match the sign of the type used by the C compiler.</p></page>
+may not match the sign of the type used by the C compiler.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the storage type for the enumeration</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
index 86075c72..648d5fde 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.enum_info_get_value.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIValueInfo*</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_value</api:name>
+      <api:arg>
+        <api:type>GIEnumInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_enum_info_get_value</title>
-<p>Obtain a value for this enumeration.</p><p>free the struct with g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIValueInfo* g_enum_info_get_value (GIEnumInfo* info,
+                                    gint n);
+</code></synopsis>
+<p>Obtain a value for this enumeration.</p><p>free the struct with g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of value to fetch</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the enumeration value or %NULL if type tag is wrong,</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
index 2435dbd7..c7672099 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_field.page
@@ -1,14 +1,59 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIFieldInfo*</api:type>
+        <api:name>field_info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gpointer</api:type>
+        <api:name>mem</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_field_info_get_field</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_field_info_get_field (GIFieldInfo* field_info,
+                                 gpointer mem,
+                                 GIArgument* value);
+</code></synopsis>
 <p>Reads a field identified by a <link xref="GFieldInfo">GFieldInfo</link> from a C structure or
 union.  This only handles fields of simple C types. It will fail
 for a field of a composite type like a nested structure or union
-even if that is actually readable.</p></page>
+even if that is actually readable.</p>
+
+<table>
+<tr>
+<td><p>field_info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>mem :</p></td>
+<td><p>pointer to a block of memory representing a C structure or union</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>a <link xref="GIArgument">GIArgument</link> into which to store the value retrieved</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if reading the field succeeded, otherwise %FALSE</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
index cac65ed5..eee2a089 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_flags.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFieldInfoFlags</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIFieldInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_field_info_get_flags</title>
-<p>Obtain the flags for this <link xref="GIFieldInfo">GIFieldInfo</link>. See <link xref="GIFieldInfoFlags">GIFieldInfoFlags</link> for possible
-flag values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfoFlags g_field_info_get_flags (GIFieldInfo* info);
+</code></synopsis>
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIRepository.FieldInfoFlags</link> for possible
+flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
index 406c67f7..343ae75b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_offset.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_offset"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_offset</api:name>
+      <api:arg>
+        <api:type>GIFieldInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_field_info_get_offset</title>
+<synopsis><code mime="text/x-csrc">
+gint g_field_info_get_offset (GIFieldInfo* info);
+</code></synopsis>
 <p>Obtain the offset in bits of the field member, this is relative
-to the beginning of the struct or union.</p></page>
+to the beginning of the struct or union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the field offset</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
index 6c4534b0..76719c94 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_size.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_size</api:name>
+      <api:arg>
+        <api:type>GIFieldInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_field_info_get_size</title>
+<synopsis><code mime="text/x-csrc">
+gint g_field_info_get_size (GIFieldInfo* info);
+</code></synopsis>
 <p>Obtain the size in bits of the field member, this is how
-much space you need to allocate to store the field.</p></page>
+much space you need to allocate to store the field.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the field size</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
index 9f0de8ac..28706303 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_get_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIFieldInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_field_info_get_type</title>
-<p>Obtain the type of a field as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_field_info_get_type (GIFieldInfo* info);
+</code></synopsis>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
index 81eac7eb..624c4278 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.field_info_set_field.page
@@ -1,16 +1,61 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_set_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_field_info_set_field</api:name>
+      <api:arg>
+        <api:type>GIFieldInfo*</api:type>
+        <api:name>field_info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gpointer</api:type>
+        <api:name>mem</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_field_info_set_field</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_field_info_set_field (GIFieldInfo* field_info,
+                                 gpointer mem,
+                                 GIArgument* value);
+</code></synopsis>
 <p>Writes a field identified by a <link xref="GFieldInfo">GFieldInfo</link> to a C structure or
 union.  This only handles fields of simple C types. It will fail
 for a field of a composite type like a nested structure or union
 even if that is actually writable. Note also that that it will refuse
 to write fields where memory management would by required. A field
-with a type such as 'char *' must be set with a setter function.</p></page>
+with a type such as 'char *' must be set with a setter function.</p>
+
+<table>
+<tr>
+<td><p>field_info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>mem :</p></td>
+<td><p>pointer to a block of memory representing a C structure or union</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>a <link xref="GIArgument">GIArgument</link> holding the value to store</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if writing the field succeeded, otherwise %FALSE</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
index 1f5a9882..06e35cdc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_flags.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfoFlags</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIFunctionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_function_info_get_flags</title>
-<p>Obtain the <link xref="GIFunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfoFlags g_function_info_get_flags (GIFunctionInfo* info);
+</code></synopsis>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIRepository.FunctionInfoFlags</link> for the @info.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
index f1c9b2a0..0a58368d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_property.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_property"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIPropertyInfo*</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_property</api:name>
+      <api:arg>
+        <api:type>GIFunctionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_function_info_get_property</title>
-<p>Obtain the property associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
+<synopsis><code mime="text/x-csrc">
+GIPropertyInfo* g_function_info_get_property (GIFunctionInfo* info);
+</code></synopsis>
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
 %GI_FUNCTION_IS_SETTER have a property set. For other cases,
-%NULL will be returned.</p><p>g_base_info_unref() when done.</p></page>
+%NULL will be returned.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the property or %NULL if not set. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
index b34d0d88..69a18a9b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_symbol.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_symbol"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_symbol</api:name>
+      <api:arg>
+        <api:type>GIFunctionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_function_info_get_symbol</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_function_info_get_symbol (GIFunctionInfo* info);
+</code></synopsis>
 <p>Obtain the symbol of the function. The symbol is the name of the
 exported function, suitable to be used as an argument to
-g_module_symbol().</p></page>
+g_module_symbol().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
index 6187a76d..e36ee57a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_get_vfunc.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfo*</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_vfunc</api:name>
+      <api:arg>
+        <api:type>GIFunctionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_function_info_get_vfunc</title>
-<p>Obtain the virtual function associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
-a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_function_info_get_vfunc (GIFunctionInfo* info);
+</code></synopsis>
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
+a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the virtual function or %NULL if not set.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
index c2b73a45..318ccc93 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.function_info_invoke.page
@@ -1,16 +1,88 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_invoke"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_function_info_invoke</api:name>
+      <api:arg>
+        <api:type>GIFunctionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>int</api:type>
+        <api:name>n_in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>int</api:type>
+        <api:name>n_out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>return_value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_function_info_invoke</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_function_info_invoke (GIFunctionInfo* info,
+                                 GIArgument* in_args,
+                                 int n_in_args,
+                                 GIArgument* out_args,
+                                 int n_out_args,
+                                 GIArgument* return_value);
+</code></synopsis>
 <p>Invokes the function described in @info with the given
 arguments. Note that inout parameters must appear in both
 argument lists. This function uses dlsym() to obtain a pointer
 to the function, so the library or shared object containing the
 described function must either be linked to the caller, or must
-have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>error occurred.</p></page>
+have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>error occurred.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> describing the function to invoke</p></td>
+</tr>
+<tr>
+<td><p>in_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_in_args :</p></td>
+<td><p>the length of the @in_args array</p></td>
+</tr>
+<tr>
+<td><p>out_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_out_args :</p></td>
+<td><p>the length of the @out_args array</p></td>
+</tr>
+<tr>
+<td><p>return_value :</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the function has been invoked, %FALSE if an</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page
index 75cbf8d7..9942e803 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_new.page
@@ -1,11 +1,65 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.info_new"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_info_new</api:name>
+      <api:arg>
+        <api:type>GIInfoType</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIBaseInfo*</api:type>
+        <api:name>container</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GITypelib*</api:type>
+        <api:name>typelib</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>guint32</api:type>
+        <api:name>offset</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_info_new</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_info_new (GIInfoType type,
+                        GIBaseInfo* container,
+                        GITypelib* typelib,
+                        guint32 offset);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>container :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>typelib :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>offset :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page
index 8102182b..1b45b230 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.info_type_to_string.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.info_type_to_string"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_info_type_to_string</api:name>
+      <api:arg>
+        <api:type>GIInfoType</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_info_type_to_string</title>
-<p>Obtain a string representation of @type</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_info_type_to_string (GIInfoType type);
+</code></synopsis>
+<p>Obtain a string representation of @type</p>
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td><p>the info type</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the string</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
index b4f7a269..6c4df0d9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_method.page
@@ -1,12 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_find_method</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_interface_info_find_method (GIInterfaceInfo* info,
+                                              gchar* name);
+</code></synopsis>
 <p>Obtain a method of the interface type given a @name. %NULL will be
-returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p></page>
+returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> or %NULL if none found.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
index 6b5878f6..d78596e6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_find_vfunc.page
@@ -1,12 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_find_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_find_vfunc</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_find_vfunc</title>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_interface_info_find_vfunc (GIInterfaceInfo* info,
+                                          gchar* name);
+</code></synopsis>
 <p>Locate a virtual function slot with name @name. See the documentation
-for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_info_unref() when done.</p></page>
+for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>The name of a virtual function to find.</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
index 8f3e1e84..5634b169 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_constant.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_constant"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIConstantInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_constant</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_constant</title>
-<p>Obtain an interface type constant at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIConstantInfo* g_interface_info_get_constant (GIInterfaceInfo* info,
+                                               gint n);
+</code></synopsis>
+<p>Obtain an interface type constant at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of constant to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
index d8ac1a76..89d83a5e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_iface_struct.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_iface_struct"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIStructInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_iface_struct</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_iface_struct</title>
-<p>Returns the layout C structure associated with this <link xref="GInterface">GInterface</link>.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIStructInfo* g_interface_info_get_iface_struct (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Returns the layout C structure associated with this <link xref="GInterface">GInterface</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
index 3de6eee7..f98c84f8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_method.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_method</title>
-<p>Obtain an interface type method at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_interface_info_get_method (GIInterfaceInfo* info,
+                                             gint n);
+</code></synopsis>
+<p>Obtain an interface type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
index 03c41fb1..7139f14c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_constants.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_constants"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_constants</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_n_constants</title>
-<p>Obtain the number of constants that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_constants (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of constants that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of constants</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
index 138954b9..2ea816f4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_methods.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_n_methods</title>
-<p>Obtain the number of methods that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_methods (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
index 8b6456b4..712f2d14 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_prerequisites.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_prerequisites"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_prerequisites</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_n_prerequisites</title>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_prerequisites (GIInterfaceInfo* info);
+</code></synopsis>
 <p>Obtain the number of prerequisites for this interface type.
 A prerequisites is another interface that needs to be implemented for
-interface, similar to an base class for GObjects.</p></page>
+interface, similar to an base class for GObjects.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of prerequisites</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
index 9856351e..f0805f58 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_properties.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_properties"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_properties</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_n_properties</title>
-<p>Obtain the number of properties that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_properties (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of properties that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of properties</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
index e9070e99..79bff47d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_signals.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_signals"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_signals</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_n_signals</title>
-<p>Obtain the number of signals that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_signals (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of signals that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of signals</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
index aa048198..3e202f22 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_n_vfuncs.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_vfuncs"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_vfuncs</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_n_vfuncs</title>
-<p>Obtain the number of virtual functions that this interface type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_interface_info_get_n_vfuncs (GIInterfaceInfo* info);
+</code></synopsis>
+<p>Obtain the number of virtual functions that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of virtual functions</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
index 095f4bae..db11a191 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_prerequisite.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_prerequisite"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_prerequisite</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_prerequisite</title>
-<p>Obtain an interface type prerequisites index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_interface_info_get_prerequisite (GIInterfaceInfo* info,
+                                               gint n);
+</code></synopsis>
+<p>Obtain an interface type prerequisites index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of prerequisites to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
index 44609b31..366d742b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_property.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_property"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIPropertyInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_property</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_property</title>
-<p>Obtain an interface type property at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIPropertyInfo* g_interface_info_get_property (GIInterfaceInfo* info,
+                                               gint n);
+</code></synopsis>
+<p>Obtain an interface type property at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of property to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
index 046a6c49..f8ef5592 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_signal.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GISignalInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_signal</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_signal</title>
-<p>Obtain an interface type signal at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_interface_info_get_signal (GIInterfaceInfo* info,
+                                           gint n);
+</code></synopsis>
+<p>Obtain an interface type signal at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of signal to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
index 7bf28868..6e7c62dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.interface_info_get_vfunc.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfo*</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_vfunc</api:name>
+      <api:arg>
+        <api:type>GIInterfaceInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_interface_info_get_vfunc</title>
-<p>Obtain an interface type virtual function at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_interface_info_get_vfunc (GIInterfaceInfo* info,
+                                         gint n);
+</code></synopsis>
+<p>Obtain an interface type virtual function at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of virtual function to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page
index 5b8f56e8..d59baa93 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.invoke_error_quark.page
@@ -1,11 +1,30 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.invoke_error_quark"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GQuark</api:type>
+      </api:returns>
+      <api:name>g_invoke_error_quark</api:name>
+    </api:function>
   </info>
   <title>g_invoke_error_quark</title>
+<synopsis><code mime="text/x-csrc">
+GQuark g_invoke_error_quark (void);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
index b942d98b..269351b6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.nvokeError.page
@@ -1,11 +1,13 @@
 <?xml version="1.0"?>
 <page id="GIRepository.nvokeError"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
-  <title>GIRepositorynvokeError</title>
+  <title>GIRepository.nvokeError</title>
 <p>An error occuring while invoking a function via
-g_function_info_invoke().</p></page>
+g_function_info_invoke().</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
index 5e99574c..ebf712a1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
@@ -1,12 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_find_method</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_object_info_find_method (GIObjectInfo* info,
+                                           gchar* name);
+</code></synopsis>
 <p>Obtain a method of the object type given a @name. %NULL will be
-returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p></page>
+returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
index a30510e0..a4a57f68 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method_using_interfaces.page
@@ -1,14 +1,59 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_method_using_interfaces"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_method_using_interfaces</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIObjectInfo**</api:type>
+        <api:name>implementor</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_find_method_using_interfaces</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_object_info_find_method_using_interfaces (GIObjectInfo* info,
+                                                            gchar* name,
+                                                            GIObjectInfo** implementor);
+</code></synopsis>
 <p>Obtain a method of the object given a @name, searching both the
 object @info and any interfaces it implements.  %NULL will be
 returned if there's no method available with that name.</p><p>Note that this function does *not* search parent classes; you will have
-to chain up if that's desired.</p><p>g_base_info_unref() when done.</p></page>
+to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>implementor :</p></td>
+<td><p>The implementor of the interface</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
index 3b7662c4..2e451f9e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_signal.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GISignalInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_signal</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_find_signal</title>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_object_info_find_signal (GIObjectInfo* info,
+                                         gchar* name);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Name of signal</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Info for the signal with name @name in @info, or %NULL on failure.</p></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
index d3f7990f..0a99d39f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_vfunc.page
@@ -1,17 +1,53 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_vfunc</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_find_vfunc</title>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_object_info_find_vfunc (GIObjectInfo* info,
+                                       gchar* name);
+</code></synopsis>
 <p>Locate a virtual function slot with name @name. Note that the namespace
 for virtuals is distinct from that of methods; there may or may not be
 a concrete method associated for a virtual. If there is one, it may
 be retrieved using g_vfunc_info_get_invoker(), otherwise %NULL will be
 returned.
 See the documentation for g_vfunc_info_get_invoker() for more
-information on invoking virtuals.</p><p>g_base_info_unref() when done.</p></page>
+information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>The name of a virtual function to find.</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
index 068650fe..2b5c7c5b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_abstract.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_abstract"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_abstract</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_abstract</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_object_info_get_abstract (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain if the object type is an abstract type, eg if it cannot be
-instantiated</p></page>
+instantiated</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the object type is abstract</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
index 8da2729c..ddb04488 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_class_struct.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_class_struct"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIStructInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_class_struct</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_class_struct</title>
+<synopsis><code mime="text/x-csrc">
+GIStructInfo* g_object_info_get_class_struct (GIObjectInfo* info);
+</code></synopsis>
 <p>Every <link xref="GObject">GObject</link> has two structures; an instance structure and a class
-structure.  This function returns the metadata for the class structure.</p><p>g_base_info_unref() when done.</p></page>
+structure.  This function returns the metadata for the class structure.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or %NULL. Free with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
index bcf08e83..3064b45f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_constant.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_constant"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIConstantInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_constant</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_constant</title>
-<p>Obtain an object type constant at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIConstantInfo* g_object_info_get_constant (GIObjectInfo* info,
+                                            gint n);
+</code></synopsis>
+<p>Obtain an object type constant at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of constant to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
index 22cc7019..cb46abbe 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_field.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFieldInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_field</title>
-<p>Obtain an object type field at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfo* g_object_info_get_field (GIObjectInfo* info,
+                                      gint n);
+</code></synopsis>
+<p>Obtain an object type field at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of field to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
index b8cd0420..b0f52449 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_fundamental.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_fundamental"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_fundamental</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_fundamental</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_object_info_get_fundamental (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain if the object type is of a fundamental type which is not
-G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p></page>
+G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the object type is a fundamental type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
index 9d81004e..912a70fc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function.page
@@ -1,15 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_get_value_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>char*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_get_value_function</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_get_value_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_get_value_function (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to convert
 an object instance pointer of this object type to a GValue.
 I's mainly used fundamental types. The type signature for the symbol
 is %GIObjectInfoGetValueFunction, to fetch the function pointer
-see g_object_info_get_get_value_function().</p></page>
+see g_object_info_get_get_value_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
index 2226ead8..94ade854 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_get_value_function_pointer.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_get_value_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIObjectInfoGetValueFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_get_value_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_get_value_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoGetValueFunction g_object_info_get_get_value_function_pointer (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 extract an instance of this object type out of a GValue.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
index 63c791fe..d751b2f3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_interface.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_interface"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIInterfaceInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_interface</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_interface</title>
-<p>Obtain an object type interface at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIInterfaceInfo* g_object_info_get_interface (GIObjectInfo* info,
+                                              gint n);
+</code></synopsis>
+<p>Obtain an object type interface at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of interface to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
index a657b4ef..b62b9ead 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_method.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_method</title>
-<p>Obtain an object type method at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_object_info_get_method (GIObjectInfo* info,
+                                          gint n);
+</code></synopsis>
+<p>Obtain an object type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
index 35370474..c52ca1d0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_constants.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_constants"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_constants</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_constants</title>
-<p>Obtain the number of constants that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_constants (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of constants that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of constants</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
index 20bf1c24..99d7f6ea 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_fields.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_fields"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_fields</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_fields</title>
-<p>Obtain the number of fields that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_fields (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of fields that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
index 45145245..421d938f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_interfaces.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_interfaces"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_interfaces</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_interfaces</title>
-<p>Obtain the number of interfaces that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_interfaces (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of interfaces that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of interfaces</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
index a6b4f80c..867bb57c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_methods.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_methods</title>
-<p>Obtain the number of methods that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_methods (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
index 3b1a3f12..cb1b65b9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_properties.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_properties"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_properties</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_properties</title>
-<p>Obtain the number of properties that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_properties (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of properties that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of properties</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
index 95e3d50e..73ae0e99 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_signals.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_signals"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_signals</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_signals</title>
-<p>Obtain the number of signals that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_signals (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of signals that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of signals</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
index 5a016876..4d9bc224 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_n_vfuncs.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_vfuncs"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_vfuncs</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_n_vfuncs</title>
-<p>Obtain the number of virtual functions that this object type has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_object_info_get_n_vfuncs (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the number of virtual functions that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of virtual functions</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
index ea52bca7..158773e8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_parent.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_parent"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIObjectInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_parent</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_parent</title>
-<p>Obtain the parent of the object type.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfo* g_object_info_get_parent (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the parent of the object type.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
index b827f850..21701c66 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_property.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_property"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIPropertyInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_property</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_property</title>
-<p>Obtain an object type property at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIPropertyInfo* g_object_info_get_property (GIObjectInfo* info,
+                                            gint n);
+</code></synopsis>
+<p>Obtain an object type property at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of property to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
index 25d8406a..b0aba2d4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_ref_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>char*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_ref_function</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_ref_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_ref_function (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to ref this
 object type. It's mainly used fundamental types. The type signature for
 the symbol is %GIObjectInfoRefFunction, to fetch the function pointer
-see g_object_info_get_ref_function().</p></page>
+see g_object_info_get_ref_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
index 56a3c3db..67263ae0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_ref_function_pointer.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_ref_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIObjectInfoRefFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_ref_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_ref_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoRefFunction g_object_info_get_ref_function_pointer (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 increase the reference count an instance of this object type.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
index 5cdb04c7..950070a4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function.page
@@ -1,15 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_set_value_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>char*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_set_value_function</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_set_value_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_set_value_function (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to convert
 set a GValue giving an object instance pointer of this object type.
 I's mainly used fundamental types. The type signature for the symbol
 is %GIObjectInfoSetValueFunction, to fetch the function pointer
-see g_object_info_get_set_value_function().</p></page>
+see g_object_info_get_set_value_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
index 0177dbce..442d6020 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_set_value_function_pointer.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_set_value_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIObjectInfoSetValueFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_set_value_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_set_value_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoSetValueFunction g_object_info_get_set_value_function_pointer (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 set a GValue given an instance of this object type.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
index b33d72c9..ed92e254 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_signal.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GISignalInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_signal</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_signal</title>
-<p>Obtain an object type signal at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_object_info_get_signal (GIObjectInfo* info,
+                                        gint n);
+</code></synopsis>
+<p>Obtain an object type signal at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of signal to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
index 76aa19de..a21b5b3f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_init.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_type_init"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_type_init</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_type_init</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_object_info_get_type_init (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain the function which when called will return the GType
-function for which this object type is registered.</p></page>
+function for which this object type is registered.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type init function</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
index 89a2a880..a67af92d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_type_name.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_type_name"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_type_name</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_type_name</title>
-<p>Obtain the name of the objects class/type.</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_object_info_get_type_name (GIObjectInfo* info);
+</code></synopsis>
+<p>Obtain the name of the objects class/type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>name of the objects type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
index 4597c898..9b3b2f46 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_unref_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>char*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_unref_function</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_unref_function</title>
+<synopsis><code mime="text/x-csrc">
+char* g_object_info_get_unref_function (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to unref this
 object type. It's mainly used fundamental types. The type signature for
 the symbol is %GIObjectInfoUnrefFunction, to fetch the function pointer
-see g_object_info_get_unref_function().</p></page>
+see g_object_info_get_unref_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
index a152b760..775ece37 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_unref_function_pointer.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_unref_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIObjectInfoUnrefFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_unref_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_unref_function_pointer</title>
+<synopsis><code mime="text/x-csrc">
+GIObjectInfoUnrefFunction g_object_info_get_unref_function_pointer (GIObjectInfo* info);
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 decrease the reference count an instance of this object type.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
index fe27e3e2..846fc455 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_get_vfunc.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfo*</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_vfunc</api:name>
+      <api:arg>
+        <api:type>GIObjectInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_object_info_get_vfunc</title>
-<p>Obtain an object type virtual function at index @n.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_object_info_get_vfunc (GIObjectInfo* info,
+                                      gint n);
+</code></synopsis>
+<p>Obtain an object type virtual function at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of virtual function to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
index eecc6931..5e41efef 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_flags.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.property_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GParamFlags</api:type>
+      </api:returns>
+      <api:name>g_property_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIPropertyInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_property_info_get_flags</title>
+<synopsis><code mime="text/x-csrc">
+GParamFlags g_property_info_get_flags (GIPropertyInfo* info);
+</code></synopsis>
 <p>Obtain the flags for this property info. See <link xref="GParamFags">GParamFags</link> for
-more information about possible flag values.</p></page>
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
index fc24387f..990754fb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_ownership_transfer.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.property_info_get_ownership_transfer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITransfer</api:type>
+      </api:returns>
+      <api:name>g_property_info_get_ownership_transfer</api:name>
+      <api:arg>
+        <api:type>GIPropertyInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_property_info_get_ownership_transfer</title>
-<p>Obtain the ownership transfer for this property. See <link xref="GITransfer">GITransfer</link> for more
-information about transfer values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITransfer g_property_info_get_ownership_transfer (GIPropertyInfo* info);
+</code></synopsis>
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GIRepository.Transfer</link> for more
+information about transfer values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the transfer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
index 4f49dbe6..e069cdad 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.property_info_get_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.property_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_property_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIPropertyInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_property_info_get_type</title>
-<p>Obtain the type information for the property @info.</p><p>g_base_info_unref() when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_property_info_get_type (GIPropertyInfo* info);
+</code></synopsis>
+<p>Obtain the type information for the property @info.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
index 30098eb7..419336b2 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_g_type.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.registered_type_info_get_g_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GType</api:type>
+      </api:returns>
+      <api:name>g_registered_type_info_get_g_type</api:name>
+      <api:arg>
+        <api:type>GIRegisteredTypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_registered_type_info_get_g_type</title>
+<synopsis><code mime="text/x-csrc">
+GType g_registered_type_info_get_g_type (GIRegisteredTypeInfo* info);
+</code></synopsis>
 <p>Obtain the <link xref="GType">GType</link> for this registered type or G_TYPE_NONE which a special meaning.
 It means that either there is no type information associated with this @info or
 that the shared library which provides the type_init function for this
-@info cannot be called.</p></page>
+@info cannot be called.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GType">GType</link>.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
index fe71e6b7..b82f0a0f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_init.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.registered_type_info_get_type_init"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_registered_type_info_get_type_init</api:name>
+      <api:arg>
+        <api:type>GIRegisteredTypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_registered_type_info_get_type_init</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_registered_type_info_get_type_init (GIRegisteredTypeInfo* info);
+</code></synopsis>
 <p>Obtain the type init function for @info. The type init function is the
 function which will register the GType within the GObject type system.
 Usually this is not called by langauge bindings or applications, use
-g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_module_symbol().</p></page>
+g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_module_symbol().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol name of the type init function, suitable for</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
index a651f7c4..a1765091 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.registered_type_info_get_type_name.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.registered_type_info_get_type_name"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_registered_type_info_get_type_name</api:name>
+      <api:arg>
+        <api:type>GIRegisteredTypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_registered_type_info_get_type_name</title>
+<synopsis><code mime="text/x-csrc">
+gchar* g_registered_type_info_get_type_name (GIRegisteredTypeInfo* info);
+</code></synopsis>
 <p>Obtain the type name of the struct within the GObject type system.
-This type can be passed to g_type_name() to get a <link xref="GType">GType</link>.</p></page>
+This type can be passed to g_type_name() to get a <link xref="GType">GType</link>.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type name</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
index 05a465ac..29534f23 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_class_closure.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.signal_info_get_class_closure"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfo*</api:type>
+      </api:returns>
+      <api:name>g_signal_info_get_class_closure</api:name>
+      <api:arg>
+        <api:type>GISignalInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_signal_info_get_class_closure</title>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfo* g_signal_info_get_class_closure (GISignalInfo* info);
+</code></synopsis>
 <p>Obtain the class closure for this signal if one is set. The class
 closure is a virtual function on the type that the signal belongs to.
-If the signal lacks a closure %NULL will be returned.</p></page>
+If the signal lacks a closure %NULL will be returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the class closure or %NULL</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
index 763e4bf9..bbd3180b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_get_flags.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.signal_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GSignalFlags</api:type>
+      </api:returns>
+      <api:name>g_signal_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GISignalInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_signal_info_get_flags</title>
+<synopsis><code mime="text/x-csrc">
+GSignalFlags g_signal_info_get_flags (GISignalInfo* info);
+</code></synopsis>
 <p>Obtain the flags for this signal info. See <link xref="GSignalFlags">GSignalFlags</link> for
-more information about possible flag values.</p></page>
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
index 02cc1b87..e986f96c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.signal_info_true_stops_emit.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.signal_info_true_stops_emit"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_signal_info_true_stops_emit</api:name>
+      <api:arg>
+        <api:type>GISignalInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_signal_info_true_stops_emit</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_signal_info_true_stops_emit (GISignalInfo* info);
+</code></synopsis>
 <p>Obtain if the returning true in the signal handler will
-stop the emission of the signal.</p></page>
+stop the emission of the signal.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if returning true stops the signal emission</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
index 9c446c55..5d7da64c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_find_method.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_struct_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_find_method</title>
-<p>Obtain the type information for method named @name.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_struct_info_find_method (GIStructInfo* info,
+                                           gchar* name);
+</code></synopsis>
+<p>Obtain the type information for method named @name.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a method name</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
index 7cb4a806..412b9c27 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_alignment.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_alignment"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_alignment</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_get_alignment</title>
-<p>Obtain the required alignment of the structure.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_struct_info_get_alignment (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the required alignment of the structure.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>required alignment in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
index 5da3e831..7baf0de6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_field.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFieldInfo*</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_get_field</title>
-<p>Obtain the type information for field with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfo* g_struct_info_get_field (GIStructInfo* info,
+                                      gint n);
+</code></synopsis>
+<p>Obtain the type information for field with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
index 6bbdb1a4..2ef40a5f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_method.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_get_method</title>
-<p>Obtain the type information for method with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_struct_info_get_method (GIStructInfo* info,
+                                          gint n);
+</code></synopsis>
+<p>Obtain the type information for method with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a method index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
index 210f747d..ae21e5dc 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_fields.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_n_fields"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_n_fields</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_get_n_fields</title>
-<p>Obtain the number of fields this structure has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_struct_info_get_n_fields (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the number of fields this structure has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
index 2e1e8739..00ab1074 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_n_methods.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_get_n_methods</title>
-<p>Obtain the number of methods this structure has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_struct_info_get_n_methods (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods this structure has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
index 738ce9a1..170bd82e 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_get_size.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_size</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_get_size</title>
-<p>Obtain the total size of the structure.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_struct_info_get_size (GIStructInfo* info);
+</code></synopsis>
+<p>Obtain the total size of the structure.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the structure in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page
index 2b266ef3..4e28d2bb 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_foreign.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_is_foreign"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_struct_info_is_foreign</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_is_foreign</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_struct_info_is_foreign (GIStructInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
index 3555b8e2..7a42b85c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.struct_info_is_gtype_struct.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_is_gtype_struct"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_struct_info_is_gtype_struct</api:name>
+      <api:arg>
+        <api:type>GIStructInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_struct_info_is_gtype_struct</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_struct_info_is_gtype_struct (GIStructInfo* info);
+</code></synopsis>
 <p>Return true if this structure represents the "class structure" for some
 <link xref="GObject">GObject</link> or <link xref="GInterface">GInterface</link>.  This function is mainly useful to hide this kind of structure
-from generated public APIs.</p></page>
+from generated public APIs.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if this is a class struct, %FALSE otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
index 8598d54d..def200be 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_fixed_size.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_array_fixed_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_array_fixed_size</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_get_array_fixed_size</title>
+<synopsis><code mime="text/x-csrc">
+gint g_type_info_get_array_fixed_size (GITypeInfo* info);
+</code></synopsis>
 <p>Obtain the fixed array size of the type. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the size or -1 if it's not an array</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
index b091016b..bcd94a74 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_length.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_array_length"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_array_length</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_get_array_length</title>
+<synopsis><code mime="text/x-csrc">
+gint g_type_info_get_array_length (GITypeInfo* info);
+</code></synopsis>
 <p>Obtain the array length of the type. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array length, or -1 if the type is not an array</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
index 17f87f21..29e33110 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_array_type.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_array_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIArrayType</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_array_type</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_get_array_type</title>
-<p>Obtain the array type for this type. See <link xref="GIArrayType">GIArrayType</link> for a list of
+<synopsis><code mime="text/x-csrc">
+GIArrayType g_type_info_get_array_type (GITypeInfo* info);
+</code></synopsis>
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIRepository.ArrayType</link> for a list of
 possible values. If the type tag of this type is not array, -1 will be
-returned.</p></page>
+returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array type or -1</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
index b12793b2..69d95e3f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_interface.page
@@ -1,14 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_interface"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIBaseInfo*</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_interface</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_get_interface</title>
+<synopsis><code mime="text/x-csrc">
+GIBaseInfo* g_type_info_get_interface (GITypeInfo* info);
+</code></synopsis>
 <p>For types which have <link xref="GI_TYPE_TAG_INTERFACE">GI_TYPE_TAG_INTERFACE</link> such as GObjects and boxed values,
 this function returns full information about the referenced type.  You can then
-inspect the type of the returned <link xref="GIBaseInfo">GIBaseInfo</link> to further query whether it is
-a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p></page>
+inspect the type of the returned <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> to further query whether it is
+a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
index e657da53..1e174ed4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_param_type.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_param_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_param_type</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_get_param_type</title>
-<p>Obtain the parameter type @n.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_type_info_get_param_type (GITypeInfo* info,
+                                        gint n);
+</code></synopsis>
+<p>Obtain the parameter type @n.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of the parameter</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the param type info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
index 6d5b4003..aaa367f0 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_get_tag.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_tag"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeTag</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_tag</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_get_tag</title>
-<p>Obtain the type tag for the type. See <link xref="GITypeTag">GITypeTag</link> for a list
-of type tags.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeTag g_type_info_get_tag (GITypeInfo* info);
+</code></synopsis>
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GIRepository.TypeTag</link> for a list
+of type tags.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type tag</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
index 89b3e45c..00129c25 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_pointer.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_is_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_type_info_is_pointer</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_is_pointer</title>
-<p>Obtain if the type is passed as a reference.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_type_info_is_pointer (GITypeInfo* info);
+</code></synopsis>
+<p>Obtain if the type is passed as a reference.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if it is a pointer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
index c0d8afcc..674f446f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_info_is_zero_terminated.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_is_zero_terminated"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_type_info_is_zero_terminated</api:name>
+      <api:arg>
+        <api:type>GITypeInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_info_is_zero_terminated</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_type_info_is_zero_terminated (GITypeInfo* info);
+</code></synopsis>
 <p>Obtain if the last element of the array is %NULL. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or %FALSE will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or %FALSE will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if zero terminated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page
index 82877848..03dc316c 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.type_tag_to_string.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_tag_to_string"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gchar*</api:type>
+      </api:returns>
+      <api:name>g_type_tag_to_string</api:name>
+      <api:arg>
+        <api:type>GITypeTag</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_type_tag_to_string</title>
-<p>Obtain a string representation of @type</p></page>
+<synopsis><code mime="text/x-csrc">
+gchar* g_type_tag_to_string (GITypeTag type);
+</code></synopsis>
+<p>Obtain a string representation of @type</p>
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td><p>the type_tag</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the string</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
index 991ae89c..3d88c323 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_find_method.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_union_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gchar*</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_find_method</title>
-<p>Obtain the type information for method named @name.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_union_info_find_method (GIUnionInfo* info,
+                                          gchar* name);
+</code></synopsis>
+<p>Obtain the type information for method named @name.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a method name</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
index 25fc4d88..c88852ab 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_alignment.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_alignment"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_alignment</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_alignment</title>
-<p>Obtain the required alignment of the union.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_union_info_get_alignment (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the required alignment of the union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>required alignment in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
index 974a1cba..9cc0106a 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator.page
@@ -1,13 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_discriminator"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIConstantInfo*</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_discriminator</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_discriminator</title>
+<synopsis><code mime="text/x-csrc">
+GIConstantInfo* g_union_info_get_discriminator (GIUnionInfo* info,
+                                                gint n);
+</code></synopsis>
 <p>Obtain discriminator value assigned for n-th union field, i.e. n-th
 union field is the active one if discriminator contains this
-constant.</p><p>when done.</p></page>
+constant.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a union field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page
index 9fa8c0e0..7d4b75f3 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_offset.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_discriminator_offset"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_discriminator_offset</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_discriminator_offset</title>
+<synopsis><code mime="text/x-csrc">
+gint g_union_info_get_discriminator_offset (GIUnionInfo* info);
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
index 2e31022b..f51155c1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_discriminator_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GITypeInfo*</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_discriminator_type</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_discriminator_type</title>
-<p>Obtain the type information of the union discriminator.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GITypeInfo* g_union_info_get_discriminator_type (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the type information of the union discriminator.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
index 77ff25a5..a9a03d09 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_field.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFieldInfo*</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_field</title>
-<p>Obtain the type information for field with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFieldInfo* g_union_info_get_field (GIUnionInfo* info,
+                                     gint n);
+</code></synopsis>
+<p>Obtain the type information for field with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
index bb541325..8c08e549 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_method.page
@@ -1,11 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_method</title>
-<p>Obtain the type information for method with specified index.</p><p>when done.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_union_info_get_method (GIUnionInfo* info,
+                                         gint n);
+</code></synopsis>
+<p>Obtain the type information for method with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a method index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
index 10e14728..e3cd6d41 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_fields.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_n_fields"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_n_fields</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_n_fields</title>
-<p>Obtain the number of fields this union has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_union_info_get_n_fields (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the number of fields this union has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
index 3c4b319e..ec10c17b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_n_methods.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_n_methods</title>
-<p>Obtain the number of methods this union has.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint g_union_info_get_n_methods (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the number of methods this union has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
index 3644d37b..e5aa879d 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_size.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_size</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_get_size</title>
-<p>Obtain the total size of the union.</p></page>
+<synopsis><code mime="text/x-csrc">
+gsize g_union_info_get_size (GIUnionInfo* info);
+</code></synopsis>
+<p>Obtain the total size of the union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the union in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
index 934cd89e..5c46a467 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_is_discriminated.page
@@ -1,11 +1,38 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_is_discriminated"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_union_info_is_discriminated</api:name>
+      <api:arg>
+        <api:type>GIUnionInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_union_info_is_discriminated</title>
-<p>Return true if this union contains discriminator field.</p></page>
+<synopsis><code mime="text/x-csrc">
+gboolean g_union_info_is_discriminated (GIUnionInfo* info);
+</code></synopsis>
+<p>Return true if this union contains discriminator field.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if this is a discriminated union, %FALSE otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
index 2c63b170..637db67b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.value_info_get_value.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.value_info_get_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint64</api:type>
+      </api:returns>
+      <api:name>g_value_info_get_value</api:name>
+      <api:arg>
+        <api:type>GIValueInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_value_info_get_value</title>
-<p>Obtain the enumeration value of the <link xref="GIValueInfo">GIValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
-return type is to allow both.</p></page>
+<synopsis><code mime="text/x-csrc">
+gint64 g_value_info_get_value (GIValueInfo* info);
+</code></synopsis>
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
+return type is to allow both.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the enumeration value. This will always be representable</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
index e0a94e3f..750128ed 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_address.page
@@ -1,12 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_address"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gpointer</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_address</api:name>
+      <api:arg>
+        <api:type>GIVFuncInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GType</api:type>
+        <api:name>implementor_gtype</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_vfunc_info_get_address</title>
+<synopsis><code mime="text/x-csrc">
+gpointer g_vfunc_info_get_address (GIVFuncInfo* info,
+                                   GType implementor_gtype);
+</code></synopsis>
 <p>This method will look up where inside the type struct of @implementor_gtype
-is the implementation for @info.</p></page>
+is the implementation for @info.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>implementor_gtype :</p></td>
+<td><p><link xref="GType">GType</link> implementing this virtual function</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>address to a function or %NULL if an error happened</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
index 46b3ad20..d6eafd9b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_flags.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIVFuncInfoFlags</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIVFuncInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_vfunc_info_get_flags</title>
-<p>Obtain the flags for this virtual function info. See <link xref="GIVFuncInfoFlags">GIVFuncInfoFlags</link> for
-more information about possible flag values.</p></page>
+<synopsis><code mime="text/x-csrc">
+GIVFuncInfoFlags g_vfunc_info_get_flags (GIVFuncInfo* info);
+</code></synopsis>
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIRepository.VFuncInfoFlags</link> for
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
index 117e9e29..d0550f30 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_invoker.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_invoker"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIFunctionInfo*</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_invoker</api:name>
+      <api:arg>
+        <api:type>GIVFuncInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_vfunc_info_get_invoker</title>
+<synopsis><code mime="text/x-csrc">
+GIFunctionInfo* g_vfunc_info_get_invoker (GIVFuncInfo* info);
+</code></synopsis>
 <p>If this virtual function has an associated invoker method, this
-method will return it.  An invoker method is a C entry point.</p><p>Not all virtuals will have invokers.</p><p>g_base_info_unref() when done.</p></page>
+method will return it.  An invoker method is a C entry point.</p><p>Not all virtuals will have invokers.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> or %NULL. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
index f5bc5f4e..f6423d8f 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_offset.page
@@ -1,12 +1,39 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_offset"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_offset</api:name>
+      <api:arg>
+        <api:type>GIVFuncInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_vfunc_info_get_offset</title>
+<synopsis><code mime="text/x-csrc">
+gint g_vfunc_info_get_offset (GIVFuncInfo* info);
+</code></synopsis>
 <p>Obtain the offset of the function pointer in the class struct. The value
-0xFFFF indicates that the struct offset is unknown.</p></page>
+0xFFFF indicates that the struct offset is unknown.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the struct offset or 0xFFFF if it's unknown</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
index 4a454563..2ae55cd1 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_get_signal.page
@@ -1,13 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GISignalInfo*</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_signal</api:name>
+      <api:arg>
+        <api:type>GIVFuncInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_vfunc_info_get_signal</title>
+<synopsis><code mime="text/x-csrc">
+GISignalInfo* g_vfunc_info_get_signal (GIVFuncInfo* info);
+</code></synopsis>
 <p>Obtain the signal for the virtual function if one is set.
 The signal comes from the object or interface to which
-this virtual function belongs.</p></page>
+this virtual function belongs.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the signal or %NULL if none set</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
index 3df88419..b12d431b 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.vfunc_info_invoke.page
@@ -1,13 +1,94 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_invoke"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_invoke</api:name>
+      <api:arg>
+        <api:type>GIVFuncInfo*</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GType</api:type>
+        <api:name>implementor</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>int</api:type>
+        <api:name>n_in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>int</api:type>
+        <api:name>n_out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIArgument*</api:type>
+        <api:name>return_value</api:name>
+      </api:arg>
+    </api:function>
   </info>
   <title>g_vfunc_info_invoke</title>
+<synopsis><code mime="text/x-csrc">
+gboolean g_vfunc_info_invoke (GIVFuncInfo* info,
+                              GType implementor,
+                              GIArgument* in_args,
+                              int n_in_args,
+                              GIArgument* out_args,
+                              int n_out_args,
+                              GIArgument* return_value);
+</code></synopsis>
 <p>Invokes the function described in @info with the given
 arguments. Note that inout parameters must appear in both
-argument lists.</p><p>error occurred.</p></page>
+argument lists.</p><p>error occurred.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> describing the virtual function to invoke</p></td>
+</tr>
+<tr>
+<td><p>implementor :</p></td>
+<td><p><link xref="GType">GType</link> of the type that implements this virtual function</p></td>
+</tr>
+<tr>
+<td><p>in_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_in_args :</p></td>
+<td><p>the length of the @in_args array</p></td>
+</tr>
+<tr>
+<td><p>out_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>n_out_args :</p></td>
+<td><p>the length of the @out_args array</p></td>
+</tr>
+<tr>
+<td><p>return_value :</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be %NULL</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>%TRUE if the function has been invoked, %FALSE if an</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-C-expected/index.page b/tests/doctool/GIRepository-2.0-C-expected/index.page
index badacf05..c1ce06a6 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/index.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/index.page
@@ -7,13 +7,13 @@
   <info>
   </info>
   <title>GIRepository Documentation</title>
-  <links type="topic" ui:expanded="yes" groups="class">
+  <links type="topic" ui:expanded="yes" groups="class" style="linklist">
     <title>Classes</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="function">
+  <links type="topic" ui:expanded="yes" groups="function" style="linklist">
     <title>Functions</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArgInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArgInfo.page
index c804fe08..8cddb854 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArgInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArgInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ArgInfo</title>
-<p>Represents an argument.</p></page>
+<p>Represents an argument.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
index 31a1f19e..876ab63c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
@@ -1,10 +1,31 @@
 <?xml version="1.0"?>
 <page id="GIRepository.ArrayType"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.ArrayType</title>
-<p>The type of array in a <link xref="GITypeInfo">GITypeInfo</link>.</p></page>
+  <p>The type of array in a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+<table>
+<tr>
+<td><p>ArrayType.C :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ArrayType.ARRAY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ArrayType.PTR_ARRAY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ArrayType.BYTE_ARRAY :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.AttributeIter.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.AttributeIter.page
index 39cc3306..6ee6932c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.AttributeIter.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.AttributeIter.page
@@ -7,6 +7,7 @@
   <info>
     <link type="guide" xref="index"/>
   </info>
-  <title>GIRepository.AttributeIter</title>
-<p>An opaque structure used to iterate over attributes
-in a <link xref="GIBaseInfo">GIBaseInfo</link> struct.</p></page>
+  <title>GIRepositoryAttributeIter</title>
+  <p>An opaque structure used to iterate over attributes
+in a #GIBaseInfo struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page
index d650f813..e7e329fc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.equal.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.equal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_base_info_equal</api:name>
+      <api:arg>
+        <api:type>GIRepository.BaseInfo</api:type>
+        <api:name>info2</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.equal</title>
-<p>Compare two <link xref="GIBaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
-different instances of <link xref="GIBaseInfo">GIBaseInfo</link> that refers to the same part of the
-TypeLib; use this function instead to do <link xref="GIBaseInfo">GIBaseInfo</link> comparisons.</p></page>
+  <title>equal</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.BaseInfo)
+@returns(gboolean)
+def equal(info2)
+</code></synopsis>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> comparisons.</p>
+
+<table>
+<tr>
+<td><p>info2 :</p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if and only if @info1 equals @info2.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page
index 4979c514..3af42049 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_attribute.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_attribute"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_attribute</api:name>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.get_attribute</title>
-<p>Retrieve an arbitrary attribute associated with this node.</p></page>
+  <title>get_attribute</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(utf8)
+def get_attribute(name)
+</code></synopsis>
+<p>Retrieve an arbitrary attribute associated with this node.</p>
+
+<table>
+<tr>
+<td><p>name :</p></td>
+<td><p>a freeform string naming an attribute</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The value of the attribute, or None if no such attribute exists</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page
index 1fb285f7..c529cb1c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_container.page
@@ -1,13 +1,33 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_container"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_container</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.get_container</title>
+  <title>get_container</title>
+<synopsis><code mime="text/x-python">
+@returns(GIRepository.BaseInfo)
+def get_container()
+</code></synopsis>
 <p>Obtain the container of the @info. The container is the parent
-GIBaseInfo. For instance, the parent of a <link xref="GIFunctionInfo">GIFunctionInfo</link> is an
-<link xref="GIObjectInfo">GIObjectInfo</link> or <link xref="GIInterfaceInfo">GIInterfaceInfo</link>.</p></page>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the container</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
index 7ac3a14f..5ec55809 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_name.page
@@ -1,13 +1,33 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_name"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_name</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.get_name</title>
+  <title>get_name</title>
+<synopsis><code mime="text/x-python">
+@returns(utf8)
+def get_name()
+</code></synopsis>
 <p>Obtain the name of the @info. What the name represents depends on
-the <link xref="GIInfoType">GIInfoType</link> of the @info. For instance for <link xref="GIFunctionInfo">GIFunctionInfo</link> it is
-the name of the function.</p></page>
+the <link xref="GIRepository.InfoType">GIRepository.InfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> it is
+the name of the function.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the name of @info or None if it lacks a name.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_namespace.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_namespace.page
index b66409c1..ea8ba89e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_namespace.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_namespace.page
@@ -1,11 +1,31 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_namespace"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_namespace</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.get_namespace</title>
-<p>Obtain the namespace of @info.</p></page>
+  <title>get_namespace</title>
+<synopsis><code mime="text/x-python">
+@returns(utf8)
+def get_namespace()
+</code></synopsis>
+<p>Obtain the namespace of @info.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the namespace</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_typelib.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_typelib.page
index b856a222..d20244d1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_typelib.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.get_typelib.page
@@ -1,11 +1,31 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.get_typelib"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Typelib</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_typelib</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.get_typelib</title>
-<p>Obtain the typelib this @info belongs to</p></page>
+  <title>get_typelib</title>
+<synopsis><code mime="text/x-python">
+@returns(GIRepository.Typelib)
+def get_typelib()
+</code></synopsis>
+<p>Obtain the typelib this @info belongs to</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the typelib.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.is_deprecated.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.is_deprecated.page
index f7c24a3b..77de6227 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.is_deprecated.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.is_deprecated.page
@@ -1,12 +1,32 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.is_deprecated"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_base_info_is_deprecated</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.is_deprecated</title>
+  <title>is_deprecated</title>
+<synopsis><code mime="text/x-python">
+@returns(gboolean)
+def is_deprecated()
+</code></synopsis>
 <p>Obtain whether the @info is represents a metadata which is
-deprecated or not.</p></page>
+deprecated or not.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if deprecated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
index 5b9bf3b5..9ef317d0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.iterate_attributes.page
@@ -1,16 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.iterate_attributes"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_base_info_iterate_attributes</api:name>
+      <api:arg>
+        <api:type>GIRepository.AttributeIter</api:type>
+        <api:name>iterator</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.iterate_attributes</title>
+  <title>iterate_attributes</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.AttributeIter, utf8, utf8)
+@returns(gboolean)
+def iterate_attributes(iterator, name, value)
+</code></synopsis>
 <p>Iterate over all attributes associated with this node.  The iterator
 structure is typically stack allocated, and must have its first
-member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
+member initialized to None.</p><p>Both the @name and @value should be treated as constants
 and must not be freed.</p><p>&lt;example&gt;
 &lt;title&gt;Iterating over attributes&lt;/title&gt;
 &lt;programlisting&gt;
@@ -26,4 +51,24 @@ g_print ("attribute name: %s value: %s", name, value);
 }
 }
 &lt;/programlisting&gt;
-&lt;/example&gt;</p></page>
+&lt;/example&gt;</p>
+
+<table>
+<tr>
+<td><p>iterator :</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if there are more attributes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.page
index 8bb5fcdc..055334f0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.page
@@ -7,37 +7,42 @@
   <info>
     <link type="guide" xref="index"/>
   </info>
-  <title>GIRepository.BaseInfo</title>
-<p>GIBaseInfo is the common base struct of all other *Info structs
-accessible through the <link xref="GIRepository">GIRepository</link> API.
-All other structs can be casted to a <link xref="GIBaseInfo">GIBaseInfo</link>, for instance:
-&lt;example&gt;
-&lt;title&gt;Casting a <link xref="GIFunctionInfo">GIFunctionInfo</link> to <link xref="GIBaseInfo">GIBaseInfo</link>&lt;/title&gt;
-&lt;programlisting&gt;
+  <title>GIRepositoryBaseInfo</title>
+  <p>GIBaseInfo is the common base struct of all other *Info structs
+accessible through the #GIRepository API.
+All other structs can be casted to a #GIBaseInfo, for instance:
+<example>
+<title>Casting a #GIFunctionInfo to #GIBaseInfo</title>
+<programlisting>
 GIFunctionInfo *function_info = ...;
 GIBaseInfo *info = (GIBaseInfo*)function_info;
-&lt;/programlisting&gt;
-&lt;/example&gt;
-Most <link xref="GIRepository">GIRepository</link> APIs returning a <link xref="GIBaseInfo">GIBaseInfo</link> is actually creating a new struct, in other
+</programlisting>
+</example>
+Most #GIRepository APIs returning a #GIBaseInfo is actually creating a new struct, in other
 words, g_base_info_unref() has to be called when done accessing the data.
 GIBaseInfos are normally accessed by calling either
-g_irepository_find_by_name(), g_irepository_find_by_gtype() or g_irepository_get_info().</p><p>&lt;example&gt;
-&lt;title&gt;Getting the Button of the Gtk typelib&lt;/title&gt;
-&lt;programlisting&gt;
+g_irepository_find_by_name(), g_irepository_find_by_gtype() or g_irepository_get_info().
+
+<example>
+<title>Getting the Button of the Gtk typelib</title>
+<programlisting>
 GIBaseInfo *button_info = g_irepository_find_by_name(NULL, "Gtk", "Button");
 ... use button_info ...
 g_base_info_unref(button_info);
-&lt;/programlisting&gt;
-&lt;/example&gt;</p><p>&lt;refsect1 id="gi-gibaseinfo.struct-hierarchy" role="struct_hierarchy"&gt;
-&lt;title role="struct_hierarchy.title"&gt;Struct hierarchy&lt;/title&gt;
-&lt;synopsis&gt;
+</programlisting>
+</example>
+
+<refsect1 id="gi-gibaseinfo.struct-hierarchy" role="struct_hierarchy">
+<title role="struct_hierarchy.title">Struct hierarchy</title>
+<synopsis>
 GIBaseInfo
-+----&lt;link linkend="gi-GIArgInfo"&gt;GIArgInfo&lt;/link&gt;
-+----&lt;link linkend="gi-GICallableInfo"&gt;GICallableInfo&lt;/link&gt;
-+----&lt;link linkend="gi-GIConstantInfo"&gt;GIConstantInfo&lt;/link&gt;
-+----&lt;link linkend="gi-GIFieldInfo"&gt;GIFieldInfo&lt;/link&gt;
-+----&lt;link linkend="gi-GIPropertyInfo"&gt;GIPropertyInfo&lt;/link&gt;
-+----&lt;link linkend="gi-GIRegisteredTypeInfo"&gt;GIRegisteredTypeInfo&lt;/link&gt;
-+----&lt;link linkend="gi-GITypeInfo"&gt;GITypeInfo&lt;/link&gt;
-&lt;/synopsis&gt;
-&lt;/refsect1&gt;</p></page>
++----<link linkend="gi-GIArgInfo">GIArgInfo</link>
++----<link linkend="gi-GICallableInfo">GICallableInfo</link>
++----<link linkend="gi-GIConstantInfo">GIConstantInfo</link>
++----<link linkend="gi-GIFieldInfo">GIFieldInfo</link>
++----<link linkend="gi-GIPropertyInfo">GIPropertyInfo</link>
++----<link linkend="gi-GIRegisteredTypeInfo">GIRegisteredTypeInfo</link>
++----<link linkend="gi-GITypeInfo">GITypeInfo</link>
+</synopsis>
+</refsect1></p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.ref.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.ref.page
index 0b81c1d7..32b20f40 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.ref.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.ref.page
@@ -1,11 +1,31 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.ref"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_base_info_ref</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.ref</title>
-<p>Increases the reference count of @info.</p></page>
+  <title>ref</title>
+<synopsis><code mime="text/x-python">
+@returns(GIRepository.BaseInfo)
+def ref()
+</code></synopsis>
+<p>Increases the reference count of @info.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the same @info.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.unref.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.unref.page
index 5abc2ada..0c3e3c54 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.unref.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.BaseInfo.unref.page
@@ -1,12 +1,28 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.BaseInfo.unref"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.BaseInfo" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>g_base_info_unref</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.unref</title>
+  <title>unref</title>
+<synopsis><code mime="text/x-python">
+@returns(none)
+def unref()
+</code></synopsis>
 <p>Decreases the reference count of @info. When its reference count
-drops to 0, the info is freed.</p></page>
+drops to 0, the info is freed.</p>
+
+<table>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
index 739ee20b..ab20f816 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
@@ -7,5 +7,6 @@
   <info>
   </info>
   <title>GIRepository.CallableInfo</title>
-<p>Represents a callable, either <link xref="GIFunctionInfo">GIFunctionInfo</link>, <link xref="GICallbackInfo">GICallbackInfo</link> or
-<link xref="GIVFuncInfo">GIVFuncInfo</link>.</p></page>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GIRepository.CallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallbackInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallbackInfo.page
index 82055937..e5a71709 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallbackInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallbackInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.CallbackInfo</title>
-<p>Represents a callback, eg arguments and return value.</p></page>
+<p>Represents a callback, eg arguments and return value.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ConstantInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ConstantInfo.page
index 1780406e..4ed05edb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ConstantInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ConstantInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ConstantInfo</title>
-<p>Represents a constant.</p></page>
+<p>Represents a constant.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
index 1b68ba89..88c6bd5b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
@@ -1,10 +1,27 @@
 <?xml version="1.0"?>
 <page id="GIRepository.Direction"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.Direction</title>
-<p>The direction of a <link xref="GIArgInfo">GIArgInfo</link>.</p></page>
+  <p>The direction of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>.</p>
+<table>
+<tr>
+<td><p>Direction.IN :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Direction.OUT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Direction.INOUT :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.EnumInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.EnumInfo.page
index 76c71545..eebac1b0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.EnumInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.EnumInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.EnumInfo</title>
-<p>Represents an enum or a flag.</p></page>
+<p>Represents an enum or a flag.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
index 9aae6805..0e90ebad 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.FieldInfo</title>
-<p>Represents a field of a <link xref="GIStructInfo">GIStructInfo</link> or a <link xref="GIUnionInfo">GIUnionInfo</link>.</p></page>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
index d1e85b07..87df966c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.FieldInfoFlags</title>
-<p>Flags for a <link xref="GIFieldInfo">GIFieldInfo</link>.</p></page>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfo.page
index d20c7b2b..d0b0f457 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.FunctionInfo</title>
-<p>Represents a function, eg arguments and return value.</p></page>
+<p>Represents a function, eg arguments and return value.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
index f86678cb..962e3ffa 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.FunctionInfoFlags</title>
-<p>Flags for a <link xref="GIFunctionInfo">GIFunctionInfo</link> struct.</p></page>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page
index 04e4bbba..c624fb66 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InfoType.page
@@ -1,10 +1,95 @@
 <?xml version="1.0"?>
 <page id="GIRepository.InfoType"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.InfoType</title>
-<p>The type of a GIBaseInfo struct.</p></page>
+  <p>The type of a GIBaseInfo struct.</p>
+<table>
+<tr>
+<td><p>InfoType.INVALID :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.FUNCTION :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.CALLBACK :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.STRUCT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.BOXED :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.ENUM :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.FLAGS :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.OBJECT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.INTERFACE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.CONSTANT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.INVALID_0 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.UNION :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.VALUE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.SIGNAL :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.VFUNC :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.PROPERTY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.FIELD :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.ARG :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.TYPE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>InfoType.UNRESOLVED :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InterfaceInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InterfaceInfo.page
index 76883352..27ebf8f8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InterfaceInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.InterfaceInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.InterfaceInfo</title>
-<p>Represents an interface.</p></page>
+<p>Represents an interface.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfo.page
index 3cd4aed4..fd74384c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ObjectInfo</title>
-<p>Represents an object.</p></page>
+<p>Represents an object.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoGetValueFunction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoGetValueFunction.page
index 10524550..a8a86392 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoGetValueFunction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoGetValueFunction.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ObjectInfoGetValueFunction</title>
-<p>Extract an object instance out of @value</p></page>
+<p>Extract an object instance out of @value</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoRefFunction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoRefFunction.page
index 5af40462..12b8b52a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoRefFunction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoRefFunction.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ObjectInfoRefFunction</title>
-<p>Increases the reference count of an object instance.</p></page>
+<p>Increases the reference count of an object instance.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoSetValueFunction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoSetValueFunction.page
index 2940635d..3d5c677d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoSetValueFunction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoSetValueFunction.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ObjectInfoSetValueFunction</title>
-<p>Update @value and attach the object instance pointer @object to it.</p></page>
+<p>Update @value and attach the object instance pointer @object to it.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoUnrefFunction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoUnrefFunction.page
index 64f7d992..11120095 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoUnrefFunction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ObjectInfoUnrefFunction.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ObjectInfoUnrefFunction</title>
-<p>Decreases the reference count of an object instance.</p></page>
+<p>Decreases the reference count of an object instance.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
index 5b92351e..4d383595 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.PropertyInfo</title>
-<p>Represents a property of a <link xref="GIObjectInfo">GIObjectInfo</link> or a <link xref="GIInterfaceInfo">GIInterfaceInfo</link>.</p></page>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RegisteredTypeInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RegisteredTypeInfo.page
index debbc0b4..d98e976c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RegisteredTypeInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RegisteredTypeInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.RegisteredTypeInfo</title>
-<p>Represent a registered type.</p></page>
+<p>Represent a registered type.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.dump.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.dump.page
new file mode 100644
index 00000000..a6defe03
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.dump.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.dump"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_irepository_dump</api:name>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>arg</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>dump</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(gboolean)
+def dump(arg)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>arg :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.enumerate_versions.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.enumerate_versions.page
index 0b4f84d0..d6c2f85f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.enumerate_versions.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.enumerate_versions.page
@@ -1,12 +1,45 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.enumerate_versions"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>&lt;list&gt;</api:type>
+      </api:returns>
+      <api:name>g_irepository_enumerate_versions</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.enumerate_versions</title>
+  <title>enumerate_versions</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(&lt;list&gt;)
+def enumerate_versions(namespace_)
+</code></synopsis>
 <p>Obtain an unordered list of versions (either currently loaded or
-available) for @namespace_ in this @repository.</p></page>
+available) for @namespace_ in this @repository.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array of versions.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.error_quark.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.error_quark.page
new file mode 100644
index 00000000..9fe89d2a
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.error_quark.page
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.error_quark"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GLib.Quark</api:type>
+      </api:returns>
+      <api:name>g_irepository_error_quark</api:name>
+    </api:function>
+  </info>
+  <title>error_quark</title>
+<synopsis><code mime="text/x-python">
+@returns(GLib.Quark)
+def error_quark()
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
index 989a713e..843b68bd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_error_domain.page
@@ -1,14 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.find_by_error_domain"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.EnumInfo</api:type>
+      </api:returns>
+      <api:name>g_irepository_find_by_error_domain</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GLib.Quark</api:type>
+        <api:name>domain</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.find_by_error_domain</title>
+  <title>find_by_error_domain</title>
+<synopsis><code mime="text/x-python">
+@accepts(GLib.Quark)
+@returns(GIRepository.EnumInfo)
+def find_by_error_domain(domain)
+</code></synopsis>
 <p>Searches for the enum type corresponding to the given <link xref="GError">GError</link>
 domain. Before calling this function for a particular namespace,
 you must call g_irepository_require() once to load the namespace, or
-otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NULL</p></page>
+otherwise ensure the namespace has already been loaded.</p><p>enum type, or None</p>
+
+<table>
+<tr>
+<td><p>domain :</p></td>
+<td><p>a <link xref="GError">GError</link> domain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link> representing metadata about @domain's</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
index 0ced00de..006ce3cd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_gtype.page
@@ -1,16 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.find_by_gtype"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_irepository_find_by_gtype</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GType</api:type>
+        <api:name>gtype</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.find_by_gtype</title>
+  <title>find_by_gtype</title>
+<synopsis><code mime="text/x-python">
+@accepts(GType)
+@returns(GIRepository.BaseInfo)
+def find_by_gtype(gtype)
+</code></synopsis>
 <p>Searches all loaded namespaces for a particular <link xref="GType">GType</link>.  Note that
 in order to locate the metadata, the namespace corresponding to
 the type must first have been loaded.  There is currently no
 mechanism for determining the namespace which corresponds to an
 arbitrary GType - thus, this function will operate most reliably
-when you know the GType to originate from be from a loaded namespace.</p></page>
+when you know the GType to originate from be from a loaded namespace.</p>
+
+<table>
+<tr>
+<td><p>gtype :</p></td>
+<td><p>GType to search for</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @type, or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
index 6f61fd83..5b84d4f0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.find_by_name.page
@@ -1,14 +1,55 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.find_by_name"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_irepository_find_by_name</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.find_by_name</title>
+  <title>find_by_name</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8, utf8)
+@returns(GIRepository.BaseInfo)
+def find_by_name(namespace_, name)
+</code></synopsis>
 <p>Searches for a particular entry in a namespace.  Before calling
 this function for a particular namespace, you must call
 g_irepository_require() once to load the namespace, or otherwise
-ensure the namespace has already been loaded.</p></page>
+ensure the namespace has already been loaded.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace which will be searched</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Entry name to find</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> representing metadata about @name, or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page
index 1bf517c7..22932d13 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_c_prefix.page
@@ -1,14 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_c_prefix"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_c_prefix</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_c_prefix</title>
+  <title>get_c_prefix</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(utf8)
+def get_c_prefix(namespace_)
+</code></synopsis>
 <p>This function returns the "C prefix", or the C level namespace
 associated with the given introspection namespace.  Each C symbol
 starts with this prefix, as well each <link xref="GType">GType</link> in the library.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>C namespace prefix, or None if none associated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
new file mode 100644
index 00000000..1c8e529d
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_default"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Repository</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_default</api:name>
+    </api:function>
+  </info>
+  <title>get_default</title>
+<synopsis><code mime="text/x-python">
+@returns(GIRepository.Repository)
+def get_default()
+</code></synopsis>
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository.Repository</link>.  It is
+not currently supported to have multiple repositories in a
+particular process, but this function is provided in the unlikely
+eventuality that it would become possible, and as a convenience for
+higher level language bindings to conform to the GObject method
+call conventions.
+All methods on <link xref="GIRepository.Repository">GIRepository.Repository</link> also accept None as an instance
+parameter to mean this default repository, which is usually more
+convenient for C.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository.Repository</link></p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_dependencies.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_dependencies.page
index 3dcb1f8c..a919b262 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_dependencies.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_dependencies.page
@@ -1,14 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_dependencies"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>[utf8]</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_dependencies</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_dependencies</title>
+  <title>get_dependencies</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns([utf8])
+def get_dependencies(namespace_)
+</code></synopsis>
 <p>Return an array of all (transitive) dependencies for namespace
 @namespace_, including version.  The returned strings are of the
 form &lt;code&gt;namespace-version&lt;/code&gt;.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace of interest</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Zero-terminated string array of versioned dependencies</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page
index 85d0a533..62e45494 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_info.page
@@ -1,15 +1,56 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_info"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_info</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>index</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_info</title>
+  <title>get_info</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8, gint)
+@returns(GIRepository.BaseInfo)
+def get_info(namespace_, index)
+</code></synopsis>
 <p>This function returns a particular metadata entry in the
 given namespace @namespace_.  The namespace must have
 already been loaded before calling this function.
 See g_irepository_get_n_infos() to find the maximum number of
-entries.</p></page>
+entries.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>index :</p></td>
+<td><p>0-based offset into namespace metadata for entry</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> containing metadata</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_loaded_namespaces.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_loaded_namespaces.page
index b9203930..b10f94b8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_loaded_namespaces.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_loaded_namespaces.page
@@ -1,11 +1,35 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_loaded_namespaces"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>[utf8]</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_loaded_namespaces</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_loaded_namespaces</title>
-<p>Return the list of currently loaded namespaces.</p></page>
+  <title>get_loaded_namespaces</title>
+<synopsis><code mime="text/x-python">
+@returns([utf8])
+def get_loaded_namespaces()
+</code></synopsis>
+<p>Return the list of currently loaded namespaces.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>List of namespaces</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_n_infos.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_n_infos.page
index 5cba4336..eca7a563 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_n_infos.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_n_infos.page
@@ -1,13 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_n_infos"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_n_infos</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_n_infos</title>
+  <title>get_n_infos</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(gint)
+def get_n_infos(namespace_)
+</code></synopsis>
 <p>This function returns the number of metadata entries in
 given namespace @namespace_.  The namespace must have
-already been loaded before calling this function.</p></page>
+already been loaded before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of metadata entries</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_option_group.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_option_group.page
new file mode 100644
index 00000000..13b733ad
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_option_group.page
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_option_group"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GLib.OptionGroup</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_option_group</api:name>
+    </api:function>
+  </info>
+  <title>get_option_group</title>
+<synopsis><code mime="text/x-python">
+@returns(GLib.OptionGroup)
+def get_option_group()
+</code></synopsis>
+<p>Obtain the option group for girepository, it's used
+by the dumper and for programs that wants to provide
+introspection information</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the option group</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_search_path.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_search_path.page
new file mode 100644
index 00000000..3faa1452
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_search_path.page
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.get_search_path"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>&lt;list&gt;</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_search_path</api:name>
+    </api:function>
+  </info>
+  <title>get_search_path</title>
+<synopsis><code mime="text/x-python">
+@returns(&lt;list&gt;)
+def get_search_path()
+</code></synopsis>
+<p>Returns the search path the GIRepository will use when looking for typelibs.
+The string is internal to GIRespository and should not be freed, nor should
+the elements.</p>
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>list of strings</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page
index ed0bff74..c0be1f9d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_shared_library.page
@@ -1,15 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_shared_library"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_shared_library</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_shared_library</title>
+  <title>get_shared_library</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(utf8)
+def get_shared_library(namespace_)
+</code></synopsis>
 <p>This function returns the full path to the shared C library
 associated with the given namespace @namespace_. There may be no
 shared library path associated, in which case this function will
-return %NULL.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+return None.</p><p>Note: The namespace must have already been loaded using a function
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Full path to shared library, or None if none associated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page
index 60a1cc67..4dd71b43 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_typelib_path.page
@@ -1,14 +1,47 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_typelib_path"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_typelib_path</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_typelib_path</title>
+  <title>get_typelib_path</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(utf8)
+def get_typelib_path(namespace_)
+</code></synopsis>
 <p>If namespace @namespace_ is loaded, return the full path to the
 .typelib file it was loaded from.  If the typelib for
 namespace @namespace_ was included in a shared library, return
-the special string "$lt;builtin$gt;".</p></page>
+the special string "$lt;builtin$gt;".</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Filesystem path (or $lt;builtin$gt;) if successful, None if namespace is not loaded</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_version.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_version.page
index 97c961e0..86ab7dd7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_version.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_version.page
@@ -1,13 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.get_version"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_irepository_get_version</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.get_version</title>
+  <title>get_version</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(utf8)
+def get_version(namespace_)
+</code></synopsis>
 <p>This function returns the loaded version associated with the given
 namespace @namespace_.</p><p>Note: The namespace must have already been loaded using a function
-such as g_irepository_require() before calling this function.</p></page>
+such as g_irepository_require() before calling this function.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace to inspect</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Loaded version</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page
index f9749286..862a6da1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.is_registered.page
@@ -1,16 +1,57 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.is_registered"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_irepository_is_registered</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>version</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.is_registered</title>
+  <title>is_registered</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8, utf8)
+@returns(gboolean)
+def is_registered(namespace_, version)
+</code></synopsis>
 <p>Check whether a particular namespace (and optionally, a specific
 version thereof) is currently loaded.  This function is likely to
 only be useful in unusual circumstances; in order to act upon
 metadata in the namespace, you should call g_irepository_require()
 instead which will ensure the namespace is loaded, and return as
-quickly as this function will if it has already been loaded.</p></page>
+quickly as this function will if it has already been loaded.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>Namespace of interest</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Required version, may be None for latest</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if namespace-version is loaded, False otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.load_typelib.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.load_typelib.page
index 42583b3d..9bd25fc8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.load_typelib.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.load_typelib.page
@@ -1,11 +1,52 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.load_typelib"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_irepository_load_typelib</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.Typelib</api:type>
+        <api:name>typelib</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.RepositoryLoadFlags</api:type>
+        <api:name>flags</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.load_typelib</title>
+  <title>load_typelib</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.Typelib, GIRepository.RepositoryLoadFlags)
+@returns(utf8)
+def load_typelib(typelib, flags)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>typelib :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.page
index 02cfb1f5..4a6216ca 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.page
@@ -3,12 +3,20 @@
       type="guide"
       style="class"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="class"/>
   </info>
   <title>GIRepository.Repository</title>
-  <synopsis ui:expanded="no">
+
+
+  <synopsis><code>
+from gi.repository import GIRepository
+
+repository = GIRepository.Repository()  </code></synopsis>
+
+  <synopsis>
     <title>Hierarchy</title>
     <tree>
       <item>
@@ -16,19 +24,23 @@
       </item>
     </tree>
   </synopsis>
-  <links type="topic" ui:expanded="yes" groups="constructor">
-    <title>Constructors</title>
-  </links>
-  <links type="topic" ui:expanded="yes" groups="method">
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-python"
+         groups="method" style="linklist">
     <title>Methods</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="property">
+  <links type="topic" ui:expanded="yes"
+         api:type="function" api:mime="text/x-python"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
+  <links type="topic" ui:expanded="yes" groups="property" style="linklist">
     <title>Properties</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="signal">
+  <links type="topic" ui:expanded="yes" groups="signal" style="linklist">
     <title>Signals</title>
   </links>
-  <links type="topic" ui:expanded="yes" groups="#first #default #last">
+  <links type="topic" ui:expanded="yes" groups="#first #default #last" style="linklist">
     <title>Other</title>
   </links>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.prepend_search_path.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.prepend_search_path.page
new file mode 100644
index 00000000..01614b16
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.prepend_search_path.page
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.Repository.prepend_search_path"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="GIRepository.Repository" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>g_irepository_prepend_search_path</api:name>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>directory</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>prepend_search_path</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8)
+@returns(none)
+def prepend_search_path(directory)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>directory :</p></td>
+<td></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
index eaca377e..4995f3ce 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require.page
@@ -1,15 +1,64 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.require"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Typelib</api:type>
+      </api:returns>
+      <api:name>g_irepository_require</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>version</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.RepositoryLoadFlags</api:type>
+        <api:name>flags</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.require</title>
+  <title>require</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8, utf8, GIRepository.RepositoryLoadFlags)
+@returns(GIRepository.Typelib)
+def require(namespace_, version, flags)
+</code></synopsis>
 <p>Force the namespace @namespace_ to be loaded if it isn't already.
 If @namespace_ is not loaded, this function will search for a
 ".typelib" file using the repository search path.  In addition, a
 version @version of namespace may be specified.  If @version is
-not specified, the latest will be used.</p></page>
+not specified, the latest will be used.</p>
+
+<table>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Version of namespace, may be None for latest</p></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td><p>Set of %GIRepositoryLoadFlags, may be 0</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, None otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
index 211d179b..034914e0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.require_private.page
@@ -1,15 +1,72 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.Repository.require_private"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="GIRepository.Repository" group="method"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Typelib</api:type>
+      </api:returns>
+      <api:name>g_irepository_require_private</api:name>
+      <api:arg>
+        <api:type>GIRepository *</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>typelib_dir</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>namespace_</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>version</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.RepositoryLoadFlags</api:type>
+        <api:name>flags</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.Repository.require_private</title>
+  <title>require_private</title>
+<synopsis><code mime="text/x-python">
+@accepts(utf8, utf8, utf8, GIRepository.RepositoryLoadFlags)
+@returns(GIRepository.Typelib)
+def require_private(typelib_dir, namespace_, version, flags)
+</code></synopsis>
 <p>Force the namespace @namespace_ to be loaded if it isn't already.
 If @namespace_ is not loaded, this function will search for a
 ".typelib" file within the private directory only. In addition, a
 version @version of namespace should be specified.  If @version is
-not specified, the latest will be used.</p></page>
+not specified, the latest will be used.</p>
+
+<table>
+<tr>
+<td><p>typelib_dir :</p></td>
+<td><p>Private directory where to find the requested typelib</p></td>
+</tr>
+<tr>
+<td><p>namespace_ :</p></td>
+<td><p>GI namespace to use, e.g. "Gtk"</p></td>
+</tr>
+<tr>
+<td><p>version :</p></td>
+<td><p>Version of namespace, may be None for latest</p></td>
+</tr>
+<tr>
+<td><p>flags :</p></td>
+<td><p>Set of %GIRepositoryLoadFlags, may be 0</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GIRepository.Typelib</link> if successful, None otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryClass.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryClass.page
index e8282d81..3da740bc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryClass.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryClass.page
@@ -7,5 +7,6 @@
   <info>
     <link type="guide" xref="index"/>
   </info>
-  <title>GIRepository.RepositoryClass</title>
+  <title>GIRepositoryRepositoryClass</title>
+  <p>None</p>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page
index f2c0a0b7..d4224816 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryError.page
@@ -1,10 +1,31 @@
 <?xml version="1.0"?>
 <page id="GIRepository.RepositoryError"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.RepositoryError</title>
+  
+<table>
+<tr>
+<td><p>RepositoryError.TYPELIB_NOT_FOUND :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>RepositoryError.NAMESPACE_MISMATCH :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>RepositoryError.NAMESPACE_VERSION_CONFLICT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>RepositoryError.LIBRARY_NOT_FOUND :</p></td>
+<td></td>
+</tr>
+</table>
+
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryLoadFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryLoadFlags.page
index 620b0d77..6ad05e8b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryLoadFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryLoadFlags.page
@@ -8,4 +8,5 @@
   </info>
   <title>GIRepository.RepositoryLoadFlags</title>
 <p>Flags that controlls how a typelib is loaded by
-GIRepositry, used by g_irepository_load_typelib().</p></page>
+GIRepositry, used by g_irepository_load_typelib().</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryPrivate.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryPrivate.page
deleted file mode 100644
index b8d23139..00000000
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.RepositoryPrivate.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.RepositoryPrivate"
-      type="guide"
-      style="record"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="index"/>
-  </info>
-  <title>GIRepository.RepositoryPrivate</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
index 8ac8bff9..9ff8a53c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
@@ -1,12 +1,33 @@
 <?xml version="1.0"?>
 <page id="GIRepository.ScopeType"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.ScopeType</title>
-<p>Scope type of a <link xref="GIArgInfo">GIArgInfo</link> representing callback, determines how the
+  <p>Scope type of a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link> representing callback, determines how the
 callback is invoked and is used to decided when the invoke structs
-can be freed.</p></page>
+can be freed.</p>
+<table>
+<tr>
+<td><p>ScopeType.INVALID :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ScopeType.CALL :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ScopeType.ASYNC :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>ScopeType.NOTIFIED :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.SignalInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.SignalInfo.page
index 239e792b..24f8471c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.SignalInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.SignalInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.SignalInfo</title>
-<p>Represents a signal.</p></page>
+<p>Represents a signal.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.StructInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.StructInfo.page
index f99632ff..5e1cb0dc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.StructInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.StructInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.StructInfo</title>
-<p>Represents a struct.</p></page>
+<p>Represents a struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
index b1c7a862..9d55aa1e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
@@ -1,19 +1,36 @@
 <?xml version="1.0"?>
 <page id="GIRepository.Transfer"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.Transfer</title>
-<p>The transfer is the exchange of data between two parts, from the callee to
+  <p>The transfer is the exchange of data between two parts, from the callee to
 the caller. The callee is either a function/method/signal or an
 object/interface where a property is defined. The caller is the side
 accessing a property or calling a function.
-<link xref="GITransfer">GITransfer</link> specifies who's responsible for freeing the resources after the
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> specifies who's responsible for freeing the resources after the
 ownership transfer is complete. In case of a containing type such as a list,
 an array or a hash table the container itself is specified differently from
 the items within the container itself. Each container is freed differently,
 check the documentation for the types themselves for information on how to
-free them.</p></page>
+free them.</p>
+<table>
+<tr>
+<td><p>Transfer.NOTHING :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Transfer.CONTAINER :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Transfer.EVERYTHING :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeInfo.page
index 38ac1939..5b46d876 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.TypeInfo</title>
-<p>Represents type information, direction, transfer etc.</p></page>
+<p>Represents type information, direction, transfer etc.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
index 128b4124..0ce9a1f6 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
@@ -1,10 +1,103 @@
 <?xml version="1.0"?>
 <page id="GIRepository.TypeTag"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.TypeTag</title>
-<p>The type tag of a <link xref="GITypeInfo">GITypeInfo</link>.</p></page>
+  <p>The type tag of a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p>
+<table>
+<tr>
+<td><p>TypeTag.VOID :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.BOOLEAN :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT8 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT8 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT16 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT16 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT32 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT32 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INT64 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UINT64 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.FLOAT :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.DOUBLE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GTYPE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UTF8 :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.FILENAME :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.ARRAY :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.INTERFACE :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GLIST :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GSLIST :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.GHASH :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.ERROR :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>TypeTag.UNICHAR :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.get_namespace.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.get_namespace.page
deleted file mode 100644
index 23642dd4..00000000
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.get_namespace.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.get_namespace"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="GIRepository.Typelib" group="function"/>
-  </info>
-  <title>GIRepository.get_namespace</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.symbol.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.symbol.page
deleted file mode 100644
index a65440dd..00000000
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Typelib.symbol.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.Typelib.symbol"
-      type="topic"
-      style="function"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="GIRepository.Typelib" group="function"/>
-  </info>
-  <title>GIRepository.symbol</title>
-</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnionInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnionInfo.page
index 34ee6384..013ecb53 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnionInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnionInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.UnionInfo</title>
-<p>Represents a union.</p></page>
+<p>Represents a union.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnresolvedInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnresolvedInfo.page
deleted file mode 100644
index e65ea505..00000000
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.UnresolvedInfo.page
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<page id="GIRepository.UnresolvedInfo"
-      type="guide"
-      style="record"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:ui="http://projectmallard.org/experimental/ui/">
-  <info>
-    <link type="guide" xref="index"/>
-  </info>
-  <title>GIRepository.UnresolvedInfo</title>
-<p>Represents a unresolved type in a typelib.</p></page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfo.page
index 6dc63171..a864ec1d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.VFuncInfo</title>
-<p>Represents a virtual function.</p></page>
+<p>Represents a virtual function.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
index df2ca4f5..a750dfde 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.VFuncInfoFlags</title>
-<p>Flags of a <link xref="GIVFuncInfo">GIVFuncInfo</link> struct.</p></page>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> struct.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
index 3892b2a5..39ad0fa5 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository.ValueInfo</title>
-<p>Represents a enum value of a <link xref="GIEnumInfo">GIEnumInfo</link>.</p></page>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link>.</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._Argument.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._Argument.page
index 41893502..b5472b97 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._Argument.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._Argument.page
@@ -7,4 +7,5 @@
   <info>
   </info>
   <title>GIRepository._Argument</title>
+
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._BaseInfoStub.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._BaseInfoStub.page
index 13b5d801..7d57d63d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._BaseInfoStub.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository._BaseInfoStub.page
@@ -7,5 +7,6 @@
   <info>
     <link type="guide" xref="index"/>
   </info>
-  <title>GIRepository._BaseInfoStub</title>
+  <title>GIRepository_BaseInfoStub</title>
+  <p>None</p>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page
index 2dd6878f..4cc663eb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_closure.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_closure"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_closure</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_get_closure</title>
+  <title>arg_info_get_closure</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gint)
+def arg_info_get_closure(info)
+</code></synopsis>
 <p>Obtain the index of the user data argument. This is only valid
-for arguments which are callbacks.</p></page>
+for arguments which are callbacks.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>index of the user data argument or -1 if there is none</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page
index 5116162a..be3a4f75 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_destroy.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_destroy"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_destroy</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_get_destroy</title>
+  <title>arg_info_get_destroy</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gint)
+def arg_info_get_destroy(info)
+</code></synopsis>
 <p>Obtains the index of the <link xref="GDestroyNotify">GDestroyNotify</link> argument. This is only valid
-for arguments which are callbacks.</p></page>
+for arguments which are callbacks.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>index of the <link xref="GDestroyNotify">GDestroyNotify</link> argument or -1 if there is none</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page
index c17be515..c96c426c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_direction.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_direction"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Direction</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_direction</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_get_direction</title>
-<p>Obtain the direction of the argument. Check <link xref="GIDirection">GIDirection</link> for possible
-direction values.</p></page>
+  <title>arg_info_get_direction</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(GIRepository.Direction)
+def arg_info_get_direction(info)
+</code></synopsis>
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIRepository.Direction</link> for possible
+direction values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the direction</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page
index a1091c9b..3a7c65eb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_ownership_transfer.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_ownership_transfer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Transfer</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_ownership_transfer</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_get_ownership_transfer</title>
+  <title>arg_info_get_ownership_transfer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(GIRepository.Transfer)
+def arg_info_get_ownership_transfer(info)
+</code></synopsis>
 <p>Obtain the ownership transfer for this argument.
-<link xref="GITransfer">GITransfer</link> contains a list of possible values.</p></page>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the transfer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page
index f80b184b..63ccc342 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_scope.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_scope"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ScopeType</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_scope</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_get_scope</title>
+  <title>arg_info_get_scope</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(GIRepository.ScopeType)
+def arg_info_get_scope(info)
+</code></synopsis>
 <p>Obtain the scope type for this argument. The scope type explains
 how a callback is going to be invoked, most importantly when
 the resources required to invoke it can be freed.
-<link xref="GIScopeType">GIScopeType</link> contains a list of possible values.</p></page>
+<link xref="GIRepository.ScopeType">GIRepository.ScopeType</link> contains a list of possible values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the scope type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page
index 7aba6d1d..3b71b73b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_get_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_arg_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_get_type</title>
-<p>Obtain the type information for @info.</p><p>g_base_info_unref() when done.</p></page>
+  <title>arg_info_get_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(GIRepository.TypeInfo)
+def arg_info_get_type(info)
+</code></synopsis>
+<p>Obtain the type information for @info.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>, free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page
index 4c504555..1f297fcd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_caller_allocates.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_caller_allocates"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_caller_allocates</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_is_caller_allocates</title>
+  <title>arg_info_is_caller_allocates</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gboolean)
+def arg_info_is_caller_allocates(info)
+</code></synopsis>
 <p>Obtain if the argument is a pointer to a struct or object that will
 receive an output of a function.  The default assumption for
 %GI_DIRECTION_OUT arguments which have allocation is that the
-callee allocates; if this is %TRUE, then the caller must allocate.</p></page>
+callee allocates; if this is True, then the caller must allocate.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if caller is required to have allocated the argument</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page
index 0d87d0ed..91d1988e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_optional.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_optional"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_optional</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_is_optional</title>
-<p>Obtain if the argument is optional.</p></page>
+  <title>arg_info_is_optional</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gboolean)
+def arg_info_is_optional(info)
+</code></synopsis>
+<p>Obtain if the argument is optional.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if it is an optional argument</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page
index a98a3a62..ccad77e5 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_return_value.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_return_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_return_value</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_is_return_value</title>
+  <title>arg_info_is_return_value</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gboolean)
+def arg_info_is_return_value(info)
+</code></synopsis>
 <p>Obtain if the argument is a return value. It can either be a
-parameter or a return value.</p></page>
+parameter or a return value.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if it is a return value</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page
index a4555648..8d26c654 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_is_skip.page
@@ -1,11 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_is_skip"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_is_skip</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_is_skip</title>
-<p>Obtain if an argument is only useful in C.</p></page>
+  <title>arg_info_is_skip</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gboolean)
+def arg_info_is_skip(info)
+</code></synopsis>
+<p>Obtain if an argument is only useful in C.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if argument is only useful in C.</p></td>
+</tr>
+</table>
+<p>Since 1.29.0</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page
index 4dbf8120..27e5ac45 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_load_type.page
@@ -1,13 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_load_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>g_arg_info_load_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_load_type</title>
+  <title>arg_info_load_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo, GIRepository.TypeInfo)
+@returns(none)
+def arg_info_load_type(info, type)
+</code></synopsis>
 <p>Obtain information about a the type of given argument @info; this
 function is a variant of g_arg_info_get_type() designed for stack
-allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>type :</p></td>
+<td><p>Initialized with information about type of @info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
index ec2595cb..d9034276 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.arg_info_may_be_null.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.arg_info_may_be_null"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_arg_info_may_be_null</api:name>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.arg_info_may_be_null</title>
-<p>Obtain if the argument accepts %NULL.</p></page>
+  <title>arg_info_may_be_null</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ArgInfo)
+@returns(gboolean)
+def arg_info_may_be_null(info)
+</code></synopsis>
+<p>Obtain if the argument accepts None.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if it accepts None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page
index d217737a..765af90d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.base_info_get_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.base_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.InfoType</api:type>
+      </api:returns>
+      <api:name>g_base_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.BaseInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.base_info_get_type</title>
-<p>Obtain the info type of the GIBaseInfo.</p></page>
+  <title>base_info_get_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.BaseInfo)
+@returns(GIRepository.InfoType)
+def base_info_get_type(info)
+</code></synopsis>
+<p>Obtain the info type of the GIBaseInfo.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the info type of @info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page
index eca50d15..eb335624 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_arg.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_arg"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ArgInfo</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_arg</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_get_arg</title>
-<p>Obtain information about a particular argument of this callable.</p><p>g_base_info_unref() when done.</p></page>
+  <title>callable_info_get_arg</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo, gint)
+@returns(GIRepository.ArgInfo)
+def callable_info_get_arg(info, n)
+</code></synopsis>
+<p>Obtain information about a particular argument of this callable.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>the argument index to fetch</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIRepository.ArgInfo</link>. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page
index 730c3ce4..46f340ca 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_caller_owns.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_caller_owns"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Transfer</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_caller_owns</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_get_caller_owns</title>
+  <title>callable_info_get_caller_owns</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo)
+@returns(GIRepository.Transfer)
+def callable_info_get_caller_owns(info)
+</code></synopsis>
 <p>See whether the caller owns the return value of this callable.
-<link xref="GITransfer">GITransfer</link> contains a list of possible transfer values.</p></page>
+<link xref="GIRepository.Transfer">GIRepository.Transfer</link> contains a list of possible transfer values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if the caller owns the return value, False otherwise.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page
index 1212d82a..831e9fb0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_n_args.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_n_args"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_n_args</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_get_n_args</title>
-<p>Obtain the number of arguments (both IN and OUT) for this callable.</p></page>
+  <title>callable_info_get_n_args</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo)
+@returns(gint)
+def callable_info_get_n_args(info)
+</code></synopsis>
+<p>Obtain the number of arguments (both IN and OUT) for this callable.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The number of arguments this callable expects.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
index 99d5139d..52ddc1ba 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_attribute.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_return_attribute"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_return_attribute</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_get_return_attribute</title>
-<p>Retrieve an arbitrary attribute associated with the return value.</p></page>
+  <title>callable_info_get_return_attribute</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo, utf8)
+@returns(utf8)
+def callable_info_get_return_attribute(info, name)
+</code></synopsis>
+<p>Retrieve an arbitrary attribute associated with the return value.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a freeform string naming an attribute</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>The value of the attribute, or None if no such attribute exists</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page
index 653aafa7..e54edfed 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_get_return_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_get_return_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_callable_info_get_return_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_get_return_type</title>
-<p>Obtain the return type of a callable item as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+  <title>callable_info_get_return_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo)
+@returns(GIRepository.TypeInfo)
+def callable_info_get_return_type(info)
+</code></synopsis>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
index 90c923a5..fd04e15e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_iterate_return_attributes.page
@@ -1,15 +1,68 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_iterate_return_attributes"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_callable_info_iterate_return_attributes</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.AttributeIter</api:type>
+        <api:name>iterator</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_iterate_return_attributes</title>
+  <title>callable_info_iterate_return_attributes</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo, GIRepository.AttributeIter, utf8, utf8)
+@returns(gboolean)
+def callable_info_iterate_return_attributes(info, iterator, name, value)
+</code></synopsis>
 <p>Iterate over all attributes associated with the return value.  The
 iterator structure is typically stack allocated, and must have its
-first member initialized to %NULL.</p><p>Both the @name and @value should be treated as constants
+first member initialized to None.</p><p>Both the @name and @value should be treated as constants
 and must not be freed.</p><p>See g_base_info_iterate_attributes() for an example of how to use a
-similar API.</p></page>
+similar API.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>iterator :</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIRepository.AttributeIter</link> structure, must be initialized; see below</p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>Returned name, must not be freed</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if there are more attributes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page
index 28e7258c..8f3cbcd1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_arg.page
@@ -1,13 +1,54 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_load_arg"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>g_callable_info_load_arg</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.ArgInfo</api:type>
+        <api:name>arg</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_load_arg</title>
+  <title>callable_info_load_arg</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo, gint, GIRepository.ArgInfo)
+@returns(none)
+def callable_info_load_arg(info, n, arg)
+</code></synopsis>
 <p>Obtain information about a particular argument of this callable; this
 function is a variant of g_callable_info_get_arg() designed for stack
-allocation.</p><p>The initialized @arg must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @arg must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>the argument index to fetch</p></td>
+</tr>
+<tr>
+<td><p>arg :</p></td>
+<td><p>Initialize with argument number @n</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page
index 5176c822..04e7aafe 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_load_return_type.page
@@ -1,13 +1,46 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_load_return_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>g_callable_info_load_return_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_load_return_type</title>
+  <title>callable_info_load_return_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo, GIRepository.TypeInfo)
+@returns(none)
+def callable_info_load_return_type(info, type)
+</code></synopsis>
 <p>Obtain information about a return value of callable; this
 function is a variant of g_callable_info_get_return_type() designed for stack
-allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p></page>
+allocation.</p><p>The initialized @type must not be referenced after @info is deallocated.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>type :</p></td>
+<td><p>Initialized with return type of @info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
index e0523639..8e7c10a8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_may_return_null.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_may_return_null"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_callable_info_may_return_null</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_may_return_null</title>
-<p>See if a callable could return %NULL.</p></page>
+  <title>callable_info_may_return_null</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo)
+@returns(gboolean)
+def callable_info_may_return_null(info)
+</code></synopsis>
+<p>See if a callable could return None.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if callable could return None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page
index 05a7ea16..48152a32 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.callable_info_skip_return.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.callable_info_skip_return"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_callable_info_skip_return</api:name>
+      <api:arg>
+        <api:type>GIRepository.CallableInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.callable_info_skip_return</title>
-<p>See if a callable's return value is only useful in C.</p></page>
+  <title>callable_info_skip_return</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.CallableInfo)
+@returns(gboolean)
+def callable_info_skip_return(info)
+</code></synopsis>
+<p>See if a callable's return value is only useful in C.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GIRepository.CallableInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if return value is only useful in C.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page
new file mode 100644
index 00000000..58eb9469
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_free_value.page
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.constant_info_free_value"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>g_constant_info_free_value</api:name>
+      <api:arg>
+        <api:type>GIRepository.ConstantInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>constant_info_free_value</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ConstantInfo, None)
+@returns(none)
+def constant_info_free_value(info, value)
+</code></synopsis>
+<p>Free the value returned from g_constant_info_get_value().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>the argument</p></td>
+</tr>
+</table>
+<p>Since 1.30.1</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page
index 189e57c5..542313d3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.constant_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_constant_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.ConstantInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.constant_info_get_type</title>
-<p>Obtain the type of the constant as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+  <title>constant_info_get_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ConstantInfo)
+@returns(GIRepository.TypeInfo)
+def constant_info_get_type(info)
+</code></synopsis>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page
index a47181ae..6369c8ac 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.constant_info_get_value.page
@@ -1,13 +1,51 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.constant_info_get_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_constant_info_get_value</api:name>
+      <api:arg>
+        <api:type>GIRepository.ConstantInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.constant_info_get_value</title>
-<p>Obtain the value associated with the <link xref="GIConstantInfo">GIConstantInfo</link> and store it in the
+  <title>constant_info_get_value</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ConstantInfo, None)
+@returns(gint)
+def constant_info_get_value(info, value)
+</code></synopsis>
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link> and store it in the
 @value parameter. @argument needs to be allocated before passing it in.
-The size of the constant value stored in @argument will be returned.</p></page>
+The size of the constant value stored in @argument will be returned.
+Free the value with g_constant_info_free_value().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link></p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>an argument</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the constant</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_error_domain.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_error_domain.page
index 1aa26b40..5ce7a56f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_error_domain.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_error_domain.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_error_domain"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_error_domain</api:name>
+      <api:arg>
+        <api:type>GIRepository.EnumInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.enum_info_get_error_domain</title>
+  <title>enum_info_get_error_domain</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.EnumInfo)
+@returns(utf8)
+def enum_info_get_error_domain(info)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page
new file mode 100644
index 00000000..994391a8
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_method.page
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.enum_info_get_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.EnumInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>enum_info_get_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.EnumInfo, gint)
+@returns(GIRepository.FunctionInfo)
+def enum_info_get_method(info, n)
+</code></synopsis>
+<p>Obtain an enum type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page
new file mode 100644
index 00000000..e4986277
--- /dev/null
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_methods.page
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<page id="GIRepository.enum_info_get_n_methods"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/">
+  <info>
+    <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIRepository.EnumInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>enum_info_get_n_methods</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.EnumInfo)
+@returns(gint)
+def enum_info_get_n_methods(info)
+</code></synopsis>
+<p>Obtain the number of methods that this enum type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+<p>Since 1.29.17</p>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_values.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_values.page
index 3fdbc5d4..bb14b4eb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_values.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_n_values.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_n_values"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_n_values</api:name>
+      <api:arg>
+        <api:type>GIRepository.EnumInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.enum_info_get_n_values</title>
+  <title>enum_info_get_n_values</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.EnumInfo)
+@returns(gint)
+def enum_info_get_n_values(info)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page
index 6d827b81..e9076cca 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_storage_type.page
@@ -1,15 +1,44 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_storage_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeTag</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_storage_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.EnumInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.enum_info_get_storage_type</title>
+  <title>enum_info_get_storage_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.EnumInfo)
+@returns(GIRepository.TypeTag)
+def enum_info_get_storage_type(info)
+</code></synopsis>
 <p>Obtain the tag of the type used for the enum in the C ABI. This will
 will be a signed or unsigned integral type.
 Note that in the current implementation the width of the type is
 computed correctly, but the signed or unsigned nature of the type
-may not match the sign of the type used by the C compiler.</p></page>
+may not match the sign of the type used by the C compiler.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the storage type for the enumeration</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
index bcb571ef..06fc6c95 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.enum_info_get_value.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.enum_info_get_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ValueInfo</api:type>
+      </api:returns>
+      <api:name>g_enum_info_get_value</api:name>
+      <api:arg>
+        <api:type>GIRepository.EnumInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.enum_info_get_value</title>
-<p>Obtain a value for this enumeration.</p><p>free the struct with g_base_info_unref() when done.</p></page>
+  <title>enum_info_get_value</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.EnumInfo, gint)
+@returns(GIRepository.ValueInfo)
+def enum_info_get_value(info, n)
+</code></synopsis>
+<p>Obtain a value for this enumeration.</p><p>free the struct with g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIRepository.EnumInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of value to fetch</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the enumeration value or None if type tag is wrong,</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page
index e824aa21..a9d26dab 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_field.page
@@ -1,14 +1,59 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIRepository.FieldInfo</api:type>
+        <api:name>field_info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gpointer</api:type>
+        <api:name>mem</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.field_info_get_field</title>
+  <title>field_info_get_field</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FieldInfo, gpointer, None)
+@returns(gboolean)
+def field_info_get_field(field_info, mem, value)
+</code></synopsis>
 <p>Reads a field identified by a <link xref="GFieldInfo">GFieldInfo</link> from a C structure or
 union.  This only handles fields of simple C types. It will fail
 for a field of a composite type like a nested structure or union
-even if that is actually readable.</p></page>
+even if that is actually readable.</p>
+
+<table>
+<tr>
+<td><p>field_info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>mem :</p></td>
+<td><p>pointer to a block of memory representing a C structure or union</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>a <link xref="GIArgument">GIArgument</link> into which to store the value retrieved</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if reading the field succeeded, otherwise False</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page
index 88ceae7a..d5ce386c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_flags.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FieldInfoFlags</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIRepository.FieldInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.field_info_get_flags</title>
-<p>Obtain the flags for this <link xref="GIFieldInfo">GIFieldInfo</link>. See <link xref="GIFieldInfoFlags">GIFieldInfoFlags</link> for possible
-flag values.</p></page>
+  <title>field_info_get_flags</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FieldInfo)
+@returns(GIRepository.FieldInfoFlags)
+def field_info_get_flags(info)
+</code></synopsis>
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIRepository.FieldInfoFlags</link> for possible
+flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page
index e7fe1962..97434ebf 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_offset.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_offset"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_offset</api:name>
+      <api:arg>
+        <api:type>GIRepository.FieldInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.field_info_get_offset</title>
+  <title>field_info_get_offset</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FieldInfo)
+@returns(gint)
+def field_info_get_offset(info)
+</code></synopsis>
 <p>Obtain the offset in bits of the field member, this is relative
-to the beginning of the struct or union.</p></page>
+to the beginning of the struct or union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the field offset</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page
index 0561b65a..19f80ecc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_size.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_size</api:name>
+      <api:arg>
+        <api:type>GIRepository.FieldInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.field_info_get_size</title>
+  <title>field_info_get_size</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FieldInfo)
+@returns(gint)
+def field_info_get_size(info)
+</code></synopsis>
 <p>Obtain the size in bits of the field member, this is how
-much space you need to allocate to store the field.</p></page>
+much space you need to allocate to store the field.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the field size</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page
index eca27986..f001fcaf 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_get_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_field_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.FieldInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.field_info_get_type</title>
-<p>Obtain the type of a field as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p></page>
+  <title>field_info_get_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FieldInfo)
+@returns(GIRepository.TypeInfo)
+def field_info_get_type(info)
+</code></synopsis>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page
index ddee9b31..e4a3ee1f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.field_info_set_field.page
@@ -1,16 +1,61 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.field_info_set_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_field_info_set_field</api:name>
+      <api:arg>
+        <api:type>GIRepository.FieldInfo</api:type>
+        <api:name>field_info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gpointer</api:type>
+        <api:name>mem</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.field_info_set_field</title>
+  <title>field_info_set_field</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FieldInfo, gpointer, None)
+@returns(gboolean)
+def field_info_set_field(field_info, mem, value)
+</code></synopsis>
 <p>Writes a field identified by a <link xref="GFieldInfo">GFieldInfo</link> to a C structure or
 union.  This only handles fields of simple C types. It will fail
 for a field of a composite type like a nested structure or union
 even if that is actually writable. Note also that that it will refuse
 to write fields where memory management would by required. A field
-with a type such as 'char *' must be set with a setter function.</p></page>
+with a type such as 'char *' must be set with a setter function.</p>
+
+<table>
+<tr>
+<td><p>field_info :</p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link></p></td>
+</tr>
+<tr>
+<td><p>mem :</p></td>
+<td><p>pointer to a block of memory representing a C structure or union</p></td>
+</tr>
+<tr>
+<td><p>value :</p></td>
+<td><p>a <link xref="GIArgument">GIArgument</link> holding the value to store</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if writing the field succeeded, otherwise False</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page
index 5d210e83..fd08039c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_flags.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfoFlags</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIRepository.FunctionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.function_info_get_flags</title>
-<p>Obtain the <link xref="GIFunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p></page>
+  <title>function_info_get_flags</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FunctionInfo)
+@returns(GIRepository.FunctionInfoFlags)
+def function_info_get_flags(info)
+</code></synopsis>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIRepository.FunctionInfoFlags</link> for the @info.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
index 2a7da64c..45b8a82e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_property.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_property"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.PropertyInfo</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_property</api:name>
+      <api:arg>
+        <api:type>GIRepository.FunctionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.function_info_get_property</title>
-<p>Obtain the property associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
+  <title>function_info_get_property</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FunctionInfo)
+@returns(GIRepository.PropertyInfo)
+def function_info_get_property(info)
+</code></synopsis>
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
 %GI_FUNCTION_IS_SETTER have a property set. For other cases,
-%NULL will be returned.</p><p>g_base_info_unref() when done.</p></page>
+None will be returned.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the property or None if not set. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page
index 8ec516c8..fffd2485 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_symbol.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_symbol"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_symbol</api:name>
+      <api:arg>
+        <api:type>GIRepository.FunctionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.function_info_get_symbol</title>
+  <title>function_info_get_symbol</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FunctionInfo)
+@returns(utf8)
+def function_info_get_symbol(info)
+</code></synopsis>
 <p>Obtain the symbol of the function. The symbol is the name of the
 exported function, suitable to be used as an argument to
-g_module_symbol().</p></page>
+g_module_symbol().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
index 2380c62c..e7ba3c8a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_get_vfunc.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_get_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfo</api:type>
+      </api:returns>
+      <api:name>g_function_info_get_vfunc</api:name>
+      <api:arg>
+        <api:type>GIRepository.FunctionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.function_info_get_vfunc</title>
-<p>Obtain the virtual function associated with this <link xref="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
-a virtual function set. For other cases, %NULL will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p></page>
+  <title>function_info_get_vfunc</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FunctionInfo)
+@returns(GIRepository.VFuncInfo)
+def function_info_get_vfunc(info)
+</code></synopsis>
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
+a virtual function set. For other cases, None will be returned.</p><p>Free it by calling g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the virtual function or None if not set.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
index 8aedc49f..0ad45094 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.function_info_invoke.page
@@ -1,16 +1,85 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.function_info_invoke"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_function_info_invoke</api:name>
+      <api:arg>
+        <api:type>GIRepository.FunctionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n_in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n_out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>return_value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.function_info_invoke</title>
+  <title>function_info_invoke</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.FunctionInfo, None, gint, None, gint, None)
+@returns(gboolean)
+def function_info_invoke(info, in_args, n_in_args, out_args, n_out_args, return_value)
+</code></synopsis>
 <p>Invokes the function described in @info with the given
 arguments. Note that inout parameters must appear in both
 argument lists. This function uses dlsym() to obtain a pointer
 to the function, so the library or shared object containing the
 described function must either be linked to the caller, or must
-have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>error occurred.</p></page>
+have been g_module_symbol()&lt;!-- --&gt;ed before calling this function.</p><p>error occurred.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> describing the function to invoke</p></td>
+</tr>
+<tr>
+<td><p>in_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be None</p></td>
+</tr>
+<tr>
+<td><p>n_in_args :</p></td>
+<td><p>the length of the @in_args array</p></td>
+</tr>
+<tr>
+<td><p>out_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be None</p></td>
+</tr>
+<tr>
+<td><p>n_out_args :</p></td>
+<td><p>the length of the @out_args array</p></td>
+</tr>
+<tr>
+<td><p>return_value :</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be None</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if the function has been invoked, False if an</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_new.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_new.page
index f7c61679..79730416 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_new.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_new.page
@@ -1,11 +1,64 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.info_new"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_info_new</api:name>
+      <api:arg>
+        <api:type>GIRepository.InfoType</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.BaseInfo</api:type>
+        <api:name>container</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.Typelib</api:type>
+        <api:name>typelib</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>guint32</api:type>
+        <api:name>offset</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.info_new</title>
+  <title>info_new</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InfoType, GIRepository.BaseInfo, GIRepository.Typelib, guint32)
+@returns(GIRepository.BaseInfo)
+def info_new(type, container, typelib, offset)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>container :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>typelib :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>offset :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_type_to_string.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_type_to_string.page
index c671368b..5b12439d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_type_to_string.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.info_type_to_string.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.info_type_to_string"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_info_type_to_string</api:name>
+      <api:arg>
+        <api:type>GIRepository.InfoType</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.info_type_to_string</title>
-<p>Obtain a string representation of @type</p></page>
+  <title>info_type_to_string</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InfoType)
+@returns(utf8)
+def info_type_to_string(type)
+</code></synopsis>
+<p>Obtain a string representation of @type</p>
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td><p>the info type</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the string</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
index 4f811344..be95a519 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_method.page
@@ -1,12 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_find_method</title>
-<p>Obtain a method of the interface type given a @name. %NULL will be
-returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p></page>
+  <title>interface_info_find_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, utf8)
+@returns(GIRepository.FunctionInfo)
+def interface_info_find_method(info, name)
+</code></synopsis>
+<p>Obtain a method of the interface type given a @name. None will be
+returned if there's no method available with that name.</p><p>Free the struct by calling g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link> or None if none found.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
index b431977d..b23e4e43 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_find_vfunc.page
@@ -1,12 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_find_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_find_vfunc</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_find_vfunc</title>
+  <title>interface_info_find_vfunc</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, utf8)
+@returns(GIRepository.VFuncInfo)
+def interface_info_find_vfunc(info, name)
+</code></synopsis>
 <p>Locate a virtual function slot with name @name. See the documentation
-for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_info_unref() when done.</p></page>
+for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>The name of a virtual function to find.</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or None. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page
index 2346fde5..5b3fbcef 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_constant.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_constant"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ConstantInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_constant</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_constant</title>
-<p>Obtain an interface type constant at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_constant</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, gint)
+@returns(GIRepository.ConstantInfo)
+def interface_info_get_constant(info, n)
+</code></synopsis>
+<p>Obtain an interface type constant at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of constant to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
index d1d93f13..571bbde9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_iface_struct.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_iface_struct"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.StructInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_iface_struct</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_iface_struct</title>
-<p>Returns the layout C structure associated with this <link xref="GInterface">GInterface</link>.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_iface_struct</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(GIRepository.StructInfo)
+def interface_info_get_iface_struct(info)
+</code></synopsis>
+<p>Returns the layout C structure associated with this <link xref="GInterface">GInterface</link>.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or None. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page
index bd43e4ff..760a0963 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_method.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_method</title>
-<p>Obtain an interface type method at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, gint)
+@returns(GIRepository.FunctionInfo)
+def interface_info_get_method(info, n)
+</code></synopsis>
+<p>Obtain an interface type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page
index 2e20aafc..a574e0cc 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_constants.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_constants"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_constants</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_n_constants</title>
-<p>Obtain the number of constants that this interface type has.</p></page>
+  <title>interface_info_get_n_constants</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(gint)
+def interface_info_get_n_constants(info)
+</code></synopsis>
+<p>Obtain the number of constants that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of constants</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page
index a2769ae6..ba351b3a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_methods.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_n_methods</title>
-<p>Obtain the number of methods that this interface type has.</p></page>
+  <title>interface_info_get_n_methods</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(gint)
+def interface_info_get_n_methods(info)
+</code></synopsis>
+<p>Obtain the number of methods that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page
index a356a156..70db1464 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_prerequisites.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_prerequisites"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_prerequisites</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_n_prerequisites</title>
+  <title>interface_info_get_n_prerequisites</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(gint)
+def interface_info_get_n_prerequisites(info)
+</code></synopsis>
 <p>Obtain the number of prerequisites for this interface type.
 A prerequisites is another interface that needs to be implemented for
-interface, similar to an base class for GObjects.</p></page>
+interface, similar to an base class for GObjects.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of prerequisites</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page
index 2db72af8..6c9502de 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_properties.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_properties"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_properties</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_n_properties</title>
-<p>Obtain the number of properties that this interface type has.</p></page>
+  <title>interface_info_get_n_properties</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(gint)
+def interface_info_get_n_properties(info)
+</code></synopsis>
+<p>Obtain the number of properties that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of properties</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page
index 1b66f951..1174ec4e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_signals.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_signals"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_signals</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_n_signals</title>
-<p>Obtain the number of signals that this interface type has.</p></page>
+  <title>interface_info_get_n_signals</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(gint)
+def interface_info_get_n_signals(info)
+</code></synopsis>
+<p>Obtain the number of signals that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of signals</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page
index 12564d77..62c0bc10 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_n_vfuncs.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_n_vfuncs"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_n_vfuncs</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_n_vfuncs</title>
-<p>Obtain the number of virtual functions that this interface type has.</p></page>
+  <title>interface_info_get_n_vfuncs</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo)
+@returns(gint)
+def interface_info_get_n_vfuncs(info)
+</code></synopsis>
+<p>Obtain the number of virtual functions that this interface type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of virtual functions</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page
index 53fb1c16..2dea057c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_prerequisite.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_prerequisite"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_prerequisite</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_prerequisite</title>
-<p>Obtain an interface type prerequisites index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_prerequisite</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, gint)
+@returns(GIRepository.BaseInfo)
+def interface_info_get_prerequisite(info, n)
+</code></synopsis>
+<p>Obtain an interface type prerequisites index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of prerequisites to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page
index 81ba56b9..6cff4155 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_property.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_property"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.PropertyInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_property</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_property</title>
-<p>Obtain an interface type property at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_property</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, gint)
+@returns(GIRepository.PropertyInfo)
+def interface_info_get_property(info, n)
+</code></synopsis>
+<p>Obtain an interface type property at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of property to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page
index 08e6b259..f46af599 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_signal.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.SignalInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_signal</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_signal</title>
-<p>Obtain an interface type signal at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_signal</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, gint)
+@returns(GIRepository.SignalInfo)
+def interface_info_get_signal(info, n)
+</code></synopsis>
+<p>Obtain an interface type signal at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of signal to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page
index 1ad94ab8..58b6809b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.interface_info_get_vfunc.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.interface_info_get_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfo</api:type>
+      </api:returns>
+      <api:name>g_interface_info_get_vfunc</api:name>
+      <api:arg>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.interface_info_get_vfunc</title>
-<p>Obtain an interface type virtual function at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>interface_info_get_vfunc</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.InterfaceInfo, gint)
+@returns(GIRepository.VFuncInfo)
+def interface_info_get_vfunc(info, n)
+</code></synopsis>
+<p>Obtain an interface type virtual function at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of virtual function to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.invoke_error_quark.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.invoke_error_quark.page
index f7b9ba06..a1bea3d4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.invoke_error_quark.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.invoke_error_quark.page
@@ -1,11 +1,31 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.invoke_error_quark"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GLib.Quark</api:type>
+      </api:returns>
+      <api:name>g_invoke_error_quark</api:name>
+    </api:function>
   </info>
-  <title>GIRepository.invoke_error_quark</title>
+  <title>invoke_error_quark</title>
+<synopsis><code mime="text/x-python">
+@returns(GLib.Quark)
+def invoke_error_quark()
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page
index e71aca50..9cd1c9ea 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.nvokeError.page
@@ -1,11 +1,28 @@
 <?xml version="1.0"?>
 <page id="GIRepository.nvokeError"
-      type="topic"
-      style=""
+      type="guide"
+      style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
+    <link type="guide" xref="index"/>
   </info>
   <title>GIRepository.nvokeError</title>
-<p>An error occuring while invoking a function via
-g_function_info_invoke().</p></page>
+  <p>An error occuring while invoking a function via
+g_function_info_invoke().</p>
+<table>
+<tr>
+<td><p>nvokeError.FAILED :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>nvokeError.SYMBOL_NOT_FOUND :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>nvokeError.ARGUMENT_MISMATCH :</p></td>
+<td></td>
+</tr>
+</table>
+
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
index b2274937..40ca69b0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
@@ -1,12 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_find_method</title>
-<p>Obtain a method of the object type given a @name. %NULL will be
-returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_find_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, utf8)
+@returns(GIRepository.FunctionInfo)
+def object_info_find_method(info, name)
+</code></synopsis>
+<p>Obtain a method of the object type given a @name. None will be
+returned if there's no method available with that name.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
index c1122518..6e4bd653 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method_using_interfaces.page
@@ -1,14 +1,59 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_method_using_interfaces"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_method_using_interfaces</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>implementor</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_find_method_using_interfaces</title>
+  <title>object_info_find_method_using_interfaces</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, utf8, GIRepository.ObjectInfo)
+@returns(GIRepository.FunctionInfo)
+def object_info_find_method_using_interfaces(info, name, implementor)
+</code></synopsis>
 <p>Obtain a method of the object given a @name, searching both the
-object @info and any interfaces it implements.  %NULL will be
+object @info and any interfaces it implements.  None will be
 returned if there's no method available with that name.</p><p>Note that this function does *not* search parent classes; you will have
-to chain up if that's desired.</p><p>g_base_info_unref() when done.</p></page>
+to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>name of method to obtain</p></td>
+</tr>
+<tr>
+<td><p>implementor :</p></td>
+<td><p>The implementor of the interface</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
index 89a8e1a4..fc49ce8f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_signal.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.SignalInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_signal</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_find_signal</title>
+  <title>object_info_find_signal</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, utf8)
+@returns(GIRepository.SignalInfo)
+def object_info_find_signal(info, name)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>Name of signal</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>Info for the signal with name @name in @info, or None on failure.</p></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
index e041085e..5618afa5 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_vfunc.page
@@ -1,17 +1,54 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_find_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_find_vfunc</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_find_vfunc</title>
+  <title>object_info_find_vfunc</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, utf8)
+@returns(GIRepository.VFuncInfo)
+def object_info_find_vfunc(info, name)
+</code></synopsis>
 <p>Locate a virtual function slot with name @name. Note that the namespace
 for virtuals is distinct from that of methods; there may or may not be
 a concrete method associated for a virtual. If there is one, it may
-be retrieved using g_vfunc_info_get_invoker(), otherwise %NULL will be
+be retrieved using g_vfunc_info_get_invoker(), otherwise None will be
 returned.
 See the documentation for g_vfunc_info_get_invoker() for more
-information on invoking virtuals.</p><p>g_base_info_unref() when done.</p></page>
+information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>The name of a virtual function to find.</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>, or None. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page
index 620ce4ef..b546701a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_abstract.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_abstract"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_abstract</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_abstract</title>
+  <title>object_info_get_abstract</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gboolean)
+def object_info_get_abstract(info)
+</code></synopsis>
 <p>Obtain if the object type is an abstract type, eg if it cannot be
-instantiated</p></page>
+instantiated</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if the object type is abstract</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
index a4f8d78e..bc529fc3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_class_struct.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_class_struct"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.StructInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_class_struct</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_class_struct</title>
+  <title>object_info_get_class_struct</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(GIRepository.StructInfo)
+def object_info_get_class_struct(info)
+</code></synopsis>
 <p>Every <link xref="GObject">GObject</link> has two structures; an instance structure and a class
-structure.  This function returns the metadata for the class structure.</p><p>g_base_info_unref() when done.</p></page>
+structure.  This function returns the metadata for the class structure.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link> or None. Free with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page
index 23e9627e..2d6fde91 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_constant.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_constant"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ConstantInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_constant</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_constant</title>
-<p>Obtain an object type constant at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_constant</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.ConstantInfo)
+def object_info_get_constant(info, n)
+</code></synopsis>
+<p>Obtain an object type constant at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of constant to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page
index 0262989a..29bea30e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_field.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FieldInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_field</title>
-<p>Obtain an object type field at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_field</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.FieldInfo)
+def object_info_get_field(info, n)
+</code></synopsis>
+<p>Obtain an object type field at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of field to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page
index 746f7dca..66a55496 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_fundamental.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_fundamental"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_fundamental</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_fundamental</title>
+  <title>object_info_get_fundamental</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gboolean)
+def object_info_get_fundamental(info)
+</code></synopsis>
 <p>Obtain if the object type is of a fundamental type which is not
-G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p></page>
+G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if the object type is a fundamental type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
index 72cdad82..d689de9c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function.page
@@ -1,15 +1,44 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_get_value_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_get_value_function</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_get_value_function</title>
+  <title>object_info_get_get_value_function</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(utf8)
+def object_info_get_get_value_function(info)
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to convert
 an object instance pointer of this object type to a GValue.
 I's mainly used fundamental types. The type signature for the symbol
 is %GIObjectInfoGetValueFunction, to fetch the function pointer
-see g_object_info_get_get_value_function().</p></page>
+see g_object_info_get_get_value_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
index e464cd60..2550997b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_get_value_function_pointer.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_get_value_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ObjectInfoGetValueFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_get_value_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_get_value_function_pointer</title>
+  <title>object_info_get_get_value_function_pointer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(GIRepository.ObjectInfoGetValueFunction)
+def object_info_get_get_value_function_pointer(info)
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 extract an instance of this object type out of a GValue.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page
index 5f337a0b..611cf305 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_interface.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_interface"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.InterfaceInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_interface</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_interface</title>
-<p>Obtain an object type interface at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_interface</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.InterfaceInfo)
+def object_info_get_interface(info, n)
+</code></synopsis>
+<p>Obtain an object type interface at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of interface to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIRepository.InterfaceInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page
index db6a2cb6..c24d3c0d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_method.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_method</title>
-<p>Obtain an object type method at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.FunctionInfo)
+def object_info_get_method(info, n)
+</code></synopsis>
+<p>Obtain an object type method at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of method to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page
index 970ea9d9..650d9153 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_constants.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_constants"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_constants</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_constants</title>
-<p>Obtain the number of constants that this object type has.</p></page>
+  <title>object_info_get_n_constants</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_constants(info)
+</code></synopsis>
+<p>Obtain the number of constants that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of constants</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page
index 87d5467c..1e9074bf 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_fields.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_fields"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_fields</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_fields</title>
-<p>Obtain the number of fields that this object type has.</p></page>
+  <title>object_info_get_n_fields</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_fields(info)
+</code></synopsis>
+<p>Obtain the number of fields that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page
index dc5c351e..a56b0b4f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_interfaces.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_interfaces"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_interfaces</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_interfaces</title>
-<p>Obtain the number of interfaces that this object type has.</p></page>
+  <title>object_info_get_n_interfaces</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_interfaces(info)
+</code></synopsis>
+<p>Obtain the number of interfaces that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of interfaces</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page
index 5e927614..3d996e49 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_methods.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_methods</title>
-<p>Obtain the number of methods that this object type has.</p></page>
+  <title>object_info_get_n_methods</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_methods(info)
+</code></synopsis>
+<p>Obtain the number of methods that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page
index 872d7574..f50535e9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_properties.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_properties"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_properties</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_properties</title>
-<p>Obtain the number of properties that this object type has.</p></page>
+  <title>object_info_get_n_properties</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_properties(info)
+</code></synopsis>
+<p>Obtain the number of properties that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of properties</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page
index 6f90d219..a5241419 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_signals.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_signals"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_signals</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_signals</title>
-<p>Obtain the number of signals that this object type has.</p></page>
+  <title>object_info_get_n_signals</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_signals(info)
+</code></synopsis>
+<p>Obtain the number of signals that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of signals</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page
index d6a954ab..a4868af8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_n_vfuncs.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_n_vfuncs"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_n_vfuncs</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_n_vfuncs</title>
-<p>Obtain the number of virtual functions that this object type has.</p></page>
+  <title>object_info_get_n_vfuncs</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(gint)
+def object_info_get_n_vfuncs(info)
+</code></synopsis>
+<p>Obtain the number of virtual functions that this object type has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of virtual functions</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page
index 6c16b661..963126b2 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_parent.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_parent"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ObjectInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_parent</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_parent</title>
-<p>Obtain the parent of the object type.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_parent</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(GIRepository.ObjectInfo)
+def object_info_get_parent(info)
+</code></synopsis>
+<p>Obtain the parent of the object type.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page
index 96ca5f79..ce8a4563 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_property.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_property"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.PropertyInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_property</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_property</title>
-<p>Obtain an object type property at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_property</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.PropertyInfo)
+def object_info_get_property(info, n)
+</code></synopsis>
+<p>Obtain an object type property at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of property to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
index 1c795d12..ac7d6c5c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_ref_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_ref_function</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_ref_function</title>
+  <title>object_info_get_ref_function</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(utf8)
+def object_info_get_ref_function(info)
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to ref this
 object type. It's mainly used fundamental types. The type signature for
 the symbol is %GIObjectInfoRefFunction, to fetch the function pointer
-see g_object_info_get_ref_function().</p></page>
+see g_object_info_get_ref_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
index f99782a7..00fbf109 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_ref_function_pointer.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_ref_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ObjectInfoRefFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_ref_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_ref_function_pointer</title>
+  <title>object_info_get_ref_function_pointer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(GIRepository.ObjectInfoRefFunction)
+def object_info_get_ref_function_pointer(info)
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 increase the reference count an instance of this object type.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
index d37bf2d5..9e30f51f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function.page
@@ -1,15 +1,44 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_set_value_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_set_value_function</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_set_value_function</title>
+  <title>object_info_get_set_value_function</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(utf8)
+def object_info_get_set_value_function(info)
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to convert
 set a GValue giving an object instance pointer of this object type.
 I's mainly used fundamental types. The type signature for the symbol
 is %GIObjectInfoSetValueFunction, to fetch the function pointer
-see g_object_info_get_set_value_function().</p></page>
+see g_object_info_get_set_value_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
index 1141c31a..9c2646d7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_set_value_function_pointer.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_set_value_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ObjectInfoSetValueFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_set_value_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_set_value_function_pointer</title>
+  <title>object_info_get_set_value_function_pointer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(GIRepository.ObjectInfoSetValueFunction)
+def object_info_get_set_value_function_pointer(info)
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 set a GValue given an instance of this object type.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page
index 90ba5f61..be2b9216 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_signal.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.SignalInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_signal</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_signal</title>
-<p>Obtain an object type signal at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_signal</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.SignalInfo)
+def object_info_get_signal(info, n)
+</code></synopsis>
+<p>Obtain an object type signal at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of signal to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page
index dc6fa951..25e2243a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_init.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_type_init"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_type_init</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_type_init</title>
+  <title>object_info_get_type_init</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(utf8)
+def object_info_get_type_init(info)
+</code></synopsis>
 <p>Obtain the function which when called will return the GType
-function for which this object type is registered.</p></page>
+function for which this object type is registered.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type init function</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page
index bff23d2a..154bcb35 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_type_name.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_type_name"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_type_name</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_type_name</title>
-<p>Obtain the name of the objects class/type.</p></page>
+  <title>object_info_get_type_name</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(utf8)
+def object_info_get_type_name(info)
+</code></synopsis>
+<p>Obtain the name of the objects class/type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>name of the objects type</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
index 1829c346..63b00c72 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_unref_function"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_unref_function</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_unref_function</title>
+  <title>object_info_get_unref_function</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(utf8)
+def object_info_get_unref_function(info)
+</code></synopsis>
 <p>Obtain the symbol name of the function that should be called to unref this
 object type. It's mainly used fundamental types. The type signature for
 the symbol is %GIObjectInfoUnrefFunction, to fetch the function pointer
-see g_object_info_get_unref_function().</p></page>
+see g_object_info_get_unref_function().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
index 35811aff..5584f78c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_unref_function_pointer.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_unref_function_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ObjectInfoUnrefFunction</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_unref_function_pointer</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_unref_function_pointer</title>
+  <title>object_info_get_unref_function_pointer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo)
+@returns(GIRepository.ObjectInfoUnrefFunction)
+def object_info_get_unref_function_pointer(info)
+</code></synopsis>
 <p>Obtain a pointer to a function which can be used to
 decrease the reference count an instance of this object type.
 This takes derivation into account and will reversely traverse
-the base classes of this type, starting at the top type.</p></page>
+the base classes of this type, starting at the top type.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the function pointer or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page
index a190fe14..d9200d3a 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_get_vfunc.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.object_info_get_vfunc"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfo</api:type>
+      </api:returns>
+      <api:name>g_object_info_get_vfunc</api:name>
+      <api:arg>
+        <api:type>GIRepository.ObjectInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.object_info_get_vfunc</title>
-<p>Obtain an object type virtual function at index @n.</p><p>g_base_info_unref() when done.</p></page>
+  <title>object_info_get_vfunc</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ObjectInfo, gint)
+@returns(GIRepository.VFuncInfo)
+def object_info_get_vfunc(info, n)
+</code></synopsis>
+<p>Obtain an object type virtual function at index @n.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIRepository.ObjectInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of virtual function to get</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link>. Free the struct by calling</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page
index 3ce24b0c..ca54411e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_flags.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.property_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GObject.ParamFlags</api:type>
+      </api:returns>
+      <api:name>g_property_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIRepository.PropertyInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.property_info_get_flags</title>
+  <title>property_info_get_flags</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.PropertyInfo)
+@returns(GObject.ParamFlags)
+def property_info_get_flags(info)
+</code></synopsis>
 <p>Obtain the flags for this property info. See <link xref="GParamFags">GParamFags</link> for
-more information about possible flag values.</p></page>
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page
index a4ff311a..e645fab7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_ownership_transfer.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.property_info_get_ownership_transfer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.Transfer</api:type>
+      </api:returns>
+      <api:name>g_property_info_get_ownership_transfer</api:name>
+      <api:arg>
+        <api:type>GIRepository.PropertyInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.property_info_get_ownership_transfer</title>
-<p>Obtain the ownership transfer for this property. See <link xref="GITransfer">GITransfer</link> for more
-information about transfer values.</p></page>
+  <title>property_info_get_ownership_transfer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.PropertyInfo)
+@returns(GIRepository.Transfer)
+def property_info_get_ownership_transfer(info)
+</code></synopsis>
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GIRepository.Transfer</link> for more
+information about transfer values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the transfer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page
index 73d57a7e..f1a8e85b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.property_info_get_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.property_info_get_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_property_info_get_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.PropertyInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.property_info_get_type</title>
-<p>Obtain the type information for the property @info.</p><p>g_base_info_unref() when done.</p></page>
+  <title>property_info_get_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.PropertyInfo)
+@returns(GIRepository.TypeInfo)
+def property_info_get_type(info)
+</code></synopsis>
+<p>Obtain the type information for the property @info.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIRepository.PropertyInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page
index a2871e02..f0119c02 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_g_type.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.registered_type_info_get_g_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GType</api:type>
+      </api:returns>
+      <api:name>g_registered_type_info_get_g_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.RegisteredTypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.registered_type_info_get_g_type</title>
+  <title>registered_type_info_get_g_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.RegisteredTypeInfo)
+@returns(GType)
+def registered_type_info_get_g_type(info)
+</code></synopsis>
 <p>Obtain the <link xref="GType">GType</link> for this registered type or G_TYPE_NONE which a special meaning.
 It means that either there is no type information associated with this @info or
 that the shared library which provides the type_init function for this
-@info cannot be called.</p></page>
+@info cannot be called.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GType">GType</link>.</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page
index 805d7c29..b2d63463 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_init.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.registered_type_info_get_type_init"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_registered_type_info_get_type_init</api:name>
+      <api:arg>
+        <api:type>GIRepository.RegisteredTypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.registered_type_info_get_type_init</title>
+  <title>registered_type_info_get_type_init</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.RegisteredTypeInfo)
+@returns(utf8)
+def registered_type_info_get_type_init(info)
+</code></synopsis>
 <p>Obtain the type init function for @info. The type init function is the
 function which will register the GType within the GObject type system.
 Usually this is not called by langauge bindings or applications, use
-g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_module_symbol().</p></page>
+g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_module_symbol().</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the symbol name of the type init function, suitable for</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page
index cf2e7068..a127f2ad 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.registered_type_info_get_type_name.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.registered_type_info_get_type_name"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_registered_type_info_get_type_name</api:name>
+      <api:arg>
+        <api:type>GIRepository.RegisteredTypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.registered_type_info_get_type_name</title>
+  <title>registered_type_info_get_type_name</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.RegisteredTypeInfo)
+@returns(utf8)
+def registered_type_info_get_type_name(info)
+</code></synopsis>
 <p>Obtain the type name of the struct within the GObject type system.
-This type can be passed to g_type_name() to get a <link xref="GType">GType</link>.</p></page>
+This type can be passed to g_type_name() to get a <link xref="GType">GType</link>.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRepository.RegisteredTypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type name</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
index 37170c06..9a12d01d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_class_closure.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.signal_info_get_class_closure"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfo</api:type>
+      </api:returns>
+      <api:name>g_signal_info_get_class_closure</api:name>
+      <api:arg>
+        <api:type>GIRepository.SignalInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.signal_info_get_class_closure</title>
+  <title>signal_info_get_class_closure</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.SignalInfo)
+@returns(GIRepository.VFuncInfo)
+def signal_info_get_class_closure(info)
+</code></synopsis>
 <p>Obtain the class closure for this signal if one is set. The class
 closure is a virtual function on the type that the signal belongs to.
-If the signal lacks a closure %NULL will be returned.</p></page>
+If the signal lacks a closure None will be returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the class closure or None</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page
index d54aee44..01a6085b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_get_flags.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.signal_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GObject.SignalFlags</api:type>
+      </api:returns>
+      <api:name>g_signal_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIRepository.SignalInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.signal_info_get_flags</title>
+  <title>signal_info_get_flags</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.SignalInfo)
+@returns(GObject.SignalFlags)
+def signal_info_get_flags(info)
+</code></synopsis>
 <p>Obtain the flags for this signal info. See <link xref="GSignalFlags">GSignalFlags</link> for
-more information about possible flag values.</p></page>
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page
index 7c4faabf..d98975b0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.signal_info_true_stops_emit.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.signal_info_true_stops_emit"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_signal_info_true_stops_emit</api:name>
+      <api:arg>
+        <api:type>GIRepository.SignalInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.signal_info_true_stops_emit</title>
+  <title>signal_info_true_stops_emit</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.SignalInfo)
+@returns(gboolean)
+def signal_info_true_stops_emit(info)
+</code></synopsis>
 <p>Obtain if the returning true in the signal handler will
-stop the emission of the signal.</p></page>
+stop the emission of the signal.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GIRepository.SignalInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if returning true stops the signal emission</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page
index 5a9a875b..3f0c7578 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_find_method.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_struct_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_find_method</title>
-<p>Obtain the type information for method named @name.</p><p>when done.</p></page>
+  <title>struct_info_find_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo, utf8)
+@returns(GIRepository.FunctionInfo)
+def struct_info_find_method(info, name)
+</code></synopsis>
+<p>Obtain the type information for method named @name.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a method name</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page
index fe2d2f97..537bbfa1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_alignment.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_alignment"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_alignment</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_get_alignment</title>
-<p>Obtain the required alignment of the structure.</p></page>
+  <title>struct_info_get_alignment</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo)
+@returns(gsize)
+def struct_info_get_alignment(info)
+</code></synopsis>
+<p>Obtain the required alignment of the structure.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>required alignment in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page
index 8d070049..cac0bbc3 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_field.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FieldInfo</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_get_field</title>
-<p>Obtain the type information for field with specified index.</p><p>when done.</p></page>
+  <title>struct_info_get_field</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo, gint)
+@returns(GIRepository.FieldInfo)
+def struct_info_get_field(info, n)
+</code></synopsis>
+<p>Obtain the type information for field with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page
index 2664e57f..ef731f07 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_method.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_get_method</title>
-<p>Obtain the type information for method with specified index.</p><p>when done.</p></page>
+  <title>struct_info_get_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo, gint)
+@returns(GIRepository.FunctionInfo)
+def struct_info_get_method(info, n)
+</code></synopsis>
+<p>Obtain the type information for method with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a method index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page
index b9cb4637..9648a53b 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_fields.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_n_fields"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_n_fields</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_get_n_fields</title>
-<p>Obtain the number of fields this structure has.</p></page>
+  <title>struct_info_get_n_fields</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo)
+@returns(gint)
+def struct_info_get_n_fields(info)
+</code></synopsis>
+<p>Obtain the number of fields this structure has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page
index 8c807982..83eb6c17 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_n_methods.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_get_n_methods</title>
-<p>Obtain the number of methods this structure has.</p></page>
+  <title>struct_info_get_n_methods</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo)
+@returns(gint)
+def struct_info_get_n_methods(info)
+</code></synopsis>
+<p>Obtain the number of methods this structure has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page
index 28fdd9cc..d46018f1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_get_size.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_get_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_struct_info_get_size</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_get_size</title>
-<p>Obtain the total size of the structure.</p></page>
+  <title>struct_info_get_size</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo)
+@returns(gsize)
+def struct_info_get_size(info)
+</code></synopsis>
+<p>Obtain the total size of the structure.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the structure in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_foreign.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_foreign.page
index 1e09a1e0..9801afc9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_foreign.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_foreign.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_is_foreign"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_struct_info_is_foreign</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_is_foreign</title>
+  <title>struct_info_is_foreign</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo)
+@returns(gboolean)
+def struct_info_is_foreign(info)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page
index 01e52ef5..546ba03e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.struct_info_is_gtype_struct.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.struct_info_is_gtype_struct"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_struct_info_is_gtype_struct</api:name>
+      <api:arg>
+        <api:type>GIRepository.StructInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.struct_info_is_gtype_struct</title>
+  <title>struct_info_is_gtype_struct</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.StructInfo)
+@returns(gboolean)
+def struct_info_is_gtype_struct(info)
+</code></synopsis>
 <p>Return true if this structure represents the "class structure" for some
 <link xref="GObject">GObject</link> or <link xref="GInterface">GInterface</link>.  This function is mainly useful to hide this kind of structure
-from generated public APIs.</p></page>
+from generated public APIs.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIRepository.StructInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if this is a class struct, False otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page
index 9e5297cc..b848767e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_fixed_size.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_array_fixed_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_array_fixed_size</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_get_array_fixed_size</title>
+  <title>type_info_get_array_fixed_size</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(gint)
+def type_info_get_array_fixed_size(info)
+</code></synopsis>
 <p>Obtain the fixed array size of the type. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the size or -1 if it's not an array</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page
index 94cec6ee..7280cfbb 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_length.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_array_length"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_array_length</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_get_array_length</title>
+  <title>type_info_get_array_length</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(gint)
+def type_info_get_array_length(info)
+</code></synopsis>
 <p>Obtain the array length of the type. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p></page>
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or -1 will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array length, or -1 if the type is not an array</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page
index a8fb76e4..e9122f32 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_array_type.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_array_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ArrayType</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_array_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_get_array_type</title>
-<p>Obtain the array type for this type. See <link xref="GIArrayType">GIArrayType</link> for a list of
+  <title>type_info_get_array_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(GIRepository.ArrayType)
+def type_info_get_array_type(info)
+</code></synopsis>
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIRepository.ArrayType</link> for a list of
 possible values. If the type tag of this type is not array, -1 will be
-returned.</p></page>
+returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the array type or -1</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
index 63b19149..1433f665 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_interface.page
@@ -1,14 +1,43 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_interface"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.BaseInfo</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_interface</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_get_interface</title>
+  <title>type_info_get_interface</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(GIRepository.BaseInfo)
+def type_info_get_interface(info)
+</code></synopsis>
 <p>For types which have <link xref="GI_TYPE_TAG_INTERFACE">GI_TYPE_TAG_INTERFACE</link> such as GObjects and boxed values,
 this function returns full information about the referenced type.  You can then
-inspect the type of the returned <link xref="GIBaseInfo">GIBaseInfo</link> to further query whether it is
-a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p></page>
+inspect the type of the returned <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link> to further query whether it is
+a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIRepository.BaseInfo</link>, or None. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page
index 1cc7d67a..6c8c038d 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_param_type.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_param_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_param_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_get_param_type</title>
-<p>Obtain the parameter type @n.</p></page>
+  <title>type_info_get_param_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo, gint)
+@returns(GIRepository.TypeInfo)
+def type_info_get_param_type(info, n)
+</code></synopsis>
+<p>Obtain the parameter type @n.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>index of the parameter</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the param type info</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page
index 73baf7a4..f4bd50a9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_get_tag.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_get_tag"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeTag</api:type>
+      </api:returns>
+      <api:name>g_type_info_get_tag</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_get_tag</title>
-<p>Obtain the type tag for the type. See <link xref="GITypeTag">GITypeTag</link> for a list
-of type tags.</p></page>
+  <title>type_info_get_tag</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(GIRepository.TypeTag)
+def type_info_get_tag(info)
+</code></synopsis>
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GIRepository.TypeTag</link> for a list
+of type tags.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the type tag</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page
index ddc7f678..f8383b64 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_pointer.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_is_pointer"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_type_info_is_pointer</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_is_pointer</title>
-<p>Obtain if the type is passed as a reference.</p></page>
+  <title>type_info_is_pointer</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(gboolean)
+def type_info_is_pointer(info)
+</code></synopsis>
+<p>Obtain if the type is passed as a reference.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if it is a pointer</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
index ad8e22bf..1c78bdd0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_info_is_zero_terminated.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_info_is_zero_terminated"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_type_info_is_zero_terminated</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_info_is_zero_terminated</title>
-<p>Obtain if the last element of the array is %NULL. The type tag must be a
-<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or %FALSE will returned.</p></page>
+  <title>type_info_is_zero_terminated</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeInfo)
+@returns(gboolean)
+def type_info_is_zero_terminated(info)
+</code></synopsis>
+<p>Obtain if the last element of the array is None. The type tag must be a
+<link xref="GI_TYPE_TAG_ARRAY">GI_TYPE_TAG_ARRAY</link> or False will returned.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if zero terminated</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_tag_to_string.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_tag_to_string.page
index e6df08f0..8e0dc3c2 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_tag_to_string.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.type_tag_to_string.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.type_tag_to_string"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>utf8</api:type>
+      </api:returns>
+      <api:name>g_type_tag_to_string</api:name>
+      <api:arg>
+        <api:type>GIRepository.TypeTag</api:type>
+        <api:name>type</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.type_tag_to_string</title>
-<p>Obtain a string representation of @type</p></page>
+  <title>type_tag_to_string</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.TypeTag)
+@returns(utf8)
+def type_tag_to_string(type)
+</code></synopsis>
+<p>Obtain a string representation of @type</p>
+
+<table>
+<tr>
+<td><p>type :</p></td>
+<td><p>the type_tag</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the string</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page
index d79cbe36..1e8ccc8f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_find_method.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_find_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_union_info_find_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>utf8</api:type>
+        <api:name>name</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_find_method</title>
-<p>Obtain the type information for method named @name.</p><p>when done.</p></page>
+  <title>union_info_find_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo, utf8)
+@returns(GIRepository.FunctionInfo)
+def union_info_find_method(info, name)
+</code></synopsis>
+<p>Obtain the type information for method named @name.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>name :</p></td>
+<td><p>a method name</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page
index 67f1343e..41a4478f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_alignment.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_alignment"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_alignment</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_alignment</title>
-<p>Obtain the required alignment of the union.</p></page>
+  <title>union_info_get_alignment</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(gsize)
+def union_info_get_alignment(info)
+</code></synopsis>
+<p>Obtain the required alignment of the union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>required alignment in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page
index c52fe728..4f2bc8cf 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator.page
@@ -1,13 +1,50 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_discriminator"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.ConstantInfo</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_discriminator</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_discriminator</title>
+  <title>union_info_get_discriminator</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo, gint)
+@returns(GIRepository.ConstantInfo)
+def union_info_get_discriminator(info, n)
+</code></synopsis>
 <p>Obtain discriminator value assigned for n-th union field, i.e. n-th
 union field is the active one if discriminator contains this
-constant.</p><p>when done.</p></page>
+constant.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a union field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIRepository.ConstantInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_offset.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_offset.page
index 848b4532..f4607bd0 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_offset.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_offset.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_discriminator_offset"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_discriminator_offset</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_discriminator_offset</title>
+  <title>union_info_get_discriminator_offset</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(gint)
+def union_info_get_discriminator_offset(info)
+</code></synopsis>
+
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td></td>
+</tr>
+</table>
 </page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
index 09f7f308..c6d1c99c 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_discriminator_type"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.TypeInfo</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_discriminator_type</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_discriminator_type</title>
-<p>Obtain the type information of the union discriminator.</p><p>when done.</p></page>
+  <title>union_info_get_discriminator_type</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(GIRepository.TypeInfo)
+def union_info_get_discriminator_type(info)
+</code></synopsis>
+<p>Obtain the type information of the union discriminator.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GIRepository.TypeInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page
index 3dd15117..71971333 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_field.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_field"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FieldInfo</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_field</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_field</title>
-<p>Obtain the type information for field with specified index.</p><p>when done.</p></page>
+  <title>union_info_get_field</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo, gint)
+@returns(GIRepository.FieldInfo)
+def union_info_get_field(info, n)
+</code></synopsis>
+<p>Obtain the type information for field with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a field index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIRepository.FieldInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page
index efaa9dc9..b0f9c60e 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_method.page
@@ -1,11 +1,48 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_method"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_method</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_method</title>
-<p>Obtain the type information for method with specified index.</p><p>when done.</p></page>
+  <title>union_info_get_method</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo, gint)
+@returns(GIRepository.FunctionInfo)
+def union_info_get_method(info, n)
+</code></synopsis>
+<p>Obtain the type information for method with specified index.</p><p>when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>n :</p></td>
+<td><p>a method index</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIRepository.FunctionInfo</link>, free it with g_base_info_unref()</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page
index 1b9cd575..8467d7ef 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_fields.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_n_fields"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_n_fields</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_n_fields</title>
-<p>Obtain the number of fields this union has.</p></page>
+  <title>union_info_get_n_fields</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(gint)
+def union_info_get_n_fields(info)
+</code></synopsis>
+<p>Obtain the number of fields this union has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of fields</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page
index ab0e8073..aa6a24a8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_n_methods.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_n_methods"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_n_methods</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_n_methods</title>
-<p>Obtain the number of methods this union has.</p></page>
+  <title>union_info_get_n_methods</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(gint)
+def union_info_get_n_methods(info)
+</code></synopsis>
+<p>Obtain the number of methods this union has.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>number of methods</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page
index daf0281b..7fd35af7 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_size.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_get_size"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gsize</api:type>
+      </api:returns>
+      <api:name>g_union_info_get_size</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_get_size</title>
-<p>Obtain the total size of the union.</p></page>
+  <title>union_info_get_size</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(gsize)
+def union_info_get_size(info)
+</code></synopsis>
+<p>Obtain the total size of the union.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>size of the union in bytes</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page
index d7951626..957b9305 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_is_discriminated.page
@@ -1,11 +1,40 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.union_info_is_discriminated"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_union_info_is_discriminated</api:name>
+      <api:arg>
+        <api:type>GIRepository.UnionInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.union_info_is_discriminated</title>
-<p>Return true if this union contains discriminator field.</p></page>
+  <title>union_info_is_discriminated</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.UnionInfo)
+@returns(gboolean)
+def union_info_is_discriminated(info)
+</code></synopsis>
+<p>Return true if this union contains discriminator field.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIRepository.UnionInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if this is a discriminated union, False otherwise</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page
index 0ecb0cb8..da4d0c04 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.value_info_get_value.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.value_info_get_value"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint64</api:type>
+      </api:returns>
+      <api:name>g_value_info_get_value</api:name>
+      <api:arg>
+        <api:type>GIRepository.ValueInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.value_info_get_value</title>
-<p>Obtain the enumeration value of the <link xref="GIValueInfo">GIValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
-return type is to allow both.</p></page>
+  <title>value_info_get_value</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.ValueInfo)
+@returns(gint64)
+def value_info_get_value(info)
+</code></synopsis>
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
+return type is to allow both.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIRepository.ValueInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the enumeration value. This will always be representable</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
index 4569fe79..ecccffca 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_address.page
@@ -1,12 +1,49 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_address"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gpointer</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_address</api:name>
+      <api:arg>
+        <api:type>GIRepository.VFuncInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GType</api:type>
+        <api:name>implementor_gtype</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.vfunc_info_get_address</title>
+  <title>vfunc_info_get_address</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.VFuncInfo, GType)
+@returns(gpointer)
+def vfunc_info_get_address(info, implementor_gtype)
+</code></synopsis>
 <p>This method will look up where inside the type struct of @implementor_gtype
-is the implementation for @info.</p></page>
+is the implementation for @info.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>implementor_gtype :</p></td>
+<td><p><link xref="GType">GType</link> implementing this virtual function</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>address to a function or None if an error happened</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page
index 5b2dfb7d..c4690bf1 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_flags.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_flags"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.VFuncInfoFlags</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_flags</api:name>
+      <api:arg>
+        <api:type>GIRepository.VFuncInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.vfunc_info_get_flags</title>
-<p>Obtain the flags for this virtual function info. See <link xref="GIVFuncInfoFlags">GIVFuncInfoFlags</link> for
-more information about possible flag values.</p></page>
+  <title>vfunc_info_get_flags</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.VFuncInfo)
+@returns(GIRepository.VFuncInfoFlags)
+def vfunc_info_get_flags(info)
+</code></synopsis>
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIRepository.VFuncInfoFlags</link> for
+more information about possible flag values.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the flags</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
index 042bbbc4..95819a90 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_invoker.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_invoker"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.FunctionInfo</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_invoker</api:name>
+      <api:arg>
+        <api:type>GIRepository.VFuncInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.vfunc_info_get_invoker</title>
+  <title>vfunc_info_get_invoker</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.VFuncInfo)
+@returns(GIRepository.FunctionInfo)
+def vfunc_info_get_invoker(info)
+</code></synopsis>
 <p>If this virtual function has an associated invoker method, this
-method will return it.  An invoker method is a C entry point.</p><p>Not all virtuals will have invokers.</p><p>g_base_info_unref() when done.</p></page>
+method will return it.  An invoker method is a C entry point.</p><p>Not all virtuals will have invokers.</p><p>g_base_info_unref() when done.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> or None. Free it with</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page
index 9c219290..da482367 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_offset.page
@@ -1,12 +1,41 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_offset"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gint</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_offset</api:name>
+      <api:arg>
+        <api:type>GIRepository.VFuncInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.vfunc_info_get_offset</title>
+  <title>vfunc_info_get_offset</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.VFuncInfo)
+@returns(gint)
+def vfunc_info_get_offset(info)
+</code></synopsis>
 <p>Obtain the offset of the function pointer in the class struct. The value
-0xFFFF indicates that the struct offset is unknown.</p></page>
+0xFFFF indicates that the struct offset is unknown.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the struct offset or 0xFFFF if it's unknown</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
index d21acdc5..b6bf3019 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_get_signal.page
@@ -1,13 +1,42 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_get_signal"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>GIRepository.SignalInfo</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_get_signal</api:name>
+      <api:arg>
+        <api:type>GIRepository.VFuncInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.vfunc_info_get_signal</title>
+  <title>vfunc_info_get_signal</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.VFuncInfo)
+@returns(GIRepository.SignalInfo)
+def vfunc_info_get_signal(info)
+</code></synopsis>
 <p>Obtain the signal for the virtual function if one is set.
 The signal comes from the object or interface to which
-this virtual function belongs.</p></page>
+this virtual function belongs.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link></p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>the signal or None if none set</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
index f3b8533f..197cb20f 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.vfunc_info_invoke.page
@@ -1,13 +1,90 @@
 <?xml version="1.0"?>
+
 <page id="GIRepository.vfunc_info_invoke"
       type="topic"
       style="function"
       xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/experimental/ui/">
   <info>
     <link type="guide" xref="index" group="function"/>
+    <api:function>
+      <api:returns>
+        <api:type>gboolean</api:type>
+      </api:returns>
+      <api:name>g_vfunc_info_invoke</api:name>
+      <api:arg>
+        <api:type>GIRepository.VFuncInfo</api:type>
+        <api:name>info</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>GType</api:type>
+        <api:name>implementor</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n_in_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>gint</api:type>
+        <api:name>n_out_args</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>None</api:type>
+        <api:name>return_value</api:name>
+      </api:arg>
+    </api:function>
   </info>
-  <title>GIRepository.vfunc_info_invoke</title>
+  <title>vfunc_info_invoke</title>
+<synopsis><code mime="text/x-python">
+@accepts(GIRepository.VFuncInfo, GType, None, gint, None, gint, None)
+@returns(gboolean)
+def vfunc_info_invoke(info, implementor, in_args, n_in_args, out_args, n_out_args, return_value)
+</code></synopsis>
 <p>Invokes the function described in @info with the given
 arguments. Note that inout parameters must appear in both
-argument lists.</p><p>error occurred.</p></page>
+argument lists.</p><p>error occurred.</p>
+
+<table>
+<tr>
+<td><p>info :</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIRepository.VFuncInfo</link> describing the virtual function to invoke</p></td>
+</tr>
+<tr>
+<td><p>implementor :</p></td>
+<td><p><link xref="GType">GType</link> of the type that implements this virtual function</p></td>
+</tr>
+<tr>
+<td><p>in_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each in parameter of @info. If there are no in parameter, @in_args can be None</p></td>
+</tr>
+<tr>
+<td><p>n_in_args :</p></td>
+<td><p>the length of the @in_args array</p></td>
+</tr>
+<tr>
+<td><p>out_args :</p></td>
+<td><p>an array of <link xref="GIArgument">GIArgument</link>&lt;!-- --&gt;s, one for each out parameter of @info. If there are no out parameters, @out_args may be None</p></td>
+</tr>
+<tr>
+<td><p>n_out_args :</p></td>
+<td><p>the length of the @out_args array</p></td>
+</tr>
+<tr>
+<td><p>return_value :</p></td>
+<td><p>return location for the return value of the function. If the function returns void, @return_value may be None</p></td>
+</tr>
+<tr>
+<td><p>Returns :</p></td>
+<td><p>True if the function has been invoked, False if an</p></td>
+</tr>
+</table>
+</page>
diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am
index eff85e7e..5bb84a65 100644
--- a/tests/doctool/Makefile.am
+++ b/tests/doctool/Makefile.am
@@ -1,30 +1,29 @@
 include $(top_srcdir)/common.mk
 
-# Disabled temporarily
+GIRS = GIRepository-2.0.gir
+CHECK_TARGETS = $(GIRS:.gir=-C.page.check) $(GIRS:.gir=-Python.page.check)
+MALLARD_DIRS = $(GIRS:.gir=-C) $(GIRS:.gir=-Python)
+EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected)
+CLEANFILES = $(GIRS)
+BUILT_SOURCES = $(MALLARD_DIRS)
+EXTRA_DIST = $(EXPECTED_MALLARD_DIRS)
 
-# GIRS = GIRepository-2.0.gir
-# CHECK_TARGETS = $(GIRS:.gir=-C.page.check) $(GIRS:.gir=-Python.page.check)
-# MALLARD_DIRS = $(GIRS:.gir=-C) $(GIRS:.gir=-Python)
-# EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected)
-# CLEANFILES = $(GIRS)
-# EXTRA_DIST = $(EXPECTED_MALLARD_DIRS)
+%.gir:
+	cp ../../$*.gir .
 
-# %.gir:
-# 	cp ../../$*.gir .
+%-C: %.gir
+	mkdir $*-C ; rm $*-C/*.page ; $(INTROSPECTION_DOCTOOL) --language C $*.gir -o $*-C/index.page && echo "  GEN  $*-C/index.page"
 
-# %-C: %.gir
-# 	mkdir $*-C ; rm $*-C/*.page ; $(INTROSPECTION_DOCTOOL) --language C --format mallard $*.gir -o $*-C/index.page && echo "  GEN  $*-C/index.page"
+%-Python: %.gir
+	mkdir $*-Python ; rm $*-Python/*.page ; $(INTROSPECTION_DOCTOOL) --language Python $*.gir -o $*-Python/index.page && echo "  GEN  $*-Python/index.page"
 
-# %-Python: %.gir
-# 	mkdir $*-Python ; rm $*-Python/*.page ; $(INTROSPECTION_DOCTOOL) --language Python --format mallard $*.gir -o $*-Python/index.page && echo "  GEN  $*-Python/index.page"
+%-C.page.check: %-C
+	@diff -u -U 10 $(srcdir)/$*-C-expected $*-C && echo "  TEST  $*-C" && rm -rf $*-C
 
-# %-C.page.check: %-C
-# 	@diff -u -U 10 $(srcdir)/$*-C-expected $*-C && echo "  TEST  $*-C" && rm -rf $*-C
+%-Python.page.check: %-Python
+	@diff -u -U 10 $(srcdir)/$*-Python-expected $*-Python && echo "  TEST  $*-Python" && rm -rf $*-Python
 
-# %-Python.page.check: %-Python
-# 	@diff -u -U 10 $(srcdir)/$*-Python-expected $*-Python && echo "  TEST  $*-Python" && rm -rf $*-Python
+check-local: $(CHECK_TARGETS)
 
-# check-local: $(CHECK_TARGETS)
-
-# clean-local:
-# 	@rm -rf $(MALLARD_DIRS)
+clean-local:
+	@rm -rf $(MALLARD_DIRS)