Index: doc/gconf/gconf-sections.txt
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/gconf-sections.txt,v
retrieving revision 1.17
diff -u -5 -r1.17 gconf-sections.txt
--- doc/gconf/gconf-sections.txt	17 Sep 2000 00:55:00 -0000	1.17
+++ doc/gconf/gconf-sections.txt	17 Jul 2004 07:14:38 -0000
@@ -146,26 +146,26 @@
 <FILE>gconf-schema</FILE>
 GConfSchema
 gconf_schema_new
 gconf_schema_free
 gconf_schema_copy
-gconf_schema_set_type
-gconf_schema_set_locale
-gconf_schema_set_short_desc
-gconf_schema_set_long_desc
-gconf_schema_set_owner
-gconf_schema_set_default_value
-gconf_schema_set_default_value_nocopy
 gconf_schema_get_type
 gconf_schema_get_locale
 gconf_schema_get_short_desc
 gconf_schema_get_long_desc
 gconf_schema_get_owner
 gconf_schema_get_default_value
 gconf_schema_get_car_type
 gconf_schema_get_cdr_type
 gconf_schema_get_list_type
+gconf_schema_set_type
+gconf_schema_set_locale
+gconf_schema_set_short_desc
+gconf_schema_set_long_desc
+gconf_schema_set_owner
+gconf_schema_set_default_value
+gconf_schema_set_default_value_nocopy
 gconf_schema_set_car_type
 gconf_schema_set_cdr_type
 gconf_schema_set_list_type
 </SECTION>
 
Index: doc/gconf/tmpl/gconf-schema.sgml
===================================================================
RCS file: /cvs/gnome/gconf/doc/gconf/tmpl/gconf-schema.sgml,v
retrieving revision 1.8
diff -u -5 -r1.8 gconf-schema.sgml
--- doc/gconf/tmpl/gconf-schema.sgml	3 Jun 2002 02:36:22 -0000	1.8
+++ doc/gconf/tmpl/gconf-schema.sgml	17 Jul 2004 07:14:38 -0000
@@ -1,236 +1,268 @@
 <!-- ##### SECTION Title ##### -->
-gconf-schema
+GConfSchema
 
 <!-- ##### SECTION Short_Description ##### -->
 
+A #GConfSchema describes a #GConfEntry.
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+A "schema" describes a key-value pair in a GConf database.
+It may include information such as default value and value
+type, as well as documentation describing the pair, the
+name of the application that created the pair, etc.
+</para>
+<para>
+A #GConfSchema duplicates some of the information about the value it
+describes, such as type information. In these cases, the type information
+provided describes what the type of the value <emphasis>should
+be</emphasis>, not what the type actually is.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
 <!-- ##### STRUCT GConfSchema ##### -->
 <para>
-
+An opaque data type representing a description of a key-value pair.
 </para>
 
 
 <!-- ##### FUNCTION gconf_schema_new ##### -->
 <para>
-
+Creates a new #GConfSchema.
 </para>
 
-@Returns: 
+@Returns: newly-allocated #GConfSchema.
 
 
 <!-- ##### FUNCTION gconf_schema_free ##### -->
 <para>
-
+Deallocates a #GConfSchema. Also deallocates any allocated memory
+inside the #GConfSchema.
 </para>
 
-@sc: 
+@sc: a #GConfSchema to destroy.
 
 
 <!-- ##### FUNCTION gconf_schema_copy ##### -->
 <para>
-
+Copies a #GConfSchema. The copy is a deep copy, that is, any allocated memory inside the #GConfSchema will also be copied.
 </para>
 
-@sc: 
-@Returns: 
+@sc: a #GConfSchema to copy.
+@Returns: a newly-allocated #GConfSchema identical to @sc.
 
 
-<!-- ##### FUNCTION gconf_schema_set_type ##### -->
+<!-- ##### FUNCTION gconf_schema_get_type ##### -->
 <para>
-
+Returns the type of the entry described by a #GConfSchema.
 </para>
 
-@sc: 
-@type: 
+@schema: a #GConfSchema.
+@Returns: the entry type.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_set_locale ##### -->
+<!-- ##### FUNCTION gconf_schema_get_locale ##### -->
 <para>
-
+Returns the locale for a #GConfSchema. The returned string
+is <emphasis>not</emphasis> a copy, don't try to free it. It is
+"owned" by the #GConfSchema and will be destroyed when the #GConfSchema
+is destroyed.
 </para>
 
-@sc: 
-@locale: 
+@schema: a #GConfSchema.
+@Returns: the locale.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_set_short_desc ##### -->
+<!-- ##### FUNCTION gconf_schema_get_short_desc ##### -->
 <para>
-
+Returns the short description for a #GConfSchema. The returned string
+is <emphasis>not</emphasis> a copy, don't try to free it. It is
+"owned" by the #GConfSchema and will be destroyed when the #GConfSchema
+is destroyed.
 </para>
 
-@sc: 
-@desc: 
+@schema: a #GConfSchema.
+@Returns: the short description.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_set_long_desc ##### -->
+<!-- ##### FUNCTION gconf_schema_get_long_desc ##### -->
 <para>
-
+Returns the long description for a #GConfSchema. The returned string
+is <emphasis>not</emphasis> a copy, don't try to free it. It is
+"owned" by the #GConfSchema and will be destroyed when the #GConfSchema
+is destroyed.
 </para>
 
-@sc: 
-@desc: 
+@schema: a #GConfSchema.
+@Returns: the long description.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_set_owner ##### -->
+<!-- ##### FUNCTION gconf_schema_get_owner ##### -->
 <para>
