hwclock: cleanup help output and man page

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 31 insertions, 27 deletions

diff --git a/hwclock/hwclock.c b/hwclock/hwclock.c
index 619ff79f6..12e7676bb 100644
--- a/hwclock/hwclock.c
+++ b/hwclock/hwclock.c
@@ -1218,39 +1218,43 @@ usage( const char *fmt, ... ) {
     "hwclock - query and set the hardware clock (RTC)\n\n"
     "Usage: hwclock [function] [options...]\n\n"
     "Functions:\n"
-    "  --help         show this help\n"
-    "  --show         read hardware clock and print result\n"
-    "  --set          set the rtc to the time given with --date\n"
-    "  --hctosys      set the system time from the hardware clock\n"
-    "  --systohc      set the hardware clock to the current system time\n"
-    "  --adjust       adjust the rtc to account for systematic drift since \n"
-    "                 the clock was last set or adjusted\n"
-    "  --getepoch     print out the kernel's hardware clock epoch value\n"
-    "  --setepoch     set the kernel's hardware clock epoch value to the \n"
-    "                 value given with --epoch\n"
-    "  --version      print out the version of hwclock to stdout\n"
-    "\nOptions: \n"
-    "  --utc          the hardware clock is kept in coordinated universal time\n"
-    "  --localtime    the hardware clock is kept in local time\n"
-    "  --rtc=path     special /dev/... file to use instead of default\n"
-    "  --directisa    access the ISA bus directly instead of %s\n"
-    "  --badyear      ignore rtc's year because the bios is broken\n"
-    "  --date         specifies the time to which to set the hardware clock\n"
-    "  --epoch=year   specifies the year which is the beginning of the \n"
-    "                 hardware clock's epoch value\n"
-    "  --noadjfile    do not access /etc/adjtime. Requires the use of\n"
-    "                 either --utc or --localtime\n"
-    "  --adjfile=path specifies the path to the adjust file (default is\n"
-    "                 /etc/adjtime)\n"
+	"  -h | --help         show this help\n"
+	"  -r | --show         read hardware clock and print result\n"
+	"       --set          set the rtc to the time given with --date\n"
+	"  -s | --hctosys      set the system time from the hardware clock\n"
+	"  -w | --systohc      set the hardware clock to the current system time\n"
+	"       --adjust       adjust the rtc to account for systematic drift since\n"
+	"                      the clock was last set or adjusted\n"
+	"       --getepoch     print out the kernel's hardware clock epoch value\n"
+	"       --setepoch     set the kernel's hardware clock epoch value to the \n"
+	"                      value given with --epoch\n"
+	"  -v | --version      print out the version of hwclock to stdout\n"
+	"\nOptions: \n"
+	"  -u | --utc          the hardware clock is kept in UTC\n"
+	"       --localtime    the hardware clock is kept in local time\n"
+	"  -f | --rtc=path     special /dev/... file to use instead of default\n"
+	"       --directisa    access the ISA bus directly instead of %s\n"
+	"       --badyear      ignore rtc's year because the bios is broken\n"
+	"       --date         specifies the time to which to set the hardware clock\n"
+	"       --epoch=year   specifies the year which is the beginning of the \n"
+	"                      hardware clock's epoch value\n"
+	"       --noadjfile    do not access /etc/adjtime. Requires the use of\n"
+	"                      either --utc or --localtime\n"
+	"       --adjfile=path specifies the path to the adjust file (default is\n"
+	"                      /etc/adjtime)\n"
+	"       --test         do everything except actually updating the hardware\n"
+	"                      clock or anything else\n"
+	"  -D | --debug        debug mode\n"
+	"\n"
     ),RTC_DEV);
 #ifdef __alpha__
   fprintf(usageto, _(
-    "  --jensen, --arc, --srm, --funky-toy\n"
-    "                tell hwclock the type of alpha you have (see hwclock(8))\n"
+	"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+	"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+	"\n"
     ) );
 #endif
 
-
   fflush(stdout);
   if (fmt) {
     usageto = stderr;