Updates

svn path=/trunk/; revision=5767

diff --git a/docs/reference/glib/tmpl/hooks.sgml b/docs/reference/glib/tmpl/hooks.sgml
index 9291e1cd4cb783cf14392e9e593ac527518cbc25..b63cb47dc849a23d744ae8ba8c4ef22af1bee8ab 100644 (file)
--- a/docs/reference/glib/tmpl/hooks.sgml
+++ b/docs/reference/glib/tmpl/hooks.sgml
@@ -30,10 +30,10 @@ list of hook functions.
 @hook_size: the size of the #GHookList elements, in bytes.
 @is_setup: 1 if the #GHookList has been initialized.
 @hooks: the first #GHook element in the list.
-@dummy3: 
+@dummy3: unused 
 @finalize_hook: the function to call to finalize a #GHook element. The
 default behaviour is to call the hooks <function>destroy</function> function.
-@dummy: 
+@dummy: unused
 
 <!-- ##### USER_FUNCTION GHookFinalizeFunc ##### -->
 <para>

diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml
index 9dabf2f6f88d472cf75dbcf2873f3080ee6a142d..0915f55c7feba64b1c23621cbee0b6f6352fd634 100644 (file)
--- a/docs/reference/glib/tmpl/messages.sgml
+++ b/docs/reference/glib/tmpl/messages.sgml
@@ -68,18 +68,23 @@ flags).
 
 <!-- ##### ENUM GLogLevelFlags ##### -->
 <para>
-Flags specifying the level of log messages.
+Flags specifying the level of log messages. It is possible to change
+how GLib treats messages of the various levels using g_log_set_handler()
+and g_log_set_fatal_mask().
 </para>
 
-@G_LOG_FLAG_RECURSION: 
-@G_LOG_FLAG_FATAL: 
-@G_LOG_LEVEL_ERROR: 
-@G_LOG_LEVEL_CRITICAL: 
-@G_LOG_LEVEL_WARNING: 
-@G_LOG_LEVEL_MESSAGE: 
-@G_LOG_LEVEL_INFO: 
-@G_LOG_LEVEL_DEBUG: 
-@G_LOG_LEVEL_MASK: 
+@G_LOG_FLAG_RECURSION: internal flag
+@G_LOG_FLAG_FATAL: internal flag
+@G_LOG_LEVEL_ERROR: log level for errors, see g_error(). 
+  This level is also used for messages produced by g_assert().
+@G_LOG_LEVEL_CRITICAL: log level for critical messages, see g_critical().
+  This level is also used for messages produced by g_return_if_fail() and 
+  g_return_val_if_fail().
+@G_LOG_LEVEL_WARNING: log level for warnings, see g_warning()
+@G_LOG_LEVEL_MESSAGE: log level for messages, see g_message()
+@G_LOG_LEVEL_INFO: log level for informational messages
+@G_LOG_LEVEL_DEBUG: log level for debug messages, see g_debug()
+@G_LOG_LEVEL_MASK: a mask including all log levels.
 
 <!-- ##### FUNCTION g_log ##### -->
 <para>

diff --git a/docs/reference/glib/tmpl/trees-nary.sgml b/docs/reference/glib/tmpl/trees-nary.sgml
index 697bbc8ab52c1c8fa0f6a2edfca8a492d76eb22c..0e2c2a1ca8f6fb289ba7385b35c6d25a321d5e8b 100644 (file)
--- a/docs/reference/glib/tmpl/trees-nary.sgml
+++ b/docs/reference/glib/tmpl/trees-nary.sgml
@@ -251,9 +251,9 @@ including g_node_traverse() and g_node_find().
 @G_TRAVERSE_NON_LEAVES: only non-leaf nodes should be visited. This name 
   has been introduced in 2.6, for older version use %G_TRAVERSE_NON_LEAFS.
 @G_TRAVERSE_ALL: all nodes should be visited.
-@G_TRAVERSE_MASK: 
-@G_TRAVERSE_LEAFS: identical to %G_TRAVERSE_LEAVES
-@G_TRAVERSE_NON_LEAFS: identical to %G_TRAVERSE_NON_LEAVES
+@G_TRAVERSE_MASK: a mask of all traverse flags.
+@G_TRAVERSE_LEAFS: identical to %G_TRAVERSE_LEAVES.
+@G_TRAVERSE_NON_LEAFS: identical to %G_TRAVERSE_NON_LEAVES.
 
 <!-- ##### USER_FUNCTION GNodeTraverseFunc ##### -->
 <para>

diff --git a/docs/reference/glib/tmpl/types.sgml b/docs/reference/glib/tmpl/types.sgml
index 4f49f1c81fb88ad04a64b50a1eac6455005aad81..89424994dedd8229c83b0e7b8ccad33ab7bcbcec 100644 (file)
--- a/docs/reference/glib/tmpl/types.sgml
+++ b/docs/reference/glib/tmpl/types.sgml
@@ -179,14 +179,12 @@ Values of this type can range from -9,223,372,036,854,775,808 to
 </para>
 
 
-<!-- ##### FUNCTION guint64 ##### -->
+<!-- ##### TYPEDEF guint64 ##### -->
 <para>
 An unsigned integer guaranteed to be 64 bits on all platforms.
 Values of this type can range from 0 to 18,446,744,073,709,551,615.
 </para>
 
-@Returns: 
-
 
 <!-- ##### MACRO G_GINT64_CONSTANT ##### -->
 <para>