diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am index 53a177f2da29f82fbb6592268111d06b69533c6e..0ae3eca3e1962319114c37262864da4af249b99b 100644 --- a/docs/reference/glib/Makefile.am +++ b/docs/reference/glib/Makefile.am @@ -35,6 +35,7 @@ IGNORE_HFILES= \ gprintfint.h \ galias.h \ gmirroringtable.h \ + gscripttable.h \ glib-mirroring-tab \ gnulib diff --git a/docs/reference/glib/tmpl/main.sgml b/docs/reference/glib/tmpl/main.sgml index dad0b25f20016c09e001a88a3a6a29414f28aa7a..733fe8a08ca224790f6149c5667f7a25c97fd763 100644 --- a/docs/reference/glib/tmpl/main.sgml +++ b/docs/reference/glib/tmpl/main.sgml @@ -554,6 +554,15 @@ for the default main context. @Returns: + + + + + +@interval: +@Returns: + + @@ -576,6 +585,17 @@ for the default main context. @Returns: + + + + + +@interval: +@function: +@data: +@Returns: + + diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml index 73ed0301beef0d9f3591c3ae839f413959304160..eef01facc414ac8641245779c3128678ff8806c9 100644 --- a/docs/reference/glib/tmpl/messages.sgml +++ b/docs/reference/glib/tmpl/messages.sgml @@ -132,6 +132,12 @@ A convenience function/macro to log a normal message. @...: +@...: + +@...: + +@...: + @...: @@ -163,6 +169,12 @@ variable (see Running GLib Applications). @...: +@...: + +@...: + +@...: + @...: @@ -199,6 +211,12 @@ the %G_DEBUG environment variable (see @...: +@...: + +@...: + +@...: + @...: @@ -230,6 +248,12 @@ assertion failure. @...: +@...: + +@...: + +@...: + @...: @@ -256,6 +280,12 @@ A convenience function/macro to log a debug message. @...: +@...: + +@...: + +@...: + @...: @Since: 2.6 diff --git a/glib/Makefile.am b/glib/Makefile.am index 8cf98ae58fee5901cd0f2b2dffbeca9402178b0c..1ea7a0f8eece4f6d443c7a04a71bf95d3560f646 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -40,6 +40,7 @@ EXTRA_DIST = \ makefile.msc.in \ glib.rc.in \ gen-unicode-tables.pl \ + gen-script-table.pl \ makegalias.pl \ abicheck.sh \ pltcheck.sh \ @@ -106,6 +107,7 @@ libglib_2_0_la_SOURCES = \ grel.c \ grand.c \ gscanner.c \ + gscripttable.h \ gshell.c \ gslice.c \ gslist.c \