Merge commit '1678ee'

diff --git a/grab_client.c b/grab_client.c
index ef3f34a76216e3b677e82e435ef5d5f947667891..5b0688fc90aa078632f1e9633c641a28bb5ad9d6 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -140,6 +140,8 @@ static void gc_activate(struct grab_client *gc, struct sched *s)
 /**
  * Activate inactive grab clients if possible.
  *
+ * \param sched Needed to schedule the grab client task.
+ *
  * This is called from audiod.c when the current audio file changes. It loops
  * over all inactive grab clients and checks each grab client's configuration
  * to determine if the client in question wishes to grab the new stream.  If

diff --git a/interactive.c b/interactive.c
index 64ee9202fc56309769609c3869738a3e8fd5ec65..e17a7a106b7e6c813455251082cb59d650d36d1b 100644 (file)
--- a/interactive.c
+++ b/interactive.c
@@ -481,7 +481,7 @@ int i9e_select(int n, fd_set *readfds, fd_set *writefds,
  * This function is independent of readline and may be called before
  * i9e_open().
  *
- * return The number of possible completions.
+ * \return The number of possible completions.
  */
 int i9e_extract_completions(const char *word, char **string_list,
                char ***result)