documentation additions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0cda550..bf954e6 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib-docs.sgml:
+       * gobject/gobject-docs.sgml: Add 2.12 indices.
+
+       * gobject/tmpl/gtype.sgml: Document g_type_register_static_simple
+
 2006-04-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gobject/tmpl/objects.sgml: Add some missing Since: 2.8 tags

diff --git a/docs/reference/glib/glib-docs.sgml b/docs/reference/glib/glib-docs.sgml
index 951adac..97b62ce 100644 (file)
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-docs.sgml
@@ -207,5 +207,8 @@ synchronize their operation.
   <index role="2.10">
     <title>Index of new symbols in 2.10</title>
   </index>  
+  <index role="2.12">
+    <title>Index of new symbols in 2.12</title>
+  </index>  
 
 </book>

diff --git a/docs/reference/gobject/gobject-docs.sgml b/docs/reference/gobject/gobject-docs.sgml
index 4ac82e4..2a536b8 100644 (file)
--- a/docs/reference/gobject/gobject-docs.sgml
+++ b/docs/reference/gobject/gobject-docs.sgml
@@ -142,5 +142,8 @@
   <index role="2.10">
     <title>Index of new symbols in 2.10</title>
   </index>  
+  <index role="2.12">
+    <title>Index of new symbols in 2.12</title>
+  </index>  
   
 </book>

diff --git a/docs/reference/gobject/tmpl/gtype.sgml b/docs/reference/gobject/tmpl/gtype.sgml
index bc8f618..19baa98 100644 (file)
--- a/docs/reference/gobject/tmpl/gtype.sgml
+++ b/docs/reference/gobject/tmpl/gtype.sgml
@@ -1230,6 +1230,24 @@ instances (if not abstract).  The value of @flags determines the nature
 @Returns:      The new type identifier.
 
 
+<!-- ##### FUNCTION g_type_register_static_simple ##### -->
+<para>
+Registers @type_name as the name of a new static type derived from
+@parent_type.  The value of @flags determines the nature (e.g. 
+abstract or not) of the type. It works by filling a #GTypeInfo 
+struct and calling g_type_info_register_static().
+</para>
+
+@parent_type:  Type which this type will be derived from.
+@type_name:    0-terminated string used as the name of the new type.
+@class_size:    Size of the class structure (see #GTypeInfo)
+@class_init:   Location of the class initialization function (see #GTypeInfo)
+@instance_size: Size of the instance structure (see #GTypeInfo)
+@instance_init: Location of the instance initialization function (see #GTypeInfo)
+@flags:        Bitwise combination of #GTypeFlags values.
+@Returns:      The new type identifier.
+@Since:         2.12
+
 <!-- ##### FUNCTION g_type_register_dynamic ##### -->
 <para>
 Registers @type_name as the name of a new dynamic type derived from