aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 14:58:54 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 14:58:54 +0100
commitf560422fa079b07a761a572ca4f9cf287c2cc47e (patch)
tree6962fe92683c37e561363eed6da8b60c09842196 /procps
parentf10f7a21d40d5ce0846414973e88602a59d4580e (diff)
downloadbusybox-w32-f560422fa079b07a761a572ca4f9cf287c2cc47e.tar.gz
busybox-w32-f560422fa079b07a761a572ca4f9cf287c2cc47e.tar.bz2
busybox-w32-f560422fa079b07a761a572ca4f9cf287c2cc47e.zip
Big cleanup in config help and description
Redundant help texts (one which only repeats the description) are deleted. Descriptions and help texts are trimmed. Some config options are moved, even across menus. No config option _names_ are changed. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'procps')
-rw-r--r--procps/Config.src2
-rw-r--r--procps/pidof.c8
-rw-r--r--procps/ps.c16
-rw-r--r--procps/uptime.c4
4 files changed, 13 insertions, 17 deletions
diff --git a/procps/Config.src b/procps/Config.src
index eb4760752..35fef2eda 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -8,7 +8,7 @@ menu "Process Utilities"
8INSERT 8INSERT
9 9
10config FEATURE_SHOW_THREADS 10config FEATURE_SHOW_THREADS
11 bool "Support for showing threads in ps/pstree/top" 11 bool "Support thread display in ps/pstree/top"
12 default y 12 default y
13 depends on PS || TOP || PSTREE 13 depends on PS || TOP || PSTREE
14 help 14 help
diff --git a/procps/pidof.c b/procps/pidof.c
index 069adb7a4..b64f0cbd6 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -14,18 +14,18 @@
14//config: those id's on the standard output. 14//config: those id's on the standard output.
15//config: 15//config:
16//config:config FEATURE_PIDOF_SINGLE 16//config:config FEATURE_PIDOF_SINGLE
17//config: bool "Enable argument for single shot (-s)" 17//config: bool "Enable single shot (-s)"
18//config: default y 18//config: default y
19//config: depends on PIDOF 19//config: depends on PIDOF
20//config: help 20//config: help
21//config: Support argument '-s' for returning only the first pid found. 21//config: Support '-s' for returning only the first pid found.
22//config: 22//config:
23//config:config FEATURE_PIDOF_OMIT 23//config:config FEATURE_PIDOF_OMIT
24//config: bool "Enable argument for omitting pids (-o)" 24//config: bool "Enable omitting pids (-o PID)"
25//config: default y 25//config: default y
26//config: depends on PIDOF 26//config: depends on PIDOF
27//config: help 27//config: help
28//config: Support argument '-o' for omitting the given pids in output. 28//config: Support '-o PID' for omitting the given pid(s) in output.
29//config: The special pid %PPID can be used to name the parent process 29//config: The special pid %PPID can be used to name the parent process
30//config: of the pidof, in other words the calling shell or shell script. 30//config: of the pidof, in other words the calling shell or shell script.
31 31
diff --git a/procps/ps.c b/procps/ps.c
index e291ecd7e..1d380590d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -32,19 +32,10 @@
32//config: Adds fields PPID, RSS, START, TIME & TTY 32//config: Adds fields PPID, RSS, START, TIME & TTY
33//config: 33//config:
34//config:config FEATURE_PS_TIME 34//config:config FEATURE_PS_TIME
35//config: bool "Enable time and elapsed time output" 35//config: bool "Support -o time and -o etime output specifiers"
36//config: default y 36//config: default y
37//config: depends on PS && DESKTOP 37//config: depends on PS && DESKTOP
38//config: select PLATFORM_LINUX 38//config: select PLATFORM_LINUX
39//config: help
40//config: Support -o time and -o etime output specifiers.
41//config:
42//config:config FEATURE_PS_ADDITIONAL_COLUMNS
43//config: bool "Enable additional ps columns"
44//config: default y
45//config: depends on PS && DESKTOP
46//config: help
47//config: Support -o rgroup, -o ruser, -o nice output specifiers.
48//config: 39//config:
49//config:config FEATURE_PS_UNUSUAL_SYSTEMS 40//config:config FEATURE_PS_UNUSUAL_SYSTEMS
50//config: bool "Support Linux prior to 2.4.0 and non-ELF systems" 41//config: bool "Support Linux prior to 2.4.0 and non-ELF systems"
@@ -53,6 +44,11 @@
53//config: help 44//config: help
54//config: Include support for measuring HZ on old kernels and non-ELF systems 45//config: Include support for measuring HZ on old kernels and non-ELF systems
55//config: (if you are on Linux 2.4.0+ and use ELF, you don't need this) 46//config: (if you are on Linux 2.4.0+ and use ELF, you don't need this)
47//config:
48//config:config FEATURE_PS_ADDITIONAL_COLUMNS
49//config: bool "Support -o rgroup, -o ruser, -o nice specifiers"
50//config: default y
51//config: depends on PS && DESKTOP
56 52
57//applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP)) 53//applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))
58 54
diff --git a/procps/uptime.c b/procps/uptime.c
index 436193925..8e8956c0f 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -21,11 +21,11 @@
21//config: on, and the system load averages for the past 1, 5, and 15 minutes. 21//config: on, and the system load averages for the past 1, 5, and 15 minutes.
22//config: 22//config:
23//config:config FEATURE_UPTIME_UTMP_SUPPORT 23//config:config FEATURE_UPTIME_UTMP_SUPPORT
24//config: bool "Support for showing the number of users" 24//config: bool "Show the number of users"
25//config: default y 25//config: default y
26//config: depends on UPTIME && FEATURE_UTMP 26//config: depends on UPTIME && FEATURE_UTMP
27//config: help 27//config: help
28//config: Makes uptime display the number of users currently logged on. 28//config: Display the number of users currently logged on.
29 29
30//applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP)) 30//applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))
31 31