12 files changed, 9 insertions, 23 deletions

diff --git a/procps/fuser.c b/procps/fuser.c
index 8d63a7313..05b52abb1 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -11,7 +11,6 @@
 //usage:       "[OPTIONS] FILE or PORT/PROTO"
 //usage:#define fuser_full_usage "\n\n"
 //usage:       "Find processes which use FILEs or PORTs\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -m      Find processes which use same fs as FILEs"
 //usage:     "\n        -4,-6   Search only IPv4/IPv6 space"
 //usage:     "\n        -s      Don't display PIDs"
diff --git a/procps/iostat.c b/procps/iostat.c
index 51c5fac08..978d23430 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -393,7 +393,6 @@ static void dev_report(cputime_t itv)
 //usage:       "[-c] [-d] [-t] [-z] [-k|-m] [ALL|BLOCKDEV...] [INTERVAL [COUNT]]"
 //usage:#define iostat_full_usage "\n\n"
 //usage:       "Report CPU and I/O statistics\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -c      Show CPU utilization"
 //usage:     "\n        -d      Show device utilization"
 //usage:     "\n        -t      Print current time"
diff --git a/procps/kill.c b/procps/kill.c
index 6776d9546..224e5ad1a 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -12,7 +12,6 @@
 //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:
@@ -30,7 +29,6 @@
 //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"
@@ -42,7 +40,6 @@
 //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" */
diff --git a/procps/mpstat.c b/procps/mpstat.c
index da8f34dab..aa5a5c73f 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -844,7 +844,6 @@ static int get_irqcpu_nr(const char *f, int max_irqs)
 //usage:       "[-A] [-I SUM|CPU|ALL|SCPU] [-u] [-P num|ALL] [INTERVAL [COUNT]]"
 //usage:#define mpstat_full_usage "\n\n"
 //usage:       "Per-processor statistics\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -A                      Same as -I ALL -u -P ALL"
 //usage:     "\n        -I SUM|CPU|ALL|SCPU     Report interrupt statistics"
 //usage:     "\n        -P num|ALL              Processor to monitor"
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 902a3a75e..156b4ad69 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -11,7 +11,6 @@
 //usage:       "[-flnovx] [-s SID|-P PPID|PATTERN]"
 //usage:#define pgrep_full_usage "\n\n"
 //usage:       "Display process(es) selected by regex PATTERN\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      Show command name too"
 //usage:     "\n        -f      Match against entire command line"
 //usage:     "\n        -n      Show the newest process only"
@@ -25,7 +24,6 @@
 //usage:       "[-l|-SIGNAL] [-fnovx] [-s SID|-P PPID|PATTERN]"
 //usage:#define pkill_full_usage "\n\n"
 //usage:       "Send a signal to process(es) selected by regex PATTERN\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -l      List all signals"
 //usage:     "\n        -f      Match against entire command line"
 //usage:     "\n        -n      Signal the newest process only"
diff --git a/procps/pidof.c b/procps/pidof.c
index e102a31c6..6d7b59109 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -10,7 +10,7 @@
 //usage:#if (ENABLE_FEATURE_PIDOF_SINGLE || ENABLE_FEATURE_PIDOF_OMIT)
 //usage:#define pidof_trivial_usage
 //usage:       "[OPTIONS] [NAME]..."
-//usage:#define USAGE_PIDOF "\n\nOptions:"
+//usage:#define USAGE_PIDOF "\n"
 //usage:#else
 //usage:#define pidof_trivial_usage
 //usage:       "[NAME]..."
diff --git a/procps/pmap.c b/procps/pmap.c
index 7f7f391b9..fd995a54d 100644
--- a/procps/pmap.c
+++ b/procps/pmap.c
@@ -8,22 +8,22 @@
  * for details.
  */
 
-//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
-//kbuild:lib-$(CONFIG_PMAP)     += pmap.o
-
 //config:config PMAP
 //config:       bool "pmap"
 //config:       default y
 //config:       help
 //config:         Display processes' memory mappings.
 
+//applet:IF_PMAP(APPLET(pmap, BB_DIR_USR_BIN, BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_PMAP) += pmap.o
+
 //usage:#define pmap_trivial_usage
-//usage:       "[-x][-q] PID"
+//usage:       "[-xq] PID"
 //usage:#define pmap_full_usage "\n\n"
-//usage:       "Display detailed precesses' memory usage\n"
-//usage:       "\nOptions:"
-//usage:       "\n     -x              show details"
-//usage:       "\n     -q              quiet"
+//usage:       "Display detailed process memory usage"
+//usage:     "\n"
+//usage:     "\n        -x      Show details"
+//usage:     "\n        -q      Quiet"
 
 #include "libbb.h"
 
diff --git a/procps/ps.c b/procps/ps.c
index 7f273d0a6..213695f16 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -15,7 +15,6 @@
 //usage:       "[-o COL1,COL2=HEADER]" IF_FEATURE_SHOW_THREADS(" [-T]")
 //usage:#define ps_full_usage "\n\n"
 //usage:       "Show list of processes\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -o COL1,COL2=HEADER     Select columns for display"
 //usage:        IF_FEATURE_SHOW_THREADS(
 //usage:     "\n        -T                      Show threads"
@@ -26,7 +25,6 @@
 //usage:#if !ENABLE_SELINUX && !ENABLE_FEATURE_PS_WIDE
 //usage:#define USAGE_PS "\nThis version of ps accepts no options"
 //usage:#else
-//usage:#define USAGE_PS "\nOptions:"
 //usage:#endif
 //usage:
 //usage:#define ps_trivial_usage
diff --git a/procps/pstree.c b/procps/pstree.c
index 16649cfaa..8ba30795d 100644
--- a/procps/pstree.c
+++ b/procps/pstree.c
@@ -24,7 +24,6 @@
 //usage:        "[-p] [PID|USER]"
 //usage:#define pstree_full_usage "\n\n"
 //usage:       "Display process tree, optionally start from USER or PID\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -p      Show pids"
 
 #include "libbb.h"
diff --git a/procps/renice.c b/procps/renice.c
index 067c8f75a..77f400a1d 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -23,7 +23,6 @@
 //usage:       "{{-n INCREMENT} | PRIORITY} [[-p | -g | -u] ID...]"
 //usage:#define renice_full_usage "\n\n"
 //usage:       "Change scheduling priority for a running process\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Adjust current nice value (smaller is faster)"
 //usage:     "\n        -p      Process id(s) (default)"
 //usage:     "\n        -g      Process group id(s)"
diff --git a/procps/sysctl.c b/procps/sysctl.c
index f36548f87..cb3b6a25a 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -15,7 +15,6 @@
 //usage:       "[OPTIONS] [VALUE]..."
 //usage:#define sysctl_full_usage "\n\n"
 //usage:       "Configure kernel parameters at runtime\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Don't print key names"
 //usage:     "\n        -e      Don't warn about unknown keys"
 //usage:     "\n        -w      Change sysctl setting"
diff --git a/procps/watch.c b/procps/watch.c
index e289bf8cb..36af1cca7 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -15,7 +15,6 @@
 //usage:       "[-n SEC] [-t] PROG ARGS"
 //usage:#define watch_full_usage "\n\n"
 //usage:       "Run PROG periodically\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -n      Loop period in seconds (default 2)"
 //usage:     "\n        -t      Don't print header"
 //usage: