Merge pull request #736 from shichao-an/master

Fix typo: SIGCHILD => SIGCHLD

Author: mnaberez

docs/configuration.rst

@@ -765,10 +765,10 @@ where specified.
 
 ``stopwaitsecs``
 
-  The number of seconds to wait for the OS to return a SIGCHILD to
+  The number of seconds to wait for the OS to return a SIGCHLD to
   :program:`supervisord` after the program has been sent a stopsignal.
   If this number of seconds elapses before :program:`supervisord`
-  receives a SIGCHILD from the process, :program:`supervisord` will
+  receives a SIGCHLD from the process, :program:`supervisord` will
   attempt to kill it with a final SIGKILL.
 
   *Default*: 10

supervisor/options.py

@@ -1328,10 +1328,10 @@ def dropPrivileges(self, user):
         os.setuid(uid)
 
     def waitpid(self):
-        # Need pthread_sigmask here to avoid concurrent sigchild, but Python
+        # Need pthread_sigmask here to avoid concurrent sigchld, but Python
         # doesn't offer in Python < 3.4.  There is still a race condition here;
-        # we can get a sigchild while we're sitting in the waitpid call.
-        # However, AFAICT, if waitpid is interrupted bu SIGCHILD, as long as we
+        # we can get a sigchld while we're sitting in the waitpid call.
+        # However, AFAICT, if waitpid is interrupted by SIGCHLD, as long as we
         # call waitpid again (which happens every so often during the normal
         # course in the mainloop), we'll eventually reap the child that we
         # tried to reap during the interrupted call. At least on Linux, this