Index: gconf/gconf.c
===================================================================
RCS file: /export/cvs/head/gconf/gconf/gconf.c,v
retrieving revision 1.148
diff -p -u -5 -r1.148 gconf.c
--- gconf/gconf.c	14 Jul 2005 17:30:49 -0000	1.148
+++ gconf/gconf.c	3 Oct 2005 14:06:33 -0000
@@ -2293,11 +2293,13 @@ gconf_detach_config_server(void)
 /**
  * gconf_debug_shutdown:
  * @void: 
  * 
  * Detach from the config server and release
- * all related resources
+ * all related resources.
+ *
+ * Returns: 1 if an exception occurs, 0 otherwise.
  **/
 int
 gconf_debug_shutdown (void)
 {
   gconf_detach_config_server ();
Index: doc/gconf/gconf-sections.txt
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/gconf-sections.txt,v
retrieving revision 1.17
diff -p -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	3 Oct 2005 14:07:09 -0000
@@ -11,24 +11,27 @@ gconf_client_get_default
 gconf_client_get_for_engine
 gconf_client_add_dir
 gconf_client_remove_dir
 gconf_client_notify_add
 gconf_client_notify_remove
+gconf_client_notify
 gconf_client_set_error_handling
 gconf_client_set_global_default_error_handler
 gconf_client_clear_cache
 gconf_client_preload
 gconf_client_set
 gconf_client_get
 gconf_client_get_without_default
 gconf_client_get_entry
 gconf_client_get_default_from_schema
 gconf_client_unset
+gconf_client_recursive_unset
 gconf_client_all_entries
 gconf_client_all_dirs
 gconf_client_suggest_sync
 gconf_client_dir_exists
+gconf_client_key_is_writable
 gconf_client_get_float
 gconf_client_get_int
 gconf_client_get_string
 gconf_client_get_bool
 gconf_client_get_schema
@@ -42,14 +45,14 @@ gconf_client_set_schema
 gconf_client_set_list
 gconf_client_set_pair
 gconf_client_error
 gconf_client_unreturned_error
 gconf_client_value_changed
+gconf_client_commit_change_set
 gconf_client_reverse_change_set
 gconf_client_change_set_from_currentv
 gconf_client_change_set_from_current
-gconf_client_commit_change_set
 <SUBSECTION Standard>
 GCONF_TYPE_CLIENT
 GCONF_IS_CLIENT
 gconf_client_get_type
 GCONF_CLIENT_CLASS
@@ -72,19 +75,24 @@ gconf_backend_resolve_address
 <SECTION>
 <FILE>gconf-engine</FILE>
 GConfEngine
 gconf_engine_get_default
 gconf_engine_get_for_address
-gconf_engine_get_local
+gconf_engine_get_for_addresses
 gconf_engine_unref
 gconf_engine_ref
+gconf_engine_get_local
+gconf_engine_get_local_for_addresses
+gconf_engine_set_user_data
+gconf_engine_get_user_data
 </SECTION>
 
 <SECTION>
 <FILE>gconf-error</FILE>
 GConfError
 gconf_error_new
+gconf_error_quark
 gconf_set_error
 gconf_compose_errors
 </SECTION>
 
 <SECTION>
@@ -104,17 +112,15 @@ gconf_value_type_to_string
 gconf_value_type_from_string
 gconf_load_source_path
 gconf_shutdown_daemon
 gconf_ping_daemon
 gconf_spawn_daemon
-gconf_concat_dir_and_key
 gconf_string_to_gulong
 gconf_current_locale
 GConfLogPriority
 gconf_log
 gconf_key_check
-gconf_value_new_from_string
 gconf_value_new_list_from_string
 gconf_value_new_pair_from_string
 gconf_quote_string
 gconf_unquote_string
 gconf_unquote_string_inplace
@@ -125,11 +131,10 @@ gconf_value_list_from_primitive_list
 gconf_value_pair_from_primitive_pair
 gconf_value_list_to_primitive_list_destructive
 gconf_value_pair_to_primitive_pair_destructive
 gconf_set_daemon_mode
 gconf_handle_oaf_exception
-gconf_engine_get_full
 </SECTION>
 
 <SECTION>
 <FILE>gconf-listeners</FILE>
 GConfListeners
@@ -138,10 +143,13 @@ gconf_listeners_new
 gconf_listeners_free
 gconf_listeners_add
 gconf_listeners_remove
 gconf_listeners_notify
 gconf_listeners_count
+gconf_listeners_foreach
+gconf_listeners_get_data
+gconf_listeners_remove_if
 </SECTION>
 
 <SECTION>
 <FILE>gconf-schema</FILE>
 GConfSchema
@@ -195,22 +203,23 @@ gconf_sources_query_default_value
 <SECTION>
 <FILE>gconf-value</FILE>
 GConfValueType
 GConfValue
 GCONF_VALUE_TYPE_VALID
-gconf_value_new
-gconf_value_copy
-gconf_value_free
 gconf_value_get_string
 gconf_value_get_int
 gconf_value_get_float
 gconf_value_get_list_type
 gconf_value_get_list
 gconf_value_get_car
 gconf_value_get_cdr
 gconf_value_get_bool
 gconf_value_get_schema
+gconf_value_new
+gconf_value_new_from_string
+gconf_value_copy
+gconf_value_free
 gconf_value_set_int
 gconf_value_set_string
 gconf_value_set_float
 gconf_value_set_bool
 gconf_value_set_schema
@@ -231,20 +240,27 @@ gconf_meta_info_get_mod_user
 gconf_meta_info_mod_time
 gconf_meta_info_set_schema
 gconf_meta_info_set_mod_user
 gconf_meta_info_set_mod_time
 GConfEntry
-gconf_entry_new_nocopy
-gconf_entry_free
 gconf_entry_get_key
 gconf_entry_get_value
-gconf_entry_steal_value
-gconf_entry_get_is_default
 gconf_entry_get_schema_name
-gconf_entry_set_is_default
-gconf_entry_set_schema_name
+gconf_entry_get_is_default
+gconf_entry_get_is_writable
+gconf_entry_new
+gconf_entry_new_nocopy
+gconf_entry_copy
+gconf_entry_free
+gconf_entry_ref
+gconf_entry_unref
+gconf_entry_steal_value
+gconf_entry_set_value
 gconf_entry_set_value_nocopy
+gconf_entry_set_schema_name
+gconf_entry_set_is_default
+gconf_entry_set_is_writable
 </SECTION>
 
 <SECTION>
 <FILE>gconf</FILE>
 gconf_init
@@ -253,23 +269,29 @@ gconf_postinit
 gconf_is_initialized
 GConfNotifyFunc
 gconf_engine_notify_add
 gconf_engine_notify_remove
 gconf_engine_get
-gconf_engine_get_with_locale
 gconf_engine_get_without_default
 gconf_engine_get_entry
+gconf_engine_get_with_locale
 gconf_engine_get_default_from_schema
 gconf_engine_set
 gconf_engine_unset
 gconf_engine_associate_schema
 gconf_engine_all_entries
 gconf_engine_all_dirs
 gconf_engine_suggest_sync
 gconf_engine_dir_exists
+gconf_engine_remove_dir
+gconf_engine_key_is_writable
 gconf_valid_key
 gconf_key_is_below
+gconf_concat_dir_and_key
+gconf_unique_key
+gconf_escape_key
+gconf_unescape_key
 gconf_engine_get_float
 gconf_engine_get_int
 gconf_engine_get_string
 gconf_engine_get_bool
 gconf_engine_get_schema
@@ -283,10 +305,13 @@ gconf_engine_set_schema
 gconf_engine_set_list
 gconf_engine_set_pair
 GConfEnumStringPair
 gconf_string_to_enum
 gconf_enum_to_string
+gconf_clear_cache
+gconf_synchronous_sync
+gconf_engine_get_full
 </SECTION>
 
 <SECTION>
 <FILE>gconf-locale</FILE>
 GConfLocaleCache
@@ -303,28 +328,30 @@ gconf_split_locale
 <SECTION>
 <FILE>gconf-changeset</FILE>
 GConfChangeSet
 GConfChangeSetForeachFunc
 gconf_engine_commit_change_set
+gconf_engine_reverse_change_set
+gconf_engine_change_set_from_currentv
+gconf_engine_change_set_from_current
 gconf_change_set_new
 gconf_change_set_ref
 gconf_change_set_unref
 gconf_change_set_clear
 gconf_change_set_size
 gconf_change_set_remove
 gconf_change_set_foreach
+gconf_change_set_check_value
 gconf_change_set_set
 gconf_change_set_set_nocopy
 gconf_change_set_unset
 gconf_change_set_set_float
 gconf_change_set_set_int
 gconf_change_set_set_string
 gconf_change_set_set_bool
 gconf_change_set_set_schema
 gconf_change_set_set_list
 gconf_change_set_set_pair
-gconf_change_set_check_value
-gconf_engine_change_set_from_currentv
-gconf_engine_change_set_from_current
-gconf_engine_reverse_change_set
+gconf_change_set_set_user_data
+gconf_change_set_get_user_data
 </SECTION>
 
Index: doc/gconf/tmpl/gconf-changeset.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-changeset.sgml,v
retrieving revision 1.8
diff -p -u -5 -r1.8 gconf-changeset.sgml
--- doc/gconf/tmpl/gconf-changeset.sgml	25 Jul 2005 16:12:58 -0000	1.8
+++ doc/gconf/tmpl/gconf-changeset.sgml	3 Oct 2005 14:07:39 -0000
@@ -79,10 +79,46 @@ occurred will have been removed from the
 @remove_committed: whether to remove successfully-committed changes from the set
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> if an error occurs.
 
 
+<!-- ##### FUNCTION gconf_engine_reverse_change_set ##### -->
+<para>
+Creates a change set that would reverse @cs. That is, for each change in @cs,
+save the current state of that key in the returned change set.
+</para>
+
+@conf: a #GConfEngine.
+@cs: the #GConfChangeSet to be reverted.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: the modified #GConfChangeSet.
+
+
+<!-- ##### FUNCTION gconf_engine_change_set_from_currentv ##### -->
+<para>
+Creates a change set that will change the keys in 
+<symbol>NULL</symbol>terminated array @keys to their current state.
+</para>
+
+@conf: a #GConfEngine.
+@keys: <symbol>NULL</symbol>terminated array of key names.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: the newly allocated #GConfChangeSet.
+
+
+<!-- ##### FUNCTION gconf_engine_change_set_from_current ##### -->
+<para>
+Convenient Varags version of gconf_engine_change_set_from_current().
+</para>
+
+@conf: a #GConfEngine.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@first_key: the first key, a char* value.
+@Varargs: the keys to be set.
+@Returns: the newly allocated #GConfChangeSet.
+
+
 <!-- ##### FUNCTION gconf_change_set_new ##### -->
 <para>
 Creates a new, empty #GConfChangeSet. The caller assumes one reference
 count, and must call gconf_change_set_unref() eventually.
 </para>
@@ -116,15 +152,15 @@ change set would have no effect.
 @cs: a #GConfChangeSet.
 
 
 <!-- ##### FUNCTION gconf_change_set_size ##### -->
 <para>
-
+Returns the size of the changeset, a #guint value.
 </para>
 
-@cs: 
-@Returns: 
+@cs: a #GConfChangeSet.
+@Returns: the size, a #guint value.
 
 
 <!-- ##### FUNCTION gconf_change_set_remove ##### -->
 <para>
 Removes a change from a #GConfChangeSet. The key given as the @key
@@ -148,10 +184,22 @@ confuse the internal data structures and
 @cs: a #GConfChangeSet.
 @func: function to call for each change in the change set.
 @user_data: user data to pass to the #GConfChangeSetForeachFunc.
 
 
+<!-- ##### FUNCTION gconf_change_set_check_value ##### -->
+<para>
+Looks up the hash table associated with the #GConfChangeSet for the key @key. If the key
+is found , the value is set in value_retloc.
+</para>
+
+@cs: a #GConfChangeSet.
+@key: the key to be searched in the changeset.
+@value_retloc: a #GConfValue ** to hold the key, if found.
+@Returns: <symbol>TRUE</symbol> on finding the key, <symbol>FALSE</symbol> if key is not found.
+
+
 <!-- ##### FUNCTION gconf_change_set_set ##### -->
 <para>
 Adds a "set" operation to a change set. This function is similar to
 gconf_engine_set (), except that no errors can occur (errors occur later, when
 you try to commit the change set).
@@ -241,72 +289,51 @@ unmodified.
 @val: the new value of @key.
 
 
 <!-- ##### FUNCTION gconf_change_set_set_list ##### -->
 <para>
-
+Adds a "set" operation; takes a #GList argument and the type of the
+list, so you can avoid creating a #GConfValue. This results in the 
+list of values being set for the key.  
 </para>
 
-@cs: 
-@key: 
-@list_type: 
-@list: 
+@cs: a #GConfChangeSet.
+@key: the key to set.
+@list_type: the type of the list.
+@list: a #GList containing the values to be set.
 
 
 <!-- ##### FUNCTION gconf_change_set_set_pair ##### -->
 <para>
-
-</para>
-
-@cs: 
-@key: 
-@car_type: 
-@cdr_type: 
-@address_of_car: 
-@address_of_cdr: 
-
-
-<!-- ##### FUNCTION gconf_change_set_check_value ##### -->
-<para>
-
-</para>
-
-@cs: 
-@key: 
-@value_retloc: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gconf_engine_change_set_from_currentv ##### -->
-<para>
-
+Adds a "set" operation; takes a pointer to the addresses of the pair
+of values, so you can avoid creating a #GConfValue. This results in 
+the pair of values being set for the key.
 </para>
 
-@conf: 
-@keys: 
-@err: 
-@Returns: 
+@cs: a #GConfChangeSet.
+@key: the key to set.
+@car_type: the type of the pair's first field. (car)
+@cdr_type: the type of the pair's second field. (cdr)
+@address_of_car: address of the car.
+@address_of_cdr: address of the cdr.
 
 
-<!-- ##### FUNCTION gconf_engine_change_set_from_current ##### -->
+<!-- ##### FUNCTION gconf_change_set_set_user_data ##### -->
 <para>
-
+Sets the user_data and the destroy notification function fields of the 
+#GConfChangeSet.
 </para>
 
-@conf: 
-@err: 
-@first_key: 
-@Varargs: 
-@Returns: 
+@cs: a #GConfChangeSet.
+@data: a #gpointer.
+@dnotify: a pointer to the function to be called during destroy.
 
 
-<!-- ##### FUNCTION gconf_engine_reverse_change_set ##### -->
+<!-- ##### FUNCTION gconf_change_set_get_user_data ##### -->
 <para>
-
+Returns the user_data field of the #GConfChangeSet.
 </para>
 
-@conf: 
-@cs: 
-@err: 
-@Returns: 
+@cs: a #GConfChangeSet.
+@Returns: a pointer to the user_data.
 
 
Index: doc/gconf/tmpl/gconf-client.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-client.sgml,v
retrieving revision 1.17
diff -p -u -5 -r1.17 gconf-client.sgml
--- doc/gconf/tmpl/gconf-client.sgml	25 Jul 2005 16:12:58 -0000	1.17
+++ doc/gconf/tmpl/gconf-client.sgml	3 Oct 2005 14:07:46 -0000
@@ -162,28 +162,22 @@ it around (the #GConfClient will destroy
 is called).
 </para>
 
 @client: the #GConfClient notifying us.
 @cnxn_id: connection ID from gconf_client_notify_add().
-@entry: 
+@entry: a #GConfEntry.
 @user_data: user data from gconf_client_notify_add().
-<!-- # Unused Parameters # -->
-@key: key that has changed.
-@value: new value, or <symbol>NULL</symbol> for unset.
-@is_default: 
 
 
 <!-- ##### USER_FUNCTION GConfClientErrorHandlerFunc ##### -->
 <para>
-
+This is the signature of a user function which needs to be called for error 
+handling.
 </para>
 
-@client: 
-@error: 
-<!-- # Unused Parameters # -->
-@parent_func: 
-@parent_user_data: 
+@client: a #GConfClient.
+@error: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 
 
 <!-- ##### MACRO GCONF_CLIENT ##### -->
 <para>
 Casts a pointer to a #GConfClient*.
@@ -250,11 +244,11 @@ the removed directory.  Note that if a d
 you must remove it the same number of times before the remove takes effect.
 </para>
 
 @client: a #GConfClient.
 @dir: directory to remove.
-@err: 
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 
 
 <!-- ##### FUNCTION gconf_client_notify_add ##### -->
 <para>
 Request notification of changes to @namespace_section. This includes the key
@@ -302,10 +296,22 @@ notification's user data, if appropriate
 
 @client: a #GConfClient.
 @cnxn: connection ID.
 
 
+<!-- ##### FUNCTION gconf_client_notify ##### -->
+<para>
+Obtains the #GConfEntry associated with the #GConfClient using gconf_client_get_entry().
+If the entry is not <symbol>NULL </symbol> it emits the #value_changed signal by calling
+gconf_client_value_changed() and notifies the listeners associated with the client,if any.
+</para>
+
+@client: a #GConfClient.
+@key: the key that has changed.
+@Since: 2.4.
+
+
 <!-- ##### FUNCTION gconf_client_set_error_handling ##### -->
 <para>
 Controls the default error handling for #GConfClient. See
 #GConfClientErrorHandlingMode and #GConfClientParentWindowFunc for details on this.
 </para>
@@ -317,14 +323,14 @@ Controls the default error handling for 
 @user_data: user data to pass to @func.
 
 
 <!-- ##### FUNCTION gconf_client_set_global_default_error_handler ##### -->
 <para>
-
+Set @func as the default error handler for the #GConfClient.
 </para>
 
-@func: 
+@func: pointer to the function to be called for error handling.
 
 
 <!-- ##### FUNCTION gconf_client_clear_cache ##### -->
 <para>
 Dumps everything out of the #GConfClient client-side cache. If you know you're
@@ -392,11 +398,11 @@ Obtains the full #GConfEntry for a value
 @client: a #GConfClient.
 @key:  key to get.
 @locale: preferred locale (as in the locale-related environment variables).
 @use_schema_default: indicates whether to look for a default value when the key is unset.
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
-@Returns: 
+@Returns: a #GConfEntry.
 
 
 <!-- ##### FUNCTION gconf_client_get_default_from_schema ##### -->
 <para>
 Returns the default value stored in the key's schema, if the key has a schema
@@ -426,10 +432,25 @@ Just like gconf_engine_unset (), but use
 @key: key to unset.
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> on error.
 
 
+<!-- ##### FUNCTION gconf_client_recursive_unset ##### -->
+<para>
+Unsets all keys below @key, including @key itself.  If any unset fails, continues on to unset 
+as much as it can. The first failure is returned in @err. Just like gconf_engine_recursive_unset (), 
+but uses #GConfClient caching and error-handling features.
+</para>
+
+@client: a #GConfClient.
+@key: a key or directory name to be unset.
+@flags: change how the unset is done.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> on error.
+@Since: 2.4.
+
+
 <!-- ##### FUNCTION gconf_client_all_entries ##### -->
 <para>
 Lists the key-value pairs in @dir. Does not list subdirectories; for
 that use gconf_client_all_dirs(). The returned list contains #GConfEntry
 objects. A #GConfEntry contains an <emphasis>absolute</emphasis> key
@@ -485,10 +506,21 @@ Just like gconf_engine_dir_exists (), bu
 @dir: directory to check for
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: <symbol>TRUE</symbol> or <symbol>FALSE</symbol>.
 
 
+<!-- ##### FUNCTION gconf_client_key_is_writable ##### -->
+<para>
+Checks whether the key is writable.
+</para>
+
+@client: a #GConfClient.
+@key: the value to be changed.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: <symbol>TRUE</symbol> if the key is writable, <symbol>FALSE</symbol> if the key is read only.
+
+
 <!-- ##### FUNCTION gconf_client_get_float ##### -->
 <para>
 Requests the floating point number (%GCONF_VALUE_FLOAT) stored at
 @key. Automatically performs type-checking, so if a non-float is
 stored at @key, an error is returned. On error, or if @key is unset, 
@@ -801,11 +833,13 @@ Just like gconf_engine_set (), but uses 
 @Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> on error.
 
 
 <!-- ##### FUNCTION gconf_client_set_list ##### -->
 <para>
-
+Changes the value of @key to a @list of type @list_type. Automatically creates the @key if it didn't exist before 
+(ie it was unset or it had a default value). If the key already exists but doesn't store a list value 
+(GCONF_VALUE_LIST), gconf_client_set_list() will fail.
 </para>
 
 @client: a #GConfClient.
 @key: key you want to set the value of.
 @list_type: type of each list element.
@@ -814,10 +848,13 @@ Just like gconf_engine_set (), but uses 
 @Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> on error.
 
 
 <!-- ##### FUNCTION gconf_client_set_pair ##### -->
 <para>
+Changes the value of @key to a pair with the first field of type @car_type and the second field of type @cdr_type. 
+Automatically creates the key if it didn't exist before (ie it was unset or it had a default value). If the key 
+already exists but doesn't store a pair value (GCONF_VALUE_PAIR), gconf_client_set_pair() will fail.
 
 </para>
 
 @client: a #GConfClient.
 @key: key you want to set the value of.
@@ -855,10 +892,35 @@ Emits the "value_changed" signal. Rarely
 @client: a #GConfClient.
 @key: key to pass to signal handlers.
 @value: value of @key to pass to signal handlers.
 
 
+<!-- ##### FUNCTION gconf_client_commit_change_set ##### -->
+<para>
+Applies the changes in the change set to the #GConfClient passed as
+the first argument. If @remove_committed is <symbol>TRUE</symbol>,
+then any successfully-committed changes are removed from the change
+set. If @remove_committed is <symbol>FALSE</symbol>, the
+#GConfChangeSet is left unmodified.
+</para>
+
+<para>
+If any set or unset operation results in an error, then processing
+terminates and the error is returned in @err (unless @err was
+<symbol>NULL</symbol>). If @remove_committed was
+<symbol>TRUE</symbol>, then all the changes committed before the error
+occurred will have been removed from the set. If any error occurs,
+<symbol>FALSE</symbol> is returned.
+</para>
+
+@client: a #GConfClient.
+@cs: a #GConfChangeSet.
+@remove_committed: whether to remove successfully-committed changes from the set.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> if an error occurs.
+
+
 <!-- ##### FUNCTION gconf_client_reverse_change_set ##### -->
 <para>
 Creates a change set that would reverse @cs. That is, for each change in @cs,
 save the current state of that key in the returned change set.
 </para>
@@ -893,17 +955,5 @@ Convenient varargs version of gconf_clie
 @first_key: first key to save the current state of.
 @Varargs: <symbol>NULL</symbol>-terminated list of additional keys.
 @Returns: new change set that changes all the keys to their current state.
 
 
-<!-- ##### FUNCTION gconf_client_commit_change_set ##### -->
-<para>
-
-</para>
-
-@client: 
-@cs: 
-@remove_committed: 
-@err: 
-@Returns: 
-
-
Index: doc/gconf/tmpl/gconf-engine.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-engine.sgml,v
retrieving revision 1.10
diff -p -u -5 -r1.10 gconf-engine.sgml
--- doc/gconf/tmpl/gconf-engine.sgml	25 Jul 2005 16:12:58 -0000	1.10
+++ doc/gconf/tmpl/gconf-engine.sgml	3 Oct 2005 14:07:56 -0000
@@ -59,21 +59,20 @@ unreferenced by the caller of this funct
 @address: a configuration source address.
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: a #GConfEngine.
 
 
-<!-- ##### FUNCTION gconf_engine_get_local ##### -->
+<!-- ##### FUNCTION gconf_engine_get_for_addresses ##### -->
 <para>
-Obtain a local (non-process-transparent) #GConfEngine. Local engines
-do not support notification, and can only access config databases
-directly (they do not use the multiple sources in a path system
-supported by nonlocal engines).
+Similar to gconf_engine_get_for_address() , but takes a list of addresses 
+instead of a single address.
 </para>
 
-@address: address of local database
-@err: return location of an allocated #GError
-@Returns: a #GConfEngine
+@addresses: a list of configuration addresses.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: a #GConfEngine.
+@Since: 2.4
 
 
 <!-- ##### FUNCTION gconf_engine_unref ##### -->
 <para>
 Decreases the reference count of a #GConfEngine by one; if the
@@ -89,5 +88,50 @@ Increases the reference count of a #GCon
 </para>
 
 @conf: a #GConfEngine.
 
 
+<!-- ##### FUNCTION gconf_engine_get_local ##### -->
+<para>
+Obtain a local (non-process-transparent) #GConfEngine. Local engines
+do not support notification, and can only access config databases
+directly (they do not use the multiple sources in a path system
+supported by nonlocal engines).
+</para>
+
+@address: address of local database.
+@err: return location of an allocated #GError.
+@Returns: a #GConfEngine.
+
+
+<!-- ##### FUNCTION gconf_engine_get_local_for_addresses ##### -->
+<para>
+Obtains a local #GConfEngine similar to gconf_engine_get_local ().
+Instead of taking the address of the local database, this function takes
+the addresses of the sources and gets the #GConfSources using gconf_sources_new_from_addresses ().
+</para>
+
+@addresses: a list of addresses of #GConfSources.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: a #GConfEngine.
+@Since: 2.8
+
+
+<!-- ##### FUNCTION gconf_engine_set_user_data ##### -->
+<para>
+Sets the user_data and the destroy notification function fields of a #GConfEngine.
+</para>
+
+@engine: a #GConfEngine.
+@data: a #gpointer.
+@dnotify: a pointer to the function to be called during destroy.
+
+
+<!-- ##### FUNCTION gconf_engine_get_user_data ##### -->
+<para>
+Returns the user_data field of a #GConfEngine.
+</para>
+
+@engine: a #GConfEngine.
+@Returns: a pointer to the user_data.
+
+
Index: doc/gconf/tmpl/gconf-error.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-error.sgml,v
retrieving revision 1.10
diff -p -u -5 -r1.10 gconf-error.sgml
--- doc/gconf/tmpl/gconf-error.sgml	25 Jul 2005 16:12:58 -0000	1.10
+++ doc/gconf/tmpl/gconf-error.sgml	3 Oct 2005 14:08:07 -0000
@@ -115,10 +115,18 @@ argument list is the same as in printf()
 @format: printf()-style format for error description.
 @Varargs: arguments required by the @format.
 @Returns: newly-allocated #GError.
 
 
+<!-- ##### FUNCTION gconf_error_quark ##### -->
+<para>
+Converts the string 'gconf-error-quark' to a #GQuark and returns the value.
+</para>
+
+@Returns: the #GQuark representing the string.
+
+
 <!-- ##### FUNCTION gconf_set_error ##### -->
 <para>
 Internal function.
 </para>
 
Index: doc/gconf/tmpl/gconf-internals.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-internals.sgml,v
retrieving revision 1.11
diff -p -u -5 -r1.11 gconf-internals.sgml
--- doc/gconf/tmpl/gconf-internals.sgml	25 Jul 2005 16:12:58 -0000	1.11
+++ doc/gconf/tmpl/gconf-internals.sgml	3 Oct 2005 14:08:47 -0000
@@ -123,20 +123,10 @@ gconf-internals
 
 @err: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gconf_concat_dir_and_key ##### -->
-<para>
-
-</para>
-
-@dir: 
-@key: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gconf_string_to_gulong ##### -->
 <para>
 
 </para>
 
@@ -184,22 +174,10 @@ gconf-internals
 @key: 
 @err: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gconf_value_new_from_string ##### -->
-<para>
-Tries to parse a string and create a primitive #GConfValue from
-it. Only works on primitive types.
-</para>
-
-@type: 
-@str: 
-@err: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gconf_value_new_list_from_string ##### -->
 <para>
 This function does not work. Don't use it.
 </para>
 
@@ -334,22 +312,5 @@ This function does not work. Don't use i
 @ev: 
 @err: 
 @Returns: 
 
 
-<!-- ##### FUNCTION gconf_engine_get_full ##### -->
-<para>
-This function is basically for internal use.
-</para>
-
-@conf: 
-@key: 
-@locale: 
-@use_schema_default: 
-@is_default_p: 
-@is_writable_p: 
-@err: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@value_is_default: 
-
-
Index: doc/gconf/tmpl/gconf-listeners.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-listeners.sgml,v
retrieving revision 1.4
diff -p -u -5 -r1.4 gconf-listeners.sgml
--- doc/gconf/tmpl/gconf-listeners.sgml	25 Jul 2005 16:12:58 -0000	1.4
+++ doc/gconf/tmpl/gconf-listeners.sgml	3 Oct 2005 14:08:58 -0000
@@ -4,11 +4,13 @@ gconf-listeners
 <!-- ##### SECTION Short_Description ##### -->
 
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-
+A GConfListeners object is used to store listeners who want notification of changes
+in a namespace section. It is a public API shared between gconfd and the GObject 
+convenience wrapper.
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
@@ -17,78 +19,118 @@ gconf-listeners
 <!-- ##### SECTION Stability_Level ##### -->
 
 
 <!-- ##### STRUCT GConfListeners ##### -->
 <para>
-
+The #GConfListeners structure contains nothing other than a dummy pointer. Internally 
+the data about listeners is maintained through a listener table structure,
+LTable which contains data like the namespace, an array to hold the listeners, count of
+active listeners,value to be given to the next connection and the list of connection indices
+to be recycled. There is also a Listener structure maintaining data pertaining to listeners. 
 </para>
 
 
 <!-- ##### USER_FUNCTION GConfListenersCallback ##### -->
 <para>
-
+This is the signature of a user function added with gconf_listeners_notify(). This function
+is called whenever the value of a key changes. 
 </para>
 
-@listeners: 
-@all_above_key: 
-@cnxn_id: 
-@listener_data: 
-@user_data: 
+@listeners: a #GConfListeners.
+@all_above_key: the key that has changed.
+@cnxn_id: the connection id got from gconf_listeners_add().
+@listener_data: the data field associated with each listener.
+@user_data: the user data to be passed to the callback.
 
 
 <!-- ##### FUNCTION gconf_listeners_new ##### -->
 <para>
-
+Creates a new listener table and typecasts it to a #GConfListeners.
 </para>
 
-@Returns: 
+@Returns: the newly allocated #GConfListeners.
 
 
 <!-- ##### FUNCTION gconf_listeners_free ##### -->
 <para>
-
+Destroys the listener table.
 </para>
 
-@listeners: 
+@listeners: a #GConfListeners.
 
 
 <!-- ##### FUNCTION gconf_listeners_add ##### -->
 <para>
-
+Creates a new Listener with the next available connection id and inserts it into the listener table.
+The newly created listener listens for changes below and including the @listen_point.Returns the newly 
+assigned connection id.
 </para>
 
-@listeners: 
-@listen_point: 
-@listener_data: 
-@destroy_notify: 
-@Returns: 
+@listeners: a #GConfListeners.
+@listen_point: where to listen for changes.
+@listener_data: data to pass to function.
+@destroy_notify: pointer to the function to be called when the listener is destroyed.
+@Returns: the newly assigned connection id, a #guint value.
 
 
 <!-- ##### FUNCTION gconf_listeners_remove ##### -->
 <para>
-
+Removes the listener from the listener table.
 </para>
 
-@listeners: 
-@cnxn_id: 
+@listeners: a #GConfListeners.
+@cnxn_id: the connection id returned during gconf_listeners_add().
 
 
 <!-- ##### FUNCTION gconf_listeners_notify ##### -->
 <para>
-
+Notifies all the associated listeners that a key has changed.
 </para>
 
-@listeners: 
-@all_above: 
-@callback: 
-@user_data: 
+@listeners: a #GConfListeners.
+@all_above: the key that has changed.
+@callback: a #GConfListenersCallback to be called.
+@user_data: data to be passed to the callback.
 
 
 <!-- ##### FUNCTION gconf_listeners_count ##### -->
 <para>
+Returns the number of alive listeners in the listener table.
+</para>
+
+@listeners: a #GConfListeners
+@Returns: the number of active listeners.
+
+
+<!-- ##### FUNCTION gconf_listeners_foreach ##### -->
+<para>
+Execute a function for each of the #GConfListeners.
+</para>
 
+@listeners: a #GConfListeners.
+@callback: the function to be called.
+@user_data: a gpointer.
+
+
+<!-- ##### FUNCTION gconf_listeners_get_data ##### -->
+<para>
+Obtains the data particular to a #GConfListener.
+</para>
+
+@listeners: a #GConfListeners.
+@cnxn_id: the connection id, an integer.
+@listener_data_p: the address for getting the listener data.
+@location_p: a pointer to the address for getting the name.
+@Returns: <symbol>TRUE</symbol> if the data could be obtained successfully, <symbol>FALSE</symbol> 
+if an error occurs while retrieving the data.
+
+
+<!-- ##### FUNCTION gconf_listeners_remove_if ##### -->
+<para>
+Remove the listener if a predicate is satisfied.
 </para>
 
-@listeners: 
-@Returns: 
+@listeners: a #GConfListeners.
+@predicate: the predicate checked for removal.
+@user_data: a #gpointer.
 
 
Index: doc/gconf/tmpl/gconf-value.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf-value.sgml,v
retrieving revision 1.22
diff -p -u -5 -r1.22 gconf-value.sgml
--- doc/gconf/tmpl/gconf-value.sgml	25 Jul 2005 16:12:58 -0000	1.22
+++ doc/gconf/tmpl/gconf-value.sgml	3 Oct 2005 14:09:11 -0000
@@ -77,41 +77,10 @@ list value.
 </para>
 
 @x: 
 
 
-<!-- ##### FUNCTION gconf_value_new ##### -->
-<para>
-Creates a new #GConfValue with type @type. The type is immutable after
-creation; values have a fixed type. You <emphasis>must</emphasis>
-initialize the #GConfValue after creation; that is, you must set its 
-value with one of the "setter" functions.
-</para>
-
-@type: type of the new #GConfValue.
-@Returns: newly-allocated #GConfValue.
-
-
-<!-- ##### FUNCTION gconf_value_copy ##### -->
-<para>
-Copies a #GConfValue. The copy is a deep copy, that is, any allocated
-memory inside the #GConfValue will also be copied.
-</para>
-
-@src: a #GConfValue to copy.
-@Returns: a newly-allocated #GConfValue identical to @src.
-
-
-<!-- ##### FUNCTION gconf_value_free ##### -->
-<para>
-Deallocates a #GConfValue. Also deallocates any allocated memory
-inside the #GConfValue (such as lists, pair members, strings, and schemas).
-</para>
-
-@value: a #GConfValue to destroy.
-
-
 <!-- ##### FUNCTION gconf_value_get_string ##### -->
 <para>
 Returns a <symbol>const gchar*</symbol> for a #GConfValue with type
 %GCONF_VALUE_STRING. The returned string is <emphasis>not</emphasis> a
 copy, don't try to free it. It is "owned" by the #GConfValue and will
@@ -123,48 +92,40 @@ If the #GConfValue is not initialized (i
 gconf_value_set_string()) then the string may be
 <symbol>NULL</symbol>, but of course you should not try to use an
 uninitialized #GConfValue.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: a const char*.
 
 
 <!-- ##### FUNCTION gconf_value_get_int ##### -->
 <para>
 Returns a #gint for a #GConfValue with type %GCONF_VALUE_INT. 
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: a #gint.
 
 
 <!-- ##### FUNCTION gconf_value_get_float ##### -->
 <para>
 Returns a #gdouble for a #GConfValue with type %GCONF_VALUE_FLOAT.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: a #gdouble.
 
 
 <!-- ##### FUNCTION gconf_value_get_list_type ##### -->
 <para>
 Returns the type of the list elements in a #GConfValue with type 
 %GCONF_VALUE_LIST.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: the type of the list elements (a primitive type).
 
 
 <!-- ##### FUNCTION gconf_value_get_list ##### -->
 <para>
 Returns a #GSList containing #GConfValue objects. Each #GConfValue in
