From b49ae1646197e90d273d3ffd5d884d93109c2df7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 31 Oct 2010 22:41:00 -0400
Subject: [PATCH] Various documentation fixes

---
 docs/reference/gio/gio-sections.txt | 10 +++++-----
 gio/gactiongroup.c                  | 12 ++++++------
 gio/gappinfo.c                      | 10 +++++-----
 gio/gapplicationcommandline.c       |  1 +
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index bdd683df5..04daff768 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -1152,6 +1152,7 @@ GSimpleAsyncThreadFunc
 g_simple_async_result_new
 g_simple_async_result_new_error
 g_simple_async_result_new_from_error
+g_simple_async_result_new_take_error
 g_simple_async_result_set_op_res_gpointer
 g_simple_async_result_get_op_res_gpointer
 g_simple_async_result_set_op_res_gssize
@@ -1165,6 +1166,7 @@ g_simple_async_result_complete
 g_simple_async_result_complete_in_idle
 g_simple_async_result_run_in_thread
 g_simple_async_result_set_from_error
+g_simple_async_result_take_error
 g_simple_async_result_propagate_error
 g_simple_async_result_set_error
 g_simple_async_result_set_error_va
@@ -2767,6 +2769,7 @@ G_ACTION_GROUP
 <TITLE>GAction</TITLE>
 GAction
 
+
 <SUBSECTION>
 g_action_get_name
 g_action_get_parameter_type
@@ -2826,9 +2829,6 @@ g_simple_action_group_lookup
 g_simple_action_group_insert
 g_simple_action_group_remove
 
-<SUBSECTION>
-g_simple_action_group_set_enabled
-
 <SUBSECTION Standard>
 GSimpleActionGroupClass
 GSimpleActionGroupPrivate
@@ -2845,7 +2845,7 @@ G_SIMPLE_ACTION_GROUP
 <FILE>gproxyresolver</FILE>
 <TITLE>GProxyResolver</TITLE>
 GProxyResolver
-GProxyResolverIface
+GProxyResolverInterface
 G_PROXY_RESOLVER_EXTENSION_POINT_NAME
 g_proxy_resolver_get_default
 g_proxy_resolver_is_supported
@@ -2888,7 +2888,7 @@ g_proxy_address_get_type
 <FILE>gproxy</FILE>
 <TITLE>GProxy</TITLE>
 GProxy
-GProxyIface
+GProxyInterface
 G_PROXY_EXTENSION_POINT_NAME
 g_proxy_connect
 g_proxy_connect_async
diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c
index f989e985b..5efb2096c 100644
--- a/gio/gactiongroup.c
+++ b/gio/gactiongroup.c
@@ -196,7 +196,7 @@ g_action_group_has_action (GActionGroup *action_group,
 }
 
 /**
- * g_action_group_get_parameter_type:
+ * g_action_group_get_action_parameter_type:
  * @action_group: a #GActionGroup
  * @action_name: the name of the action to query
  *
@@ -229,7 +229,7 @@ g_action_group_get_action_parameter_type (GActionGroup *action_group,
 }
 
 /**
- * g_action_group_get_state_type:
+ * g_action_group_get_action_state_type:
  * @action_group: a #GActionGroup
  * @action_name: the name of the action to query
  *
@@ -264,7 +264,7 @@ g_action_group_get_action_state_type (GActionGroup *action_group,
 }
 
 /**
- * g_action_group_get_state_hint:
+ * g_action_group_get_action_state_hint:
  * @action_group: a #GActionGroup
  * @action_name: the name of the action to query
  *
@@ -302,7 +302,7 @@ g_action_group_get_action_state_hint (GActionGroup *action_group,
 }
 
 /**
- * g_action_group_get_enabled:
+ * g_action_group_get_action_enabled:
  * @action_group: a #GActionGroup
  * @action_name: the name of the action to query
  *
@@ -326,7 +326,7 @@ g_action_group_get_action_enabled (GActionGroup *action_group,
 }
 
 /**
- * g_action_group_get_state:
+ * g_action_group_get_action_state:
  * @action_group: a #GActionGroup
  * @action_name: the name of the action to query
  *
@@ -354,7 +354,7 @@ g_action_group_get_action_state (GActionGroup *action_group,
 }
 
 /**
- * g_action_group_set_state:
+ * g_action_group_change_action_state:
  * @action_group: a #GActionGroup
  * @action_name: the name of the action to request the change on
  * @value: the new state
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 2902f4a53..941ba2514 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -476,13 +476,13 @@ g_app_info_get_icon (GAppInfo *appinfo)
  * a textual uri you want to pass in as argument, consider using
  * g_app_info_launch_uris() instead.
  *
- * On UNIX, this function sets the <envvar>GIO_LAUNCHED_DESKTOP_FILE</envvar>
+ * On UNIX, this function sets the <envar>GIO_LAUNCHED_DESKTOP_FILE</envar>
  * environment variable with the path of the launched desktop file and
- * <envvar>GIO_LAUNCHED_DESKTOP_FILE_PID</envvar> to the process
+ * <envar>GIO_LAUNCHED_DESKTOP_FILE_PID</envar> to the process
  * id of the launched process. This can be used to ignore
- * <envvar>GIO_LAUNCHED_DESKTOP_FILE</envvar>, should it be inherited
- * by further processes. The <envvar>DISPLAY</envvar> and
- * <envvar>DESKTOP_STARTUP_ID</envvar> environment variables are also
+ * <envar>GIO_LAUNCHED_DESKTOP_FILE</envar>, should it be inherited
+ * by further processes. The <envar>DISPLAY</envar> and
+ * <envar>DESKTOP_STARTUP_ID</envar> environment variables are also
  * set, based on information provided in @launch_context.
  *
  * Returns: %TRUE on successful launch, %FALSE otherwise.
diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c
index 2cb0691f9..5931f57d7 100644
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.c
@@ -335,6 +335,7 @@ g_application_command_line_get_environ (GApplicationCommandLine *cmdline)
 /**
  * g_application_command_line_getenv:
  * @cmdline: a #GApplicationCommandLine
+ * @name: the environment variable to get
  *
  * Gets the value of a particular environment variable of the command
  * line invocation, as would be returned by g_getenv().  The strings may