Merge commit 'b83c9704128dd106071184e4b00335a3b8486857' into merge

1 files changed, 39 insertions, 0 deletions

diff --git a/procps/kill.c b/procps/kill.c
index 599152250..fa79ce2e7 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -8,6 +8,45 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
+//usage:#define kill_trivial_usage
+//usage:       "[-l] [-SIG] PID..."
+//usage:#define kill_full_usage "\n\n"
+//usage:       "Send a signal (default: TERM) to given PIDs\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -l      List all signal names and numbers"
+/* //usage:  "\n        -s SIG  Yet another way of specifying SIG" */
+//usage:
+//usage:#define kill_example_usage
+//usage:       "$ ps | grep apache\n"
+//usage:       "252 root     root     S [apache]\n"
+//usage:       "263 www-data www-data S [apache]\n"
+//usage:       "264 www-data www-data S [apache]\n"
+//usage:       "265 www-data www-data S [apache]\n"
+//usage:       "266 www-data www-data S [apache]\n"
+//usage:       "267 www-data www-data S [apache]\n"
+//usage:       "$ kill 252\n"
+//usage:
+//usage:#define killall_trivial_usage
+//usage:       "[-l] [-q] [-SIG] PROCESS_NAME..."
+//usage:#define killall_full_usage "\n\n"
+//usage:       "Send a signal (default: TERM) to given processes\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -l      List all signal names and numbers"
+/* //usage:  "\n        -s SIG  Yet another way of specifying SIG" */
+//usage:     "\n        -q      Don't complain if no processes were killed"
+//usage:
+//usage:#define killall_example_usage
+//usage:       "$ killall apache\n"
+//usage:
+//usage:#define killall5_trivial_usage
+//usage:       "[-l] [-SIG] [-o PID]..."
+//usage:#define killall5_full_usage "\n\n"
+//usage:       "Send a signal (default: TERM) to all processes outside current session\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -l      List all signal names and numbers"
+//usage:     "\n        -o PID  Don't signal this PID"
+/* //usage:  "\n        -s SIG  Yet another way of specifying SIG" */
+
 #include "libbb.h"
 
 /* Note: kill_main is directly called from shell in order to implement