@@ -172,14 +133,12 @@ the returned list will have the type ret
 gconf_value_get_list_type(). Remember that the empty #GSList is equal to
 <symbol>NULL</symbol>.  The list is not a copy; it is "owned" by the
 #GConfValue and will be destroyed when the #GConfValue is destroyed.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: a #GList.
 
 
 <!-- ##### FUNCTION gconf_value_get_car ##### -->
 <para>
 Returns the first member (car) of a #GConfValue with type
@@ -190,14 +149,12 @@ type (bool, int, float, string, schema).
 <para>
 The returned value is not a copy; it is "owned" by the pair and will
 be destroyed when the pair is destroyed.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: the first member of a pair, a primitive type.
 
 
 <!-- ##### FUNCTION gconf_value_get_cdr ##### -->
 <para>
 Returns the second member (cdr) of a #GConfValue with type
@@ -208,25 +165,21 @@ type (bool, int, float, string, schema).
 <para>
 The returned value is not a copy; it is "owned" by the pair and will
 be destroyed when the pair is destroyed.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: the second member of a pair, a primitive type.
 
 
 <!-- ##### FUNCTION gconf_value_get_bool ##### -->
 <para>
 Returns a #gboolean for a #GConfValue with type %GCONF_VALUE_BOOL. 
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: a #gboolean value.
 
 
 <!-- ##### FUNCTION gconf_value_get_schema ##### -->
 <para>
 Returns a #GConfSchema for a #GConfValue with type
