summaryrefslogtreecommitdiff
path: root/tests/scanner/Regress-1.0-Python-expected
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-02-14 22:47:10 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2013-02-14 23:18:00 -0500
commit3b64a2e808ae25b437c30bec237ada89dc4bcfb3 (patch)
tree359dfe6569e3c0058af70f7e8431cf1ae6aa6633 /tests/scanner/Regress-1.0-Python-expected
parentafe9d25896491db94bdbfac109f003d9ec9ff852 (diff)
downloadgobject-introspection-3b64a2e808ae25b437c30bec237ada89dc4bcfb3.tar.gz
doctool: Fix use of <dl> tag in templates
This isn't legal Mallard
Diffstat (limited to 'tests/scanner/Regress-1.0-Python-expected')
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page38
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page28
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page28
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page28
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page38
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page58
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page20
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page28
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page20
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page20
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page20
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page32
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page32
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page26
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page20
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page58
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page58
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page58
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page58
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page46
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page52
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page28
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page28
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page22
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page40
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page46
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page58
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page10
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page16
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page4
303 files changed, 3156 insertions, 1900 deletions
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
index dff139fd..119860d2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>ATestError.CODE0 :</p></dt>
-<dd></dd>
-<dt><p>ATestError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>ATestError.CODE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>ATestError.CODE0</code></title>
+
+</item>
+<item>
+<title><code>ATestError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>ATestError.CODE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
index 221c269a..f01e3bf8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page
@@ -23,20 +23,30 @@ def callback(annotation_object, arg1, arg2, user_param1, ...)
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd><p>a value</p></dd>
-<dt><p>arg2 :</p></dt>
-<dd><p>another value</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* <p>the return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+<p>a value</p>
+</item>
+<item>
+<title><code>arg2</code></title>
+<p>another value</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* <p>the return value</p></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
index 03b488b2..64994913 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
@@ -23,16 +23,22 @@ def callback(annotation_object, arg1, user_param1, ...)
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>arg1 :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>arg1</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
index d0da8d63..250aca08 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page
@@ -24,16 +24,22 @@ known by GObject as it's only marked as G_TYPE_POINTER</p>
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>list :</p></dt>
-<dd><p>a list of strings</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>list</code></title>
+<p>a list of strings</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
index 66e2ee60..4aaf7e83 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page
@@ -25,16 +25,22 @@ it says it's pointer but it's actually a string.</p>
<p>Since 1.0</p>
-<dl>
-<dt><p>annotation_object :</p></dt>
-<dd><p>instance of Regress.AnnotationObject that is emitting the signal</p></dd>
-<dt><p>string :</p></dt>
-<dd><p>a string</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>annotation_object</code></title>
+<p>instance of Regress.AnnotationObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>string</code></title>
+<p>a string</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
index 7d94a776..0fe1c050 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
@@ -39,14 +39,20 @@ def allow_none(self, somearg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>somearg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>None</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>somearg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
index 157739d7..3f2107e5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
@@ -39,14 +39,20 @@ def calleeowns(self, toown):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
index e9436824..cd2c7d9c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
@@ -43,16 +43,24 @@ def calleesowns(self, toown1, toown2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown1 :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>toown2 :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown1</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>toown2</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
index 31c8d37e..fcc89102 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
@@ -39,12 +39,16 @@ def compute_sum(self, nums):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
index f017eb3a..d929218f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -43,14 +43,20 @@ def compute_sum_n(self, nums, n_nums):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-<dt><p>n_nums :</p></dt>
-<dd><p>Length of number array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+<item>
+<title><code>n_nums</code></title>
+<p>Length of number array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
index c7ae439f..053a368d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page
@@ -43,14 +43,20 @@ def compute_sum_nz(self, nums, n_nums):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>nums :</p></dt>
-<dd><p>Sequence of numbers that are zero-terminated</p></dd>
-<dt><p>n_nums :</p></dt>
-<dd><p>Length of number array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>nums</code></title>
+<p>Sequence of numbers that are zero-terminated</p>
+</item>
+<item>
+<title><code>n_nums</code></title>
+<p>Length of number array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
index 66b74067..4ee8088c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
@@ -35,12 +35,16 @@ def create_object(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
index 648dc52b..4e79b26b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
@@ -35,12 +35,16 @@ def do_not_use(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>None</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
index b3fa22dd..5ddadfc6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page
@@ -35,10 +35,12 @@ def extra_annos(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
index be20587c..0d34439f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page
@@ -43,14 +43,20 @@ def foreach(self, func, user_data):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>Callback to invoke</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>Callback user data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>Callback to invoke</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>Callback user data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
index 66d4b85c..87cfede3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
@@ -36,12 +36,16 @@ objects.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>hash table</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
index d2883854..bd174a4d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
@@ -37,12 +37,16 @@ intentionally similar example to gtk_container_get_children</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>list of objects</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
index 6b5f4391..698180b7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
@@ -36,12 +36,16 @@ each string needs to be freed.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
index 328a7bac..5dd1e2b9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page
@@ -35,10 +35,12 @@ def hidden_self(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
index 71a0aef1..569587ea 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
@@ -39,14 +39,20 @@ def in(self, inarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
index 7ddf3a7e..84ac74a0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
@@ -39,14 +39,20 @@ def inout(self, inoutarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
index 82056c3b..b6205805 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
@@ -39,14 +39,20 @@ def inout2(self, inoutarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
index 45b89591..ca64eaa3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
@@ -39,14 +39,20 @@ def inout3(self, inoutarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>inoutarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>inoutarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
index bb23ba15..f2800882 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
@@ -35,12 +35,16 @@ def method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
index 73731e73..8e7786ad 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
@@ -35,12 +35,16 @@ def notrans(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, not referenced</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
index ba69737f..a8718795 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
@@ -39,14 +39,20 @@ def out(self, outarg):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>outarg :</p></dt>
-<dd><p>This is an argument test</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>an int</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>outarg</code></title>
+<p>This is an argument test</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
index ac28c6fb..c76bb940 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page
@@ -43,14 +43,20 @@ def parse_args(self, argc, argv):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>argc :</p></dt>
-<dd><p>Length of the argument vector</p></dd>
-<dt><p>argv :</p></dt>
-<dd><p>Argument vector</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>argc</code></title>
+<p>Length of the argument vector</p>
+</item>
+<item>
+<title><code>argv</code></title>
+<p>Argument vector</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
index 8f949161..beaebab8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page
@@ -43,14 +43,20 @@ def set_data(self, data, length):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
index 70c3e62a..b9fc65f6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page
@@ -43,14 +43,20 @@ def set_data2(self, data, length):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
index 1a5bb115..ccabb841 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page
@@ -44,14 +44,20 @@ type.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>data :</p></dt>
-<dd><p>The data</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>Length of the data</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>The data</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>Length of the data</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
index 5c02dbdb..9d12f393 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page
@@ -39,14 +39,20 @@ def string_out(self, str_out):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>str_out :</p></dt>
-<dd><p>string return value</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>some boolean</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>str_out</code></title>
+<p>string return value</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
index 2e5bba23..6c5d72c4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
@@ -39,12 +39,16 @@ def use_buffer(self, bytes):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="GObject.Object"/></p></dd>
-<dt><p>bytes :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="GObject.Object"/></p>
+</item>
+<item>
+<title><code>bytes</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
index ced0ddcd..ebb7aa0c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
@@ -47,16 +47,24 @@ def watch_full(self, func, user_data, destroy):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/></p></dd>
-<dt><p>func :</p></dt>
-<dd><p>The callback</p></dd>
-<dt><p>user_data :</p></dt>
-<dd><p>The callback data</p></dd>
-<dt><p>destroy :</p></dt>
-<dd><p>Destroy notification</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.AnnotationObject"/></p>
+</item>
+<item>
+<title><code>func</code></title>
+<p>The callback</p>
+</item>
+<item>
+<title><code>user_data</code></title>
+<p>The callback data</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+<p>Destroy notification</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
index 086223d7..b4ceb23e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page
@@ -39,12 +39,16 @@ def with_voidp(self, data):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd><p>Opaque pointer handle</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+<p>Opaque pointer handle</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
index 34f1ed7c..b59e7634 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
@@ -19,10 +19,12 @@
-<dl>
-<dt><p>FooASingle.FOO_SOME_SINGLE_ENUM :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooASingle.FOO_SOME_SINGLE_ENUM</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
index 2dafde03..e3f52935 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooAddressType.INVALID :</p></dt>
-<dd></dd>
-<dt><p>FooAddressType.IPV4 :</p></dt>
-<dd></dd>
-<dt><p>FooAddressType.IPV6 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooAddressType.INVALID</code></title>
+
+</item>
+<item>
+<title><code>FooAddressType.IPV4</code></title>
+
+</item>
+<item>
+<title><code>FooAddressType.IPV6</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
index 8654fb42..fd700d29 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page
@@ -39,12 +39,16 @@ def add(self, b2):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>b2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>b2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
index b357ea2f..9cfe9318 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page
@@ -35,10 +35,12 @@ def method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
index 472d16b7..8b65f138 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page
@@ -35,10 +35,12 @@ def some_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
index db6a6b05..2d19be62 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page
@@ -35,10 +35,12 @@ def method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
index a46070da..443f25ea 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooEnumFullname.ONE :</p></dt>
-<dd></dd>
-<dt><p>FooEnumFullname.TWO :</p></dt>
-<dd></dd>
-<dt><p>FooEnumFullname.THREE :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumFullname.ONE</code></title>
+
+</item>
+<item>
+<title><code>FooEnumFullname.TWO</code></title>
+
+</item>
+<item>
+<title><code>FooEnumFullname.THREE</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
index 2313192d..5957904b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
@@ -19,16 +19,24 @@
-<dl>
-<dt><p>FooEnumNoType.UN :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.DEUX :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.TROIS :</p></dt>
-<dd></dd>
-<dt><p>FooEnumNoType.NEUF :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumNoType.UN</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.DEUX</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.TROIS</code></title>
+
+</item>
+<item>
+<title><code>FooEnumNoType.NEUF</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
index 37510f5c..d052d4f5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooEnumType.ALPHA :</p></dt>
-<dd></dd>
-<dt><p>FooEnumType.BETA :</p></dt>
-<dd></dd>
-<dt><p>FooEnumType.DELTA :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooEnumType.ALPHA</code></title>
+
+</item>
+<item>
+<title><code>FooEnumType.BETA</code></title>
+
+</item>
+<item>
+<title><code>FooEnumType.DELTA</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
index 0877e7c8..5577eebe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>FooError.GOOD :</p></dt>
-<dd></dd>
-<dt><p>FooError.BAD :</p></dt>
-<dd></dd>
-<dt><p>FooError.UGLY :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooError.GOOD</code></title>
+
+</item>
+<item>
+<title><code>FooError.BAD</code></title>
+
+</item>
+<item>
+<title><code>FooError.UGLY</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
index 8b7835fc..86bdfa3e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
index b942b553..6cb6433e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page
@@ -24,12 +24,16 @@ def do_do_regress_foo(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
index 60af8445..465f9130 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page
@@ -39,12 +39,16 @@ def do_regress_foo(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
index 947a5e97..7da66ea3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page
@@ -35,10 +35,12 @@ def static_method(x):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
index a634e4e2..e5189c14 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page
@@ -24,14 +24,20 @@ def do_read_fn(object, offset, length):
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
index c663823d..7a353a2b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page
@@ -23,20 +23,30 @@ def callback(foo_object, object, p0, user_param1, ...)
-<dl>
-<dt><p>foo_object :</p></dt>
-<dd><p>instance of Regress.FooObject that is emitting the signal</p></dd>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>p0 :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gchar* </dd>
-</dl>
+<terms>
+<item>
+<title><code>foo_object</code></title>
+<p>instance of Regress.FooObject that is emitting the signal</p>
+</item>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>p0</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gchar* </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
index 1ad7512f..e4579001 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page
@@ -24,14 +24,20 @@ def do_virtual_method(object, first_param):
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
index 6cb51386..e291ab64 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page
@@ -35,10 +35,12 @@ def a_global_method(obj):
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
index a3e39f1c..7fa2ea7d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page
@@ -39,14 +39,20 @@ def append_new_stack_layer(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
index a0237951..3d329fb5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page
@@ -35,12 +35,16 @@ def dup_name(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
index 48d5e591..09481e92 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page
@@ -35,12 +35,16 @@ def external_type(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.FooObject"/></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>None</code> always</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.FooObject"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
index b1208bdc..3b7c8722 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page
@@ -31,10 +31,12 @@ uses a C sugar return type.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The global <link xref="Regress.FooSubobject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
index fc87e4a9..52a90560 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page
@@ -35,12 +35,16 @@ def get_name(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
index 20fea248..5671a1cd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page
@@ -39,12 +39,16 @@ def handle_glyph(self, glyph):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>glyph :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>glyph</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
index 3ee60dd2..633c32fb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page
@@ -39,12 +39,16 @@ def is_it_time_yet(self, time):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>time :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>time</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
index d3ec000f..787081f0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page
@@ -43,14 +43,20 @@ def read(self, offset, length):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>obj</p></dd>
-<dt><p>offset :</p></dt>
-<dd><p>offset</p></dd>
-<dt><p>length :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>obj</p>
+</item>
+<item>
+<title><code>offset</code></title>
+<p>offset</p>
+</item>
+<item>
+<title><code>length</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
index 2212da02..4c825d80 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page
@@ -30,10 +30,12 @@ def static_meth():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
index 702a6e85..15227cd8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page
@@ -43,14 +43,20 @@ def various(self, data, some_type):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>some_type :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>some_type</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
index 68a94097..3e05ffae 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page
@@ -39,14 +39,20 @@ def virtual_method(self, first_param):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>first_param :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>first_param</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
index ea8bf20c..e2f8bbeb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page
@@ -39,12 +39,16 @@ def add(self, r2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>add to this rect</p></dd>
-<dt><p>r2 :</p></dt>
-<dd><p>source rectangle</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>add to this rect</p>
+</item>
+<item>
+<title><code>r2</code></title>
+<p>source rectangle</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
index 83ca6a12..bd7a445b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
@@ -19,26 +19,44 @@
-<dl>
-<dt><p>FooStackLayer.DESKTOP :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.BOTTOM :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.NORMAL :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.TOP :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.DOCK :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.FULLSCREEN :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.FOCUSED_WINDOW :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.OVERRIDE_REDIRECT :</p></dt>
-<dd></dd>
-<dt><p>FooStackLayer.LAST :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>FooStackLayer.DESKTOP</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.BOTTOM</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.NORMAL</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.TOP</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.DOCK</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.FULLSCREEN</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.FOCUSED_WINDOW</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.OVERRIDE_REDIRECT</code></title>
+
+</item>
+<item>
+<title><code>FooStackLayer.LAST</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
index bb146abf..3c43a772 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page
@@ -23,14 +23,18 @@ def callback(foo_sub_interface, user_param1, ...)
-<dl>
-<dt><p>foo_sub_interface :</p></dt>
-<dd><p>instance of Regress.FooSubInterface that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo_sub_interface</code></title>
+<p>instance of Regress.FooSubInterface that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
index 5f014dfa..4b925a9f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page
@@ -24,10 +24,12 @@ def do_destroy_event(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
index fd55d897..d07cadc9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page
@@ -24,10 +24,12 @@ def do_do_bar(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
index 1078dfca..723cea8e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page
@@ -24,14 +24,20 @@ def do_do_baz(self, callback, user_data):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
index 6be01ab8..45137e84 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page
@@ -35,10 +35,12 @@ def do_bar(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
index af759a15..e95447c4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page
@@ -43,14 +43,20 @@ def do_baz(self, callback, user_data):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
index fea8d58e..6a044d79 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestABCError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestABCError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestABCError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestABCError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestABCError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestABCError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
index 489f3ffa..fa810dd4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
index 68a19e07..e03d1f0a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page
@@ -39,14 +39,20 @@ def equals(self, other):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>other :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>other</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
index f770ecfe..30b45992 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
index 84a66e51..6923488a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
index 5c37368c..366fb2d2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page
@@ -35,10 +35,12 @@ def free(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
index af75b8f6..551c6173 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page
@@ -35,12 +35,16 @@ def get_magic(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
index b6f0eb88..6a92ba9a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestDEFError.CODE0 :</p></dt>
-<dd></dd>
-<dt><p>TestDEFError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestDEFError.CODE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestDEFError.CODE0</code></title>
+
+</item>
+<item>
+<title><code>TestDEFError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestDEFError.CODE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
index 3de1bbf6..9009dcda 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
@@ -19,16 +19,24 @@
-<dl>
-<dt><p>TestEnum.VALUE1 :</p></dt>
-<dd><p>value 1</p></dd>
-<dt><p>TestEnum.VALUE2 :</p></dt>
-<dd><p>value 2</p></dd>
-<dt><p>TestEnum.VALUE3 :</p></dt>
-<dd></dd>
-<dt><p>TestEnum.VALUE4 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnum.VALUE1</code></title>
+<p>value 1</p>
+</item>
+<item>
+<title><code>TestEnum.VALUE2</code></title>
+<p>value 2</p>
+</item>
+<item>
+<title><code>TestEnum.VALUE3</code></title>
+
+</item>
+<item>
+<title><code>TestEnum.VALUE4</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
index 625c8703..a0cd98cc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestEnumNoGEnum.EVALUE1 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumNoGEnum.EVALUE2 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumNoGEnum.EVALUE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE1</code></title>
+
+</item>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE2</code></title>
+
+</item>
+<item>
+<title><code>TestEnumNoGEnum.EVALUE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
index 3069d8e3..327cacc5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
@@ -19,12 +19,16 @@
-<dl>
-<dt><p>TestEnumUnsigned.VALUE1 :</p></dt>
-<dd></dd>
-<dt><p>TestEnumUnsigned.VALUE2 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestEnumUnsigned.VALUE1</code></title>
+
+</item>
+<item>
+<title><code>TestEnumUnsigned.VALUE2</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
index 57a21163..c635d0e0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
index 243e8fdb..23164e09 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page
@@ -35,12 +35,16 @@ def ref(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>A new <link xref="Regress.TestFundamentalObject"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
index eec1dbf7..18f57651 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page
@@ -35,10 +35,12 @@ def unref(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
index 5c97095e..2aff243a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page
@@ -39,12 +39,16 @@ def do_foo(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index 1e3d0419..4f7d8e61 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
@@ -39,12 +39,16 @@ def do_foo_maybe_throw(self, x):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
index 908bdec2..ccd73b1b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page
@@ -43,14 +43,20 @@ def get_origin(self, x, y):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
index f6bb0368..39d7bcca 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page
@@ -43,14 +43,20 @@ def get_size(self, width, height):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>width :</p></dt>
-<dd></dd>
-<dt><p>height :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>width</code></title>
+
+</item>
+<item>
+<title><code>height</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
index 1a1be536..f4c2acb9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
index 3f72a491..aaea25a4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page
@@ -24,12 +24,16 @@ def do_allow_none_vfunc(obj, two):
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>two :</p></dt>
-<dd><p>Another object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+<p>Another object</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
index 6c3bca29..292ae894 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
index 8a05f090..959a7118 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
index b41a4072..a1f1fd98 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page
@@ -26,14 +26,20 @@ case.</p>
-<dl>
-<dt><p>obj :</p></dt>
-<dd></dd>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+
+</item>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
index d326c878..9441214f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page
@@ -24,16 +24,22 @@ def callback(test_obj, arr, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>arr :</p></dt>
-<dd><p>numbers</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>arr</code></title>
+<p>numbers</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
index 38e632a0..8734cde6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page
@@ -23,16 +23,22 @@ def callback(test_obj, cr, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>cr :</p></dt>
-<dd><p>A cairo context.</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>cr</code></title>
+<p>A cairo context.</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
index 467f995f..40a3c1e9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page
@@ -24,16 +24,22 @@ def callback(test_obj, hash, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>hash :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>hash</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
index 357847ba..5b077e15 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page
@@ -24,18 +24,26 @@ the introspection client langage.</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>gint64 </dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>gint64 </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
index 7f2bd5c6..4f28c6f7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page
@@ -23,16 +23,22 @@ def callback(test_obj, i, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
index a4106050..e749b702 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page
@@ -24,16 +24,22 @@ Use with regress_test_obj_emit_sig_with_obj</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>obj :</p></dt>
-<dd><p>A newly created RegressTestObj</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>obj</code></title>
+<p>A newly created RegressTestObj</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
index b6b5b25c..d70bbbc3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page
@@ -23,16 +23,22 @@ def callback(test_obj, strs, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>strs :</p></dt>
-<dd><p>strings</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>strs</code></title>
+<p>strings</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
index 5617c5c7..35ccde6b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page
@@ -24,18 +24,26 @@ the introspection client langage.</p>
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>i :</p></dt>
-<dd><p>an integer</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-<dt><p>Returns :</p></dt>
-<dd>guint64 </dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>i</code></title>
+<p>an integer</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+<p>guint64 </p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
index bdd3b3eb..3bfeb1d4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page
@@ -23,16 +23,22 @@ def callback(test_obj, object, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<item>
+<title><code>object</code></title>
+
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
index 74a74548..2ec8ca2e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page
@@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...)
-<dl>
-<dt><p>test_obj :</p></dt>
-<dd><p>instance of Regress.TestObj that is emitting the signal</p></dd>
-<dt><p>user_param1 :</p></dt>
-<dd><p>first user parameter (if any) specified with the connect() method</p></dd>
-<dt><p>... :</p></dt>
-<dd><p>additional user parameters (if any)</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of Regress.TestObj that is emitting the signal</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
index a7140188..f7d905b8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page
@@ -41,14 +41,20 @@ case.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>somestr :</p></dt>
-<dd><p>Meaningless string</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>somestr</code></title>
+<p>Meaningless string</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index b0eafb02..4da0acf0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
@@ -35,10 +35,12 @@ def emit_sig_with_foreign_struct(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
index 86c6b93d..a90da8dc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page
@@ -35,10 +35,12 @@ def emit_sig_with_int64(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
index ccd5ad82..2f02db89 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page
@@ -35,10 +35,12 @@ def emit_sig_with_obj(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
index e2f98768..fede0a67 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page
@@ -35,10 +35,12 @@ def emit_sig_with_uint64(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
index 8cb577f9..33a7507b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page
@@ -35,10 +35,12 @@ def forced_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
index 165c467e..6f0dab49 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page
@@ -35,12 +35,16 @@ def instance_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
index e57bcb6d..34b74974 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page
@@ -39,12 +39,16 @@ def instance_method_callback(self, callback):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
index 24c015c8..f654e7e4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page
@@ -35,10 +35,12 @@ def null_out(obj):
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
index b4681739..52013d55 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page
@@ -39,12 +39,16 @@ def set_bare(self, bare):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>bare :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>bare</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
index 21f9418f..609e8b30 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page
@@ -63,26 +63,44 @@ def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
index b8eab28e..b956db95 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page
@@ -63,26 +63,44 @@ def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
index 57f91672..9104649c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page
@@ -63,26 +63,44 @@ def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/>.</p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/>.</p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
index 92d58ebd..4b1e9bbe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page
@@ -63,26 +63,44 @@ def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.TestObj"/></p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>out_b :</p></dt>
-<dd><p>A return value.</p></dd>
-<dt><p>c :</p></dt>
-<dd><p>Other parameter.</p></dd>
-<dt><p>inout_d :</p></dt>
-<dd><p>Will be incremented.</p></dd>
-<dt><p>out_sum :</p></dt>
-<dd><p>Return value.</p></dd>
-<dt><p>num1 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>num2 :</p></dt>
-<dd><p>Number.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>out_b</code></title>
+<p>A return value.</p>
+</item>
+<item>
+<title><code>c</code></title>
+<p>Other parameter.</p>
+</item>
+<item>
+<title><code>inout_d</code></title>
+<p>Will be incremented.</p>
+</item>
+<item>
+<title><code>out_sum</code></title>
+<p>Return value.</p>
+</item>
+<item>
+<title><code>num1</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>num2</code></title>
+<p>Number.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
index 5feb3153..dd5ca45c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page
@@ -40,14 +40,20 @@ raise an error.</p>
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>a <link xref="Regress.TestObj"/></p></dd>
-<dt><p>a :</p></dt>
-<dd><p>Parameter.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p><code>True</code> if the call succeeds, <code>False</code> if @error is set.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>a <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>a</code></title>
+<p>Parameter.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
index 1294c2ad..df4963e3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page
@@ -35,12 +35,16 @@ def static_method(x):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
index 3d7d2645..08e44411 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page
@@ -35,10 +35,12 @@ def static_method_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
index c4e4e774..c5d8c9f6 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page
@@ -59,22 +59,36 @@ def torture_signature_0(self, x, y, z, foo, q, m):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
index 787a5c35..99540568 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page
@@ -59,24 +59,40 @@ def torture_signature_1(self, x, y, z, foo, q, m):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
index 1d907d24..d1887d5e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
@@ -19,14 +19,20 @@
-<dl>
-<dt><p>TestOtherError.CODE1 :</p></dt>
-<dd></dd>
-<dt><p>TestOtherError.CODE2 :</p></dt>
-<dd></dd>
-<dt><p>TestOtherError.CODE3 :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>TestOtherError.CODE1</code></title>
+
+</item>
+<item>
+<title><code>TestOtherError.CODE2</code></title>
+
+</item>
+<item>
+<title><code>TestOtherError.CODE3</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
index b4444d2e..6b7b9ebe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page
@@ -30,10 +30,12 @@ def const_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
index 4976e9ac..22a55259 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
index a9f6577e..9616ddd9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page
@@ -39,14 +39,20 @@ def equals(self, other_a):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>other_a :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>other_a</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
index c04d3cda..405778a8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page
@@ -35,12 +35,16 @@ def copy(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
index 2b609bb4..cbc5b426 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page
@@ -39,12 +39,16 @@ def clone(self, a_out):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>the structure</p></dd>
-<dt><p>a_out :</p></dt>
-<dd><p>the cloned structure</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>the structure</p>
+</item>
+<item>
+<title><code>a_out</code></title>
+<p>the cloned structure</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
index d18fcf7b..d8bdaaeb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page
@@ -39,12 +39,16 @@ def parse(a_out, string):
-<dl>
-<dt><p>a_out :</p></dt>
-<dd><p>the structure that is to be filled</p></dd>
-<dt><p>string :</p></dt>
-<dd><p>ignored</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a_out</code></title>
+<p>the structure that is to be filled</p>
+</item>
+<item>
+<title><code>string</code></title>
+<p>ignored</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
index 2a95a23d..cebaa169 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page
@@ -39,12 +39,16 @@ def clone(self, b_out):
-<dl>
-<dt><p>self :</p></dt>
-<dd><p>the structure</p></dd>
-<dt><p>b_out :</p></dt>
-<dd><p>the cloned structure</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+<p>the structure</p>
+</item>
+<item>
+<title><code>b_out</code></title>
+<p>the cloned structure</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
index ffd3fae0..0db49624 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page
@@ -35,10 +35,12 @@ def frob(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
index bc854f46..417ba337 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page
@@ -35,12 +35,16 @@ def instance_method(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
index fa4dcc1a..bb2ad606 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page
@@ -35,10 +35,12 @@ def unset_bare(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
index c0bffe8a..4b9de5a1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page
@@ -35,12 +35,16 @@ def get_testbool(self):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
index ae043639..22346642 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page
@@ -39,12 +39,16 @@ def set_testbool(self, v):
-<dl>
-<dt><p>self :</p></dt>
-<dd></dd>
-<dt><p>v :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>self</code></title>
+
+</item>
+<item>
+<title><code>v</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
index 3c04ae74..1fecc3af 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page
@@ -35,12 +35,16 @@ def static_method(x):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
index f0476b84..377dcbd1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page
@@ -35,10 +35,12 @@ def aliased_caller_alloc(boxed):
-<dl>
-<dt><p>boxed :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
index f48f724e..023e993a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page
@@ -39,14 +39,20 @@ def annotation_attribute_func(object, data):
-<dl>
-<dt><p>object :</p></dt>
-<dd><p>A <link xref="Regress.AnnotationObject"/>.</p></dd>
-<dt><p>data :</p></dt>
-<dd><p>Some data.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+<p>A <link xref="Regress.AnnotationObject"/>.</p>
+</item>
+<item>
+<title><code>data</code></title>
+<p>Some data.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
index 439bd57f..d98c2b82 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page
@@ -44,14 +44,20 @@ detection, and fixing it via regress_annotations.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd><p>Destroy notification</p></dd>
-<dt><p>destroy :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+<p>Destroy notification</p>
+</item>
+<item>
+<title><code>destroy</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
index 339ad90b..73e35557 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page
@@ -30,10 +30,12 @@ def annotation_get_source_file():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
index 0fc0f5c4..09ee5b10 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page
@@ -39,12 +39,16 @@ def annotation_init(argc, argv):
-<dl>
-<dt><p>argc :</p></dt>
-<dd><p>The number of args.</p></dd>
-<dt><p>argv :</p></dt>
-<dd><p>The arguments.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>argc</code></title>
+<p>The number of args.</p>
+</item>
+<item>
+<title><code>argv</code></title>
+<p>The arguments.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
index d173a8f2..eec7b20e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page
@@ -35,10 +35,12 @@ def annotation_invalid_regress_annotation(foo):
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some text (e.g. example) or else</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some text (e.g. example) or else</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
index 774a0181..12752bbc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page
@@ -35,10 +35,12 @@ def annotation_ptr_array(array):
-<dl>
-<dt><p>array :</p></dt>
-<dd><p>the array</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+<p>the array</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
index 5902fd07..5b6e6bcf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page
@@ -35,12 +35,16 @@ def annotation_return_array(length):
-<dl>
-<dt><p>length :</p></dt>
-<dd><p>Number of return values</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>length</code></title>
+<p>Number of return values</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
index 961a4030..c1e8e635 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page
@@ -30,10 +30,12 @@ def annotation_return_filename():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An annotated filename</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
index 67ab7414..504ef282 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page
@@ -35,10 +35,12 @@ def annotation_set_source_file(fname):
-<dl>
-<dt><p>fname :</p></dt>
-<dd><p>Source file</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>fname</code></title>
+<p>Source file</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
index 4f718065..0307bd23 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page
@@ -30,8 +30,8 @@ def annotation_space_after_comment_bug631690():
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
index a1f859a3..e42b140e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page
@@ -39,12 +39,16 @@ def annotation_string_array_length(n_properties, properties):
-<dl>
-<dt><p>n_properties :</p></dt>
-<dd></dd>
-<dt><p>properties :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_properties</code></title>
+
+</item>
+<item>
+<title><code>properties</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
index 7aff5099..8cafc09a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page
@@ -30,10 +30,12 @@ def annotation_string_zero_terminated():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>The return value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
index d7401ed5..2c396ac0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page
@@ -35,10 +35,12 @@ def annotation_string_zero_terminated_out(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
index 60210394..402a6ff1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page
@@ -30,10 +30,12 @@ def annotation_test_parsing_bug630862():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>An object, note the colon:in here</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
index 321cd92d..956465ca 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page
@@ -30,10 +30,12 @@ def annotation_transfer_floating():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>A floating object</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
index 046fa115..a387a595 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page
@@ -31,8 +31,8 @@ def annotation_versioned():
<p>Since 0.6</p>
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
index dcaa8148..36401553 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page
@@ -30,10 +30,12 @@ def atest_error_quark():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
index ef1f6142..d9e9994b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page
@@ -43,14 +43,20 @@ def foo_async_ready_callback(cancellable, callback, user_data):
-<dl>
-<dt><p>cancellable :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>cancellable</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
index dad0e224..1f758a64 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page
@@ -43,14 +43,20 @@ def foo_destroy_notify_callback(callback, data, destroy):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>data :</p></dt>
-<dd></dd>
-<dt><p>destroy :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>destroy</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
index f7b916ef..4ee838b5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page
@@ -30,10 +30,12 @@ def foo_init():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
index ce521acb..77a94c40 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page
@@ -47,16 +47,24 @@ def foo_method_external_references(object, e, f, s):
-<dl>
-<dt><p>object :</p></dt>
-<dd></dd>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>f :</p></dt>
-<dd></dd>
-<dt><p>s :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>object</code></title>
+
+</item>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>f</code></title>
+
+</item>
+<item>
+<title><code>s</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
index d70d3375..0f58aaa3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page
@@ -31,10 +31,12 @@ a "Can't find matching type for constructor" warning.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
index c1c46521..2680f708 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page
@@ -30,10 +30,12 @@ def foo_test_array():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
index 61b2a569..6be54b8e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page
@@ -35,10 +35,12 @@ def foo_test_const_char_param(param):
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
index d3079e2e..4eb0d3a7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page
@@ -30,10 +30,12 @@ def foo_test_const_char_retval():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
index 9c757d41..31532fc3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page
@@ -35,10 +35,12 @@ def foo_test_const_struct_param(param):
-<dl>
-<dt><p>param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
index 870cca02..140bbbb9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page
@@ -30,10 +30,12 @@ def foo_test_const_struct_retval():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
index f5c7798f..1f9d3ccc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page
@@ -35,10 +35,12 @@ def foo_test_string_array(array):
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
index 4d46cef6..bf4b9a76 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page
@@ -35,10 +35,12 @@ def foo_test_string_array_with_g(array):
-<dl>
-<dt><p>array :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>array</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
index 8d795167..3c57204b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page
@@ -35,10 +35,12 @@ def foo_test_unsigned_qualifier(unsigned_param):
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
index 97672a0d..d869c4ea 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page
@@ -35,10 +35,12 @@ def foo_test_unsigned_type(unsigned_param):
-<dl>
-<dt><p>unsigned_param :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>unsigned_param</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
index 681f45b2..0c0d372e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page
@@ -35,10 +35,12 @@ def func_obj_null_in(obj):
-<dl>
-<dt><p>obj :</p></dt>
-<dd><p>A <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>obj</code></title>
+<p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
index 816a722f..bc3fffe8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page
@@ -35,10 +35,12 @@ def global_get_flags_out(v):
-<dl>
-<dt><p>v :</p></dt>
-<dd><p>A flags value</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+<p>A flags value</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
index ed405229..8010d9b5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page
@@ -40,12 +40,16 @@ libgnome-keyring.</p>
-<dl>
-<dt><p>foo :</p></dt>
-<dd><p>some int</p></dd>
-<dt><p>attributes :</p></dt>
-<dd><p>list of attributes</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>foo</code></title>
+<p>some int</p>
+</item>
+<item>
+<title><code>attributes</code></title>
+<p>list of attributes</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
index 63ef956e..230882fb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page
@@ -35,10 +35,12 @@ def introspectable_via_alias(data):
-<dl>
-<dt><p>data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
index aa725200..3eda9cde 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page
@@ -35,10 +35,12 @@ def set_abort_on_error(abort_on_error):
-<dl>
-<dt><p>abort_on_error :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>abort_on_error</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
index 9a170d7d..cf5c11ad 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page
@@ -35,12 +35,16 @@ def test_array_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
index a5cb3976..2fe68c95 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page
@@ -35,10 +35,12 @@ def test_array_fixed_out_objects(objs):
-<dl>
-<dt><p>objs :</p></dt>
-<dd><p>An array of <link xref="Regress.TestObj"/></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>objs</code></title>
+<p>An array of <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
index de526c40..ed44e366 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page
@@ -35,12 +35,16 @@ def test_array_fixed_size_int_in(ints):
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the sum of the items in <code>ints</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
index 9d7ec741..30cebc41 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page
@@ -35,10 +35,12 @@ def test_array_fixed_size_int_out(ints):
-<dl>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers ranging from 0 to 4</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
index bc33d6df..d38e4f9f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page
@@ -30,10 +30,12 @@ def test_array_fixed_size_int_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>a list of 5 integers ranging from 0 to 4</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
index 98f1e19e..db9e9044 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page
@@ -39,14 +39,20 @@ def test_array_gint16_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
index 74fb671f..21e09024 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page
@@ -39,14 +39,20 @@ def test_array_gint32_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
index 0f2ad40b..68b1158d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page
@@ -39,14 +39,20 @@ def test_array_gint64_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
index 4ad4fc7c..4c961947 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page
@@ -39,14 +39,20 @@ def test_array_gint8_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
index bc9057b0..42f73723 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page
@@ -39,14 +39,20 @@ def test_array_gtype_in(n_types, types):
-<dl>
-<dt><p>n_types :</p></dt>
-<dd></dd>
-<dt><p>types :</p></dt>
-<dd><p>List of types</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>string representation of provided types</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_types</code></title>
+
+</item>
+<item>
+<title><code>types</code></title>
+<p>List of types</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
index 088ccfa2..b0d38636 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page
@@ -35,12 +35,16 @@ def test_array_int_full_out(len):
-<dl>
-<dt><p>len :</p></dt>
-<dd><p>length of the returned array.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a new array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>len</code></title>
+<p>length of the returned array.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
index 8bc291b1..59a4be03 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page
@@ -39,14 +39,20 @@ def test_array_int_in(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd></dd>
-<dt><p>ints :</p></dt>
-<dd><p>List of ints</p></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+
+</item>
+<item>
+<title><code>ints</code></title>
+<p>List of ints</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
index 881cc86e..48fc0ac5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page
@@ -39,12 +39,16 @@ def test_array_int_inout(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd><p>the length of <code>ints</code></p></dd>
-<dt><p>ints :</p></dt>
-<dd><p>a list of integers whose items will be increased by 1, except the first that will be dropped</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+<p>the length of <code>ints</code></p>
+</item>
+<item>
+<title><code>ints</code></title>
+<p>a list of integers whose items will be increased by 1, except the first that will be dropped</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
index 39542be1..3c113930 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page
@@ -35,12 +35,16 @@ def test_array_int_none_out(len):
-<dl>
-<dt><p>len :</p></dt>
-<dd><p>length of the returned array.</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a static array of integers.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>len</code></title>
+<p>length of the returned array.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
index 1e8007f7..a2f7ba98 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page
@@ -39,12 +39,16 @@ def test_array_int_null_in(arr, len):
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>len :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>len</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
index 894a37e3..dd2aa751 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page
@@ -39,12 +39,16 @@ def test_array_int_null_out(arr, len):
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>len :</p></dt>
-<dd><p>length</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>len</code></title>
+<p>length</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
index 3bfad946..15e62e1c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page
@@ -39,12 +39,16 @@ def test_array_int_out(n_ints, ints):
-<dl>
-<dt><p>n_ints :</p></dt>
-<dd><p>the length of <code>ints</code></p></dd>
-<dt><p>ints :</p></dt>
-<dd><p>a list of 5 integers, from 0 to 4 in consecutive order</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>n_ints</code></title>
+<p>the length of <code>ints</code></p>
+</item>
+<item>
+<title><code>ints</code></title>
+<p>a list of 5 integers, from 0 to 4 in consecutive order</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
index 39a24a23..1486cc4e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page
@@ -35,10 +35,12 @@ def test_async_ready_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
index e7217be4..8c196987 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page
@@ -35,12 +35,16 @@ def test_boolean(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
index 0f7783ab..7212f687 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page
@@ -35,12 +35,16 @@ def test_boolean_false(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
index 65fec5ed..13c90c2c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page
@@ -35,12 +35,16 @@ def test_boolean_true(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
index dfebfd05..f927cf5f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page
@@ -30,10 +30,12 @@ def test_cairo_context_full_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
index 922330df..d9cd2301 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page
@@ -35,10 +35,12 @@ def test_cairo_context_none_in(context):
-<dl>
-<dt><p>context :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>context</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
index 1b32629a..ec8da6f3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page
@@ -35,10 +35,12 @@ def test_cairo_surface_full_out(surface):
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
index 1cfa1513..ac776954 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page
@@ -30,10 +30,12 @@ def test_cairo_surface_full_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
index ad456c10..c2daf5f4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page
@@ -35,10 +35,12 @@ def test_cairo_surface_none_in(surface):
-<dl>
-<dt><p>surface :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>surface</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
index 4e5dd409..4eda436c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page
@@ -30,10 +30,12 @@ def test_cairo_surface_none_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
index 5da4505b..a5e52b55 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page
@@ -35,12 +35,16 @@ def test_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
index 8ffd9661..471926a0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page
@@ -39,12 +39,16 @@ def test_callback_async(callback, user_data):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
index fed66313..26a0c31d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page
@@ -44,16 +44,24 @@ is invoked.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
index a343923a..7df745a1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page
@@ -40,14 +40,20 @@ condition in bindings which needs to be tested.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
index 459bd47d..a94e6617 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page
@@ -30,10 +30,12 @@ def test_callback_thaw_async():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
index 24c45e90..03158abe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page
@@ -32,10 +32,12 @@ corresponding destroy notfications.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>Sum of the return values of the invoked callbacks.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
index 2b03a8fd..d4a9578f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page
@@ -40,14 +40,20 @@ call and can be released on return.</p>
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
index a3290e54..cdbf8bb0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page
@@ -35,12 +35,16 @@ def test_closure(closure):
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
index c766153c..b19753a4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page
@@ -39,14 +39,20 @@ def test_closure_one_arg(closure, arg):
-<dl>
-<dt><p>closure :</p></dt>
-<dd></dd>
-<dt><p>arg :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+
+</item>
+<item>
+<title><code>arg</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
index 2151555c..6be06f3b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page
@@ -39,14 +39,20 @@ def test_closure_variant(closure, arg):
-<dl>
-<dt><p>closure :</p></dt>
-<dd><p>GClosure which takes one GVariant and returns a GVariant</p></dd>
-<dt><p>arg :</p></dt>
-<dd><p>a GVariant passed as argument to <code>closure</code></p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the return value of <code>closure</code></p></dd>
-</dl>
+<terms>
+<item>
+<title><code>closure</code></title>
+<p>GClosure which takes one GVariant and returns a GVariant</p>
+</item>
+<item>
+<title><code>arg</code></title>
+<p>a GVariant passed as argument to <code>closure</code></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
index 7e9400e4..bcdb8edd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page
@@ -30,10 +30,12 @@ def test_date_in_gvalue():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
index dc3c910a..89a1b503 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page
@@ -30,10 +30,12 @@ def test_def_error_quark():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
index 986f57a5..efea2d69 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page
@@ -35,12 +35,16 @@ def test_double(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
index ccf1af1d..80eebb18 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page
@@ -30,10 +30,12 @@ def test_filename_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>list of strings</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
index 5b5bdb81..50f89930 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page
@@ -35,12 +35,16 @@ def test_float(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
index 132de1fa..1d0ef3e5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page
@@ -30,10 +30,12 @@ def test_garray_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
index e7c1b0fc..ef2bcfd7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page
@@ -30,10 +30,12 @@ def test_garray_full_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
index 52ef85d3..f4f94659 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page
@@ -35,10 +35,12 @@ def test_gerror_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
index 676e6652..9a297dbe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page
@@ -30,10 +30,12 @@ def test_ghash_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
index 0cca64bc..3040336d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page
@@ -30,10 +30,12 @@ def test_ghash_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
index 39c476b5..7028c8b0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page
@@ -35,10 +35,12 @@ def test_ghash_gvalue_in(hash):
-<dl>
-<dt><p>hash :</p></dt>
-<dd><p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>hash</code></title>
+<p>the hash table returned by <link xref="Regress.test_ghash_gvalue_return"/>.</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
index 9a94e398..b24a3bdc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page
@@ -30,10 +30,12 @@ def test_ghash_gvalue_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
index 6d0a2a7a..2039ab45 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page
@@ -30,10 +30,12 @@ def test_ghash_nested_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
index a6837dad..adac865e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page
@@ -31,10 +31,12 @@ element-type annotation.</p>
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
index 623aee60..264d31a1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page
@@ -35,10 +35,12 @@ def test_ghash_nothing_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
index 72e7c669..ac786a45 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page
@@ -35,10 +35,12 @@ def test_ghash_nothing_in2(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
index 64438430..1e3851f7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page
@@ -30,10 +30,12 @@ def test_ghash_nothing_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
index 5748c38a..66aa7060 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page
@@ -30,10 +30,12 @@ def test_ghash_nothing_return2():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
index 5eff48f8..9b77e122 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page
@@ -35,10 +35,12 @@ def test_ghash_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
index a1c9b5bf..07d7e151 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page
@@ -35,10 +35,12 @@ def test_ghash_null_out(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
index 0683dbed..71867408 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page
@@ -30,10 +30,12 @@ def test_ghash_null_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
index 16ae13ab..28be892d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page
@@ -30,10 +30,12 @@ def test_glist_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
index 44f09fdd..2d449a4d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page
@@ -30,10 +30,12 @@ def test_glist_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
index 1950b99a..8f2d8851 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page
@@ -35,10 +35,12 @@ def test_glist_nothing_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
index 3a5d966d..a9307604 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page
@@ -35,10 +35,12 @@ def test_glist_nothing_in2(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
index 13854024..1230c517 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page
@@ -30,10 +30,12 @@ def test_glist_nothing_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
index 3a78443f..4d120ea0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page
@@ -30,10 +30,12 @@ def test_glist_nothing_return2():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
index 6f1ce10d..619f9414 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page
@@ -35,10 +35,12 @@ def test_glist_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
index 1bc2c2de..9ed9114f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page
@@ -35,10 +35,12 @@ def test_glist_null_out(out_list):
-<dl>
-<dt><p>out_list :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out_list</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
index b328b0f0..89574e27 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page
@@ -30,10 +30,12 @@ def test_gslist_container_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
index 749adc28..d0eafc0d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page
@@ -30,10 +30,12 @@ def test_gslist_everything_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
index 86e240eb..ab61b072 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page
@@ -35,10 +35,12 @@ def test_gslist_nothing_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
index 8edd87e2..df5af0ff 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page
@@ -35,10 +35,12 @@ def test_gslist_nothing_in2(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
index a6af8a2a..71813808 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page
@@ -30,10 +30,12 @@ def test_gslist_nothing_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
index 146643c6..60a28160 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page
@@ -30,10 +30,12 @@ def test_gslist_nothing_return2():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
index b3117c01..6bf4307f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page
@@ -35,10 +35,12 @@ def test_gslist_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
index 3a0fa92e..b9ce49ed 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page
@@ -35,10 +35,12 @@ def test_gslist_null_out(out_list):
-<dl>
-<dt><p>out_list :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out_list</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
index f98195ac..798d219a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page
@@ -35,12 +35,16 @@ def test_gtype(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
index edd0a830..c6fabf62 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page
@@ -30,10 +30,12 @@ def test_gvariant_as():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
index 2e9eeeb7..a99d4022 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page
@@ -30,10 +30,12 @@ def test_gvariant_asv():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
index c47377b5..891ae8ba 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page
@@ -30,10 +30,12 @@ def test_gvariant_i():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
index dfd123f8..cfabe8ba 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page
@@ -30,10 +30,12 @@ def test_gvariant_s():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
index 1f5d309e..325e136c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page
@@ -30,10 +30,12 @@ def test_gvariant_v():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>New variant</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
index 6429848b..94b02d40 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page
@@ -39,12 +39,16 @@ def test_hash_table_callback(data, callback):
-<dl>
-<dt><p>data :</p></dt>
-<dd><p>GHashTable that gets passed to callback</p></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>data</code></title>
+<p>GHashTable that gets passed to callback</p>
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
index 22c435f5..538f8ce5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page
@@ -35,12 +35,16 @@ def test_int(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
index 6f0945af..b749c85d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page
@@ -35,12 +35,16 @@ def test_int16(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
index 8070a644..29fd74ab 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page
@@ -35,12 +35,16 @@ def test_int32(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
index c9456ad6..52413c05 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page
@@ -35,12 +35,16 @@ def test_int64(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
index 73c17498..50bfa635 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page
@@ -35,12 +35,16 @@ def test_int8(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
index 9b5b728e..bf066219 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page
@@ -39,12 +39,16 @@ def test_int_out_utf8(length, in):
-<dl>
-<dt><p>length :</p></dt>
-<dd></dd>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>length</code></title>
+
+</item>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
index 2d6d569b..cb034ddf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page
@@ -35,12 +35,16 @@ def test_int_value_arg(v):
-<dl>
-<dt><p>v :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>v</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
index 3b56821e..eb13e4f8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page
@@ -35,12 +35,16 @@ def test_long(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
index ed15aba2..530f763e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page
@@ -35,12 +35,16 @@ def test_multi_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
index b781e796..df6a9f85 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page
@@ -43,14 +43,20 @@ def test_multi_double_args(in, one, two):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>one :</p></dt>
-<dd></dd>
-<dt><p>two :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>one</code></title>
+
+</item>
+<item>
+<title><code>two</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
index 6cfdbcd6..9b8ae8cd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page
@@ -30,8 +30,8 @@ def test_multiline_doc_comments():
-<dl>
-</dl>
+<terms>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
index 571dd0a5..6ee8fc23 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page
@@ -60,10 +60,12 @@ rgb(20%, 30%, 0%)&lt;/literallayout&gt;&lt;/entry&gt;
-<dl>
-<dt><p>a :</p></dt>
-<dd><p>An integer</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>a</code></title>
+<p>An integer</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
index ce50e43e..05b872e2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page
@@ -35,10 +35,12 @@ def test_null_gerror_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
index 93cd72fc..b2d23902 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page
@@ -35,10 +35,12 @@ def test_owned_gerror_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
index 77ddd585..40364efe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page
@@ -35,12 +35,16 @@ def test_short(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
index 241d0a86..fc87b44e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page
@@ -35,10 +35,12 @@ def test_simple_callback(callback):
-<dl>
-<dt><p>callback :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
index 3496e370..24432094 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page
@@ -35,12 +35,16 @@ def test_size(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
index 6e61bc83..bcfe773a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page
@@ -35,12 +35,16 @@ def test_ssize(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
index dee44c02..fca58f0a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page
@@ -35,12 +35,16 @@ def test_strv_in(arr):
-<dl>
-<dt><p>arr :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>arr</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
index ab03bda9..1db56a92 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page
@@ -30,10 +30,12 @@ def test_strv_in_gvalue():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
index e87d979f..ca99305f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page
@@ -30,10 +30,12 @@ def test_strv_out():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
index 8d5a73a7..ad925c4d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page
@@ -30,10 +30,12 @@ def test_strv_out_c():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
index feaf8c78..04b8152c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page
@@ -30,10 +30,12 @@ def test_strv_out_container():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
index 7cea6b43..40882d5c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page
@@ -35,10 +35,12 @@ def test_strv_outarg(retp):
-<dl>
-<dt><p>retp :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>retp</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
index 3e7637ec..a93fd091 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page
@@ -35,12 +35,16 @@ def test_timet(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
index 542dc1f2..2be46bb7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page
@@ -55,20 +55,32 @@ def test_torture_signature_0(x, y, z, foo, q, m):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
index 333d386e..15cfb50f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page
@@ -55,22 +55,36 @@ def test_torture_signature_1(x, y, z, foo, q, m):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
index 449793bb..7ee3809f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page
@@ -67,26 +67,44 @@ def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m):
-<dl>
-<dt><p>x :</p></dt>
-<dd></dd>
-<dt><p>callback :</p></dt>
-<dd></dd>
-<dt><p>user_data :</p></dt>
-<dd></dd>
-<dt><p>notify :</p></dt>
-<dd></dd>
-<dt><p>y :</p></dt>
-<dd></dd>
-<dt><p>z :</p></dt>
-<dd></dd>
-<dt><p>foo :</p></dt>
-<dd></dd>
-<dt><p>q :</p></dt>
-<dd></dd>
-<dt><p>m :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>user_data</code></title>
+
+</item>
+<item>
+<title><code>notify</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>z</code></title>
+
+</item>
+<item>
+<title><code>foo</code></title>
+
+</item>
+<item>
+<title><code>q</code></title>
+
+</item>
+<item>
+<title><code>m</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
index 84f702af..7735c13c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page
@@ -35,12 +35,16 @@ def test_uint(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
index b8e444a0..490c11fd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page
@@ -35,12 +35,16 @@ def test_uint16(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
index 37da5482..87a20ccd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page
@@ -35,12 +35,16 @@ def test_uint32(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
index b11cfbb2..f697e694 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page
@@ -35,12 +35,16 @@ def test_uint64(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
index 58f7817a..ae918cba 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page
@@ -35,12 +35,16 @@ def test_uint8(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
index f94fff0d..349576c5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page
@@ -35,12 +35,16 @@ def test_ulong(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
index 363a5e33..2b705e8e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page
@@ -35,12 +35,16 @@ def test_unichar(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
index 4e77143e..31b91662 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page
@@ -35,12 +35,16 @@ def test_unsigned_enum_param(e):
-<dl>
-<dt><p>e :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>e</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
index 2b0f0822..68f0aa8a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page
@@ -35,12 +35,16 @@ def test_ushort(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-<dt><p>Returns :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
index 36e992bb..888e6eab 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page
@@ -35,10 +35,12 @@ def test_utf8_const_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
index 9aef1f17..b704c60d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page
@@ -30,10 +30,12 @@ def test_utf8_const_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
index c7c32ccc..1839f096 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page
@@ -35,10 +35,12 @@ def test_utf8_inout(inout):
-<dl>
-<dt><p>inout :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>inout</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
index fd5de6a9..03049985 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page
@@ -30,10 +30,12 @@ def test_utf8_nonconst_return():
-<dl>
-<dt><p>Returns :</p></dt>
-<dd><p>UTF-8 string</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
index c6aff047..1fda6800 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page
@@ -35,10 +35,12 @@ def test_utf8_null_in(in):
-<dl>
-<dt><p>in :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
index 65b277af..f8d7b6fb 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page
@@ -35,10 +35,12 @@ def test_utf8_null_out(char_out):
-<dl>
-<dt><p>char_out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>char_out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
index 7f73b8d0..acc0a406 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page
@@ -35,10 +35,12 @@ def test_utf8_out(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
index ed43d541..e7efb7b9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page
@@ -35,12 +35,16 @@ def test_utf8_out_nonconst_return(out):
-<dl>
-<dt><p>out :</p></dt>
-<dd><p>a copy of "second"</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>out</code></title>
+<p>a copy of "second"</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
index 763053fa..bde41d8e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page
@@ -39,12 +39,16 @@ def test_utf8_out_out(out0, out1):
-<dl>
-<dt><p>out0 :</p></dt>
-<dd><p>a copy of "first"</p></dd>
-<dt><p>out1 :</p></dt>
-<dd><p>a copy of "second"</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>out0</code></title>
+<p>a copy of "first"</p>
+</item>
+<item>
+<title><code>out1</code></title>
+<p>a copy of "second"</p>
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
index 54aaaa66..6470babc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page
@@ -35,12 +35,16 @@ def test_value_return(i):
-<dl>
-<dt><p>i :</p></dt>
-<dd><p>an int</p></dd>
-<dt><p>Returns :</p></dt>
-<dd><p>the int wrapped in a GValue.</p></dd>
-</dl>
+<terms>
+<item>
+<title><code>i</code></title>
+<p>an int</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+{formatter.format(node, node.retval.doc)}
+</item>
+</terms>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
index 4a5cfd82..cac760a7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page
@@ -31,8 +31,8 @@ def test_versioning():
<p>Since 1.32.1</p>
-<dl>
-</dl>
+<terms>
+</terms>