summaryrefslogtreecommitdiff
path: root/tests/scanner/Regress-1.0-Gjs-expected
diff options
context:
space:
mode:
Diffstat (limited to 'tests/scanner/Regress-1.0-Gjs-expected')
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page4
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page2
-rw-r--r--tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page2
411 files changed, 413 insertions, 411 deletions
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
index 119860d2..9ac6820d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page
index 2229245a..9490e4a3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
index 8cbc8326..4e19ef92 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
index 30f950c2..9a652d80 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page
index 506ceffd..db77a117 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
index 3f9409ed..79844c66 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page
index b2dc717c..17c80292 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
index 713c6d67..c30c3377 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
index 2e71c465..61025917 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page
index f526ea9b..d9d8b55a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
index c9e35a9d..4e2044dd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page
index b570a59c..eba5cef7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
index 4597130f..59408b40 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page
index e52a728f..9c797278 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
index d94ad834..4246c2aa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
index d964b9c7..b65b1ce6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
index bcc26d8f..221b24c8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
index 0dc19bcf..2aa3f064 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
index a6870013..b769ba6d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
index ed909ac8..b7a834a1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
index 6098722c..b22eaf80 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
index 61915f41..8b7912df 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
index 58bf5ff4..90175931 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
index 5d5c79d7..cdf26c5c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
index ff2aef1d..20ffffdf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: GObject.Object}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
index e339e088..6ae6806d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
index 9a3db5d0..96134cf3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
index 1abc4010..2238d903 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
index b5f2d65f..cf669406 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
index 9b615360..b8d5088c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
index 58cab9ad..6c34095a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
index e21a9c62..d7adac12 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
index c771d769..217ae08b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
index 606e2b1b..c9a864f7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
index d4bf6b19..3f845502 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page
index 20104697..95675a60 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
index d1e428d4..1bc89fbd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
index b1e4129a..6c5d1e7f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
index 402b1622..de78bd3e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
index 8c54d3b8..94c689ed 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
index 59321295..78e1db7e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
index 36a1815c..c2e5f111 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
index c9904095..329c9688 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
index 8a77746f..57eff666 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page
index edc9fd18..e2100429 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
index b59e7634..09cd98fd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
index e3f52935..008a8f36 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
index 975d5123..48b5bfd6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
index 9476671b..21d810ae 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooBRect" group="constructor"/>
+ <link xref="Regress.FooBRect" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooBRect</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page
index 57e26525..fd1e9d6e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page
index 63831e74..8644d96e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
index 270c8093..4f00498d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
index 8d86995c..8cfb6191 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooBoxed" group="constructor"/>
+ <link xref="Regress.FooBoxed" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooBoxed</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page
index 962300f3..bca1f99a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page
index c9cd8be7..0b4f9e52 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
index 5903a764..af7c408e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
index 241296e1..52feda29 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
index 0ba67e71..47459952 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page
index 08ad0d2e..b4eaeade 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
index 443f25ea..00169aaf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
index 5957904b..d2b41e61 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
index d052d4f5..c3ff89b3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
index 5577eebe..8c0b6a23 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page
index 0b77bcbb..ce368302 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page
index 45cd3a13..562ec03c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page
index 7e9ca7d4..0000add5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
index d4db757a..53539d49 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
index e4f3edef..2b4afeb5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
index 97aff9ae..eb2fc332 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
index 7753c4ad..fdeb3979 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooForeignStruct" group="constructor"/>
+ <link xref="Regress.FooForeignStruct" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooForeignStruct</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page
index 06c5793f..312994a9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
index b39c41f1..17f6ec94 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
index f992fca8..b91471d7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page
index 16d03111..83ae1d0d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
index e79716c7..d38a4488 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
index 72ee34e5..4bdaf370 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
index f5066231..6e5657d4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page
index d86283d8..a738fdd7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
index aaf6bfa3..d2ccd866 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
index 5241c4f3..83fec18f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
index 8c700359..d53564b0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
index baf2386c..46a61b27 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
index 71276178..fb2b54c3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
index 63027a5e..8ab86544 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
index 54b6f10c..b06580f3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
index 4de3f713..746d830c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
index 5586b96b..8f83b375 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
index 0cc61551..32500e14 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="constructor"/>
+ <link xref="Regress.FooObject" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooObject</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
index 1245175f..2c85b269 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooObject" group="constructor"/>
+ <link xref="Regress.FooObject" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>GObject.Object</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page
index 8d801b70..1cbea89b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
index 526a4fb7..b59223c9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
index 3bec5bb4..c4c1045a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
index 6f861c78..8ed0b6d6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
index 980d4ef3..460c4615 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page
index 4d9cabc6..44a63ab1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page
index 5368b928..0916a449 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
index 18646a84..46d62528 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page
index 521a68bc..0cfef622 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
index bd7a445b..8a08c9ae 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page
index 4088a6c2..84f5d192 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
index 5a297708..961a22e6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
index 8df59ff4..5abc585f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
index 04a55514..81649248 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
index b3e4bd7e..4945c890 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
index 7db9c6b5..8a1fd9e5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
index 00fc1255..10e8020e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page
index 4ace79fb..0694e3df 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
index b9991b85..6e400bb3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.FooSubobject" group="constructor"/>
+ <link xref="Regress.FooSubobject" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.FooSubobject</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page
index da87ffad..f9cac644 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page
index 7ae6ae56..430dce7c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page
index 06d2e800..9746f17e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page
index 0471b871..2b94f691 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page
index 18122490..c389ef05 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page
index 05362e5c..44a946ee 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page
index 9af00b51..f66aee44 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
index 6a044d79..f31b58ec 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
index d7fe0888..eac21331 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
index 82819c87..23a6d7d6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
index 9377348b..5fbf83a5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxed" group="constructor"/>
+ <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxed</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
index 915a79bf..7d1b27be 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxed" group="constructor"/>
+ <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxed</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
index 7cdfd4f4..3a4ef982 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxed" group="constructor"/>
+ <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxed</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
index 03623419..da86a8ef 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxed" group="constructor"/>
+ <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxed</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page
index c6792c50..baa423f2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
index c79a4d24..78b81658 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
index 687c90d0..b68acc9f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedB" group="constructor"/>
+ <link xref="Regress.TestBoxedB" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxedB</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page
index 46cf7c15..0e39780b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
index 25dd557a..301936bb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedC" group="constructor"/>
+ <link xref="Regress.TestBoxedC" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxedC</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page
index 88dd1a4c..18b77d9f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
index f30d4724..be4b26aa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
index c6affa24..3198b66e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
index 62465644..fdb9dbff 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
index 781cd994..6ed46e59 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestBoxedD" group="constructor"/>
+ <link xref="Regress.TestBoxedD" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestBoxedD</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page
index 17b3c79b..995e80dd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page
index 9a219e9e..bed84d50 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page
index 7ceb2e07..7d3f7b83 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page
index 3de1fbe8..0b8fca1d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page
index 1f6f2bdb..804382f5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page
index 906947c1..06ebb706 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page
index e7397a1b..28b21ea4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page
index f3047cfd..286c830a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
index 6a92ba9a..589059d5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
index 9009dcda..814b474b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
index a0cd98cc..5c0c5594 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
index 327cacc5..df3cfa1e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
index c635d0e0..d6a6ebb2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
index d5451972..d5bfeeb4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
index 9ca5d060..35ea1f41 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestFloating" group="constructor"/>
+ <link xref="Regress.TestFloating" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestFloating</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page
index 481bea28..07ef3f21 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
index d669f549..a8cb35a0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
index d887b198..7891d88b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
index 2e0932b6..8992abc1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page
index dfd65cef..73a33285 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page
index 2b9d965c..df0e8fba 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
index e879a7de..109cb52f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
@@ -7,7 +7,9 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestFundamentalSubObject" group="constructor"/>
+ <link xref="Regress.TestFundamentalSubObject"
+ group="constructor"
+ type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestFundamentalSubObject</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
index 4e40b9ce..619eb308 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
index 9c1af712..eb60f557 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
index 176b164d..f9f05b2f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
index 17020c62..24489cf6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
index e2444c69..f8c06b4f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page
index 05d628f3..02fa0649 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page
index deaeea50..0df0396b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page
index d097d9c9..4f398908 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
index 1094566b..c2d87a47 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
index 874928d9..3febd772 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page
index 97c7ee68..f1f1b520 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page
index e8706270..a392a771 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
index 0bff84e5..8e5e2bfe 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page
index df735051..5e2df6bb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
index 34d6f7c3..d0294e9e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page
index ea02ac24..0554ba82 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page
index b477bed4..6b222e4e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page
index ca81a39a..1d3c3c22 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page
index abd64ea0..f8d3441a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page
index 88652345..0c3f4ccb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
index 19331f31..9d8ea917 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
index 93252b2b..02638e9e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
index 7b81f903..1d832171 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
index 2e2d2fbd..b1919f9b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
index 1f4d53d0..31b8ca38 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
index 58d03932..137a4130 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
index 28d0b7e8..6c528c03 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
index 2a1f980c..f724bcbf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
index 9f3e81f1..d7e15e05 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
index ae851a3b..a63e2076 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
index 17a54d1c..6fbf7a09 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page
index 13f2b4b1..2e91097a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
index 6c2fced5..b19711f1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
index ebec470e..9700cefd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
index e41bb1dd..14c8ba67 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="constructor"/>
+ <link xref="Regress.TestObj" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestObj</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
index aa1e5f3d..2b27fe66 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
index 00967896..a2eb7eaf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
index 029b8847..b2853ef8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
index 49974155..c0f99504 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
index 491828af..7ff7b0ba 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
index f70bfbe9..771bba8c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
index 636d2167..096b7547 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
index 9fc14087..d0f6009d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
index 23910861..d3210cab 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="constructor"/>
+ <link xref="Regress.TestObj" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestObj</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
index 49cdd8e4..44279520 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="constructor"/>
+ <link xref="Regress.TestObj" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestObj</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
index ae4dd140..a4f99805 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestObj" group="constructor"/>
+ <link xref="Regress.TestObj" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestObj</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
index fed5b0a3..dfc9ef04 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page
index 9c4b902e..b8428942 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
index b4da15e4..d80d786c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
index 14cc9da4..df6625d8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
index 3a447770..f557941c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
index e6e4535b..06c0c624 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
index 7323da2b..9ea28a1f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
index 84807b3b..c61e93e0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
index 4744d5fc..d1f2e59b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
index d4281868..13e917eb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
index fa7d17be..8053e0bf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
index 20946935..0ba6cbbe 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
index d1887d5e..858e58a8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
index 788441ac..66b477d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page
index fa508137..7b1309da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
index 81a0049d..7f5dfde3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
index e7d1c811..2784f146 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
index 91197290..aa9a02e4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page
index 2a8dd629..9117ddb9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
index 0db8a8da..f0ca7210 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page
index b775b867..7ecc623e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page
index 61bafb5f..f8157820 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
index f023cfe7..9d23bbd8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page
index 07b1752d..a6a98173 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
index 22038bad..38406e68 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
index 692f8997..ed5f9c06 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page
index b5b2ff3f..21d86261 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page
index 1db74ca2..6bd58122 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page
index cf224e3e..aa9f131c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page
index 75684f3d..b931c367 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page
index 6f77035b..3b81e621 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page
index fe5e7bc6..cfb434b4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
index b3cdcd78..a237385c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page
index b5df5294..db6e7893 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
index e55a1c37..4a7427e1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
index 91236d2a..a66646bd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestSubObj" group="constructor"/>
+ <link xref="Regress.TestSubObj" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestObj</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page
index 39e755b3..7147da12 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
index e297b4dc..2b720ebf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page
index d815a3fe..e0a7bc09 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page
index 7835ee50..256dbb6d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
index f38ab9cd..0c9440b6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
index 9bcbcc11..c79a2f57 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
@@ -7,7 +7,7 @@
xmlns:ui="http://projectmallard.org/1.0/ui/">
<info>
- <link type="guide" xref="Regress.TestWi8021x" group="constructor"/>
+ <link xref="Regress.TestWi8021x" group="constructor" type="guide"/>
<api:function>
<api:returns>
<api:type>Regress.TestWi8021x</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page
index 7c9958de..d69548f3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page
+++ b/tests/scanner/Regress-1.0-Gjs-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-Gjs-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
index 764aa43e..471c51cd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
index 685c3110..ccfe04c6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
index 5c57a1b4..de2b93b3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
index 981fc543..8f00a104 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
index a975754e..4cc018c0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
index a227f73d..39f6c148 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
index ae10b7ea..c75d9c27 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
index a32b80fd..1997a4db 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
index dd6de2a4..9bfb1680 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
index a400582a..3f63c9a5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
index c590aecf..86419455 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
index 46014527..a5977b87 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
index e8891e36..675e00da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
index bdb02611..347eb6d2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
index 05578955..741447ea 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
index dce9addd..cd4d8bef 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
index b9f8a5c0..edade5bb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
index 33bd9f40..a4fceafb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
index 6693eb11..f1d57003 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
index 26b35573..3aade3ca 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
index 4a3e9114..980a9302 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
index 83a83544..d5cff2a4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
index 81fae432..20eb206c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
index 0e5168ed..10876aa8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
index 38264daf..31f881b7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
index 24d4000a..989084bf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
index 3cb9d8e9..4f095620 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
index e4784320..3ff92653 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
index b52e7d3c..da103fbf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
index 55213864..9c7539c3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
index 24dfaacb..fe3b85ac 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
index b34cf4f5..8b5c9018 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
index ebd9a0f6..c35d3e99 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
index f62023ed..9f68b516 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
index 79a12aae..446001a0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
index 741a3536..bafa5417 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
index f147b84c..d4f673d8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
index f1388183..aa2baa6c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
index cfddc655..9b300e17 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
index d5d324c3..112cd23f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
index 0eab51d3..51026b59 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
index 1f570f33..14a6e66e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
index e10c883f..ce62153d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
index 18179bf9..1e2c6786 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[Number]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
index b15076fa..e4b957e7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
index f92ad910..171ad11e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
index 98a57d55..a8b51a6b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
index fbaae440..16ddc7c5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
index 04889436..61e1d0a4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
index d2b0ab8f..5f580ad7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[Number]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
index c3b26b24..3d41dca7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
index 118056fd..b4094cd8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
index a841e04f..ac105214 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[Number]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
index eadf5908..33b27a00 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
index c50b6202..1e1a3640 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
index ba2b3497..78953ec6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
index c7cd25e8..89d737c7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
index 15f8a674..e165db21 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
index 2c35db30..21e169c0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
index 0206b085..e525a2f8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
index d78865d2..1c222c6c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
index 9abd2d19..f710ac0a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
index c0d66757..dcec607e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
index eee51f17..f1b0f96c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
index ef6d4cc3..783576a0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
index cec71274..72e602ef 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
index 57970867..869dd98c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
index b281ca74..7b9ef5b6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
index 18496d52..d147c974 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
index 6679446f..7fa31a30 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
index 592d8e07..66dec18b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
index 24e0e24a..9a8b57e1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
index 5e824a94..dd9f5977 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
index ee8f0253..a9545447 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
index 3df43b83..3c37f7ac 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
index e54fd5ae..2bdbfe6d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
index c6a75d7f..acb379e7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
index 46d62afc..5a82a3f5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
index 7be3ebd4..0ed75f62 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
index e4c935f7..b26b613e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
index 27952a27..30f2ef76 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
index 5dad9446..a4196285 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
index 35b90f87..86b1b78b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
index 4d7bc884..31ab83c2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
index e15eb13b..b002deb8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: String}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
index 0b0d347e..1c1a0a91 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: String}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
index 2556237f..2c801375 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
index 8a9fe982..08748ea5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: GObject.Value}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
index c2701df3..4dece432 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: {String: String}}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
index 896e346d..8aa4da37 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: {String: String}}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
index 438f5abe..62990fce 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
index 2dc3aa8d..72d774d8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
index 4ee392e8..e3729a57 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: String}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
index 492f6536..7777ab42 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: String}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
index 52dd2654..413a75bf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
index 09d222d9..2c272530 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
index dac341f7..df6d6860 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>{String: String}</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
index 0e6cc956..c3ac7cb1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
index a58d9261..fb31f77e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
index 3e144833..3c85d190 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
index b22fd185..f160d126 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
index ec649721..e741d906 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
index b31d98ff..0fccdbbf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
index 6add7cec..dfedc288 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
index b13cc9a0..a1c7c684 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
index 19f70911..5133d114 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
index 53936460..f82b1ce6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
index e011db60..34096195 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
index 0e718211..05e0b569 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
index dc11a421..03597fb4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
index 5e1c5646..0331f922 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
index e6987019..34168c85 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
index 5c25956d..4c9f3ca2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
index d2a438d4..824689a2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
index 0d301a9e..1eedc344 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
index fa477da4..a5709df4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
index 7af092f2..e1e7dc0d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
index b98b64d1..139e0c61 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
index 49874551..cec12de7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
index 9f215d76..a49c65c1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
index 31b8b674..6193dd8a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
index f2f39024..d8efb0b3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
index c254ed41..8015b377 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
index a30895ea..24a69e96 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
index ba53b828..ab573a0d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
index 971e6580..020f9e22 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
index 866be0d2..cb84a3c9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
index 9eeddeaa..12bc1aec 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
index 519ce43a..ea0646f6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
index 70d56ced..378ace73 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
index 75e42218..38a75e75 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
index 3ee62390..54bda89f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
index 710af513..5af4d58c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
index e966fe86..206ac215 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
index 1c53e163..59381ae1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
index d6e596c9..9d8198f7 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
index fe3f5b42..bc6896d3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
index 77bc9cd9..ccc011da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
index 880f489d..7659a72a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
index 04444570..20617c09 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
index b475f63b..477a46fa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
index 69239d57..d393946c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
index 17b55812..f9bec391 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>[String]</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
index 63bde333..01bcba42 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
index be54bccd..65ccab57 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
index af5810f1..16965833 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
index 915fdfe7..a10b0ab5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Boolean</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
index ac694000..3a3eb39a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
index deb1e900..ac1653a1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
index 357dcc5b..93faff4d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
index 445dbffb..ebab4d6f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
index f77993c6..942d786f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
index 4f099b7b..f39dcc12 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
index 5ad91424..76f33101 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>Number</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
index 2a10fb32..25465b37 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
index 9da74e6f..8b7348e8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
index 9dd5ddc0..74ada4ba 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
index 7b1f74d9..63fedb9f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
index 514a5654..a63dc22c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
index cf5ce4ac..1f282c2f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
index 3b0e3c85..2fec9e8c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
index ba9f2509..14f3a550 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
index 36e00220..66632ffd 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
index 0889a573..b1a40622 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
index 2feadbff..e8a097ea 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>String</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
index 39037cb1..07107ed8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
index a554bf19..59f03b78 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
index bfef4942..eb6ce0f2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page
+++ b/tests/scanner/Regress-1.0-Gjs-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>void</api:type>