@@ -239,14 +192,57 @@ with a <symbol>NULL</symbol> schema.
 <para>
 The returned value is not a copy; it is "owned" by the #GConfValue and will
 be destroyed when the #GConfValue is destroyed.
 </para>
 
-@value: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfValue.
+@value: a #GConfValue.
+@Returns: a #GConfSchema.
+
+
+<!-- ##### FUNCTION gconf_value_new ##### -->
+<para>
+Creates a new #GConfValue with type @type. The type is immutable after
+creation; values have a fixed type. You <emphasis>must</emphasis>
+initialize the #GConfValue after creation; that is, you must set its 
+value with one of the "setter" functions.
+</para>
+
+@type: type of the new #GConfValue.
+@Returns: newly-allocated #GConfValue.
+
+
+<!-- ##### FUNCTION gconf_value_new_from_string ##### -->
+<para>
+Creates a new #GConfValue with type @type and value set to the string passed.
+Based on the value of @type, this function does the appropriate conversion of the
+string passed to the @type, does error checks to ensure the value is valid, and
+then calls the appropriate gconf_set function depending on the @type to set the value.
+</para>
+
+@type: type of the new #GConfValue.
+@str: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@err: the value to be set.
+@Returns: the value to be set.
+
+
+<!-- ##### FUNCTION gconf_value_copy ##### -->
+<para>
+Copies a #GConfValue. The copy is a deep copy, that is, any allocated
+memory inside the #GConfValue will also be copied.
+</para>
+
+@src: a #GConfValue to copy.
+@Returns: a newly-allocated #GConfValue identical to @src.
+
+
+<!-- ##### FUNCTION gconf_value_free ##### -->
+<para>
+Deallocates a #GConfValue. Also deallocates any allocated memory
+inside the #GConfValue (such as lists, pair members, strings, and schemas).
+</para>
+
+@value: a #GConfValue to destroy.
 
 
 <!-- ##### FUNCTION gconf_value_set_int ##### -->
 <para>
 Sets the value of a #GConfValue with type %GCONF_VALUE_INT.
