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>

6 files changed, 11 insertions, 16 deletions

diff --git a/loginutils/Config.src b/loginutils/Config.src
index efb954b6c..beb4eb855 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -6,7 +6,7 @@
 menu "Login/Password Management Utilities"
 
 config FEATURE_SHADOWPASSWDS
-        bool "Support for shadow passwords"
+        bool "Support shadow passwords"
         default y
         help
           Build support for shadow password in /etc/shadow. This file is only
diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 6b2fd7ba9..94da4efbb 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -19,15 +19,13 @@
 //config:       bool "Enable long options"
 //config:       default y
 //config:       depends on ADDGROUP && LONG_OPTS
-//config:       help
-//config:         Support long options for the addgroup applet.
 //config:
 //config:config FEATURE_ADDUSER_TO_GROUP
-//config:       bool "Support for adding users to groups"
+//config:       bool "Support adding users to groups"
 //config:       default y
 //config:       depends on ADDGROUP
 //config:       help
-//config:         If  called  with two non-option arguments,
+//config:         If called with two non-option arguments,
 //config:         addgroup will add an existing user to an
 //config:         existing group.
 
diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 608fb8437..c218ac4aa 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -17,8 +17,6 @@
 //config:       bool "Enable long options"
 //config:       default y
 //config:       depends on ADDUSER && LONG_OPTS
-//config:       help
-//config:         Support long options for the adduser applet.
 //config:
 //config:config FEATURE_CHECK_NAMES
 //config:       bool "Enable sanity check on user/group names in adduser and addgroup"
diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 7c3caf9e3..fbb1614fb 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -21,7 +21,7 @@
 //config:         Utility for deleting a group account.
 //config:
 //config:config FEATURE_DEL_USER_FROM_GROUP
-//config:       bool "Support for removing users from groups"
+//config:       bool "Support removing users from groups"
 //config:       default y
 //config:       depends on DELGROUP
 //config:       help
diff --git a/loginutils/login.c b/loginutils/login.c
index 3ca8213bb..d1757a65d 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -24,7 +24,7 @@
 //config:         will not be cleaned up.
 //config:
 //config:config LOGIN_SCRIPTS
-//config:       bool "Support for login scripts"
+//config:       bool "Support login scripts"
 //config:       depends on LOGIN
 //config:       default y
 //config:       help
@@ -32,7 +32,7 @@
 //config:         just prior to switching from root to logged-in user.
 //config:
 //config:config FEATURE_NOLOGIN
-//config:       bool "Support for /etc/nologin"
+//config:       bool "Support /etc/nologin"
 //config:       default y
 //config:       depends on LOGIN
 //config:       help
@@ -40,7 +40,7 @@
 //config:         If it exists, non-root logins are prohibited.
 //config:
 //config:config FEATURE_SECURETTY
-//config:       bool "Support for /etc/securetty"
+//config:       bool "Support /etc/securetty"
 //config:       default y
 //config:       depends on LOGIN
 //config:       help
diff --git a/loginutils/su.c b/loginutils/su.c
index 24ffbde86..d04b85fb1 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -11,19 +11,18 @@
 //config:       help
 //config:         su is used to become another user during a login session.
 //config:         Invoked without a username, su defaults to becoming the super user.
-//config:
-//config:         Note that Busybox binary must be setuid root for this applet to
+//config:         Note that busybox binary must be setuid root for this applet to
 //config:         work properly.
 //config:
 //config:config FEATURE_SU_SYSLOG
-//config:       bool "Enable su to write to syslog"
+//config:       bool "Log to syslog all attempts to use su"
 //config:       default y
 //config:       depends on SU
 //config:
 //config:config FEATURE_SU_CHECKS_SHELLS
-//config:       bool "Enable su to check user's shell to be listed in /etc/shells"
-//config:       depends on SU
+//config:       bool "If user's shell is not in /etc/shells, disallow -s PROG"
 //config:       default y
+//config:       depends on SU
 
 //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
 //applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))