summaryrefslogtreecommitdiff
path: root/tests/scanner/Regress-1.0-Python-expected
diff options
context:
space:
mode:
Diffstat (limited to 'tests/scanner/Regress-1.0-Python-expected')
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page4
-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.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page4
-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.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page4
-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.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page4
-rw-r--r--tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page4
390 files changed, 556 insertions, 556 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 119860d2..9ac6820d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.ATestError</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page
index 2229245a..9490e4a3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.AliasedTestBoxed</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
index 8cbc8326..4e19ef92 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.AnnotationBitfield</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page
index 30f950c2..9a652d80 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.AnnotationCallback</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page
index 506ceffd..db77a117 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.AnnotationForeachFunc</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page
index 3f9409ed..79844c66 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.AnnotationListCallback</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page
index b2dc717c..17c80292 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.AnnotationNotifyFunc</title>
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 b52cf90c..9ed31bc3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="signal"/>
+ <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
<title type="link" role="topic">attribute-signal</title>
</info>
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 9d8641d4..29eedcc1 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="signal"/>
+ <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
<title type="link" role="topic">doc-empty-arg-parsing</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page
index f526ea9b..d9d8b55a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="property"/>
+ <link xref="Regress.AnnotationObject" group="property" type="guide"/>
<title type="link" role="topic">function-property</title>
</info>
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 d4a27322..fdfa65f7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="signal"/>
+ <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
<title type="link" role="topic">list-signal</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page
index 97391bc4..a3cb0456 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="property"/>
+ <link xref="Regress.AnnotationObject" group="property" type="guide"/>
<title type="link" role="topic">string-property</title>
</info>
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 95bd3d29..06e79aa3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="signal"/>
+ <link xref="Regress.AnnotationObject" group="signal" type="guide"/>
<title type="link" role="topic">string-signal</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page
index db243c63..ed219fe5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="property"/>
+ <link xref="Regress.AnnotationObject" group="property" type="guide"/>
<title type="link" role="topic">tab-property</title>
</info>
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 0fe1c050..5dc0d89c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
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 3f2107e5..e8088523 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 cd2c7d9c..0b6dd5dc 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 fcc89102..32bdcff6 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 d929218f..cc1c627e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 053a368d..eb65fe36 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 4ee8088c..bcd4fd5d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
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 4e79b26b..dd7f050d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
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 5ddadfc6..d8729783 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 0d34439f..63fedadb 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 87cfede3..d0dbe7c3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: GObject.Object}</api:type>
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 bd174a4d..4d378e36 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>[Regress.AnnotationObject]</api:type>
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 698180b7..7eb5735f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
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 5dd1e2b9..717525fa 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 569587ea..2f7d526e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 84ac74a0..4723d33f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 b6205805..774f3234 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 ca64eaa3..806b6e74 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 f2800882..11a0f0d0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 8e7786ad..4e474d0d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
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 a8718795..b1e037f5 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page
index 94313a6f..ec6a11f8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.AnnotationObject</title>
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 c76bb940..a69df607 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 beaebab8..e8a48794 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 b9fc65f6..63e540d3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 ccabb841..b01add00 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 9d12f393..cd68ab76 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 6c5d72c4..dddc4d57 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 ebb7aa0c..3d3c7563 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 b4ceb23e..a6b653a0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.AnnotationObject" group="method"/>
+ <link xref="Regress.AnnotationObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page
index edc9fd18..e2100429 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.AnnotationStruct</title>
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 b59e7634..09cd98fd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooASingle</title>
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 e3f52935..008a8f36 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooAddressType</title>
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 fd700d29..dca11c35 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooBRect" group="method"/>
+ <link xref="Regress.FooBRect" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page
index 57e26525..fd1e9d6e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooBRect</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page
index 63831e74..8644d96e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooBUnion</title>
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 9cfe9318..dfaf746a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooBoxed" group="method"/>
+ <link xref="Regress.FooBoxed" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page
index 962300f3..bca1f99a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooBoxed</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page
index c93a1f7f..1a515428 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.FooBuffer</title>
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 8b65f138..bee0dd0d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooBuffer" group="method"/>
+ <link xref="Regress.FooBuffer" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page
index 241296e1..52feda29 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooCallback</title>
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 2d19be62..744cbf0e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooDBusData" group="method"/>
+ <link xref="Regress.FooDBusData" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page
index 08ad0d2e..b4eaeade 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooDBusData</title>
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 443f25ea..00169aaf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooEnumFullname</title>
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 5957904b..d2b41e61 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooEnumNoType</title>
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 d052d4f5..c3ff89b3 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooEnumType</title>
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 5577eebe..8c0b6a23 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooError</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page
index 0b77bcbb..ce368302 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooEvent</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page
index 45cd3a13..562ec03c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooEventAny</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page
index 7e9ca7d4..0000add5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooEventExpose</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
index d4db757a..53539d49 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooFlagsNoType</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
index e4f3edef..2b4afeb5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooFlagsType</title>
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 86bdfa3e..757033ff 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooForeignStruct" group="method"/>
+ <link xref="Regress.FooForeignStruct" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooForeignStruct</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page
index 06c5793f..312994a9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooForeignStruct</title>
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 6cb6433e..d0be1eb5 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.FooInterface" group="vfunc" type="guide"/>
</info>
<title>Regress.FooInterface::do_regress_foo</title>
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 465f9130..d94103f8 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooInterface" group="method"/>
+ <link xref="Regress.FooInterface" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page
index bc0b7df2..d2a482f7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.FooInterface</title>
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 7da66ea3..5a09792b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooInterface" group="function"/>
+ <link xref="Regress.FooInterface" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 e5189c14..c2ca1c09 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.FooObject" group="vfunc" type="guide"/>
</info>
<title>Regress.FooObject::read_fn</title>
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 691f7aed..ee6c20c5 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="signal"/>
+ <link xref="Regress.FooObject" group="signal" type="guide"/>
<title type="link" role="topic">signal</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page
index ce48885e..9d61f3ab 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="property"/>
+ <link xref="Regress.FooObject" group="property" type="guide"/>
<title type="link" role="topic">string</title>
</info>
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 e4579001..01cf6dba 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.FooObject" group="vfunc" type="guide"/>
</info>
<title>Regress.FooObject::virtual_method</title>
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 e291ab64..ecfd04f7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="function"/>
+ <link xref="Regress.FooObject" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 7fa2ea7d..dce6f596 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooOtherObject</api:type>
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 3d329fb5..4e2a8e4f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
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 09481e92..182f153f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Utility.Object</api:type>
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 3b7c8722..68806e88 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="function"/>
+ <link xref="Regress.FooObject" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooSubobject</api:type>
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 52a90560..bc94a277 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
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 5671a1cd..260c8dde 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 633c32fb..86788025 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page
index 9a635381..3265e6b5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.FooObject</title>
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 787081f0..1dc774f8 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 4c825d80..ab006514 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="function"/>
+ <link xref="Regress.FooObject" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 15227cd8..456f9cc0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 3e05ffae..60b38154 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="method"/>
+ <link xref="Regress.FooObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page
index 4d9cabc6..44a63ab1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooObjectCookie</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page
index 111b2aca..dadf5236 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.FooOtherObject</title>
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 e2f8bbeb..1a05ace0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooRectangle" group="method"/>
+ <link xref="Regress.FooRectangle" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page
index 521a68bc..0cfef622 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooRectangle</title>
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 bd7a445b..8a08c9ae 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.FooStackLayer</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page
index 4088a6c2..84f5d192 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooStruct</title>
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 675a861d..a42bb176 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooSubInterface" group="signal"/>
+ <link xref="Regress.FooSubInterface" group="signal" type="guide"/>
<title type="link" role="topic">destroy-event</title>
</info>
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 4b925a9f..82dbc622 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
</info>
<title>Regress.FooSubInterface::destroy_event</title>
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 d07cadc9..a035189a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
</info>
<title>Regress.FooSubInterface::do_bar</title>
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 723cea8e..3b0404fa 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.FooSubInterface" group="vfunc" type="guide"/>
</info>
<title>Regress.FooSubInterface::do_baz</title>
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 45137e84..0e159413 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooSubInterface" group="method"/>
+ <link xref="Regress.FooSubInterface" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 e95447c4..f5fcb437 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooSubInterface" group="method"/>
+ <link xref="Regress.FooSubInterface" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page
index e4d936ab..81593d32 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.FooSubInterface</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page
index c4e1ce26..fc7b5ad1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.FooSubobject</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page
index 7ae6ae56..430dce7c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooThingWithArray</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page
index 06d2e800..9746f17e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooUnion</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page
index 0471b871..2b94f691 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.FooUtilityStruct</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page
index 18122490..c389ef05 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.FooXEvent</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page
index 05362e5c..44a946ee 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.LikeGnomeKeyringPasswordSchema</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page
index 9af00b51..f66aee44 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.PtrArrayAlias</title>
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 6a044d79..f31b58ec 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestABCError</title>
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 fa810dd4..85e76394 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxed" group="method"/>
+ <link xref="Regress.TestBoxed" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxed</api:type>
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 e03d1f0a..9fe30619 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxed" group="method"/>
+ <link xref="Regress.TestBoxed" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page
index c6792c50..baa423f2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestBoxed</title>
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 30b45992..e2b38f8e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedB" group="method"/>
+ <link xref="Regress.TestBoxedB" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxedB</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page
index 46cf7c15..0e39780b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestBoxedB</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page
index 88dd1a4c..18b77d9f 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestBoxedC</title>
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 6923488a..e350d80e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedD" group="method"/>
+ <link xref="Regress.TestBoxedD" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxedD</api:type>
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 366fb2d2..d083007e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedD" group="method"/>
+ <link xref="Regress.TestBoxedD" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 551c6173..ea1ac4fd 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedD" group="method"/>
+ <link xref="Regress.TestBoxedD" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page
index 17b3c79b..995e80dd 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestBoxedD</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page
index 9a219e9e..bed84d50 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallback</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page
index 7ceb2e07..7d3f7b83 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallbackArray</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page
index 3de1fbe8..0b8fca1d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallbackFull</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page
index 1f6f2bdb..804382f5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallbackGError</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page
index 906947c1..06ebb706 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallbackHashtable</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page
index e7397a1b..28b21ea4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallbackOwnedGError</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page
index f3047cfd..286c830a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestCallbackUserData</title>
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 6a92ba9a..589059d5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestDEFError</title>
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 9009dcda..814b474b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestEnum</title>
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 a0cd98cc..5c0c5594 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestEnumNoGEnum</title>
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 327cacc5..df3cfa1e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestEnumUnsigned</title>
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 c635d0e0..d6a6ebb2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestError</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
index d5451972..d5bfeeb4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestFlags</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page
index 87520bd8..a2b80e1d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestFloating</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page
index af4623a2..7035407d 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestFundamentalObject</title>
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 23164e09..af12914b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestFundamentalObject" group="method"/>
+ <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestFundamentalObject</api:type>
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 18f57651..90e7e881 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestFundamentalObject" group="method"/>
+ <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page
index dfd65cef..73a33285 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestFundamentalObjectCopyFunction</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page
index 2b9d965c..df0e8fba 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestFundamentalObjectFinalizeFunction</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page
index 6f3a246e..6b1e810a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestFundamentalSubObject</title>
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 2aff243a..2d8d0b61 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestInheritDrawable" group="method"/>
+ <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 4f7d8e61..4524842d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestInheritDrawable" group="method"/>
+ <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 ccd73b1b..983cb507 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestInheritDrawable" group="method"/>
+ <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 39d7bcca..09b0559b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestInheritDrawable" group="method"/>
+ <link xref="Regress.TestInheritDrawable" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page
index d7ed30bc..1fdd2c89 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestInheritDrawable</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page
index deaeea50..0df0396b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestInheritPixmapObjectClass</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page
index 454ff74f..807e18ae 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestInterface</title>
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 2870e2bd..f8fb4a1c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">all</title>
</info>
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 aaea25a4..7a3b9c91 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.TestObj" group="vfunc" type="guide"/>
</info>
<title>Regress.TestObj::allow_none_vfunc</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page
index 97c7ee68..f1f1b520 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">bare</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page
index e8706270..a392a771 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">boxed</title>
</info>
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 1e341964..f35c0314 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">cleanup</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page
index 8243a454..70fd579b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">double</title>
</info>
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 f35e30d7..b5bcd2c0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">first</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page
index 8ff32c00..87be50fe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">float</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page
index b477bed4..6b222e4e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">gtype</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page
index 57d37ae5..c796f365 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">hash-table-old</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page
index 1c5a6eaf..c5d426cf 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">hash-table</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page
index 18089ad7..db7a89e1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">int</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
index 70fe6185..95367ec2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">list-old</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
index b21f7238..aca148d8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">list</title>
</info>
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 a1f1fd98..fe7066a2 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="Regress.TestObj" group="vfunc" type="guide"/>
</info>
<title>Regress.TestObj::matrix</title>
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 cccc0903..eb1b99ff 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-array-prop</title>
</info>
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 0dfd9d8c..36a30d7e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-foreign-struct</title>
</info>
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 ef6ded31..2048ad2c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-hash-prop</title>
</info>
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 9bfe4b9e..a782484b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-int64-prop</title>
</info>
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 134a1bb4..d070f179 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-intarray-ret</title>
</info>
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 f99b27f5..d4814a83 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-obj</title>
</info>
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 a92fe03f..a7037a49 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-strv</title>
</info>
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 3c220f07..c89d1d16 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">sig-with-uint64-prop</title>
</info>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page
index 345a8218..fa499937 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="property"/>
+ <link xref="Regress.TestObj" group="property" type="guide"/>
<title type="link" role="topic">string</title>
</info>
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 674df4a2..736814c7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">test-with-static-scope-arg</title>
</info>
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 e7ea1607..e09f531e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="signal"/>
+ <link xref="Regress.TestObj" group="signal" type="guide"/>
<title type="link" role="topic">test</title>
</info>
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 f7d905b8..31e6b146 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 4da0acf0..3871f1f2 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 a90da8dc..5c607d18 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 2f02db89..675aba97 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 fede0a67..a6ad4b17 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 33a7507b..90bedec3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 6f0dab49..ec94048c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 34b74974..aa015c53 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 f654e7e4..75381509 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="function"/>
+ <link xref="Regress.TestObj" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
index 2da014f5..1ded23c7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestObj</title>
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 52013d55..bbd16fe1 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 609e8b30..d2eea266 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 b956db95..2a13be92 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 9104649c..0a900ee7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 4b1e9bbe..b4ae4584 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 dd5ca45c..1c10cea0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 df4963e3..6896d2ef 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="function"/>
+ <link xref="Regress.TestObj" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>float</api:type>
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 08e44411..32fe8e54 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="function"/>
+ <link xref="Regress.TestObj" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 c5d8c9f6..9ad27108 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 99540568..0313a70d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="method"/>
+ <link xref="Regress.TestObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
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 d1887d5e..858e58a8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="enum" type="guide"/>
</info>
<title>Regress.TestOtherError</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
index 788441ac..66b477d2 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestPrivateEnum</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page
index fa508137..7b1309da 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestPrivateStruct</title>
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 6b7b9ebe..10789f27 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSimpleBoxedA" group="function"/>
+ <link xref="Regress.TestSimpleBoxedA" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestSimpleBoxedA</api:type>
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 22a55259..5e191991 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSimpleBoxedA" group="method"/>
+ <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestSimpleBoxedA</api:type>
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 9616ddd9..426bd98b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSimpleBoxedA" group="method"/>
+ <link xref="Regress.TestSimpleBoxedA" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page
index 2a8dd629..9117ddb9 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestSimpleBoxedA</title>
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 405778a8..95950d77 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSimpleBoxedB" group="method"/>
+ <link xref="Regress.TestSimpleBoxedB" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestSimpleBoxedB</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page
index b775b867..7ecc623e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestSimpleBoxedB</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page
index 61bafb5f..f8157820 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestSimpleCallback</title>
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 cbc5b426..ee47fb3e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestStructA" group="method"/>
+ <link xref="Regress.TestStructA" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page
index 07b1752d..a6a98173 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructA</title>
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 d8bdaaeb..e557650d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestStructA" group="function"/>
+ <link xref="Regress.TestStructA" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 cebaa169..4abe66bc 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestStructB" group="method"/>
+ <link xref="Regress.TestStructB" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page
index b5b2ff3f..21d86261 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructB</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page
index 1db74ca2..6bd58122 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructC</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page
index cf224e3e..aa9f131c 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructD</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page
index 75684f3d..b931c367 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructE</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page
index 6f77035b..3b81e621 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestStructE__some_union__union</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page
index fe5e7bc6..cfb434b4 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructF</title>
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 0db49624..427eef38 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestStructFixedArray" group="method"/>
+ <link xref="Regress.TestStructFixedArray" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page
index b5df5294..db6e7893 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="record" type="guide"/>
</info>
<title>Regress.TestStructFixedArray</title>
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 417ba337..878b4058 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSubObj" group="method"/>
+ <link xref="Regress.TestSubObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page
index fef2f914..b1dc19b1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestSubObj</title>
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 bb2ad606..67a98067 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSubObj" group="method"/>
+ <link xref="Regress.TestSubObj" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page
index d815a3fe..e0a7bc09 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="default" type="guide"/>
</info>
<title>Regress.TestTypeGUInt64</title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page
index 5846ac62..00c168bc 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestWi8021x" group="property"/>
+ <link xref="Regress.TestWi8021x" group="property" type="guide"/>
<title type="link" role="topic">testbool</title>
</info>
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 4b9de5a1..e9431c76 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestWi8021x" group="method"/>
+ <link xref="Regress.TestWi8021x" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page
index 67b7ecae..aef03874 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index"/>
+ <link xref="index" group="class" type="guide"/>
</info>
<title>Regress.TestWi8021x</title>
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 22346642..d5afdb62 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestWi8021x" group="method"/>
+ <link xref="Regress.TestWi8021x" group="method" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
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 1fecc3af..be2afb92 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestWi8021x" group="function"/>
+ <link xref="Regress.TestWi8021x" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
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 377dcbd1..6b9f2789 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>aliased_caller_alloc</title>
+ <title>Regress.aliased_caller_alloc</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.AliasedTestBoxed)
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 023e993a..e636e2d2 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>annotation_attribute_func</title>
+ <title>Regress.annotation_attribute_func</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.AnnotationObject, unicode)
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 d98c2b82..fb428b2c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -28,7 +28,7 @@
</api:function>
</info>
- <title>annotation_custom_destroy</title>
+ <title>Regress.annotation_custom_destroy</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer)
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 73e35557..e8b0ac5e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>filename</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_get_source_file</title>
+ <title>Regress.annotation_get_source_file</title>
<synopsis><code mime="text/x-python">
@returns(filename)
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 09ee5b10..c94076ab 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>annotation_init</title>
+ <title>Regress.annotation_init</title>
<synopsis><code mime="text/x-python">
@accepts(int, [unicode])
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 eec7b20e..038bb47e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>annotation_invalid_regress_annotation</title>
+ <title>Regress.annotation_invalid_regress_annotation</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 12752bbc..daf47ffa 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>annotation_ptr_array</title>
+ <title>Regress.annotation_ptr_array</title>
<synopsis><code mime="text/x-python">
@accepts([GObject.Value])
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 5b6e6bcf..c2a7371f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>annotation_return_array</title>
+ <title>Regress.annotation_return_array</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 c1e8e635..a5a8fa0c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>filename</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_return_filename</title>
+ <title>Regress.annotation_return_filename</title>
<synopsis><code mime="text/x-python">
@returns(filename)
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 504ef282..4dd41fcb 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>annotation_set_source_file</title>
+ <title>Regress.annotation_set_source_file</title>
<synopsis><code mime="text/x-python">
@accepts(filename)
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 0307bd23..69351e90 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_space_after_comment_bug631690</title>
+ <title>Regress.annotation_space_after_comment_bug631690</title>
<synopsis><code mime="text/x-python">
@returns(none)
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 e42b140e..ca6241dd 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>annotation_string_array_length</title>
+ <title>Regress.annotation_string_array_length</title>
<synopsis><code mime="text/x-python">
@accepts(int, [unicode])
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 8cafc09a..33ad8d1e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_string_zero_terminated</title>
+ <title>Regress.annotation_string_zero_terminated</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 2c396ac0..008b4cdd 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>annotation_string_zero_terminated_out</title>
+ <title>Regress.annotation_string_zero_terminated_out</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 402a6ff1..f3243ec7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_test_parsing_bug630862</title>
+ <title>Regress.annotation_test_parsing_bug630862</title>
<synopsis><code mime="text/x-python">
@returns(GObject.Object)
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 956465ca..0e19f1f8 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_transfer_floating</title>
+ <title>Regress.annotation_transfer_floating</title>
<synopsis><code mime="text/x-python">
@returns(GObject.Object)
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 a387a595..5ca4dbba 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>annotation_versioned</title>
+ <title>Regress.annotation_versioned</title>
<synopsis><code mime="text/x-python">
@returns(none)
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 36401553..477e9856 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Quark</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>atest_error_quark</title>
+ <title>Regress.atest_error_quark</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Quark)
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 d9e9994b..399187ed 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -28,7 +28,7 @@
</api:function>
</info>
- <title>foo_async_ready_callback</title>
+ <title>Regress.foo_async_ready_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer)
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 1f758a64..3b9ccb9a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -28,7 +28,7 @@
</api:function>
</info>
- <title>foo_destroy_notify_callback</title>
+ <title>Regress.foo_destroy_notify_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify)
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 4ee838b5..6195fbc7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>foo_init</title>
+ <title>Regress.foo_init</title>
<synopsis><code mime="text/x-python">
@returns(int)
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 77a94c40..9095b088 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -32,7 +32,7 @@
</api:function>
</info>
- <title>foo_method_external_references</title>
+ <title>Regress.foo_method_external_references</title>
<synopsis><code mime="text/x-python">
@accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct)
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 0f58aaa3..9df41fac 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooObject</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>foo_not_a_constructor_new</title>
+ <title>Regress.foo_not_a_constructor_new</title>
<synopsis><code mime="text/x-python">
@returns(Regress.FooObject)
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 2680f708..8feb21f4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>foo_test_array</title>
+ <title>Regress.foo_test_array</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 6be54b8e..e16a8dd2 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>foo_test_const_char_param</title>
+ <title>Regress.foo_test_const_char_param</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 4eb0d3a7..b5c34125 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>foo_test_const_char_retval</title>
+ <title>Regress.foo_test_const_char_retval</title>
<synopsis><code mime="text/x-python">
@returns(unicode)
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 31532fc3..e37243af 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>foo_test_const_struct_param</title>
+ <title>Regress.foo_test_const_struct_param</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.FooStruct)
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 140bbbb9..2f820a94 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooStruct</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>foo_test_const_struct_retval</title>
+ <title>Regress.foo_test_const_struct_retval</title>
<synopsis><code mime="text/x-python">
@returns(Regress.FooStruct)
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 1f9d3ccc..68ff1b46 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>foo_test_string_array</title>
+ <title>Regress.foo_test_string_array</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 bf4b9a76..f5d18848 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>foo_test_string_array_with_g</title>
+ <title>Regress.foo_test_string_array_with_g</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 3c57204b..ed8bb964 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>foo_test_unsigned_qualifier</title>
+ <title>Regress.foo_test_unsigned_qualifier</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 d869c4ea..0fe4bec8 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>foo_test_unsigned_type</title>
+ <title>Regress.foo_test_unsigned_type</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 0c0d372e..5b968832 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>func_obj_null_in</title>
+ <title>Regress.func_obj_null_in</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestObj)
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 bc3fffe8..e5c60beb 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>global_get_flags_out</title>
+ <title>Regress.global_get_flags_out</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestFlags)
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 8010d9b5..9d7992d6 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>has_parameter_named_attrs</title>
+ <title>Regress.has_parameter_named_attrs</title>
<synopsis><code mime="text/x-python">
@accepts(int, [guint32])
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 230882fb..c024ff89 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>introspectable_via_alias</title>
+ <title>Regress.introspectable_via_alias</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.PtrArrayAlias)
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 3eda9cde..ad326337 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>set_abort_on_error</title>
+ <title>Regress.set_abort_on_error</title>
<synopsis><code mime="text/x-python">
@accepts(bool)
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 cf5c11ad..4da29a86 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_array_callback</title>
+ <title>Regress.test_array_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackArray)
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 2fe68c95..e2d84b81 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_array_fixed_out_objects</title>
+ <title>Regress.test_array_fixed_out_objects</title>
<synopsis><code mime="text/x-python">
@accepts([Regress.TestObj])
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 ed44e366..60ad1826 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_array_fixed_size_int_in</title>
+ <title>Regress.test_array_fixed_size_int_in</title>
<synopsis><code mime="text/x-python">
@accepts([int])
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 30cebc41..3c6afc47 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_array_fixed_size_int_out</title>
+ <title>Regress.test_array_fixed_size_int_out</title>
<synopsis><code mime="text/x-python">
@accepts([int])
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 d38e4f9f..0df5ae57 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[int]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_array_fixed_size_int_return</title>
+ <title>Regress.test_array_fixed_size_int_return</title>
<synopsis><code mime="text/x-python">
@returns([int])
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 db9e9044..e033affb 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_gint16_in</title>
+ <title>Regress.test_array_gint16_in</title>
<synopsis><code mime="text/x-python">
@accepts(int, [gint16])
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 21e09024..5a696b9a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gint32</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_gint32_in</title>
+ <title>Regress.test_array_gint32_in</title>
<synopsis><code mime="text/x-python">
@accepts(int, [gint32])
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 68b1158d..dafee3c2 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_gint64_in</title>
+ <title>Regress.test_array_gint64_in</title>
<synopsis><code mime="text/x-python">
@accepts(int, [int])
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 4c961947..40b38b28 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_gint8_in</title>
+ <title>Regress.test_array_gint8_in</title>
<synopsis><code mime="text/x-python">
@accepts(int, [gint8])
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 42f73723..9cfb531a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_gtype_in</title>
+ <title>Regress.test_array_gtype_in</title>
<synopsis><code mime="text/x-python">
@accepts(int, [GType])
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 b0d38636..4b2c4fa3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[int]</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_array_int_full_out</title>
+ <title>Regress.test_array_int_full_out</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 59a4be03..879821bb 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_int_in</title>
+ <title>Regress.test_array_int_in</title>
<synopsis><code mime="text/x-python">
@accepts(int, [int])
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 48fc0ac5..193d2f37 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_int_inout</title>
+ <title>Regress.test_array_int_inout</title>
<synopsis><code mime="text/x-python">
@accepts(int, [int])
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 3c113930..745bbe75 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[int]</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_array_int_none_out</title>
+ <title>Regress.test_array_int_none_out</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 a2f7ba98..194ecb52 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_int_null_in</title>
+ <title>Regress.test_array_int_null_in</title>
<synopsis><code mime="text/x-python">
@accepts([int], int)
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 dd2aa751..6ee35174 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_int_null_out</title>
+ <title>Regress.test_array_int_null_out</title>
<synopsis><code mime="text/x-python">
@accepts([int], int)
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 15e62e1c..30eaea97 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_array_int_out</title>
+ <title>Regress.test_array_int_out</title>
<synopsis><code mime="text/x-python">
@accepts(int, [int])
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 1486cc4e..4b2459ee 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_async_ready_callback</title>
+ <title>Regress.test_async_ready_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Gio.AsyncReadyCallback)
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 8c196987..293e35b5 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_boolean</title>
+ <title>Regress.test_boolean</title>
<synopsis><code mime="text/x-python">
@accepts(bool)
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 7212f687..ee763269 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_boolean_false</title>
+ <title>Regress.test_boolean_false</title>
<synopsis><code mime="text/x-python">
@accepts(bool)
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 13c90c2c..c233d794 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_boolean_true</title>
+ <title>Regress.test_boolean_true</title>
<synopsis><code mime="text/x-python">
@accepts(bool)
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 f927cf5f..b749fa49 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>cairo.Context</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_cairo_context_full_return</title>
+ <title>Regress.test_cairo_context_full_return</title>
<synopsis><code mime="text/x-python">
@returns(cairo.Context)
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 d9cd2301..8b36aac4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_cairo_context_none_in</title>
+ <title>Regress.test_cairo_context_none_in</title>
<synopsis><code mime="text/x-python">
@accepts(cairo.Context)
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 ec8da6f3..4e8a6366 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_cairo_surface_full_out</title>
+ <title>Regress.test_cairo_surface_full_out</title>
<synopsis><code mime="text/x-python">
@accepts(cairo.Surface)
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 ac776954..a8557047 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>cairo.Surface</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_cairo_surface_full_return</title>
+ <title>Regress.test_cairo_surface_full_return</title>
<synopsis><code mime="text/x-python">
@returns(cairo.Surface)
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 c2daf5f4..0d7e20b2 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_cairo_surface_none_in</title>
+ <title>Regress.test_cairo_surface_none_in</title>
<synopsis><code mime="text/x-python">
@accepts(cairo.Surface)
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 4eda436c..de92a087 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>cairo.Surface</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_cairo_surface_none_return</title>
+ <title>Regress.test_cairo_surface_none_return</title>
<synopsis><code mime="text/x-python">
@returns(cairo.Surface)
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 a5e52b55..d5074fab 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_callback</title>
+ <title>Regress.test_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallback)
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 471926a0..cbf04b83 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_callback_async</title>
+ <title>Regress.test_callback_async</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackUserData, gpointer)
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 26a0c31d..5452fbf9 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -28,7 +28,7 @@
</api:function>
</info>
- <title>test_callback_destroy_notify</title>
+ <title>Regress.test_callback_destroy_notify</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify)
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 7df745a1..11899cc0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_callback_destroy_notify_no_user_data</title>
+ <title>Regress.test_callback_destroy_notify_no_user_data</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackUserData, GLib.DestroyNotify)
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 a94e6617..6280f9f7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_callback_thaw_async</title>
+ <title>Regress.test_callback_thaw_async</title>
<synopsis><code mime="text/x-python">
@returns(int)
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 03158abe..cae6c5e4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_callback_thaw_notifications</title>
+ <title>Regress.test_callback_thaw_notifications</title>
<synopsis><code mime="text/x-python">
@returns(int)
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 d4a9578f..69cff3a7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_callback_user_data</title>
+ <title>Regress.test_callback_user_data</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackUserData, gpointer)
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 cdbf8bb0..20db07c6 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_closure</title>
+ <title>Regress.test_closure</title>
<synopsis><code mime="text/x-python">
@accepts(GObject.Closure)
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 b19753a4..7f35412b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_closure_one_arg</title>
+ <title>Regress.test_closure_one_arg</title>
<synopsis><code mime="text/x-python">
@accepts(GObject.Closure, int)
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 6be06f3b..dae0cc0f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Variant</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_closure_variant</title>
+ <title>Regress.test_closure_variant</title>
<synopsis><code mime="text/x-python">
@accepts(GObject.Closure, GLib.Variant)
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 bcdb8edd..13940184 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Value</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_date_in_gvalue</title>
+ <title>Regress.test_date_in_gvalue</title>
<synopsis><code mime="text/x-python">
@returns(GObject.Value)
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 89a1b503..e9200597 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Quark</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_def_error_quark</title>
+ <title>Regress.test_def_error_quark</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Quark)
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 efea2d69..0f75857f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>float</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_double</title>
+ <title>Regress.test_double</title>
<synopsis><code mime="text/x-python">
@accepts(float)
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 80eebb18..82b5e5f5 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[filename]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_filename_return</title>
+ <title>Regress.test_filename_return</title>
<synopsis><code mime="text/x-python">
@returns([filename])
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 50f89930..f63d37c0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>float</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_float</title>
+ <title>Regress.test_float</title>
<synopsis><code mime="text/x-python">
@accepts(float)
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 1d0ef3e5..86993b80 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_garray_container_return</title>
+ <title>Regress.test_garray_container_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 ef2bcfd7..162ca60b 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_garray_full_return</title>
+ <title>Regress.test_garray_full_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 f4f94659..e68a8bb4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_gerror_callback</title>
+ <title>Regress.test_gerror_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackGError)
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 9a297dbe..6558c1de 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: unicode}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_container_return</title>
+ <title>Regress.test_ghash_container_return</title>
<synopsis><code mime="text/x-python">
@returns({unicode: unicode})
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 3040336d..9df7b861 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: unicode}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_everything_return</title>
+ <title>Regress.test_ghash_everything_return</title>
<synopsis><code mime="text/x-python">
@returns({unicode: unicode})
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 7028c8b0..d6c319cf 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ghash_gvalue_in</title>
+ <title>Regress.test_ghash_gvalue_in</title>
<synopsis><code mime="text/x-python">
@accepts({unicode: GObject.Value})
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 b24a3bdc..51143d3e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: GObject.Value}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_gvalue_return</title>
+ <title>Regress.test_ghash_gvalue_return</title>
<synopsis><code mime="text/x-python">
@returns({unicode: GObject.Value})
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 2039ab45..c8c9cd2d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: {unicode: unicode}}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_nested_everything_return</title>
+ <title>Regress.test_ghash_nested_everything_return</title>
<synopsis><code mime="text/x-python">
@returns({unicode: {unicode: unicode}})
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 adac865e..932fd800 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: {unicode: unicode}}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_nested_everything_return2</title>
+ <title>Regress.test_ghash_nested_everything_return2</title>
<synopsis><code mime="text/x-python">
@returns({unicode: {unicode: unicode}})
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 264d31a1..44408900 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ghash_nothing_in</title>
+ <title>Regress.test_ghash_nothing_in</title>
<synopsis><code mime="text/x-python">
@accepts({unicode: unicode})
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 ac786a45..9d656091 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ghash_nothing_in2</title>
+ <title>Regress.test_ghash_nothing_in2</title>
<synopsis><code mime="text/x-python">
@accepts({unicode: unicode})
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 1e3851f7..31983aa0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: unicode}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_nothing_return</title>
+ <title>Regress.test_ghash_nothing_return</title>
<synopsis><code mime="text/x-python">
@returns({unicode: unicode})
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 66aa7060..17d7dd82 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: unicode}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_nothing_return2</title>
+ <title>Regress.test_ghash_nothing_return2</title>
<synopsis><code mime="text/x-python">
@returns({unicode: unicode})
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 9b77e122..9488fd83 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ghash_null_in</title>
+ <title>Regress.test_ghash_null_in</title>
<synopsis><code mime="text/x-python">
@accepts({unicode: unicode})
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 07d7e151..4ee31ff8 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ghash_null_out</title>
+ <title>Regress.test_ghash_null_out</title>
<synopsis><code mime="text/x-python">
@accepts({unicode: unicode})
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 71867408..d9d1050a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>{unicode: unicode}</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_ghash_null_return</title>
+ <title>Regress.test_ghash_null_return</title>
<synopsis><code mime="text/x-python">
@returns({unicode: unicode})
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 28be892d..069ece74 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_glist_container_return</title>
+ <title>Regress.test_glist_container_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 2d449a4d..f0a80ed0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_glist_everything_return</title>
+ <title>Regress.test_glist_everything_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 8f2d8851..42f5a251 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_glist_nothing_in</title>
+ <title>Regress.test_glist_nothing_in</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 a9307604..b17e2a6d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_glist_nothing_in2</title>
+ <title>Regress.test_glist_nothing_in2</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 1230c517..9c41b074 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_glist_nothing_return</title>
+ <title>Regress.test_glist_nothing_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 4d120ea0..f12e8447 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_glist_nothing_return2</title>
+ <title>Regress.test_glist_nothing_return2</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 619f9414..92cb7123 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_glist_null_in</title>
+ <title>Regress.test_glist_null_in</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 9ed9114f..0bac2640 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_glist_null_out</title>
+ <title>Regress.test_glist_null_out</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 89574e27..60ffdfd6 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gslist_container_return</title>
+ <title>Regress.test_gslist_container_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 d0eafc0d..f73e1138 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gslist_everything_return</title>
+ <title>Regress.test_gslist_everything_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 ab61b072..897923c5 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_gslist_nothing_in</title>
+ <title>Regress.test_gslist_nothing_in</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 df5af0ff..15e85772 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_gslist_nothing_in2</title>
+ <title>Regress.test_gslist_nothing_in2</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 71813808..231450ad 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gslist_nothing_return</title>
+ <title>Regress.test_gslist_nothing_return</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 60a28160..1384052c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gslist_nothing_return2</title>
+ <title>Regress.test_gslist_nothing_return2</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 6bf4307f..f36bb53c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_gslist_null_in</title>
+ <title>Regress.test_gslist_null_in</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 b9ce49ed..7df7b1ef 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_gslist_null_out</title>
+ <title>Regress.test_gslist_null_out</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 798d219a..45f4f8b7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GType</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_gtype</title>
+ <title>Regress.test_gtype</title>
<synopsis><code mime="text/x-python">
@accepts(GType)
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 c6fabf62..e77d4163 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Variant</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gvariant_as</title>
+ <title>Regress.test_gvariant_as</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Variant)
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 a99d4022..73d31507 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Variant</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gvariant_asv</title>
+ <title>Regress.test_gvariant_asv</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Variant)
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 891ae8ba..c9a05dff 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Variant</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gvariant_i</title>
+ <title>Regress.test_gvariant_i</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Variant)
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 cfabe8ba..939a9aaa 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Variant</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gvariant_s</title>
+ <title>Regress.test_gvariant_s</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Variant)
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 325e136c..b5dded4d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GLib.Variant</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_gvariant_v</title>
+ <title>Regress.test_gvariant_v</title>
<synopsis><code mime="text/x-python">
@returns(GLib.Variant)
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 94b02d40..bd58b7c9 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_hash_table_callback</title>
+ <title>Regress.test_hash_table_callback</title>
<synopsis><code mime="text/x-python">
@accepts({unicode: int}, Regress.TestCallbackHashtable)
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 538f8ce5..60308472 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_int</title>
+ <title>Regress.test_int</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 b749c85d..709d8c88 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gint16</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_int16</title>
+ <title>Regress.test_int16</title>
<synopsis><code mime="text/x-python">
@accepts(gint16)
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 29fd74ab..564bda3d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gint32</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_int32</title>
+ <title>Regress.test_int32</title>
<synopsis><code mime="text/x-python">
@accepts(gint32)
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 52413c05..aed6695e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_int64</title>
+ <title>Regress.test_int64</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 50bfa635..3de4c454 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gint8</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_int8</title>
+ <title>Regress.test_int8</title>
<synopsis><code mime="text/x-python">
@accepts(gint8)
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 bf066219..7de63061 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_int_out_utf8</title>
+ <title>Regress.test_int_out_utf8</title>
<synopsis><code mime="text/x-python">
@accepts(int, unicode)
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 cb034ddf..a7c20bc1 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_int_value_arg</title>
+ <title>Regress.test_int_value_arg</title>
<synopsis><code mime="text/x-python">
@accepts(GObject.Value)
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 eb13e4f8..001afa10 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_long</title>
+ <title>Regress.test_long</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 530f763e..c7dac3f1 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_multi_callback</title>
+ <title>Regress.test_multi_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallback)
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 df6a9f85..97978203 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -28,7 +28,7 @@
</api:function>
</info>
- <title>test_multi_double_args</title>
+ <title>Regress.test_multi_double_args</title>
<synopsis><code mime="text/x-python">
@accepts(float, float, float)
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 9b8ae8cd..fbae0d2d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_multiline_doc_comments</title>
+ <title>Regress.test_multiline_doc_comments</title>
<synopsis><code mime="text/x-python">
@returns(none)
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 6ee8fc23..79ad6018 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_nested_parameter</title>
+ <title>Regress.test_nested_parameter</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 05b872e2..8f038dcc 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_null_gerror_callback</title>
+ <title>Regress.test_null_gerror_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackGError)
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 b2d23902..32a64eb6 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_owned_gerror_callback</title>
+ <title>Regress.test_owned_gerror_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestCallbackOwnedGError)
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 40364efe..ebd556aa 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gshort</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_short</title>
+ <title>Regress.test_short</title>
<synopsis><code mime="text/x-python">
@accepts(gshort)
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 fc87b44e..44ff654e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_simple_callback</title>
+ <title>Regress.test_simple_callback</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestSimpleCallback)
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 24432094..9d5ef2fe 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gsize</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_size</title>
+ <title>Regress.test_size</title>
<synopsis><code mime="text/x-python">
@accepts(gsize)
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 bcfe773a..1aa8869c 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gssize</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ssize</title>
+ <title>Regress.test_ssize</title>
<synopsis><code mime="text/x-python">
@accepts(gssize)
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 fca58f0a..5b605e33 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_strv_in</title>
+ <title>Regress.test_strv_in</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 1db56a92..27538af0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Value</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_strv_in_gvalue</title>
+ <title>Regress.test_strv_in_gvalue</title>
<synopsis><code mime="text/x-python">
@returns(GObject.Value)
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 ca99305f..42e007f4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_strv_out</title>
+ <title>Regress.test_strv_out</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 ad925c4d..42c1328d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_strv_out_c</title>
+ <title>Regress.test_strv_out_c</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 04b8152c..6b020cee 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>[unicode]</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_strv_out_container</title>
+ <title>Regress.test_strv_out_container</title>
<synopsis><code mime="text/x-python">
@returns([unicode])
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 40882d5c..5a788664 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_strv_outarg</title>
+ <title>Regress.test_strv_outarg</title>
<synopsis><code mime="text/x-python">
@accepts([unicode])
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 a93fd091..9ce19296 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_timet</title>
+ <title>Regress.test_timet</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 2be46bb7..4a54bb0d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -40,7 +40,7 @@
</api:function>
</info>
- <title>test_torture_signature_0</title>
+ <title>Regress.test_torture_signature_0</title>
<synopsis><code mime="text/x-python">
@accepts(int, float, int, unicode, int, int)
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 15cfb50f..e3549dc4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>bool</api:type>
@@ -40,7 +40,7 @@
</api:function>
</info>
- <title>test_torture_signature_1</title>
+ <title>Regress.test_torture_signature_1</title>
<synopsis><code mime="text/x-python">
@accepts(int, float, int, unicode, int, int)
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 7ee3809f..b2f91328 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -52,7 +52,7 @@
</api:function>
</info>
- <title>test_torture_signature_2</title>
+ <title>Regress.test_torture_signature_2</title>
<synopsis><code mime="text/x-python">
@accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int)
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 7735c13c..6d91d532 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_uint</title>
+ <title>Regress.test_uint</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 490c11fd..f10846c4 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>guint16</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_uint16</title>
+ <title>Regress.test_uint16</title>
<synopsis><code mime="text/x-python">
@accepts(guint16)
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 87a20ccd..142eb447 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>guint32</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_uint32</title>
+ <title>Regress.test_uint32</title>
<synopsis><code mime="text/x-python">
@accepts(guint32)
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 f697e694..862fa15f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_uint64</title>
+ <title>Regress.test_uint64</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 ae918cba..a357d9c7 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>guint8</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_uint8</title>
+ <title>Regress.test_uint8</title>
<synopsis><code mime="text/x-python">
@accepts(guint8)
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 349576c5..63d71619 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>int</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ulong</title>
+ <title>Regress.test_ulong</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 2b705e8e..a7e7e66a 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_unichar</title>
+ <title>Regress.test_unichar</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 31b91662..a489d9a0 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_unsigned_enum_param</title>
+ <title>Regress.test_unsigned_enum_param</title>
<synopsis><code mime="text/x-python">
@accepts(Regress.TestEnumUnsigned)
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 68f0aa8a..2f7832fa 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>gushort</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_ushort</title>
+ <title>Regress.test_ushort</title>
<synopsis><code mime="text/x-python">
@accepts(gushort)
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 888e6eab..25f15b13 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_utf8_const_in</title>
+ <title>Regress.test_utf8_const_in</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 b704c60d..6e1b935d 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_utf8_const_return</title>
+ <title>Regress.test_utf8_const_return</title>
<synopsis><code mime="text/x-python">
@returns(unicode)
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 1839f096..efe32369 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_utf8_inout</title>
+ <title>Regress.test_utf8_inout</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 03049985..39c10832 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_utf8_nonconst_return</title>
+ <title>Regress.test_utf8_nonconst_return</title>
<synopsis><code mime="text/x-python">
@returns(unicode)
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 1fda6800..db0e6143 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_utf8_null_in</title>
+ <title>Regress.test_utf8_null_in</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 f8d7b6fb..ab07678f 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_utf8_null_out</title>
+ <title>Regress.test_utf8_null_out</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 acc0a406..d6cf8fd3 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_utf8_out</title>
+ <title>Regress.test_utf8_out</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 e7efb7b9..80d68185 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>unicode</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_utf8_out_nonconst_return</title>
+ <title>Regress.test_utf8_out_nonconst_return</title>
<synopsis><code mime="text/x-python">
@accepts(unicode)
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 bde41d8e..1e31cf4e 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -24,7 +24,7 @@
</api:function>
</info>
- <title>test_utf8_out_out</title>
+ <title>Regress.test_utf8_out_out</title>
<synopsis><code mime="text/x-python">
@accepts(unicode, unicode)
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 6470babc..63d03da8 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Value</api:type>
@@ -20,7 +20,7 @@
</api:function>
</info>
- <title>test_value_return</title>
+ <title>Regress.test_value_return</title>
<synopsis><code mime="text/x-python">
@accepts(int)
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 cac760a7..78a59f14 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
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="index" group="function"/>
+ <link xref="index" group="function" type="guide"/>
<api:function>
<api:returns>
<api:type>none</api:type>
@@ -16,7 +16,7 @@
</api:function>
</info>
- <title>test_versioning</title>
+ <title>Regress.test_versioning</title>
<synopsis><code mime="text/x-python">
@returns(none)