-
+Returns the owner of a #GConfSchema. The returned string
+is <emphasis>not</emphasis> a copy, don't try to free it. It is
+"owned" by the #GConfSchema and will be destroyed when the #GConfSchema
+is destroyed.
 </para>
 
-@sc: 
-@owner: 
+@schema: a #GConfSchema.
+@Returns: the owner.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_set_default_value ##### -->
+<!-- ##### FUNCTION gconf_schema_get_default_value ##### -->
 <para>
-
+Returns the default value of the entry that is described by a #GConfSchema.
 </para>
 
-@sc: 
-@val: 
+@schema: a #GConfSchema.
+@Returns: the default value of the entry.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_set_default_value_nocopy ##### -->
+<!-- ##### FUNCTION gconf_schema_get_car_type ##### -->
 <para>
-
+Returns the default type of the first member of the pair in the entry
+(which should be of type %GCONF_VALUE_PAIR) described by @schema.
 </para>
 
-@sc: 
-@val: 
+@schema: a #GConfSchema.
+@Returns: the type of the first member of the pair element of the entry.
+<!-- # Unused Parameters # -->
+@x: 
 
 
-<!-- ##### FUNCTION gconf_schema_get_type ##### -->
+<!-- ##### FUNCTION gconf_schema_get_cdr_type ##### -->
 <para>
-
+Returns the default type of the second member of the pair in the entry
+(which should be of type %GCONF_VALUE_PAIR) described by @schema.
 </para>
 
-@schema: 
-@Returns: 
+@schema: a #GConfSchema.
+@Returns: the type of the second member of the pair element of the entry.
 <!-- # Unused Parameters # -->
 @x: 
 
 
-<!-- ##### FUNCTION gconf_schema_get_locale ##### -->
+<!-- ##### FUNCTION gconf_schema_get_list_type ##### -->
 <para>
-
+Returns the default type of the list elements of the entry (which should be
+of default type %GCONF_VALUE_LIST) described by @schema.
 </para>
 
-@schema: 
-@Returns: 
+@schema: a #GConfSchema.
+@Returns: the type of the list elements of the entry.
 <!-- # Unused Parameters # -->
 @x: 
 
 
-<!-- ##### FUNCTION gconf_schema_get_short_desc ##### -->
+<!-- ##### FUNCTION gconf_schema_set_type ##### -->
 <para>
-
+Sets the #GConfValueType of the #GConfSchema to @type.
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@type: the type.
 
 
-<!-- ##### FUNCTION gconf_schema_get_long_desc ##### -->
+<!-- ##### FUNCTION gconf_schema_set_locale ##### -->
 <para>
-
+Sets the locale for a #GConfSchema to @locale. @locale is copied.
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@locale: the locale.
 
 
-<!-- ##### FUNCTION gconf_schema_get_owner ##### -->
+<!-- ##### FUNCTION gconf_schema_set_short_desc ##### -->
 <para>
-
+Sets the short description of a #GConfSchema to @desc. @desc is copied.
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@desc: the short description.
 
 
-<!-- ##### FUNCTION gconf_schema_get_default_value ##### -->
+<!-- ##### FUNCTION gconf_schema_set_long_desc ##### -->
 <para>
-
+Sets the long description of a #GConfSchema to @desc. @desc is copied.
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@desc: the long description.
 
 
-<!-- ##### FUNCTION gconf_schema_get_car_type ##### -->
+<!-- ##### FUNCTION gconf_schema_set_owner ##### -->
 <para>
-
+Sets the "owner" of the #GConfSchema, where the owner is the
+name of the application that created the entry.
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@owner: the name of the creating application.
 
 
-<!-- ##### FUNCTION gconf_schema_get_cdr_type ##### -->
+<!-- ##### FUNCTION gconf_schema_set_default_value ##### -->
 <para>
-
+Sets the default value for the entry described by the #GConfSchema.
+The #GConfValue is copied. Alternatively, use
+gconf_schema_set_default_value_nocopy().
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@val: the default value.
 
 
-<!-- ##### FUNCTION gconf_schema_get_list_type ##### -->
+<!-- ##### FUNCTION gconf_schema_set_default_value_nocopy ##### -->
 <para>
-
+Sets the default value for the entry described by the #GConfSchema.
+The #GConfValue is not copied; the #GConfSchema takes ownership of it.
+Alternatively, use gconf_schema_set_default_value().
 </para>
 
-@schema: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@sc: a #GConfSchema.
+@val: the default value.
 
 
 <!-- ##### FUNCTION gconf_schema_set_car_type ##### -->
 <para>
-
+Sets the #GConfValueType of the first member (car) of the entry (which
+should be of type %GCONF_VALUE_PAIR) described by #GConfSchema to @type.
 </para>
 
-@sc: 
-@type: 
+@sc: a #GConfSchema.
+@type: the type.
 
 
 <!-- ##### FUNCTION gconf_schema_set_cdr_type ##### -->
 <para>
-
+Sets the #GConfValueType of the second member (cdr) of the entry (which
+should be of type %GCONF_VALUE_PAIR) described by #GConfSchema to @type.
 </para>
 
-@sc: 
-@type: 
+@sc: a #GConfSchema.
+@type: the type.
 
 
 <!-- ##### FUNCTION gconf_schema_set_list_type ##### -->
 <para>
-
+Sets the #GConfValueType of the list elements of the entry (which
+should be of type %GCONF_VALUE_LIST) described by #GConfSchema to @type.
 </para>
 
-@sc: 
-@type: 
-
-
+@sc: a #GConfSchema.
+@type: the type.
