[gobject-introspection/mallard-templates] g-ir-doc-tool: Implement intra-namespace cross references
- From: Tomeu Vizoso <tomeuv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection/mallard-templates] g-ir-doc-tool: Implement intra-namespace cross references
- Date: Sun, 19 Feb 2012 15:36:33 +0000 (UTC)
commit ddb5f1002447b7021b0a57ec02dcc191a17788e4
Author: Tomeu Vizoso <tomeu vizoso collabora com>
Date: Sun Feb 19 16:35:59 2012 +0100
g-ir-doc-tool: Implement intra-namespace cross references
giscanner/mallardwriter.py | 6 +++++-
.../GIRepository.ArrayType.page | 2 +-
.../GIRepository.AttributeIter.page | 2 +-
.../GIRepository.BaseInfo.equal.page | 8 ++++----
.../GIRepository.BaseInfo.get_container.page | 4 ++--
.../GIRepository.BaseInfo.get_name.page | 2 +-
.../GIRepository.BaseInfo.iterate_attributes.page | 2 +-
.../GIRepository.BaseInfo.page | 8 ++++----
.../GIRepository.CallableInfo.page | 4 ++--
.../GIRepository.Direction.page | 2 +-
.../GIRepository.FieldInfo.page | 2 +-
.../GIRepository.FieldInfoFlags.page | 2 +-
.../GIRepository.FunctionInfoFlags.page | 2 +-
.../GIRepository.PropertyInfo.page | 2 +-
...Repository.Repository.find_by_error_domain.page | 2 +-
.../GIRepository.Repository.find_by_gtype.page | 2 +-
.../GIRepository.Repository.find_by_name.page | 2 +-
.../GIRepository.Repository.get_default.page | 6 +++---
.../GIRepository.Repository.get_info.page | 2 +-
.../GIRepository.Repository.require.page | 2 +-
.../GIRepository.Repository.require_private.page | 2 +-
.../GIRepository.ScopeType.page | 2 +-
.../GIRepository.Transfer.page | 2 +-
.../GIRepository.TypeTag.page | 2 +-
.../GIRepository.VFuncInfoFlags.page | 2 +-
.../GIRepository.ValueInfo.page | 2 +-
.../GIRepository.arg_info_get_closure.page | 2 +-
.../GIRepository.arg_info_get_destroy.page | 2 +-
.../GIRepository.arg_info_get_direction.page | 4 ++--
...Repository.arg_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.arg_info_get_scope.page | 4 ++--
.../GIRepository.arg_info_get_type.page | 4 ++--
.../GIRepository.arg_info_is_caller_allocates.page | 2 +-
.../GIRepository.arg_info_is_optional.page | 2 +-
.../GIRepository.arg_info_is_return_value.page | 2 +-
.../GIRepository.arg_info_is_skip.page | 2 +-
.../GIRepository.arg_info_load_type.page | 2 +-
.../GIRepository.arg_info_may_be_null.page | 2 +-
.../GIRepository.base_info_get_type.page | 2 +-
.../GIRepository.callable_info_get_arg.page | 4 ++--
...GIRepository.callable_info_get_caller_owns.page | 4 ++--
.../GIRepository.callable_info_get_n_args.page | 2 +-
...ository.callable_info_get_return_attribute.page | 2 +-
...GIRepository.callable_info_get_return_type.page | 6 +++---
...ry.callable_info_iterate_return_attributes.page | 4 ++--
.../GIRepository.callable_info_load_arg.page | 2 +-
...IRepository.callable_info_load_return_type.page | 2 +-
...GIRepository.callable_info_may_return_null.page | 2 +-
.../GIRepository.callable_info_skip_return.page | 2 +-
.../GIRepository.constant_info_free_value.page | 2 +-
.../GIRepository.constant_info_get_type.page | 6 +++---
.../GIRepository.constant_info_get_value.page | 4 ++--
.../GIRepository.enum_info_get_method.page | 4 ++--
.../GIRepository.enum_info_get_n_methods.page | 2 +-
.../GIRepository.enum_info_get_storage_type.page | 2 +-
.../GIRepository.enum_info_get_value.page | 2 +-
.../GIRepository.field_info_get_field.page | 2 +-
.../GIRepository.field_info_get_flags.page | 4 ++--
.../GIRepository.field_info_get_offset.page | 2 +-
.../GIRepository.field_info_get_size.page | 2 +-
.../GIRepository.field_info_get_type.page | 6 +++---
.../GIRepository.field_info_set_field.page | 2 +-
.../GIRepository.function_info_get_flags.page | 4 ++--
.../GIRepository.function_info_get_property.page | 6 +++---
.../GIRepository.function_info_get_symbol.page | 2 +-
.../GIRepository.function_info_get_vfunc.page | 6 +++---
.../GIRepository.function_info_invoke.page | 2 +-
.../GIRepository.interface_info_find_method.page | 4 ++--
.../GIRepository.interface_info_find_vfunc.page | 4 ++--
.../GIRepository.interface_info_get_constant.page | 4 ++--
...Repository.interface_info_get_iface_struct.page | 4 ++--
.../GIRepository.interface_info_get_method.page | 4 ++--
...IRepository.interface_info_get_n_constants.page | 2 +-
.../GIRepository.interface_info_get_n_methods.page | 2 +-
...ository.interface_info_get_n_prerequisites.page | 2 +-
...Repository.interface_info_get_n_properties.page | 2 +-
.../GIRepository.interface_info_get_n_signals.page | 2 +-
.../GIRepository.interface_info_get_n_vfuncs.page | 2 +-
...Repository.interface_info_get_prerequisite.page | 4 ++--
.../GIRepository.interface_info_get_property.page | 4 ++--
.../GIRepository.interface_info_get_signal.page | 4 ++--
.../GIRepository.interface_info_get_vfunc.page | 4 ++--
.../GIRepository.object_info_find_method.page | 4 ++--
...y.object_info_find_method_using_interfaces.page | 4 ++--
.../GIRepository.object_info_find_signal.page | 2 +-
.../GIRepository.object_info_find_vfunc.page | 4 ++--
.../GIRepository.object_info_get_abstract.page | 2 +-
.../GIRepository.object_info_get_class_struct.page | 4 ++--
.../GIRepository.object_info_get_constant.page | 4 ++--
.../GIRepository.object_info_get_field.page | 4 ++--
.../GIRepository.object_info_get_fundamental.page | 2 +-
...ository.object_info_get_get_value_function.page | 2 +-
...object_info_get_get_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_interface.page | 4 ++--
.../GIRepository.object_info_get_method.page | 4 ++--
.../GIRepository.object_info_get_n_constants.page | 2 +-
.../GIRepository.object_info_get_n_fields.page | 2 +-
.../GIRepository.object_info_get_n_interfaces.page | 2 +-
.../GIRepository.object_info_get_n_methods.page | 2 +-
.../GIRepository.object_info_get_n_properties.page | 2 +-
.../GIRepository.object_info_get_n_signals.page | 2 +-
.../GIRepository.object_info_get_n_vfuncs.page | 2 +-
.../GIRepository.object_info_get_parent.page | 4 ++--
.../GIRepository.object_info_get_property.page | 4 ++--
.../GIRepository.object_info_get_ref_function.page | 2 +-
...itory.object_info_get_ref_function_pointer.page | 2 +-
...ository.object_info_get_set_value_function.page | 2 +-
...object_info_get_set_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_signal.page | 4 ++--
.../GIRepository.object_info_get_type_init.page | 2 +-
.../GIRepository.object_info_get_type_name.page | 2 +-
...IRepository.object_info_get_unref_function.page | 2 +-
...ory.object_info_get_unref_function_pointer.page | 2 +-
.../GIRepository.object_info_get_vfunc.page | 4 ++--
.../GIRepository.property_info_get_flags.page | 2 +-
...itory.property_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.property_info_get_type.page | 4 ++--
...Repository.registered_type_info_get_g_type.page | 2 +-
...ository.registered_type_info_get_type_init.page | 2 +-
...ository.registered_type_info_get_type_name.page | 2 +-
...GIRepository.signal_info_get_class_closure.page | 2 +-
.../GIRepository.signal_info_get_flags.page | 2 +-
.../GIRepository.signal_info_true_stops_emit.page | 2 +-
.../GIRepository.struct_info_find_method.page | 4 ++--
.../GIRepository.struct_info_get_alignment.page | 2 +-
.../GIRepository.struct_info_get_field.page | 4 ++--
.../GIRepository.struct_info_get_method.page | 4 ++--
.../GIRepository.struct_info_get_n_fields.page | 2 +-
.../GIRepository.struct_info_get_n_methods.page | 2 +-
.../GIRepository.struct_info_get_size.page | 2 +-
.../GIRepository.struct_info_is_gtype_struct.page | 2 +-
...IRepository.type_info_get_array_fixed_size.page | 2 +-
.../GIRepository.type_info_get_array_length.page | 2 +-
.../GIRepository.type_info_get_array_type.page | 4 ++--
.../GIRepository.type_info_get_interface.page | 6 +++---
.../GIRepository.type_info_get_param_type.page | 2 +-
.../GIRepository.type_info_get_tag.page | 4 ++--
.../GIRepository.type_info_is_pointer.page | 2 +-
.../GIRepository.type_info_is_zero_terminated.page | 2 +-
.../GIRepository.union_info_find_method.page | 4 ++--
.../GIRepository.union_info_get_alignment.page | 2 +-
.../GIRepository.union_info_get_discriminator.page | 4 ++--
...pository.union_info_get_discriminator_type.page | 4 ++--
.../GIRepository.union_info_get_field.page | 4 ++--
.../GIRepository.union_info_get_method.page | 4 ++--
.../GIRepository.union_info_get_n_fields.page | 2 +-
.../GIRepository.union_info_get_n_methods.page | 2 +-
.../GIRepository.union_info_get_size.page | 2 +-
.../GIRepository.union_info_is_discriminated.page | 2 +-
.../GIRepository.value_info_get_value.page | 4 ++--
.../GIRepository.vfunc_info_get_address.page | 2 +-
.../GIRepository.vfunc_info_get_flags.page | 4 ++--
.../GIRepository.vfunc_info_get_invoker.page | 4 ++--
.../GIRepository.vfunc_info_get_offset.page | 2 +-
.../GIRepository.vfunc_info_get_signal.page | 2 +-
.../GIRepository.vfunc_info_invoke.page | 2 +-
.../GIRepository.ArrayType.page | 2 +-
.../GIRepository.BaseInfo.equal.page | 8 ++++----
.../GIRepository.BaseInfo.get_container.page | 4 ++--
.../GIRepository.BaseInfo.get_name.page | 2 +-
.../GIRepository.BaseInfo.iterate_attributes.page | 2 +-
.../GIRepository.CallableInfo.page | 4 ++--
.../GIRepository.Direction.page | 2 +-
.../GIRepository.FieldInfo.page | 2 +-
.../GIRepository.FieldInfoFlags.page | 2 +-
.../GIRepository.FunctionInfoFlags.page | 2 +-
.../GIRepository.PropertyInfo.page | 2 +-
...Repository.Repository.find_by_error_domain.page | 2 +-
.../GIRepository.Repository.find_by_gtype.page | 2 +-
.../GIRepository.Repository.find_by_name.page | 2 +-
.../GIRepository.Repository.get_default.page | 6 +++---
.../GIRepository.Repository.get_info.page | 2 +-
.../GIRepository.Repository.require.page | 2 +-
.../GIRepository.Repository.require_private.page | 2 +-
.../GIRepository.ScopeType.page | 2 +-
.../GIRepository.Transfer.page | 2 +-
.../GIRepository.TypeTag.page | 2 +-
.../GIRepository.VFuncInfoFlags.page | 2 +-
.../GIRepository.ValueInfo.page | 2 +-
.../GIRepository.arg_info_get_closure.page | 2 +-
.../GIRepository.arg_info_get_destroy.page | 2 +-
.../GIRepository.arg_info_get_direction.page | 4 ++--
...Repository.arg_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.arg_info_get_scope.page | 4 ++--
.../GIRepository.arg_info_get_type.page | 4 ++--
.../GIRepository.arg_info_is_caller_allocates.page | 2 +-
.../GIRepository.arg_info_is_optional.page | 2 +-
.../GIRepository.arg_info_is_return_value.page | 2 +-
.../GIRepository.arg_info_is_skip.page | 2 +-
.../GIRepository.arg_info_load_type.page | 2 +-
.../GIRepository.arg_info_may_be_null.page | 2 +-
.../GIRepository.base_info_get_type.page | 2 +-
.../GIRepository.callable_info_get_arg.page | 4 ++--
...GIRepository.callable_info_get_caller_owns.page | 4 ++--
.../GIRepository.callable_info_get_n_args.page | 2 +-
...ository.callable_info_get_return_attribute.page | 2 +-
...GIRepository.callable_info_get_return_type.page | 6 +++---
...ry.callable_info_iterate_return_attributes.page | 4 ++--
.../GIRepository.callable_info_load_arg.page | 2 +-
...IRepository.callable_info_load_return_type.page | 2 +-
...GIRepository.callable_info_may_return_null.page | 2 +-
.../GIRepository.callable_info_skip_return.page | 2 +-
.../GIRepository.constant_info_free_value.page | 2 +-
.../GIRepository.constant_info_get_type.page | 6 +++---
.../GIRepository.constant_info_get_value.page | 4 ++--
.../GIRepository.enum_info_get_method.page | 4 ++--
.../GIRepository.enum_info_get_n_methods.page | 2 +-
.../GIRepository.enum_info_get_storage_type.page | 2 +-
.../GIRepository.enum_info_get_value.page | 2 +-
.../GIRepository.field_info_get_field.page | 2 +-
.../GIRepository.field_info_get_flags.page | 4 ++--
.../GIRepository.field_info_get_offset.page | 2 +-
.../GIRepository.field_info_get_size.page | 2 +-
.../GIRepository.field_info_get_type.page | 6 +++---
.../GIRepository.field_info_set_field.page | 2 +-
.../GIRepository.function_info_get_flags.page | 4 ++--
.../GIRepository.function_info_get_property.page | 6 +++---
.../GIRepository.function_info_get_symbol.page | 2 +-
.../GIRepository.function_info_get_vfunc.page | 6 +++---
.../GIRepository.function_info_invoke.page | 2 +-
.../GIRepository.interface_info_find_method.page | 4 ++--
.../GIRepository.interface_info_find_vfunc.page | 4 ++--
.../GIRepository.interface_info_get_constant.page | 4 ++--
...Repository.interface_info_get_iface_struct.page | 4 ++--
.../GIRepository.interface_info_get_method.page | 4 ++--
...IRepository.interface_info_get_n_constants.page | 2 +-
.../GIRepository.interface_info_get_n_methods.page | 2 +-
...ository.interface_info_get_n_prerequisites.page | 2 +-
...Repository.interface_info_get_n_properties.page | 2 +-
.../GIRepository.interface_info_get_n_signals.page | 2 +-
.../GIRepository.interface_info_get_n_vfuncs.page | 2 +-
...Repository.interface_info_get_prerequisite.page | 4 ++--
.../GIRepository.interface_info_get_property.page | 4 ++--
.../GIRepository.interface_info_get_signal.page | 4 ++--
.../GIRepository.interface_info_get_vfunc.page | 4 ++--
.../GIRepository.object_info_find_method.page | 4 ++--
...y.object_info_find_method_using_interfaces.page | 4 ++--
.../GIRepository.object_info_find_signal.page | 2 +-
.../GIRepository.object_info_find_vfunc.page | 4 ++--
.../GIRepository.object_info_get_abstract.page | 2 +-
.../GIRepository.object_info_get_class_struct.page | 4 ++--
.../GIRepository.object_info_get_constant.page | 4 ++--
.../GIRepository.object_info_get_field.page | 4 ++--
.../GIRepository.object_info_get_fundamental.page | 2 +-
...ository.object_info_get_get_value_function.page | 2 +-
...object_info_get_get_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_interface.page | 4 ++--
.../GIRepository.object_info_get_method.page | 4 ++--
.../GIRepository.object_info_get_n_constants.page | 2 +-
.../GIRepository.object_info_get_n_fields.page | 2 +-
.../GIRepository.object_info_get_n_interfaces.page | 2 +-
.../GIRepository.object_info_get_n_methods.page | 2 +-
.../GIRepository.object_info_get_n_properties.page | 2 +-
.../GIRepository.object_info_get_n_signals.page | 2 +-
.../GIRepository.object_info_get_n_vfuncs.page | 2 +-
.../GIRepository.object_info_get_parent.page | 4 ++--
.../GIRepository.object_info_get_property.page | 4 ++--
.../GIRepository.object_info_get_ref_function.page | 2 +-
...itory.object_info_get_ref_function_pointer.page | 2 +-
...ository.object_info_get_set_value_function.page | 2 +-
...object_info_get_set_value_function_pointer.page | 2 +-
.../GIRepository.object_info_get_signal.page | 4 ++--
.../GIRepository.object_info_get_type_init.page | 2 +-
.../GIRepository.object_info_get_type_name.page | 2 +-
...IRepository.object_info_get_unref_function.page | 2 +-
...ory.object_info_get_unref_function_pointer.page | 2 +-
.../GIRepository.object_info_get_vfunc.page | 4 ++--
.../GIRepository.property_info_get_flags.page | 2 +-
...itory.property_info_get_ownership_transfer.page | 4 ++--
.../GIRepository.property_info_get_type.page | 4 ++--
...Repository.registered_type_info_get_g_type.page | 2 +-
...ository.registered_type_info_get_type_init.page | 2 +-
...ository.registered_type_info_get_type_name.page | 2 +-
...GIRepository.signal_info_get_class_closure.page | 2 +-
.../GIRepository.signal_info_get_flags.page | 2 +-
.../GIRepository.signal_info_true_stops_emit.page | 2 +-
.../GIRepository.struct_info_find_method.page | 4 ++--
.../GIRepository.struct_info_get_alignment.page | 2 +-
.../GIRepository.struct_info_get_field.page | 4 ++--
.../GIRepository.struct_info_get_method.page | 4 ++--
.../GIRepository.struct_info_get_n_fields.page | 2 +-
.../GIRepository.struct_info_get_n_methods.page | 2 +-
.../GIRepository.struct_info_get_size.page | 2 +-
.../GIRepository.struct_info_is_gtype_struct.page | 2 +-
...IRepository.type_info_get_array_fixed_size.page | 2 +-
.../GIRepository.type_info_get_array_length.page | 2 +-
.../GIRepository.type_info_get_array_type.page | 4 ++--
.../GIRepository.type_info_get_interface.page | 6 +++---
.../GIRepository.type_info_get_param_type.page | 2 +-
.../GIRepository.type_info_get_tag.page | 4 ++--
.../GIRepository.type_info_is_pointer.page | 2 +-
.../GIRepository.type_info_is_zero_terminated.page | 2 +-
.../GIRepository.union_info_find_method.page | 4 ++--
.../GIRepository.union_info_get_alignment.page | 2 +-
.../GIRepository.union_info_get_discriminator.page | 4 ++--
...pository.union_info_get_discriminator_type.page | 4 ++--
.../GIRepository.union_info_get_field.page | 4 ++--
.../GIRepository.union_info_get_method.page | 4 ++--
.../GIRepository.union_info_get_n_fields.page | 2 +-
.../GIRepository.union_info_get_n_methods.page | 2 +-
.../GIRepository.union_info_get_size.page | 2 +-
.../GIRepository.union_info_is_discriminated.page | 2 +-
.../GIRepository.value_info_get_value.page | 4 ++--
.../GIRepository.vfunc_info_get_address.page | 2 +-
.../GIRepository.vfunc_info_get_flags.page | 4 ++--
.../GIRepository.vfunc_info_get_invoker.page | 4 ++--
.../GIRepository.vfunc_info_get_offset.page | 2 +-
.../GIRepository.vfunc_info_get_signal.page | 2 +-
.../GIRepository.vfunc_info_invoke.page | 2 +-
309 files changed, 448 insertions(+), 444 deletions(-)
---
diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py
index b79460e..9ae7aa5 100644
--- a/giscanner/mallardwriter.py
+++ b/giscanner/mallardwriter.py
@@ -63,7 +63,11 @@ class MallardFormatter(object):
result += self.escape(para[:pos])
rest = para[pos + 1:]
link = re.split('[^a-zA-Z_:-]', rest, maxsplit=1)[0]
- xref = link #self.writer._xrefs.get(link, link)
+ if link in self._namespace.ctypes:
+ type_ = self._namespace.get_by_ctype(link)
+ xref = '%s.%s' % (self._namespace.name, type_.name)
+ else:
+ xref = link
result += '<link xref="%s">%s</link>' % (xref, link)
if len(link) < len(rest):
result += self.format_inline(rest[len(link):])
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 7d348d4..da62f44 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ArrayType.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ArrayType</title>
-<p>The type of array in a <link xref="GITypeInfo">GITypeInfo</link>.</p>
+<p>The type of array in a <link xref="GIRepository.TypeInfo">GITypeInfo</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 7528050..8a120d4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.AttributeIter.page
@@ -9,5 +9,5 @@
</info>
<title>GIRepositoryAttributeIter</title>
<p>An opaque structure used to iterate over attributes
-in a <link xref="GIBaseInfo">GIBaseInfo</link> struct.</p>
+in a <link xref="GIRepository.BaseInfo">GIBaseInfo</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 24966ea..41866da 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
@@ -23,14 +23,14 @@
<synopsis><code mime="text/x-csrc">
gboolean g_base_info_equal (GIBaseInfo* info2);
</code></synopsis>
-<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>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIBaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIBaseInfo</link> comparisons.</p>
<table>
<tr>
<td><p>info2 :</p></td>
-<td><p>a <link xref="GIBaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 f8e8346..f4f8631 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
@@ -20,8 +20,8 @@
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>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
<table>
<tr>
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 ad4115b..332bf11 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
@@ -20,7 +20,7 @@
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 <link xref="GIRepository.InfoType">GIInfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> it is
the name of the function.</p>
<table>
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 a15e328..35cfe51 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
@@ -56,7 +56,7 @@ g_print ("attribute name: %s value: %s", name, value);
<table>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIAttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 5987810..e156e6c 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</link> API.
+All other structs can be casted to a <link xref="GIRepository.BaseInfo">GIBaseInfo</link>, for instance:
<example>
-<title>Casting a <link xref="GIFunctionInfo">GIFunctionInfo</link> to <link xref="GIBaseInfo">GIBaseInfo</link></title>
+<title>Casting a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> to <link xref="GIRepository.BaseInfo">GIBaseInfo</link></title>
<programlisting>
GIFunctionInfo *function_info = ...;
GIBaseInfo *info = (GIBaseInfo*)function_info;
</programlisting>
</example>
-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</link> APIs returning a <link xref="GIRepository.BaseInfo">GIBaseInfo</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><example>
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 79c00eb..d0123bd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.CallableInfo.page
@@ -7,6 +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>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GICallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>.</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 fc0949a..d8dd647 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Direction.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.Direction</title>
-<p>The direction of a <link xref="GIArgInfo">GIArgInfo</link>.</p>
+<p>The direction of a <link xref="GIRepository.ArgInfo">GIArgInfo</link>.</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 d2cf5c8..a1812f4 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfo.page
@@ -7,5 +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>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIStructInfo</link> or a <link xref="GIRepository.UnionInfo">GIUnionInfo</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 22c26a7..81310c9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FieldInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FieldInfoFlags</title>
-<p>Flags for a <link xref="GIFieldInfo">GIFieldInfo</link>.</p>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIFieldInfo</link>.</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 03c4d5a..929c4e8 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.FunctionInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FunctionInfoFlags</title>
-<p>Flags for a <link xref="GIFunctionInfo">GIFunctionInfo</link> struct.</p>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> struct.</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 2325b69..5a5cbc9 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.PropertyInfo.page
@@ -7,5 +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>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
</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 c676298..adb9512 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
@@ -40,7 +40,7 @@ otherwise ensure the namespace has already been loaded.</p><p>enum type, or %NUL
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIEnumInfo">GIEnumInfo</link> representing metadata about @domain's</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIEnumInfo</link> representing metadata about @domain's</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
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 67cc9fb..0160552 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
@@ -42,7 +42,7 @@ when you know the GType to originate from be from a loaded namespace.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @type, or %NULL</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</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 59ddac0..4aa65f4 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
@@ -49,7 +49,7 @@ ensure the namespace has already been loaded.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @name, or %NULL</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</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_default.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Repository.get_default.page
index 9d06bea..88c6618 100644
--- 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
@@ -19,20 +19,20 @@
<synopsis><code mime="text/x-csrc">
GIRepository* g_irepository_get_default (void);
</code></synopsis>
-<p>Returns the singleton process-global default <link xref="GIRepository">GIRepository</link>. It is
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository</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">GIRepository</link> also accept %NULL as an instance
+All methods on <link xref="GIRepository.Repository">GIRepository</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">GIRepository</link></p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository</link></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 51287c3..9d3fe96 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
@@ -50,7 +50,7 @@ entries.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> containing metadata</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> containing metadata</p></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 3c2a87c..f544083 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
@@ -59,7 +59,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, %NULL otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</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 d8f65a9..98e37db 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
@@ -68,7 +68,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, %NULL otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</link> if successful, %NULL otherwise</p></td>
</tr>
</table>
</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 f2d85eb..6a9d8de 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ScopeType.page
@@ -7,7 +7,7 @@
<info>
</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">GIArgInfo</link> representing callback, determines how the
callback is invoked and is used to decided when the invoke structs
can be freed.</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 67f0729..b79e210 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.Transfer.page
@@ -11,7 +11,7 @@
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">GITransfer</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,
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 d78b167..ca21e54 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.TypeTag.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.TypeTag</title>
-<p>The type tag of a <link xref="GITypeInfo">GITypeInfo</link>.</p>
+<p>The type tag of a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</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 7b6d703..c39aa56 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.VFuncInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.VFuncInfoFlags</title>
-<p>Flags of a <link xref="GIVFuncInfo">GIVFuncInfo</link> struct.</p>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 38d93f2..9207bfd 100644
--- a/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.ValueInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ValueInfo</title>
-<p>Represents a enum value of a <link xref="GIEnumInfo">GIEnumInfo</link>.</p>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIEnumInfo</link>.</p>
</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 be13d69..ab5c30b 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
@@ -29,7 +29,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e51c69a..5f1d8d5 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
@@ -29,7 +29,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 237c1b1..8352426 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
@@ -23,13 +23,13 @@
<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="GIDirection">GIDirection</link> for possible
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIDirection</link> for possible
direction values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 4ca48dd..26357fd 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
@@ -24,12 +24,12 @@
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>
+<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 01885d4..bf54be1 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
@@ -26,12 +26,12 @@ GIScopeType g_arg_info_get_scope (GIArgInfo* info);
<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>
+<link xref="GIRepository.ScopeType">GIScopeType</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 cd74ea6..7de3f07 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
@@ -28,11 +28,11 @@ GITypeInfo* g_arg_info_get_type (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIArgInfo">GIArgInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</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 b872b9c..854de5b 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
@@ -31,7 +31,7 @@ callee allocates; if this is %TRUE, then the caller must allocate.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 7ad7c4c..9601506 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
@@ -28,7 +28,7 @@ gboolean g_arg_info_is_optional (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 2931953..6e1b559 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
@@ -29,7 +29,7 @@ parameter or a return value.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 17aeba3..897577b 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
@@ -28,7 +28,7 @@ gboolean g_arg_info_is_skip (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 bd5b3f4..4807605 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
@@ -35,7 +35,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
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 2cdee11..e3eebed 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
@@ -28,7 +28,7 @@ gboolean g_arg_info_may_be_null (GIArgInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 fffe912..80a7f55 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
@@ -28,7 +28,7 @@ GIInfoType g_base_info_get_type (GIBaseInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIBaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 a493738..f5f6562 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
@@ -33,7 +33,7 @@ GIArgInfo* g_callable_info_get_arg (GICallableInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIArgInfo* g_callable_info_get_arg (GICallableInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIArgInfo">GIArgInfo</link>. Free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</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 310f821..17ad36a 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
@@ -24,12 +24,12 @@
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>
+<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 3cbeb62..8dffbd7 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
@@ -28,7 +28,7 @@ gint g_callable_info_get_n_args (GICallableInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 38f48bb..e7cc103 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
@@ -33,7 +33,7 @@ gchar* g_callable_info_get_return_attribute (GICallableInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 357aa4b..afb4ace 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
@@ -23,16 +23,16 @@
<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="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 5ceb12e..1bbdd38 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
@@ -47,11 +47,11 @@ similar API.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIAttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 95b27f5..3c01df2 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
@@ -40,7 +40,7 @@ allocation.</p><p>The initialized @arg must not be referenced after @info is dea
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
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 278b6f2..bc01a09 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
@@ -35,7 +35,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
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 f7c6d1c..1c4e976 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
@@ -28,7 +28,7 @@ gboolean g_callable_info_may_return_null (GICallableInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 09c4a42..2e1f372 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
@@ -28,7 +28,7 @@ gboolean g_callable_info_skip_return (GICallableInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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
index be0cf4f..d63a90b 100644
--- 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
@@ -33,7 +33,7 @@ void g_constant_info_free_value (GIConstantInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
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 8a97049..27628a1 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
@@ -23,16 +23,16 @@
<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="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 3cd1cac..813198d 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
@@ -28,7 +28,7 @@
gint g_constant_info_get_value (GIConstantInfo* info,
GIArgument* value);
</code></synopsis>
-<p>Obtain the value associated with the <link xref="GIConstantInfo">GIConstantInfo</link> and store it in the
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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.
Free the value with g_constant_info_free_value().</p>
@@ -36,7 +36,7 @@ Free the value with g_constant_info_free_value().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
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
index 062c003..fdf33e9 100644
--- 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_enum_info_get_method (GIEnumInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_enum_info_get_method (GIEnumInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
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
index 0e55ab5..24f223a 100644
--- 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
@@ -28,7 +28,7 @@ gint g_enum_info_get_n_methods (GIEnumInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 ccf492a..915303b 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
@@ -32,7 +32,7 @@ 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="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 aee0f42..0ed4a24 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
@@ -33,7 +33,7 @@ GIValueInfo* g_enum_info_get_value (GIEnumInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
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 cc20208..3066b4c 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
@@ -41,7 +41,7 @@ even if that is actually readable.</p>
<table>
<tr>
<td><p>field_info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
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 1e3fd46..fbf2f1c 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
@@ -23,13 +23,13 @@
<synopsis><code mime="text/x-csrc">
GIFieldInfoFlags g_field_info_get_flags (GIFieldInfo* info);
</code></synopsis>
-<p>Obtain the flags for this <link xref="GIFieldInfo">GIFieldInfo</link>. See <link xref="GIFieldInfoFlags">GIFieldInfoFlags</link> for possible
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIFieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIFieldInfoFlags</link> for possible
flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 9c75ada..90ec787 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
@@ -29,7 +29,7 @@ to the beginning of the struct or union.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 9e6c3b9..6e0e7c4 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
@@ -29,7 +29,7 @@ much space you need to allocate to store the field.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 527e52f..6aaeeb0 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
@@ -23,16 +23,16 @@
<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="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 fab10d1..1b7c115 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
@@ -43,7 +43,7 @@ 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="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
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 5d0d72f..eb8117a 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
@@ -23,12 +23,12 @@
<synopsis><code mime="text/x-csrc">
GIFunctionInfoFlags g_function_info_get_flags (GIFunctionInfo* info);
</code></synopsis>
-<p>Obtain the <link xref="GIFunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0ff7b22..b682765 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
@@ -23,15 +23,15 @@
<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="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 381edea..a179c36 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
@@ -30,7 +30,7 @@ g_module_symbol().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 7aa703c..6f321d1 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
@@ -23,14 +23,14 @@
<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="GIFunctionInfo">GIFunctionInfo</link>.
-Only <link xref="GIFunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_WRAPS_VFUNC has
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">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>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 dbd543e..bbb50b4 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
@@ -58,7 +58,7 @@ have been g_module_symbol()<!-- -->ed before calling this function.</p><p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link> describing the function to invoke</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> describing the function to invoke</p></td>
</tr>
<tr>
<td><p>in_args :</p></td>
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 4524878..3fd47d7 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
@@ -34,7 +34,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link> or %NULL if none found.</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 6ba6001..339f08c 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
@@ -34,7 +34,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 63a45f1..64e77ea 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
@@ -33,7 +33,7 @@ GIConstantInfo* g_interface_info_get_constant (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIConstantInfo* g_interface_info_get_constant (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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 3b1a14d..a08e161 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
@@ -28,11 +28,11 @@ GIStructInfo* g_interface_info_get_iface_struct (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</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 725b968..4007dcf 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_interface_info_get_method (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_interface_info_get_method (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 269dd6d..baecbd9 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
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_constants (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e156100..b28b4fb 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
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_methods (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 c8f73f4..d05d65a 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
@@ -30,7 +30,7 @@ interface, similar to an base class for GObjects.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0d7294e..fa3c91a 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
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_properties (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0a4969b..7ffb524 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
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_signals (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 572f25d..2c61ec7 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
@@ -28,7 +28,7 @@ gint g_interface_info_get_n_vfuncs (GIInterfaceInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6e5f839..d3de034 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
@@ -33,7 +33,7 @@ GIBaseInfo* g_interface_info_get_prerequisite (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIBaseInfo* g_interface_info_get_prerequisite (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the prerequisites as a <link xref="GIBaseInfo">GIBaseInfo</link>. Free the struct by calling</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIBaseInfo</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 2543ed3..d36f1cf 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
@@ -33,7 +33,7 @@ GIPropertyInfo* g_interface_info_get_property (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIPropertyInfo* g_interface_info_get_property (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIPropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</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 d379e76..a901af2 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
@@ -33,7 +33,7 @@ GISignalInfo* g_interface_info_get_signal (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GISignalInfo* g_interface_info_get_signal (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GISignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</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 3e61fe9..1e4dabd 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
@@ -33,7 +33,7 @@ GIVFuncInfo* g_interface_info_get_vfunc (GIInterfaceInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIVFuncInfo* g_interface_info_get_vfunc (GIInterfaceInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.object_info_find_method.page
index eb8857d..d25d78c 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
@@ -34,7 +34,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 b487fc7..f16fafa 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
@@ -41,7 +41,7 @@ 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="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -53,7 +53,7 @@ to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 f3b6a40..0c5c023 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
@@ -33,7 +33,7 @@ GISignalInfo* g_object_info_find_signal (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 f514c8d..9f34efa 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
@@ -39,7 +39,7 @@ 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="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -47,7 +47,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 a8d3a7b..5a94cd1 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
@@ -29,7 +29,7 @@ instantiated</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 a2745e8..41ab20e 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
@@ -29,11 +29,11 @@ structure. This function returns the metadata for the class structure.</p><p>g_
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or %NULL. Free with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</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 7241a59..9e9872c 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
@@ -33,7 +33,7 @@ GIConstantInfo* g_object_info_get_constant (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIConstantInfo* g_object_info_get_constant (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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 109d81c..9ccc7f2 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
@@ -33,7 +33,7 @@ GIFieldInfo* g_object_info_get_field (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFieldInfo* g_object_info_get_field (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFieldInfo">GIFieldInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</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 6b97b93..f31f6c6 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
@@ -29,7 +29,7 @@ G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 99c1467..9723604 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
@@ -32,7 +32,7 @@ see g_object_info_get_get_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 7235e86..b76b841 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
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0d11375..bea6b86 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
@@ -33,7 +33,7 @@ GIInterfaceInfo* g_object_info_get_interface (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIInterfaceInfo* g_object_info_get_interface (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIInterfaceInfo">GIInterfaceInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</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 64dbe4b..5a79066 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_object_info_get_method (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_object_info_get_method (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 bfdc2d1..afe462f 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_constants (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 31413c2..0f6ed3c 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_fields (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 135fb07..07b08f2 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_interfaces (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 c74b8bd..c506dc2 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_methods (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 29fc999..ceedbfd 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_properties (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e270084..768cbeb 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_signals (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 52fc41b..1c48492 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
@@ -28,7 +28,7 @@ gint g_object_info_get_n_vfuncs (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 b61b1e2..99c2f07 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
@@ -28,11 +28,11 @@ GIObjectInfo* g_object_info_get_parent (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIObjectInfo">GIObjectInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIObjectInfo</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 bf0b7b8..b7fbec3 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
@@ -33,7 +33,7 @@ GIPropertyInfo* g_object_info_get_property (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIPropertyInfo* g_object_info_get_property (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIPropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</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 d7f245d..95269b0 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
@@ -31,7 +31,7 @@ see g_object_info_get_ref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 1feb66d..152c9cd 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
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 aa6f6b8..c16fee6 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
@@ -32,7 +32,7 @@ see g_object_info_get_set_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 d97bfe2..1b76add 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
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 aa77175..fffecb1 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
@@ -33,7 +33,7 @@ GISignalInfo* g_object_info_get_signal (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GISignalInfo* g_object_info_get_signal (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GISignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</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 d614609..1754b12 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
@@ -29,7 +29,7 @@ function for which this object type is registered.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 3df9c0d..c224146 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
@@ -28,7 +28,7 @@ gchar* g_object_info_get_type_name (GIObjectInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 f1024d5..84040c0 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
@@ -31,7 +31,7 @@ see g_object_info_get_unref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 629205d..3f71fef 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
@@ -31,7 +31,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 90d2ab2..a5e4c64 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
@@ -33,7 +33,7 @@ GIVFuncInfo* g_object_info_get_vfunc (GIObjectInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIVFuncInfo* g_object_info_get_vfunc (GIObjectInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 b94bd7e..63979c0 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
@@ -29,7 +29,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIPropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 38b4769..d5eca0a 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
@@ -23,13 +23,13 @@
<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="GITransfer">GITransfer</link> for more
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GITransfer</link> for more
information about transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIPropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 833d379..21a24d1 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
@@ -28,11 +28,11 @@ GITypeInfo* g_property_info_get_type (GIPropertyInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIPropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 4eeaad8..6c3ac43 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
@@ -31,7 +31,7 @@ that the shared library which provides the type_init function for this
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 107f22e..6e94729 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
@@ -31,7 +31,7 @@ g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_modul
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 643ed62..9a91fd3 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
@@ -29,7 +29,7 @@ This type can be passed to g_type_name() to get a <link xref="GType">GType</link
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 cffc491..3e49579 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
@@ -30,7 +30,7 @@ If the signal lacks a closure %NULL will be returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GISignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 18ff606..5182c03 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
@@ -29,7 +29,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GISignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 ff56a60..190060a 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
@@ -29,7 +29,7 @@ stop the emission of the signal.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GISignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6c1dc5a..014ce45 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_struct_info_find_method (GIStructInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_struct_info_find_method (GIStructInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 58c0418..9b160f1 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
@@ -28,7 +28,7 @@ gsize g_struct_info_get_alignment (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5d977c8..abe1dec 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
@@ -33,7 +33,7 @@ GIFieldInfo* g_struct_info_get_field (GIStructInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFieldInfo* g_struct_info_get_field (GIStructInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</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 15e421b..e37c363 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_struct_info_get_method (GIStructInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_struct_info_get_method (GIStructInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 0205fbb..4a2c2cb 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
@@ -28,7 +28,7 @@ gint g_struct_info_get_n_fields (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 eee903f..3268eda 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
@@ -28,7 +28,7 @@ gint g_struct_info_get_n_methods (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5e60501..34d26f3 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
@@ -28,7 +28,7 @@ gsize g_struct_info_get_size (GIStructInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 ab6adbe..fa1ef5f 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
@@ -30,7 +30,7 @@ from generated public APIs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6b32dc8..34c38be 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
@@ -29,7 +29,7 @@ gint g_type_info_get_array_fixed_size (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 7cb54d0..91d62aa 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
@@ -29,7 +29,7 @@ gint g_type_info_get_array_length (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 34bf716..864b293 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
@@ -23,14 +23,14 @@
<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="GIArrayType">GIArrayType</link> for a list of
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIArrayType</link> for a list of
possible values. If the type tag of this type is not array, -1 will be
returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 68df0f9..e0385cd 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
@@ -25,17 +25,17 @@ 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
+inspect the type of the returned <link xref="GIRepository.BaseInfo">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>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIBaseInfo">GIBaseInfo</link>, or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIBaseInfo</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 fb59d98..3b88d46 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
@@ -33,7 +33,7 @@ GITypeInfo* g_type_info_get_param_type (GITypeInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
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 7da23d1..c6598e7 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
@@ -23,13 +23,13 @@
<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="GITypeTag">GITypeTag</link> for a list
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GITypeTag</link> for a list
of type tags.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 76b59a9..12a7e28 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
@@ -28,7 +28,7 @@ gboolean g_type_info_is_pointer (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 fb85e42..7fc1f43 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
@@ -29,7 +29,7 @@ gboolean g_type_info_is_zero_terminated (GITypeInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 27221b5..552d0b1 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_union_info_find_method (GIUnionInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_union_info_find_method (GIUnionInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 a735a23..5e17b3a 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
@@ -28,7 +28,7 @@ gsize g_union_info_get_alignment (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 4d81861..997b658 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
@@ -35,7 +35,7 @@ constant.</p><p>when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -43,7 +43,7 @@ constant.</p><p>when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIConstantInfo">GIConstantInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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_type.page b/tests/doctool/GIRepository-2.0-C-expected/GIRepository.union_info_get_discriminator_type.page
index 03e09c6..ba6217b 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
@@ -28,11 +28,11 @@ GITypeInfo* g_union_info_get_discriminator_type (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 3b779b7..d3a127f 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
@@ -33,7 +33,7 @@ GIFieldInfo* g_union_info_get_field (GIUnionInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFieldInfo* g_union_info_get_field (GIUnionInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</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 30e557e..de0dcd1 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
@@ -33,7 +33,7 @@ GIFunctionInfo* g_union_info_get_method (GIUnionInfo* info,
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -41,7 +41,7 @@ GIFunctionInfo* g_union_info_get_method (GIUnionInfo* info,
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 740d05e..3b47ff3 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
@@ -28,7 +28,7 @@ gint g_union_info_get_n_fields (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 907fdfa..40d1492 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
@@ -28,7 +28,7 @@ gint g_union_info_get_n_methods (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e34ccbe..6b98dac 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
@@ -28,7 +28,7 @@ gsize g_union_info_get_size (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5d32681..248b472 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
@@ -28,7 +28,7 @@ gboolean g_union_info_is_discriminated (GIUnionInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 1b46ce4..3758e19 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
@@ -23,13 +23,13 @@
<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="GIValueInfo">GIValueInfo</link>.</p><p>as a 32-bit signed or unsigned value. The use of gint64 as the
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">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>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIValueInfo">GIValueInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIValueInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 4b822ad..391965d 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
@@ -34,7 +34,7 @@ is the implementation for @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>implementor_gtype :</p></td>
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 3121f45..bc082b2 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
@@ -23,13 +23,13 @@
<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="GIVFuncInfoFlags">GIVFuncInfoFlags</link> for
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIVFuncInfoFlags</link> for
more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 c4876bf..90b32f9 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
@@ -29,11 +29,11 @@ method will return it. An invoker method is a C entry point.</p><p>Not all virt
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link> or %NULL. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 b101a18..7855068 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
@@ -29,7 +29,7 @@ gint g_vfunc_info_get_offset (GIVFuncInfo* info);
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 723c924..fde4f77 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
@@ -30,7 +30,7 @@ this virtual function belongs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 531a2e8..c644e22 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
@@ -60,7 +60,7 @@ argument lists.</p><p>error occurred.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link> describing the virtual function to invoke</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> describing the virtual function to invoke</p></td>
</tr>
<tr>
<td><p>implementor :</p></td>
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 7d348d4..da62f44 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ArrayType.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ArrayType</title>
-<p>The type of array in a <link xref="GITypeInfo">GITypeInfo</link>.</p>
+<p>The type of array in a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</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 268a6db..c4e2714 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
@@ -25,14 +25,14 @@
@returns(gboolean)
def equal(info2)
</code></synopsis>
-<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>
+<p>Compare two <link xref="GIRepository.BaseInfo">GIBaseInfo</link>.</p><p>Using pointer comparison is not practical since many functions return
+different instances of <link xref="GIRepository.BaseInfo">GIBaseInfo</link> that refers to the same part of the
+TypeLib; use this function instead to do <link xref="GIRepository.BaseInfo">GIBaseInfo</link> comparisons.</p>
<table>
<tr>
<td><p>info2 :</p></td>
-<td><p>a <link xref="GIBaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 8b78527..507aac8 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
@@ -21,8 +21,8 @@
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>
+GIBaseInfo. For instance, the parent of a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> is an
+<link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
<table>
<tr>
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 b9cd84e..d0f3f00 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
@@ -21,7 +21,7 @@
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 <link xref="GIRepository.InfoType">GIInfoType</link> of the @info. For instance for <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> it is
the name of the function.</p>
<table>
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 b0058bc..697a1d0 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
@@ -56,7 +56,7 @@ g_print ("attribute name: %s value: %s", name, value);
<table>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIAttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 79c00eb..d0123bd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.CallableInfo.page
@@ -7,6 +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>
+<p>Represents a callable, either <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>, <link xref="GIRepository.CallbackInfo">GICallbackInfo</link> or
+<link xref="GIRepository.VFuncInfo">GIVFuncInfo</link>.</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 fc0949a..d8dd647 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Direction.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.Direction</title>
-<p>The direction of a <link xref="GIArgInfo">GIArgInfo</link>.</p>
+<p>The direction of a <link xref="GIRepository.ArgInfo">GIArgInfo</link>.</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 d2cf5c8..a1812f4 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfo.page
@@ -7,5 +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>
+<p>Represents a field of a <link xref="GIRepository.StructInfo">GIStructInfo</link> or a <link xref="GIRepository.UnionInfo">GIUnionInfo</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 22c26a7..81310c9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FieldInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FieldInfoFlags</title>
-<p>Flags for a <link xref="GIFieldInfo">GIFieldInfo</link>.</p>
+<p>Flags for a <link xref="GIRepository.FieldInfo">GIFieldInfo</link>.</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 03c4d5a..929c4e8 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.FunctionInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.FunctionInfoFlags</title>
-<p>Flags for a <link xref="GIFunctionInfo">GIFunctionInfo</link> struct.</p>
+<p>Flags for a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> struct.</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 2325b69..5a5cbc9 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.PropertyInfo.page
@@ -7,5 +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>
+<p>Represents a property of a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link> or a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link>.</p>
</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 c7b4349..d50b928 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
@@ -41,7 +41,7 @@ otherwise ensure the namespace has already been loaded.</p><p>enum type, or None
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIEnumInfo">GIEnumInfo</link> representing metadata about @domain's</p></td>
+<td><p><link xref="GIRepository.EnumInfo">GIEnumInfo</link> representing metadata about @domain's</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
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 3130b01..8e16064 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
@@ -43,7 +43,7 @@ when you know the GType to originate from be from a loaded namespace.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @type, or None</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</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 730655c..0f9a17a 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
@@ -49,7 +49,7 @@ ensure the namespace has already been loaded.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> representing metadata about @name, or None</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</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_default.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Repository.get_default.page
index a2eb645..3ba3243 100644
--- 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
@@ -20,20 +20,20 @@
@returns(GIRepository.Repository)
def get_default()
</code></synopsis>
-<p>Returns the singleton process-global default <link xref="GIRepository">GIRepository</link>. It is
+<p>Returns the singleton process-global default <link xref="GIRepository.Repository">GIRepository</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">GIRepository</link> also accept None as an instance
+All methods on <link xref="GIRepository.Repository">GIRepository</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">GIRepository</link></p></td>
+<td><p>The global singleton <link xref="GIRepository.Repository">GIRepository</link></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 cc622ae..d9dfc68 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
@@ -50,7 +50,7 @@ entries.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p><link xref="GIBaseInfo">GIBaseInfo</link> containing metadata</p></td>
+<td><p><link xref="GIRepository.BaseInfo">GIBaseInfo</link> containing metadata</p></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 a0780f0..ed80f2b 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
@@ -58,7 +58,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, None otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</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 f65e215..7a9e404 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
@@ -66,7 +66,7 @@ not specified, the latest will be used.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>a pointer to the <link xref="GITypelib">GITypelib</link> if successful, None otherwise</p></td>
+<td><p>a pointer to the <link xref="GIRepository.Typelib">GITypelib</link> if successful, None otherwise</p></td>
</tr>
</table>
</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 f2d85eb..6a9d8de 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ScopeType.page
@@ -7,7 +7,7 @@
<info>
</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">GIArgInfo</link> representing callback, determines how the
callback is invoked and is used to decided when the invoke structs
can be freed.</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 67f0729..b79e210 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.Transfer.page
@@ -11,7 +11,7 @@
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">GITransfer</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,
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 d78b167..ca21e54 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.TypeTag.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.TypeTag</title>
-<p>The type tag of a <link xref="GITypeInfo">GITypeInfo</link>.</p>
+<p>The type tag of a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</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 7b6d703..c39aa56 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.VFuncInfoFlags.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.VFuncInfoFlags</title>
-<p>Flags of a <link xref="GIVFuncInfo">GIVFuncInfo</link> struct.</p>
+<p>Flags of a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 38d93f2..9207bfd 100644
--- a/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
+++ b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.ValueInfo.page
@@ -7,5 +7,5 @@
<info>
</info>
<title>GIRepository.ValueInfo</title>
-<p>Represents a enum value of a <link xref="GIEnumInfo">GIEnumInfo</link>.</p>
+<p>Represents a enum value of a <link xref="GIRepository.EnumInfo">GIEnumInfo</link>.</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 2e457f6..74b0afe 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
@@ -31,7 +31,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 9c1d4fc..1a6ca59 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
@@ -31,7 +31,7 @@ for arguments which are callbacks.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 adade0a..abc0692 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
@@ -25,13 +25,13 @@
@returns(GIRepository.Direction)
def arg_info_get_direction(info)
</code></synopsis>
-<p>Obtain the direction of the argument. Check <link xref="GIDirection">GIDirection</link> for possible
+<p>Obtain the direction of the argument. Check <link xref="GIRepository.Direction">GIDirection</link> for possible
direction values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e7d5eff..2d415d4 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
@@ -26,12 +26,12 @@
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>
+<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 150271d..d613626 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
@@ -28,12 +28,12 @@ def arg_info_get_scope(info)
<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>
+<link xref="GIRepository.ScopeType">GIScopeType</link> contains a list of possible values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 d9ed620..1336153 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
@@ -30,11 +30,11 @@ def arg_info_get_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIArgInfo">GIArgInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</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 dc010cf..9a0835c 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
@@ -33,7 +33,7 @@ callee allocates; if this is True, then the caller must allocate.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 cf4cd16..61aefb2 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
@@ -30,7 +30,7 @@ def arg_info_is_optional(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 47ba38b..40fa3aa 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
@@ -31,7 +31,7 @@ parameter or a return value.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 798fb24..8eeabcf 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
@@ -30,7 +30,7 @@ def arg_info_is_skip(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6bbf012..38c84f7 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
@@ -36,7 +36,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
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 d61a1e4..254da25 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
@@ -30,7 +30,7 @@ def arg_info_may_be_null(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIArgInfo">GIArgInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ArgInfo">GIArgInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 c4b2dcc..2064d40 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
@@ -30,7 +30,7 @@ def base_info_get_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIBaseInfo">GIBaseInfo</link></p></td>
+<td><p>a <link xref="GIRepository.BaseInfo">GIBaseInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0aea92a..552d4e2 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
@@ -34,7 +34,7 @@ def callable_info_get_arg(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def callable_info_get_arg(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIArgInfo">GIArgInfo</link>. Free it with</p></td>
+<td><p>the <link xref="GIRepository.ArgInfo">GIArgInfo</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 de4f865..700ff5e 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
@@ -26,12 +26,12 @@
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>
+<link xref="GIRepository.Transfer">GITransfer</link> contains a list of possible transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e9229d8..ba7e31a 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
@@ -30,7 +30,7 @@ def callable_info_get_n_args(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e7515e4..c951308 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
@@ -34,7 +34,7 @@ def callable_info_get_return_attribute(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 f84c911..a73377a 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
@@ -25,16 +25,16 @@
@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="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the return type of a callable item as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 a6ca95e..de2ff2d 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
@@ -46,11 +46,11 @@ similar API.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>iterator :</p></td>
-<td><p>a <link xref="GIAttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
+<td><p>a <link xref="GIRepository.AttributeIter">GIAttributeIter</link> structure, must be initialized; see below</p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 c931c8f..7f152f8 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
@@ -40,7 +40,7 @@ allocation.</p><p>The initialized @arg must not be referenced after @info is dea
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
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 b0dbed6..423ba0d 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
@@ -36,7 +36,7 @@ allocation.</p><p>The initialized @type must not be referenced after @info is de
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>type :</p></td>
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 ce2836c..9694697 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
@@ -30,7 +30,7 @@ def callable_info_may_return_null(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 50c2f33..35d64ac 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
@@ -30,7 +30,7 @@ def callable_info_skip_return(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GICallableInfo">GICallableInfo</link></p></td>
+<td><p>a <link xref="GIRepository.CallableInfo">GICallableInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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
index e5806ef..ca96710 100644
--- 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
@@ -34,7 +34,7 @@ def constant_info_free_value(info, value)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
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 a54dc41..85908bc 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
@@ -25,16 +25,16 @@
@returns(GIRepository.TypeInfo)
def constant_info_get_type(info)
</code></synopsis>
-<p>Obtain the type of the constant as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of the constant as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 69fbd9a..ccd6bf9 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
@@ -29,7 +29,7 @@
@returns(gint)
def constant_info_get_value(info, value)
</code></synopsis>
-<p>Obtain the value associated with the <link xref="GIConstantInfo">GIConstantInfo</link> and store it in the
+<p>Obtain the value associated with the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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.
Free the value with g_constant_info_free_value().</p>
@@ -37,7 +37,7 @@ Free the value with g_constant_info_free_value().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIConstantInfo">GIConstantInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ConstantInfo">GIConstantInfo</link></p></td>
</tr>
<tr>
<td><p>value :</p></td>
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
index a954a96..77cb434 100644
--- 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
@@ -34,7 +34,7 @@ def enum_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def enum_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
</tr>
</table>
<p>Since 1.29.17</p>
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
index a6029d5..db076a3 100644
--- 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
@@ -30,7 +30,7 @@ def enum_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 63696df..7c8f1b9 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
@@ -34,7 +34,7 @@ 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="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 29bce58..0deb0e3 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
@@ -34,7 +34,7 @@ def enum_info_get_value(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIEnumInfo">GIEnumInfo</link></p></td>
+<td><p>a <link xref="GIRepository.EnumInfo">GIEnumInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
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 124f920..2c6429c 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
@@ -41,7 +41,7 @@ even if that is actually readable.</p>
<table>
<tr>
<td><p>field_info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
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 a558c87..bdc59cc 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
@@ -25,13 +25,13 @@
@returns(GIRepository.FieldInfoFlags)
def field_info_get_flags(info)
</code></synopsis>
-<p>Obtain the flags for this <link xref="GIFieldInfo">GIFieldInfo</link>. See <link xref="GIFieldInfoFlags">GIFieldInfoFlags</link> for possible
+<p>Obtain the flags for this <link xref="GIRepository.FieldInfo">GIFieldInfo</link>. See <link xref="GIRepository.FieldInfoFlags">GIFieldInfoFlags</link> for possible
flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 4dfb530..1847c48 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
@@ -31,7 +31,7 @@ to the beginning of the struct or union.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 d3897c1..9b320cb 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
@@ -31,7 +31,7 @@ much space you need to allocate to store the field.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 02bc546..f9f2d3f 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
@@ -25,16 +25,16 @@
@returns(GIRepository.TypeInfo)
def field_info_get_type(info)
</code></synopsis>
-<p>Obtain the type of a field as a <link xref="GITypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
+<p>Obtain the type of a field as a <link xref="GIRepository.TypeInfo">GITypeInfo</link>.</p><p>g_base_info_unref() when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 039ab95..6292ef9 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
@@ -43,7 +43,7 @@ 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="GIFieldInfo">GIFieldInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FieldInfo">GIFieldInfo</link></p></td>
</tr>
<tr>
<td><p>mem :</p></td>
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 12abce7..4a68c7b 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
@@ -25,12 +25,12 @@
@returns(GIRepository.FunctionInfoFlags)
def function_info_get_flags(info)
</code></synopsis>
-<p>Obtain the <link xref="GIFunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p>
+<p>Obtain the <link xref="GIRepository.FunctionInfoFlags">GIFunctionInfoFlags</link> for the @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 8689d29..3fad6e0 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
@@ -25,15 +25,15 @@
@returns(GIRepository.PropertyInfo)
def function_info_get_property(info)
</code></synopsis>
-<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
+<p>Obtain the property associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> with the flag %GI_FUNCTION_IS_GETTER or
%GI_FUNCTION_IS_SETTER have a property set. For other cases,
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="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 07b8714..e75087a 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
@@ -32,7 +32,7 @@ g_module_symbol().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5995d25..8b51bc7 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
@@ -25,14 +25,14 @@
@returns(GIRepository.VFuncInfo)
def function_info_get_vfunc(info)
</code></synopsis>
-<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
+<p>Obtain the virtual function associated with this <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link>.
+Only <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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="GIFunctionInfo">GIFunctionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 c82f30f..4a2696d 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
@@ -55,7 +55,7 @@ have been g_module_symbol()<!-- -->ed before calling this function.</p><p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIFunctionInfo">GIFunctionInfo</link> describing the function to invoke</p></td>
+<td><p>a <link xref="GIRepository.FunctionInfo">GIFunctionInfo</link> describing the function to invoke</p></td>
</tr>
<tr>
<td><p>in_args :</p></td>
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 45066fc..c531f4c 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
@@ -35,7 +35,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -43,7 +43,7 @@ returned if there's no method available with that name.</p><p>Free the struct by
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link> or None if none found.</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 44f1004..e21ffae 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
@@ -35,7 +35,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -43,7 +43,7 @@ for g_object_info_find_vfunc() for more information on virtuals.</p><p>g_base_in
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 94bcc55..0e9a9be 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
@@ -34,7 +34,7 @@ def interface_info_get_constant(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_constant(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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 d74b22f..53164c6 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
@@ -30,11 +30,11 @@ def interface_info_get_iface_struct(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</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 6e19b8d..3041741 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
@@ -34,7 +34,7 @@ def interface_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 7e00f6a..4315c0b 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
@@ -30,7 +30,7 @@ def interface_info_get_n_constants(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 61800dd..955c13b 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
@@ -30,7 +30,7 @@ def interface_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 c22027b..2217096 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
@@ -32,7 +32,7 @@ interface, similar to an base class for GObjects.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0ca561e..fb47efc 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
@@ -30,7 +30,7 @@ def interface_info_get_n_properties(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 97b33b1..36ecd43 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
@@ -30,7 +30,7 @@ def interface_info_get_n_signals(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 86d162b..15f67c9 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
@@ -30,7 +30,7 @@ def interface_info_get_n_vfuncs(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 f1ae414..debb73b 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
@@ -34,7 +34,7 @@ def interface_info_get_prerequisite(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_prerequisite(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the prerequisites as a <link xref="GIBaseInfo">GIBaseInfo</link>. Free the struct by calling</p></td>
+<td><p>the prerequisites as a <link xref="GIRepository.BaseInfo">GIBaseInfo</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 4622903..9d681fa 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
@@ -34,7 +34,7 @@ def interface_info_get_property(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_property(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIPropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</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 a63dfd7..492a2c5 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
@@ -34,7 +34,7 @@ def interface_info_get_signal(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_signal(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GISignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</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 6eeb350..55e56f2 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
@@ -34,7 +34,7 @@ def interface_info_get_vfunc(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIInterfaceInfo">GIInterfaceInfo</link></p></td>
+<td><p>a <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def interface_info_get_vfunc(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.object_info_find_method.page
index c286dc1..8bf686c 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
@@ -35,7 +35,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -43,7 +43,7 @@ returned if there's no method available with that name.</p><p>g_base_info_unref(
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 123e92c..e43c4b4 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
@@ -41,7 +41,7 @@ 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="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -53,7 +53,7 @@ to chain up if that's desired.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 59b1556..8a9aaeb 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
@@ -34,7 +34,7 @@ def object_info_find_signal(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
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 f4a63c3..115bc09 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
@@ -40,7 +40,7 @@ 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="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -48,7 +48,7 @@ information on invoking virtuals.</p><p>g_base_info_unref() when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>, or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 87eadd6..63f1321 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
@@ -31,7 +31,7 @@ instantiated</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 b7e5f4a..0555f57 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
@@ -31,11 +31,11 @@ structure. This function returns the metadata for the class structure.</p><p>g_
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIStructInfo">GIStructInfo</link> or None. Free with</p></td>
+<td><p>the <link xref="GIRepository.StructInfo">GIStructInfo</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 23170e1..9a0fb0e 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
@@ -34,7 +34,7 @@ def object_info_get_constant(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_constant(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIConstantInfo">GIConstantInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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 7351177..a22a332 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
@@ -34,7 +34,7 @@ def object_info_get_field(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_field(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFieldInfo">GIFieldInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</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 a12ed1b..8e97652 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
@@ -31,7 +31,7 @@ G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 ba8e046..0fce531 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
@@ -34,7 +34,7 @@ see g_object_info_get_get_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5d2aa75..32fa4df 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
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e588d4d..b94d395 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
@@ -34,7 +34,7 @@ def object_info_get_interface(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_interface(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIInterfaceInfo">GIInterfaceInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.InterfaceInfo">GIInterfaceInfo</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 1a002d9..d421cc0 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
@@ -34,7 +34,7 @@ def object_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 7bf0906..aeb8f04 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
@@ -30,7 +30,7 @@ def object_info_get_n_constants(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 524b438..d72d5a8 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
@@ -30,7 +30,7 @@ def object_info_get_n_fields(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 f474da6..38adb8b 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
@@ -30,7 +30,7 @@ def object_info_get_n_interfaces(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 901df75..71b1819 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
@@ -30,7 +30,7 @@ def object_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 f7c94ed..104ef39 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
@@ -30,7 +30,7 @@ def object_info_get_n_properties(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 21796b0..67b9853 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
@@ -30,7 +30,7 @@ def object_info_get_n_signals(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 ea0eb98..468a2ca 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
@@ -30,7 +30,7 @@ def object_info_get_n_vfuncs(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 7e3ffec..f31bbae 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
@@ -30,11 +30,11 @@ def object_info_get_parent(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIObjectInfo">GIObjectInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.ObjectInfo">GIObjectInfo</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 2d970b5..df7bb71 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
@@ -34,7 +34,7 @@ def object_info_get_property(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_property(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIPropertyInfo">GIPropertyInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.PropertyInfo">GIPropertyInfo</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 31b5148..e76dc9d 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
@@ -33,7 +33,7 @@ see g_object_info_get_ref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 bf88f93..c9a6bdf 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
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 58b5d52..d91835a 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
@@ -34,7 +34,7 @@ see g_object_info_get_set_value_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6bacaab..67544b2 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
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 998b5c2..4f4de59 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
@@ -34,7 +34,7 @@ def object_info_get_signal(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_signal(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GISignalInfo">GISignalInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.SignalInfo">GISignalInfo</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 32a39d7..63a168d 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
@@ -31,7 +31,7 @@ function for which this object type is registered.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 0d651fc..9e0cb24 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
@@ -30,7 +30,7 @@ def object_info_get_type_name(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5d0184d..c89acfa 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
@@ -33,7 +33,7 @@ see g_object_info_get_unref_function().</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 aa69e86..1aabcb4 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
@@ -33,7 +33,7 @@ the base classes of this type, starting at the top type.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 1d4936a..d971d95 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
@@ -34,7 +34,7 @@ def object_info_get_vfunc(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIObjectInfo">GIObjectInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ObjectInfo">GIObjectInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def object_info_get_vfunc(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link>. Free the struct by calling</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 cb27a67..9a999ea 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
@@ -31,7 +31,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIPropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 a1325e8..c67f539 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
@@ -25,13 +25,13 @@
@returns(GIRepository.Transfer)
def property_info_get_ownership_transfer(info)
</code></synopsis>
-<p>Obtain the ownership transfer for this property. See <link xref="GITransfer">GITransfer</link> for more
+<p>Obtain the ownership transfer for this property. See <link xref="GIRepository.Transfer">GITransfer</link> for more
information about transfer values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIPropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 4ad4d42..54f4e7a 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
@@ -30,11 +30,11 @@ def property_info_get_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIPropertyInfo">GIPropertyInfo</link></p></td>
+<td><p>a <link xref="GIRepository.PropertyInfo">GIPropertyInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>, free it with</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 34146c8..3e82300 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
@@ -33,7 +33,7 @@ that the shared library which provides the type_init function for this
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6545762..45cede0 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
@@ -33,7 +33,7 @@ g_registered_type_info_get_g_type() directly instead.</p><p>passing into g_modul
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6fcd599..24ed6a8 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
@@ -31,7 +31,7 @@ This type can be passed to g_type_name() to get a <link xref="GType">GType</link
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIRegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.RegisteredTypeInfo">GIRegisteredTypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 bb58a6f..1ad8157 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
@@ -32,7 +32,7 @@ If the signal lacks a closure None will be returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GISignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 68cc1b0..ae40e74 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
@@ -31,7 +31,7 @@ more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GISignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 9b20fc0..c8997ea 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
@@ -31,7 +31,7 @@ stop the emission of the signal.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GISignalInfo">GISignalInfo</link></p></td>
+<td><p>a <link xref="GIRepository.SignalInfo">GISignalInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 a7d2201..601d8bf 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
@@ -34,7 +34,7 @@ def struct_info_find_method(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ def struct_info_find_method(info, name)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 14e2d59..6d80c0f 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
@@ -30,7 +30,7 @@ def struct_info_get_alignment(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e9766bc..5062e25 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
@@ -34,7 +34,7 @@ def struct_info_get_field(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def struct_info_get_field(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</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 81aed76..614092b 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
@@ -34,7 +34,7 @@ def struct_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def struct_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 bd15ae1..f2e3d47 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
@@ -30,7 +30,7 @@ def struct_info_get_n_fields(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 72ae060..197bef1 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
@@ -30,7 +30,7 @@ def struct_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 845eab0..7be4513 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
@@ -30,7 +30,7 @@ def struct_info_get_size(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 2331908..05d6e38 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
@@ -32,7 +32,7 @@ from generated public APIs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIStructInfo">GIStructInfo</link></p></td>
+<td><p>a <link xref="GIRepository.StructInfo">GIStructInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 560bd67..0e6d6a6 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
@@ -31,7 +31,7 @@ def type_info_get_array_fixed_size(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 8f9a17d..28e3e32 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
@@ -31,7 +31,7 @@ def type_info_get_array_length(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 5fb1960..c9fe478 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
@@ -25,14 +25,14 @@
@returns(GIRepository.ArrayType)
def type_info_get_array_type(info)
</code></synopsis>
-<p>Obtain the array type for this type. See <link xref="GIArrayType">GIArrayType</link> for a list of
+<p>Obtain the array type for this type. See <link xref="GIRepository.ArrayType">GIArrayType</link> for a list of
possible values. If the type tag of this type is not array, -1 will be
returned.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 3060e45..12684fd 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
@@ -27,17 +27,17 @@ 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
+inspect the type of the returned <link xref="GIRepository.BaseInfo">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>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIBaseInfo">GIBaseInfo</link>, or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.BaseInfo">GIBaseInfo</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 e6793ae..fe47628 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
@@ -34,7 +34,7 @@ def type_info_get_param_type(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
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 d2ae8bd..54dc522 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
@@ -25,13 +25,13 @@
@returns(GIRepository.TypeTag)
def type_info_get_tag(info)
</code></synopsis>
-<p>Obtain the type tag for the type. See <link xref="GITypeTag">GITypeTag</link> for a list
+<p>Obtain the type tag for the type. See <link xref="GIRepository.TypeTag">GITypeTag</link> for a list
of type tags.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 a677cf7..e02346e 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
@@ -30,7 +30,7 @@ def type_info_is_pointer(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 4acf474..737c6a7 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
@@ -31,7 +31,7 @@ def type_info_is_zero_terminated(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GITypeInfo">GITypeInfo</link></p></td>
+<td><p>a <link xref="GIRepository.TypeInfo">GITypeInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 6cac9c1..df153c2 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
@@ -34,7 +34,7 @@ def union_info_find_method(info, name)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>name :</p></td>
@@ -42,7 +42,7 @@ def union_info_find_method(info, name)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 28e7e22..e7a8f65 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
@@ -30,7 +30,7 @@ def union_info_get_alignment(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 3577f59..a1edfa7 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
@@ -36,7 +36,7 @@ constant.</p><p>when done.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -44,7 +44,7 @@ constant.</p><p>when done.</p>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIConstantInfo">GIConstantInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.ConstantInfo">GIConstantInfo</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_type.page b/tests/doctool/GIRepository-2.0-Python-expected/GIRepository.union_info_get_discriminator_type.page
index a53bae8..5656869 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
@@ -30,11 +30,11 @@ def union_info_get_discriminator_type(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GITypeInfo">GITypeInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.TypeInfo">GITypeInfo</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 3ea6f11..aca31df 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
@@ -34,7 +34,7 @@ def union_info_get_field(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def union_info_get_field(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFieldInfo">GIFieldInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FieldInfo">GIFieldInfo</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 cd6ae93..6fdceba 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
@@ -34,7 +34,7 @@ def union_info_get_method(info, n)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>n :</p></td>
@@ -42,7 +42,7 @@ def union_info_get_method(info, n)
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIFunctionInfo">GIFunctionInfo</link>, free it with g_base_info_unref()</p></td>
+<td><p>the <link xref="GIRepository.FunctionInfo">GIFunctionInfo</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 fdf3ddc..dbfa9f7 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
@@ -30,7 +30,7 @@ def union_info_get_n_fields(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 38f0bec..c2d7fc7 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
@@ -30,7 +30,7 @@ def union_info_get_n_methods(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 e6074f2..9d0ed2f 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
@@ -30,7 +30,7 @@ def union_info_get_size(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 fe5536f..f6f0c7a 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
@@ -30,7 +30,7 @@ def union_info_is_discriminated(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIUnionInfo">GIUnionInfo</link></p></td>
+<td><p>a <link xref="GIRepository.UnionInfo">GIUnionInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 ab170e7..ae93232 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
@@ -25,13 +25,13 @@
@returns(gint64)
def value_info_get_value(info)
</code></synopsis>
-<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
+<p>Obtain the enumeration value of the <link xref="GIRepository.ValueInfo">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>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIValueInfo">GIValueInfo</link></p></td>
+<td><p>a <link xref="GIRepository.ValueInfo">GIValueInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 aa7b596..c4142d6 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
@@ -35,7 +35,7 @@ is the implementation for @info.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>implementor_gtype :</p></td>
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 61e9aff..99e3c48 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
@@ -25,13 +25,13 @@
@returns(GIRepository.VFuncInfoFlags)
def vfunc_info_get_flags(info)
</code></synopsis>
-<p>Obtain the flags for this virtual function info. See <link xref="GIVFuncInfoFlags">GIVFuncInfoFlags</link> for
+<p>Obtain the flags for this virtual function info. See <link xref="GIRepository.VFuncInfoFlags">GIVFuncInfoFlags</link> for
more information about possible flag values.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 1b702fe..5409a29 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
@@ -31,11 +31,11 @@ method will return it. An invoker method is a C entry point.</p><p>Not all virt
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
-<td><p>the <link xref="GIVFuncInfo">GIVFuncInfo</link> or None. Free it with</p></td>
+<td><p>the <link xref="GIRepository.VFuncInfo">GIVFuncInfo</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 c06b510..83c323c 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
@@ -31,7 +31,7 @@ def vfunc_info_get_offset(info)
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 f22f901..70466c6 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
@@ -32,7 +32,7 @@ this virtual function belongs.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link></p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link></p></td>
</tr>
<tr>
<td><p>Returns :</p></td>
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 bb404e8..a3ce4d4 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
@@ -56,7 +56,7 @@ argument lists.</p><p>error occurred.</p>
<table>
<tr>
<td><p>info :</p></td>
-<td><p>a <link xref="GIVFuncInfo">GIVFuncInfo</link> describing the virtual function to invoke</p></td>
+<td><p>a <link xref="GIRepository.VFuncInfo">GIVFuncInfo</link> describing the virtual function to invoke</p></td>
</tr>
<tr>
<td><p>implementor :</p></td>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
