Merge branch 'busybox' into merge

4 files changed, 23 insertions, 23 deletions

diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index 21d330b59..e6b7601fa 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -7,10 +7,10 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config PIPE_PROGRESS
-//config:       bool "pipe_progress"
+//config:       bool "pipe_progress (225 bytes)"
 //config:       default y
 //config:       help
-//config:         Display a dot to indicate pipe activity.
+//config:       Display a dot to indicate pipe activity.
 
 //applet:IF_PIPE_PROGRESS(APPLET(pipe_progress, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 3ef28f1d4..c6a90a486 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -23,19 +23,19 @@
  * broken compatibility because the BusyBox policy doesn't allow them.
  */
 //config:config RUN_PARTS
-//config:       bool "run-parts"
+//config:       bool "run-parts (5.6 kb)"
 //config:       default y
 //config:       help
-//config:         run-parts is a utility designed to run all the scripts in a directory.
+//config:       run-parts is a utility designed to run all the scripts in a directory.
 //config:
-//config:         It is useful to set up a directory like cron.daily, where you need to
-//config:         execute all the scripts in that directory.
+//config:       It is useful to set up a directory like cron.daily, where you need to
+//config:       execute all the scripts in that directory.
 //config:
-//config:         In this implementation of run-parts some features (such as report
-//config:         mode) are not implemented.
+//config:       In this implementation of run-parts some features (such as report
+//config:       mode) are not implemented.
 //config:
-//config:         Unless you know that run-parts is used in some of your scripts
-//config:         you can safely say N here.
+//config:       Unless you know that run-parts is used in some of your scripts
+//config:       you can safely say N here.
 //config:
 //config:config FEATURE_RUN_PARTS_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -47,9 +47,9 @@
 //config:       default y
 //config:       depends on RUN_PARTS
 //config:       help
-//config:         Support additional options:
-//config:         -l --list print the names of the all matching files (not
-//config:                   limited to executables), but don't actually run them.
+//config:       Support additional options:
+//config:       -l --list print the names of the all matching files (not
+//config:       limited to executables), but don't actually run them.
 
 //applet:IF_RUN_PARTS(APPLET_ODDNAME(run-parts, run_parts, BB_DIR_BIN, BB_SUID_DROP, run_parts))
 
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 4a9e0653e..9d60b2c7f 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -57,12 +57,12 @@ Misc options:
         -v,--verbose            Verbose
 */
 //config:config START_STOP_DAEMON
-//config:       bool "start-stop-daemon"
+//config:       bool "start-stop-daemon (12 kb)"
 //config:       default y
 //config:       help
-//config:         start-stop-daemon is used to control the creation and
-//config:         termination of system-level processes, usually the ones
-//config:         started during the startup of the system.
+//config:       start-stop-daemon is used to control the creation and
+//config:       termination of system-level processes, usually the ones
+//config:       started during the startup of the system.
 //config:
 //config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
 //config:       bool "Enable long options"
@@ -74,9 +74,9 @@ Misc options:
 //config:       default y
 //config:       depends on START_STOP_DAEMON
 //config:       help
-//config:         -o|--oknodo ignored since we exit with 0 anyway
-//config:         -v|--verbose
-//config:         -N|--nicelevel N
+//config:       -o|--oknodo ignored since we exit with 0 anyway
+//config:       -v|--verbose
+//config:       -N|--nicelevel N
 
 //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))
 
diff --git a/debianutils/which.c b/debianutils/which.c
index af33ba72e..491557167 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -6,11 +6,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WHICH
-//config:       bool "which"
+//config:       bool "which (3.7 kb)"
 //config:       default y
 //config:       help
-//config:         which is used to find programs in your PATH and
-//config:         print out their pathnames.
+//config:       which is used to find programs in your PATH and
+//config:       print out their pathnames.
 
 //applet:IF_WHICH(APPLET(which, BB_DIR_USR_BIN, BB_SUID_DROP))