diff --git a/docs/reference/glib/tmpl/checksum.sgml b/docs/reference/glib/tmpl/checksum.sgml
index 18b21a10f..81abfe944 100644
--- a/docs/reference/glib/tmpl/checksum.sgml
+++ b/docs/reference/glib/tmpl/checksum.sgml
@@ -84,6 +84,14 @@ Support for checksums has been added in GLib 2.16
@checksum:
+
+
+
+
+
+@checksum:
+
+
diff --git a/docs/reference/glib/tmpl/gurifuncs.sgml b/docs/reference/glib/tmpl/gurifuncs.sgml
new file mode 100644
index 000000000..ca280305e
--- /dev/null
+++ b/docs/reference/glib/tmpl/gurifuncs.sgml
@@ -0,0 +1,97 @@
+
+URI Functions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@uri:
+@Returns:
+
+
+
+
+
+
+
+@unescaped:
+@reserved_chars_allowed:
+@allow_utf8:
+@Returns:
+
+
+
+
+
+
+
+@escaped_string:
+@illegal_characters:
+@Returns:
+
+
+
+
+
+
+
+@escaped_string:
+@escaped_string_end:
+@illegal_characters:
+@Returns:
+
+
diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index d354b4c68..d2a1da147 100644
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -161,7 +161,7 @@ specified by the @xth function parameter.
See the GNU C documentation for details.
-@x: the index of the argument specifying the allocation size
+@x: the index of the argument specifying the allocation size
@Since: 2.18
@@ -174,8 +174,8 @@ specified by the product of two function parameters.
See the GNU C documentation for details.
-@x: the index of the argument specifying one factor of the allocation size
-@y: the index of the argument specifying the second factor of the allocation size
+@x: the index of the argument specifying one factor of the allocation size
+@y: the index of the argument specifying the second factor of the allocation size
@Since: 2.18
diff --git a/docs/reference/glib/tmpl/testing.sgml b/docs/reference/glib/tmpl/testing.sgml
new file mode 100644
index 000000000..9cbd73f1c
--- /dev/null
+++ b/docs/reference/glib/tmpl/testing.sgml
@@ -0,0 +1,417 @@
+
+Testing
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@minimized_quantity:
+@format:
+@Varargs:
+
+
+
+
+
+
+
+@maximized_quantity:
+@format:
+@Varargs:
+
+
+
+
+
+
+
+@argc:
+@argv:
+@Varargs:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+@testpath:
+@test_func:
+
+
+
+
+
+
+
+@testpath:
+@test_data:
+@test_func:
+
+
+
+
+
+
+
+@testpath:
+@Fixture:
+@tdata:
+@fsetup:
+@ftest:
+@fteardown:
+
+
+
+
+
+
+
+@format:
+@Varargs:
+
+
+
+
+
+
+
+@uri_pattern:
+
+
+
+
+
+
+
+@bug_uri_snippet:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+@gfree_pointer:
+
+
+
+
+
+
+
+@destroy_func:
+@destroy_data:
+
+
+
+
+
+
+
+@gobject:
+
+
+
+
+
+
+
+@G_TEST_TRAP_SILENCE_STDOUT:
+@G_TEST_TRAP_SILENCE_STDERR:
+@G_TEST_TRAP_INHERIT_STDIN:
+
+
+
+
+
+
+@usec_timeout:
+@test_trap_flags:
+@Returns:
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@soutpattern:
+
+
+
+
+
+
+
+@soutpattern:
+
+
+
+
+
+
+
+@serrpattern:
+
+
+
+
+
+
+
+@serrpattern:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+@begin:
+@end:
+@Returns:
+
+
+
+
+
+
+
+@Returns:
+
+
+
+
+
+
+
+@range_start:
+@range_end:
+@Returns:
+
+
+
+
+
+
+
+@expr:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@s1:
+@cmp:
+@s2:
+
+
+
+
+
+
+
+@n1:
+@cmp:
+@n2:
+
+
+
+
+
+
+
+@n1:
+@cmp:
+@n2:
+
+
+
+
+
+
+
+@n1:
+@cmp:
+@n2:
+
+
+
+
+
+
+
+@n1:
+@cmp:
+@n2:
+
+
+
+
+
+
+
+@str1:
+@str2:
+@Returns:
+
+
diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml
index 0cdfdc88d..5467bbbed 100644
--- a/docs/reference/glib/tmpl/unicode.sgml
+++ b/docs/reference/glib/tmpl/unicode.sgml
@@ -490,7 +490,6 @@ url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex
@G_UNICODE_SCRIPT_PHOENICIAN: Phoenician
@G_UNICODE_SCRIPT_PHAGS_PA: Phags-pa
@G_UNICODE_SCRIPT_NKO: N'Ko
-
@G_UNICODE_SCRIPT_KAYAH_LI: Kayah Li. Since 2.16.3
@G_UNICODE_SCRIPT_LEPCHA: Lepcha. Since 2.16.3
@G_UNICODE_SCRIPT_REJANG: Rejang. Since 2.16.3
@@ -503,7 +502,6 @@ url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex
@G_UNICODE_SCRIPT_LYCIAN: Lycian. Since 2.16.3
@G_UNICODE_SCRIPT_LYDIAN: Lydian. Since 2.16.3
-