@@ -420,82 +416,77 @@ with g_free().
 @mod_user: 
 @mod_time: 
 
 <!-- ##### FUNCTION gconf_meta_info_new ##### -->
 <para>
-
+Creates a new #GConfMetaInfo structure and returns the newly allocated 
+#GConfMetaInfo.
 </para>
 
-@Returns: 
+@Returns: the newly allocated #GConfMetainfo.
 
 
 <!-- ##### FUNCTION gconf_meta_info_free ##### -->
 <para>
-
+Frees the #GConfMetaInfo.
 </para>
 
-@gcmi: 
+@gcmi: the #GConfMetaInfo to be freed.
 
 
 <!-- ##### FUNCTION gconf_meta_info_get_schema ##### -->
 <para>
-
+Returns the schema field of the #GConfMetaInfo.
 </para>
 
-@gcmi: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@gcmi: a #GConfMetaInfo.
+@Returns: the schema field, a char* value.
 
 
 <!-- ##### FUNCTION gconf_meta_info_get_mod_user ##### -->
 <para>
-
+Returns the user owning the daemon that made the last modification of the key.
 </para>
 
-@gcmi: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@gcmi: a #GConfMetaInfo.
+@Returns: mod_user, a char* value.
 
 
 <!-- ##### FUNCTION gconf_meta_info_mod_time ##### -->
 <para>
