[git commit master 1/1] halt/poweroff/reboot: unify help text

Denys Vlasenko vda.linux at googlemail.com
Thu Sep 30 21:44:08 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=ee5ab8f321f7060c5720b50b1834f273e00f5859
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
packed_usage                                       27755   27733     -22

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 include/usage.src.h |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/include/usage.src.h b/include/usage.src.h
index 9227746..c26ed8b 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -1521,13 +1521,31 @@ INSERT
 #define halt_full_usage "\n\n" \
        "Halt the system\n" \
      "\nOptions:" \
-     "\n	-d	Delay interval for halting" \
-     "\n	-n	No call to sync()" \
-     "\n	-f	Force halt (don't go through init)" \
+     "\n	-d SEC	Delay interval" \
+     "\n	-n	Do not sync" \
+     "\n	-f	Force (don't go through init)" \
 	IF_FEATURE_WTMP( \
      "\n	-w	Only write a wtmp record" \
 	)
 
+#define poweroff_trivial_usage \
+       "[-d DELAY] [-n] [-f]"
+#define poweroff_full_usage "\n\n" \
+       "Halt and shut off power\n" \
+     "\nOptions:" \
+     "\n	-d SEC	Delay interval" \
+     "\n	-n	Do not sync" \
+     "\n	-f	Force (don't go through init)" \
+
+#define reboot_trivial_usage \
+       "[-d DELAY] [-n] [-f]"
+#define reboot_full_usage "\n\n" \
+       "Reboot the system\n" \
+     "\nOptions:" \
+     "\n	-d SEC	Delay interval" \
+     "\n	-n	Do not sync" \
+     "\n	-f	Force (don't go through init)" \
+
 #define hdparm_trivial_usage \
        "[OPTIONS] [DEVICE]"
 #define hdparm_full_usage "\n\n" \
@@ -3222,15 +3240,6 @@ INSERT
        "$ popmaildir -k ~/Maildir -- nc pop.drvv.ru 110 [<password_file]\n" \
        "$ popmaildir ~/Maildir -- openssl s_client -quiet -connect pop.gmail.com:995 [<password_file]\n"
 
-#define poweroff_trivial_usage \
-       "[-d DELAY] [-n] [-f]"
-#define poweroff_full_usage "\n\n" \
-       "Halt and shut off power\n" \
-     "\nOptions:" \
-     "\n	-d	Delay interval for halting" \
-     "\n	-n	Do not sync" \
-     "\n	-f	Force power off (don't go through init)" \
-
 #define printenv_trivial_usage \
        "[VARIABLE]..."
 #define printenv_full_usage "\n\n" \
@@ -3373,15 +3382,6 @@ INSERT
 #define realpath_full_usage "\n\n" \
        "Return the absolute pathnames of given FILE"
 
-#define reboot_trivial_usage \
-       "[-d DELAY] [-n] [-f]"
-#define reboot_full_usage "\n\n" \
-       "Reboot the system\n" \
-     "\nOptions:" \
-     "\n	-d	Delay interval for rebooting" \
-     "\n	-n	No call to sync()" \
-     "\n	-f	Force reboot (don't go through init)" \
-
 #define reformime_trivial_usage \
        "[OPTIONS] [FILE]..."
 #define reformime_full_usage "\n\n" \
-- 
1.7.1



More information about the busybox-cvs mailing list