TODO updates, indentation, comment fixes

4 files changed, 5 insertions, 5 deletions

diff --git a/doc/gconf/gconf-decl.txt b/doc/gconf/gconf-decl.txt
index 8ea8a98c..79eb7f12 100644
--- a/doc/gconf/gconf-decl.txt
+++ b/doc/gconf/gconf-decl.txt
@@ -1682,7 +1682,7 @@ GConfEngine     *conf,const gchar     *key,GError     **err
 GConfEngine     *conf,const gchar     *key,GError     **err
 </FUNCTION>
 <FUNCTION>
-<NAME>gconf_get_string</NAME>
+<NAME>gconf_engine_get_string</NAME>
 <RETURNS>gchar *</RETURNS>
 GConfEngine     *conf,const gchar     *key,GError     **err
 </FUNCTION>
diff --git a/doc/gconf/gconf-sections.txt b/doc/gconf/gconf-sections.txt
index b6c7e3f9..a282043c 100644
--- a/doc/gconf/gconf-sections.txt
+++ b/doc/gconf/gconf-sections.txt
@@ -270,7 +270,7 @@ gconf_valid_key
 gconf_key_is_below
 gconf_engine_get_float
 gconf_engine_get_int
-gconf_get_string
+gconf_engine_get_string
 gconf_engine_get_bool
 gconf_engine_get_schema
 gconf_engine_get_list
diff --git a/doc/gconf/tmpl/gconf.sgml b/doc/gconf/tmpl/gconf.sgml
index 40d88fce..87128bb6 100644
--- a/doc/gconf/tmpl/gconf.sgml
+++ b/doc/gconf/tmpl/gconf.sgml
@@ -181,7 +181,7 @@ This function is basically for internal use.
 <para>
 Returns the default value stored in the key's schema, if the key has a schema
 associated and the schema exists and the schema contains a default value.  Note
-that gconf_engine_get (), gconf_get_string(), and so on already return the default value
+that gconf_engine_get (), gconf_engine_get_string(), and so on already return the default value
 if no other value is found, so normally you do not need this function. This
 function is just for convenience; you could also get the #GConfMetaInfo for the
 key, read the schema name from there, then look up the schema by name and
@@ -362,7 +362,7 @@ stored at @key, an error is returned. On error, or if @key is unset,
 @Returns: the value of @key, or 0 if no value is obtained.
 
 
-<!-- ##### FUNCTION gconf_get_string ##### -->
+<!-- ##### FUNCTION gconf_engine_get_string ##### -->
 <para>
 Requests the string (%GCONF_VALUE_STRING) stored at
 @key. Automatically performs type-checking, so if a non-string is
diff --git a/doc/intro-article.sgml b/doc/intro-article.sgml
index 39c243a3..08f39f9e 100644
--- a/doc/intro-article.sgml
+++ b/doc/intro-article.sgml
@@ -511,7 +511,7 @@
           arguments and returns a
           <structname>GConfValue</structname>. There are also
           convenience wrappers such as
-          <function>gconf_get_string()</function> and
+          <function>gconf_engine_get_string()</function> and
           <function>gconf_engine_get_int()</function> that allow you to avoid
           the pesky <structname>GConfValue</structname> union.
         </para>