-
+Returns the last modification time of the key.
 </para>
 
-@gcmi: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@gcmi: a #GConfMetaInfo.
+@Returns: the mod_time, a #GTime value.
 
 
 <!-- ##### FUNCTION gconf_meta_info_set_schema ##### -->
 <para>
-
+Sets the schema_name field of the #GConfMetaInfo to the name passed.
 </para>
 
-@gcmi: 
-@schema_name: 
+@gcmi: a #GConfMetaInfo.
+@schema_name: the name to be set for the schema, a gchar* value.
 
 
 <!-- ##### FUNCTION gconf_meta_info_set_mod_user ##### -->
 <para>
-
+Sets the mod_user field of the #GConfMetaInfo to the user name passed.
 </para>
 
-@gcmi: 
-@mod_user: 
+@gcmi: a #GConfMetaInfo.
+@mod_user: the value to be set, a char*.
 
 
 <!-- ##### FUNCTION gconf_meta_info_set_mod_time ##### -->
 <para>
-
+Sets the mod_last field of the #GConfMetaInfo to the mod_time passed.
 </para>
 
-@gcmi: 
-@mod_time: 
+@gcmi: a #GConfMetaInfo.
+@mod_time: a #GTime.
 
 
 <!-- ##### STRUCT GConfEntry ##### -->
 <para>
 Stores an entry from a GConf "directory," including a key-value pair,
