Improve docs

diff --git a/ChangeLog b/ChangeLog
index 183328675f244778cf07e1dc791e73f286c34579..6f84253861e64d49563e73b03ff733a6ce122e15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-12-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/gspawn.c: Refer to g_child_watch_add() in addition
+       to waitpid().
+
        * glib/gstrfuncs.c (g_strndup, g_strnfill): Move docs
        inline, and improve wording.  (#372598, Behdad Esfahbod)
 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index c0deac4dcf938a826202b496880bceb329095d1b..ace6f865f9ea054cfffc265d5ab63d7ce29d8771 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,8 @@
 2006-12-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * glib/tmpl/spawn.sgml: Refer to g_child_watch_add() in addition
+       to waitpid().
+
        * gobject/tmpl/objects.sgml: Expand GObject::notify
        documentation.  (#381722, Nickolay V. Shmyrev)
 

diff --git a/docs/reference/glib/tmpl/spawn.sgml b/docs/reference/glib/tmpl/spawn.sgml
index 871433696c4b79a88ae22e20d56e73ce53288fb5..a14ba12662cfd6133347ee0cb913d44b84fcda80 100644 (file)
--- a/docs/reference/glib/tmpl/spawn.sgml
+++ b/docs/reference/glib/tmpl/spawn.sgml
@@ -61,8 +61,8 @@ Flags passed to g_spawn_sync(), g_spawn_async() and g_spawn_async_with_pipes().
  inherited by the child; otherwise all descriptors except stdin/stdout/stderr 
  will be closed before calling <function>exec()</function> in the child.
 @G_SPAWN_DO_NOT_REAP_CHILD: the child will not be automatically reaped; you 
-  must call <function>waitpid()</function> or handle <literal>SIGCHLD</literal> 
-  yourself, or the child will become a zombie.
+  must use g_child_watch_add() yourself (or call <function>waitpid()</function> 
+  or handle <literal>SIGCHLD</literal> yourself), or the child will become a zombie. 
 @G_SPAWN_SEARCH_PATH: <literal>argv[0]</literal> need not be an absolute path, 
   it will be looked for in the user's <envar>PATH</envar>.
 @G_SPAWN_STDOUT_TO_DEV_NULL: the child's standad output will be discarded, 

diff --git a/glib/gspawn.c b/glib/gspawn.c
index ea183a596be97328318be6557fe325832b35ec07..2cd8cc17723181e64fc201c0f7bc1ffeef6c29e2 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -529,7 +529,7 @@ g_spawn_sync (const gchar          *working_directory,
  *
  * If non-%NULL, @child_pid will on Unix be filled with the child's
  * process ID. You can use the process ID to send signals to the
- * child, or to waitpid() if you specified the
+ * child, or to use g_child_watch_add() (or waitpid()) if you specified the
  * %G_SPAWN_DO_NOT_REAP_CHILD flag. On Windows, @child_pid will be
  * filled with a handle to the child process only if you specified the
  * %G_SPAWN_DO_NOT_REAP_CHILD flag. You can then access the child