Merge branch 'busybox' into merge

2 files changed, 8 insertions, 9 deletions

diff --git a/init/halt.c b/init/halt.c
index b7fb10869..f69b89772 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -46,8 +46,9 @@
 //config:         locating telinit executable.
 
 //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP))
+//                   APPLET_ODDNAME:name      main  location     suid_type     help
 //applet:IF_POWEROFF(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff))
-//applet:IF_REBOOT(APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot))
+//applet:IF_REBOOT(  APPLET_ODDNAME(reboot,   halt, BB_DIR_SBIN, BB_SUID_DROP, reboot))
 
 //kbuild:lib-$(CONFIG_HALT) += halt.o
 //kbuild:lib-$(CONFIG_POWEROFF) += halt.o
diff --git a/init/init.c b/init/init.c
index 08cfa2f8c..833759341 100644
--- a/init/init.c
+++ b/init/init.c
@@ -17,7 +17,7 @@
 //config:         init is the first program run when the system boots.
 //config:
 //config:config LINUXRC
-//config:       bool "Support running init from within an initrd (not initramfs)"
+//config:       bool "linuxrc: support running init from initrd (not initramfs)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
@@ -74,12 +74,10 @@
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:
-//config:config FEATURE_EXTRA_QUIET
-//config:       bool "Be _extra_ quiet on boot"
+//config:config FEATURE_INIT_QUIET
+//config:       bool "Be quiet on boot (no 'init started:' message)"
 //config:       default y
 //config:       depends on INIT || LINUXRC
-//config:       help
-//config:         Prevent init from logging some messages to the console during boot.
 //config:
 //config:config FEATURE_INIT_COREDUMPS
 //config:       bool "Support dumping core for child processes (debugging only)"
@@ -104,13 +102,13 @@
 //config:         sets TERM to "vt102" if one is found.
 //config:
 //config:config FEATURE_INIT_MODIFY_CMDLINE
-//config:       bool "Modify the command-line to \"init\""
+//config:       bool "Clear init's command line"
 //config:       default y
 //config:       depends on INIT || LINUXRC
 //config:       help
 //config:         When launched as PID 1 and after parsing its arguments, init
 //config:         wipes all the arguments but argv[0] and rewrites argv[0] to
-//config:         contain only "init", so that its command-line appears solely as
+//config:         contain only "init", so that its command line appears solely as
 //config:         "init" in tools such as ps.
 //config:         If this option is set to Y, init will keep its original behavior,
 //config:         otherwise, all the arguments including argv[0] will be preserved,
@@ -1098,7 +1096,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
         if (argv[1])
                 xsetenv("RUNLEVEL", argv[1]);
 
-#if !ENABLE_FEATURE_EXTRA_QUIET
+#if !ENABLE_FEATURE_INIT_QUIET
         /* Hello world */
         message(L_CONSOLE | L_LOG, "init started: %s", bb_banner);
 #endif