@@ -508,58 +499,117 @@ value, use gconf_entry_get_key() and gco
 </para>
 
 <warning><para>Value can be <symbol>NULL</symbol>, indicating that the
 value is not set.</para></warning>
 
-@key: an absolute key name
-@value: 
+@key: an absolute key name.
+@value: the value.
+
+<!-- ##### FUNCTION gconf_entry_get_key ##### -->
+<para>
+Accesses the @key field of a #GConfEntry. The returned key is not a
+copy, and should not be freed or modified.
+</para>
+
+@entry: a #GConfEntry.
+@Returns: the key , a char*.
+
+
+<!-- ##### FUNCTION gconf_entry_get_value ##### -->
+<para>
+Accesses the @value field of a #GConfEntry. The returned value is not
+a copy, and should not be freed or modified. If you have called
+gconf_entry_steal_value(), the returned value will be
+<symbol>NULL</symbol>.
+</para>
+
+@entry: a #GConfEntry.
+@Returns: a #GConfValue.
+
+
+<!-- ##### FUNCTION gconf_entry_get_schema_name ##### -->
+<para>
+Returns the schema_name field of the #GConfEntry. 
+</para>
+
+@entry: a #GConfEntry.
+@Returns: the schema_name , a char* value.
+
+
+<!-- ##### FUNCTION gconf_entry_get_is_default ##### -->
+<para>
+Returns the is_default field of the #GConfEntry , a gboolean value.
+</para>
+
+@entry: a #GConfEntry.
+@Returns: a #gboolean value.
+
+
+<!-- ##### FUNCTION gconf_entry_get_is_writable ##### -->
+<para>
+Returns the is_writable field of the #GConfEntry, a gboolean value.
+</para>
+
+@entry: a #GConfEntry.
+@Returns: a #gboolean value.
+
+
+<!-- ##### FUNCTION gconf_entry_new ##### -->
+<para>
+Creates a new #GConfEntry with key @key and value @val calling gconf_entry_new_nocopy ().
+</para>
+
+@key: the key name.
+@val: the value.
+@Returns: a new #GConfEntry.
+
 
 <!-- ##### FUNCTION gconf_entry_new_nocopy ##### -->
 <para>
 Creates a new #GConfEntry with key @key and value @val. @key should be a full
 path to the key, starting with '/'. Neither the key nor the value is copied;
 both are freed when the #GConfEntry is freed. The string will be freed with
 g_free() so should be allocated with a GLib function, not malloc().
 </para>
 
