From 0f27a7cd04f7c48bd7782389b6d2612f16e162a1 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 28 Dec 2006 14:14:29 +0000 Subject: [PATCH] updates from new doc builds --- docs/reference/glib/running.sgml | 2 +- docs/reference/glib/tmpl/messages.sgml | 30 ++++++++++ docs/reference/glib/tmpl/spawn.sgml | 2 +- docs/reference/glib/tmpl/string_utils.sgml | 2 +- docs/reference/glib/tmpl/strings.sgml | 57 +++++++++++-------- docs/reference/glib/tmpl/thread_pools.sgml | 2 +- docs/reference/glib/tmpl/unicode.sgml | 1 - .../gobject/tmpl/enumerations_flags.sgml | 9 ++- 8 files changed, 73 insertions(+), 32 deletions(-) diff --git a/docs/reference/glib/running.sgml b/docs/reference/glib/running.sgml index 12cee41a8..910a3eefe 100644 --- a/docs/reference/glib/running.sgml +++ b/docs/reference/glib/running.sgml @@ -136,7 +136,7 @@ variables like LANG, PATH or HOME. use Bohem GC alike algorithms to produce more accurate results. It can also be in conjunction with debugging features of the system's malloc implementation such as glibc's MALLOC_CHECK_=2 to debug - erroneous slice allocation code, allthough debug-blocks + erroneous slice allocation code, allthough debug-blocks usually is a better suited debugging tool. diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml index eef01facc..35c85da7d 100644 --- a/docs/reference/glib/tmpl/messages.sgml +++ b/docs/reference/glib/tmpl/messages.sgml @@ -138,6 +138,12 @@ A convenience function/macro to log a normal message. @...: +@...: + +@...: + +@...: + @...: @@ -175,6 +181,12 @@ variable (see Running GLib Applications). @...: +@...: + +@...: + +@...: + @...: @@ -217,6 +229,12 @@ the %G_DEBUG environment variable (see @...: +@...: + +@...: + +@...: + @...: @@ -254,6 +272,12 @@ assertion failure. @...: +@...: + +@...: + +@...: + @...: @@ -286,6 +310,12 @@ A convenience function/macro to log a debug message. @...: +@...: + +@...: + +@...: + @...: @Since: 2.6 diff --git a/docs/reference/glib/tmpl/spawn.sgml b/docs/reference/glib/tmpl/spawn.sgml index a14ba1266..ce57cdd5b 100644 --- a/docs/reference/glib/tmpl/spawn.sgml +++ b/docs/reference/glib/tmpl/spawn.sgml @@ -62,7 +62,7 @@ Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes(). will be closed before calling exec() in the child. @G_SPAWN_DO_NOT_REAP_CHILD: the child will not be automatically reaped; you must use g_child_watch_add() yourself (or call waitpid() - or handle SIGCHLD yourself), or the child will become a zombie. + or handle SIGCHLD yourself), or the child will become a zombie. @G_SPAWN_SEARCH_PATH: argv[0] need not be an absolute path, it will be looked for in the user's PATH. @G_SPAWN_STDOUT_TO_DEV_NULL: the child's standad output will be discarded, diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml index 8d9a8be66..d1d5717a3 100644 --- a/docs/reference/glib/tmpl/string_utils.sgml +++ b/docs/reference/glib/tmpl/string_utils.sgml @@ -75,7 +75,7 @@ The returned string should be freed when no longer needed. @length: -@fill_char: +@fill_char: @Returns: diff --git a/docs/reference/glib/tmpl/strings.sgml b/docs/reference/glib/tmpl/strings.sgml index d76df4f0f..eb4ebf4a4 100644 --- a/docs/reference/glib/tmpl/strings.sgml +++ b/docs/reference/glib/tmpl/strings.sgml @@ -43,7 +43,7 @@ string. @init: -@Returns: +@Returns: @@ -61,8 +61,8 @@ string. -@dfl_size: -@Returns: +@dfl_size: +@Returns: @@ -72,7 +72,7 @@ string. @string: @rval: -@Returns: +@Returns: @@ -81,17 +81,20 @@ string. + + + -@string: +@string: @format: @Varargs: @@ -101,9 +104,9 @@ string. -@string: +@string: @format: -@Varargs: +@Varargs: @@ -111,8 +114,9 @@ string. -@string: -@Returns: +@string: +@val: +@Returns: @@ -140,10 +144,10 @@ string. -@string: +@string: @val: @len: -@Returns: +@Returns: @@ -153,7 +157,7 @@ string. @string: @val: -@Returns: +@Returns: @@ -162,7 +166,8 @@ string. @string: -@Returns: +@c: +@Returns: @@ -183,7 +188,7 @@ string. @string: @val: @len: -@Returns: +@Returns: @@ -191,8 +196,8 @@ string. - -@pos: +@string: +@pos: @val: @Returns: @@ -216,7 +221,7 @@ string. @string: @pos: @wc: -@Returns: +@Returns: @@ -228,17 +233,19 @@ string. @pos: @val: @len: -@Returns: +@Returns: o + -@string: +@string: +@pos: @len: -@Returns: +@Returns: @@ -246,9 +253,9 @@ o -@string: +@string: @len: -@Returns: +@Returns: @@ -267,7 +274,7 @@ o @string: -@free_segment: +@free_segment: @Returns: @@ -292,8 +299,8 @@ o -@str: -@Returns: +@str: +@Returns: diff --git a/docs/reference/glib/tmpl/thread_pools.sgml b/docs/reference/glib/tmpl/thread_pools.sgml index 4f1c44b2c..a2b429998 100644 --- a/docs/reference/glib/tmpl/thread_pools.sgml +++ b/docs/reference/glib/tmpl/thread_pools.sgml @@ -140,7 +140,7 @@ this struct. @pool: @immediate: -@wait: +@wait_: diff --git a/docs/reference/glib/tmpl/unicode.sgml b/docs/reference/glib/tmpl/unicode.sgml index 8b212f24a..ccae9129a 100644 --- a/docs/reference/glib/tmpl/unicode.sgml +++ b/docs/reference/glib/tmpl/unicode.sgml @@ -463,7 +463,6 @@ url="http://www.unicode.org/reports/tr24/">Unicode Standard Annex @G_UNICODE_SCRIPT_PHAGS_PA: Phags-pa @G_UNICODE_SCRIPT_NKO: N'Ko - diff --git a/docs/reference/gobject/tmpl/enumerations_flags.sgml b/docs/reference/gobject/tmpl/enumerations_flags.sgml index 1a896f7e5..1293d2fd8 100644 --- a/docs/reference/gobject/tmpl/enumerations_flags.sgml +++ b/docs/reference/gobject/tmpl/enumerations_flags.sgml @@ -232,11 +232,13 @@ than to write one yourself using g_enum_register_static(). @name: A nul-terminated string used as the name of the new type. +@_static_values: +@Returns: The new type identifier. + @const_static_values: An array of #GEnumValue structs for the possible enumeration values. The array is terminated by a struct with all members being 0. GObject keeps a reference to the data, so it cannot be stack-allocated. -@Returns: The new type identifier. @@ -250,10 +252,13 @@ than to write one yourself using g_flags_register_static(). @name: A nul-terminated string used as the name of the new type. +@_static_values: +@Returns: The new type identifier. + @const_static_values: An array of #GFlagsValue structs for the possible flags values. The array is terminated by a struct with all members being 0. GObject keeps a reference to the data, so it cannot be stack-allocated. -@Returns: The new type identifier. +