[glib] glib/: gtk-doc cleanup

[Ryan Lortie <ryanl src gnome org>]

commit 4780ee5d4a6057312abee9a8fcaad45a9897fe0e
Author: Ryan Lortie <desrt desrt ca>
Date:   Mon Jun 25 23:23:36 2012 -0400

    glib/: gtk-doc cleanup

 docs/reference/glib/glib-overrides.txt |    5 +++++
 glib/docs.c                            |    3 +++
 glib/gkeyfile.c                        |    2 +-
 glib/gunicode.h                        |    2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/docs/reference/glib/glib-overrides.txt b/docs/reference/glib/glib-overrides.txt
index 954dd56..c8ae3d5 100644
--- a/docs/reference/glib/glib-overrides.txt
+++ b/docs/reference/glib/glib-overrides.txt
@@ -2,6 +2,11 @@
 # functions, which they really were, if possible easy.
 
 <MACRO>
+<NAME>GLIB_DISABLE_DEPRECATION_WARNINGS</NAME>
+#ifdef GLIB_DISABLE_DEPRECATION_WARNINGS
+</MACRO>
+
+<MACRO>
 <NAME>G_ATOMIC_LOCK_FREE</NAME>
 #define G_ATOMIC_LOCK_FREE
 </MACRO>
diff --git a/glib/docs.c b/glib/docs.c
index a3d862c..049bc73 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -2032,6 +2032,7 @@
 
 /**
  * G_DEPRECATED_FOR:
+ * @f: the name of the function that this function was deprecated for
  *
  * This macro is similar to %G_GNUC_DEPRECATED_FOR, and can be used to mark
  * functions declarations as deprecated. Unlike %G_GNUC_DEPRECATED_FOR, it is
@@ -2043,6 +2044,8 @@
 
 /**
  * G_UNAVAILABLE:
+ * @maj: the major version that introduced the symbol
+ * @min: the minor version that introduced the symbol
  *
  * This macro can be used to mark a function declaration as unavailable.
  * It must be placed before the function declaration. Use of a function
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 98adf99..310276d 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -861,7 +861,7 @@ g_key_file_load_from_file (GKeyFile       *key_file,
 /**
  * g_key_file_load_from_data:
  * @key_file: an empty #GKeyFile struct
- * @data: (length length): key file loaded in memory
+ * @data: (array length=length): key file loaded in memory
  * @length: the length of @data in bytes (or -1 if data is nul-terminated)
  * @flags: flags from #GKeyFileFlags
  * @error: return location for a #GError, or %NULL
diff --git a/glib/gunicode.h b/glib/gunicode.h
index aafe933..f9c2fd5 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -367,7 +367,7 @@ typedef enum
  * @G_UNICODE_SCRIPT_MANDAIC:    Mandaic. Since 2.28
  * @G_UNICODE_SCRIPT_CHAKMA:               Chakma. Since: 2.32
  * @G_UNICODE_SCRIPT_MEROITIC_CURSIVE:     Meroitic Cursive. Since: 2.32
- * @G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS, Meroitic Hieroglyphs. Since: 2.32
+ * @G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS: Meroitic Hieroglyphs. Since: 2.32
  * @G_UNICODE_SCRIPT_MIAO:                 Miao. Since: 2.32
  * @G_UNICODE_SCRIPT_SHARADA:              Sharada. Since: 2.32
  * @G_UNICODE_SCRIPT_SORA_SOMPENG:         Sora Sompeng. Since: 2.32