-@key: the key name
-@val: the value
-@Returns: a new #GConfentry.
+@key: the key name.
+@val: the value.
+@Returns: a new #GConfEntry.
+
+
+<!-- ##### FUNCTION gconf_entry_copy ##### -->
+<para>
+Copies the fields of an existing #GConfEntry and returns the new #GConfEntry.
+</para>
+
+@src: the #GConfEntry to be copied.
+@Returns: the new #GConfEntry.
 
 
 <!-- ##### FUNCTION gconf_entry_free ##### -->
 <para>
 Destroys a #GConfEntry, freeing the key, the value, and the entry itself.
 </para>
 
 @entry: a #GConfEntry to free.
 
 
-<!-- ##### FUNCTION gconf_entry_get_key ##### -->
+<!-- ##### FUNCTION gconf_entry_ref ##### -->
 <para>
-Accesses the @key field of a #GConfEntry. The returned key is not a
-copy, and should not be freed or modified.
+Increases the refcount of a #GConfEntry by one.
 </para>
 
-@entry: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfEntry.
+@entry: a #GConfEntry.
 
 
-<!-- ##### FUNCTION gconf_entry_get_value ##### -->
+<!-- ##### FUNCTION gconf_entry_unref ##### -->
 <para>
-Accesses the @value field of a #GConfEntry. The returned value is not
-a copy, and should not be freed or modified. If you have called
-gconf_entry_steal_value(), the returned value will be
-<symbol>NULL</symbol>.
+Decreases the refcount of a #GConfEntry by one and  frees the
+#GConfEntry when the refcount becomes zero.
 </para>
 
-@entry: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: a #GConfEntry.
+@entry: a #GConfEntry.
 
 
 <!-- ##### FUNCTION gconf_entry_steal_value ##### -->
 <para>
 Extracts the value from a #GConfEntry, leaving the @value field in
@@ -570,54 +620,53 @@ gconf_entry_steal_value() assumes owners
 
 @entry: a #GConfEntry.
 @Returns: a #GConfValue that the caller must free.
 
 
-<!-- ##### FUNCTION gconf_entry_get_is_default ##### -->
+<!-- ##### FUNCTION gconf_entry_set_value ##### -->
 <para>
-
+Sets the value field of the #GConfEntry to the #GConfValue passed.
 </para>
 
-@entry: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@x: 
+@entry: a #GConfEntry.
+@val: a #GConfValue.
 
 
-<!-- ##### FUNCTION gconf_entry_get_schema_name ##### -->
+<!-- ##### FUNCTION gconf_entry_set_value_nocopy ##### -->
 <para>
-
+Sets the value field to @val after freeing the already existing value.
 </para>
 
-@entry: 
-@Returns: 
+@entry: a #GConfEntry.
+@val: the #GConfValue to be set.
 <!-- # Unused Parameters # -->
-@x: 
+@Returns: 
 
 
-<!-- ##### FUNCTION gconf_entry_set_is_default ##### -->
+<!-- ##### FUNCTION gconf_entry_set_schema_name ##### -->
 <para>
-
+Sets the schema_name field of the #GConfEntry to the name passed after freeing
+the already existing name.
 </para>
 
-@entry: 
-@is_default: 
+@entry: a #GConfEntry.
+@name: the name to be set for the schema, a gchar* value.
 
 
-<!-- ##### FUNCTION gconf_entry_set_schema_name ##### -->
+<!-- ##### FUNCTION gconf_entry_set_is_default ##### -->
 <para>
-
+Sets the is_default field of the #GConfEntry to the boolean value passed.
 </para>
 
-@entry: 
-@name: 
+@entry: a #GConfEntry.
+@is_default: the boolean value to be set.
 
 
-<!-- ##### FUNCTION gconf_entry_set_value_nocopy ##### -->
+<!-- ##### FUNCTION gconf_entry_set_is_writable ##### -->
 <para>
-
+Sets the is_writable field of the #GConfEntry to the boolean value passed.
 </para>
 
-@entry: 
-@val: 
+@entry: a #GConfEntry.
+@is_writable: a boolean value.
 
 
Index: doc/gconf/tmpl/gconf.sgml
===================================================================
RCS file: /export/cvs/head/gconf/doc/gconf/tmpl/gconf.sgml,v
retrieving revision 1.19
diff -p -u -5 -r1.19 gconf.sgml
--- doc/gconf/tmpl/gconf.sgml	25 Jul 2005 16:12:58 -0000	1.19
+++ doc/gconf/tmpl/gconf.sgml	3 Oct 2005 14:10:24 -0000
@@ -134,52 +134,53 @@ default value for a key, if the key is u
 @key: the key to get.
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: newly-allocated #GConfValue, or <symbol>NULL</symbol> if unset and no default exists.
 
 
-<!-- ##### FUNCTION gconf_engine_get_with_locale ##### -->
+<!-- ##### FUNCTION gconf_engine_get_without_default ##### -->
 <para>
-Requests the value appropriate for a particular locale. Right now,
-only values of type %GCONF_VALUE_SCHEMA are localized; the locale is
-meaningless for other value types. Also, gconf_engine_get () automatically
-requests the value in the user's current locale. So this function is
-only useful if you want a schema for some locale other than the user's
-current locale. Except for the additional argument, this function is
-identical to gconf_engine_get () in all respects.
+Identical to gconf_engine_get (), except that it will return <symbol>NULL</symbol> in
+place of the default value if the key is unset. Note that gconf_engine_get () can also
+return <symbol>NULL</symbol> if no default exists or an error occurs.
 </para>
 
 @conf: a #GConfEngine to get the value from.
 @key: the key to get.
-@locale: preferred locale (as in the locale-related environment variables).
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: newly-allocated #GConfValue, or <symbol>NULL</symbol> if unset.
 
 
-<!-- ##### FUNCTION gconf_engine_get_without_default ##### -->
+<!-- ##### FUNCTION gconf_engine_get_entry ##### -->
 <para>
-Identical to gconf_engine_get (), except that it will return <symbol>NULL</symbol> in
-place of the default value if the key is unset. Note that gconf_engine_get () can also
-return <symbol>NULL</symbol> if no default exists or an error occurs.
+Obtain the full #GConfEntry for a value.
 </para>
 
-@conf: a #GConfEngine to get the value from.
+@conf: a #GConfEngine.
 @key: the key to get.
+@locale: preferred locale (as in the locale-related environment variables).
+@use_schema_default: a #gboolean value indicating whether the default value associated with schema
+should be used.
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
-@Returns: newly-allocated #GConfValue, or <symbol>NULL</symbol> if unset.
+@Returns: a #GConfEntry.
 
 
-<!-- ##### FUNCTION gconf_engine_get_entry ##### -->
+<!-- ##### FUNCTION gconf_engine_get_with_locale ##### -->
 <para>
-Obtain the full #GConfEntry for a value.
+Requests the value appropriate for a particular locale. Right now,
+only values of type %GCONF_VALUE_SCHEMA are localized; the locale is
+meaningless for other value types. Also, gconf_engine_get () automatically
+requests the value in the user's current locale. So this function is
+only useful if you want a schema for some locale other than the user's
+current locale. Except for the additional argument, this function is
+identical to gconf_engine_get () in all respects.
 </para>
 
-@conf: 
-@key: 
-@locale: 
-@use_schema_default: 
-@err: 
-@Returns: 
+@conf: a #GConfEngine to get the value from.
+@key: the key to get.
+@locale: preferred locale (as in the locale-related environment variables).
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: newly-allocated #GConfValue, or <symbol>NULL</symbol> if unset.
 
 
 <!-- ##### FUNCTION gconf_engine_get_default_from_schema ##### -->
 <para>
 Returns the default value stored in the key's schema, if the key has a schema
@@ -302,10 +303,34 @@ database. Returns <symbol>TRUE</symbol> 
 @dir: Directory to check for.
 @err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
 @Returns: <symbol>TRUE</symbol> or <symbol>FALSE</symbol>.
 
 
+<!-- ##### FUNCTION gconf_engine_remove_dir ##### -->
+<para>
+This function first checks the validity of the gconf key. In case of a local #GConfEngine it removes
+the directory from the source backend calling gconf_sources_remove_dir (). Otherwise it obtains the
+configuration database using gconf_engine_get_database () and removes the directory from the database
+calling ConfigDatabase_remove_dir ().
+</para>
+
+@conf: a #GConfEngine.
+@dir: the name of the directory to be removed.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+
+
+<!-- ##### FUNCTION gconf_engine_key_is_writable ##### -->
+<para>
+Checks whether the key is writable.
+</para>
+
+@conf: a #GConfEngine.
+@key: the value to be changed.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: <symbol>TRUE</symbol> if the key is writable, <symbol>FALSE</symbol> if the key is read only.
+
+
 <!-- ##### FUNCTION gconf_valid_key ##### -->
 <para>
 Asks whether a key is syntactically correct, that is, it ensures that
 the key consists of slash-separated strings and contains only legal
 characters. Normally you shouldn't need to call this function; the
@@ -334,10 +359,30 @@ it internally so here it is if you need 
 @above: the key on the "left hand side" of the predicate.
 @below: the key on the "right hand side."
 @Returns: <symbol>TRUE</symbol> or <symbol>FALSE</symbol>.
 
 
+<!-- ##### FUNCTION gconf_concat_dir_and_key ##### -->
+<para>
+Concatenates the dir and key passed removing the unnecessary '/' characters
+and returns the new string.
+</para>
+
+@dir: the directory.
+@key: the key.
+@Returns: the newly concatenated string.
+
+
+<!-- ##### FUNCTION gconf_unique_key ##### -->
+<para>
+Generates a new and unique key using serial number, process id, current time and a 
+random number generated.
+</para>
+
+@Returns: a newly created key, a #gchar value.
+
+
 <!-- ##### FUNCTION gconf_engine_get_float ##### -->
 <para>
 Requests the floating point number (%GCONF_VALUE_FLOAT) stored at
 @key. Automatically performs type-checking, so if a non-float is
 stored at @key, an error is returned. On error, or if @key is unset, 
@@ -637,11 +682,13 @@ Change the value of @key to @val. Automa
 @Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> on error.
 
 
 <!-- ##### FUNCTION gconf_engine_set_list ##### -->
 <para>
-
+Change the value of @key to @list of type @list_type. Automatically creates the @key if it didn't exist before 
+(ie it was unset or it only had a default value). If the key already exists but doesn't store a list value 
+(GCONF_VALUE_LIST), gconf_engine_set_list() will fail.
 </para>
 
 @conf: a #GConfEngine.
 @key: key you want to set the value of.
 @list_type: type of each list element.
@@ -650,11 +697,13 @@ Change the value of @key to @val. Automa
 @Returns: <symbol>TRUE</symbol> on success, <symbol>FALSE</symbol> on error.
 
 
 <!-- ##### FUNCTION gconf_engine_set_pair ##### -->
 <para>
-
+Change the value of @key to a pair of first type @car_type and second type @cdr_type . Automatically creates the 
+@key if it didn't exist before (ie it was unset or it only had a default value). If the key already exists 
+but doesn't store a schema value (GCONF_VALUE_SCHEMA), gconf_engine_set_schema() will fail.
 </para>
 
 @conf: a #GConfEngine.
 @key: key you want to set the value of.
 @car_type: type of the pair's first field (car).
@@ -714,5 +763,46 @@ See gconf_string_to_enum() for backgroun
 @lookup_table: a lookup table mapping enum values to strings.
 @enum_value: the enumeration value to convert to a string.
 @Returns: a pointer to the proper string in the lookup table, or <symbol>NULL</symbol> if no match was found.
 
 
+<!-- ##### FUNCTION gconf_clear_cache ##### -->
+<para>
+In case of a local #GConfEngine, this function calls gconf_sources_clear_cache () to clear the
+cache from the source. Otherwise it obtains the configuration database using gconf_engine_get_database ()
+and clears the configuration database cache using ConfigDatabase_clear_cache ().
+</para>
+
+@conf: a #GConfEngine.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+
+
+<!-- ##### FUNCTION gconf_synchronous_sync ##### -->
+<para>
+In case of a local #GConfEngine, this function syncs up all the gconf sources calling
+gconf_synchronous_sync (). Otherwise it obtains the configuration database using
+gconf_engine_get_database () and syncs up the database calling ConfigDatabase_synchronous_sync ().
+</para>
+
+@conf: a #GConfEngine.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+
+
+<!-- ##### FUNCTION gconf_engine_get_full ##### -->
+<para>
+Returns the #GConfValue of a key and the associated #GConfEntry fields depending on the parameters passed.
+</para>
+
+@conf: a #GConfEngine.
+@key: the key whose value is to be obtained.
+@locale: the preferred locale (as in the locale related environment variables) or<symbol>NULL</symbol> if no locale is to be
+passed.
+@use_schema_default: a #gboolean value, indicating whether schema information is to be used as the default
+value.
+@is_default_p: a #gpointer if the is_default field of the #GConfEntry is required, <symbol>NULL</symbol>
+otherwise.
+@is_writable_p: a #gpointer if the is_writable field of the #GConfEntry is required, <symbol>NULL</symbol>
+otherwise.
+@err: the return location for an allocated #GError, or <symbol>NULL</symbol> to ignore errors.
+@Returns: the #GConfValue.
+
+
