help text: replace [OPTIONS] with actual options (if not too long)

function                                             old     new   delta
packed_usage                                       33620   33665     +45

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 4 insertions, 12 deletions

diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 8d29a6d54..6d673002f 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -20,18 +20,10 @@
 //usage:#define fstrim_trivial_usage
 //usage:       "[OPTIONS] MOUNTPOINT"
 //usage:#define fstrim_full_usage "\n\n"
-//usage:        IF_LONG_OPTS(
-//usage:       "        -o,--offset OFFSET      Offset in bytes to discard from"
-//usage:     "\n        -l,--length LEN         Bytes to discard"
-//usage:     "\n        -m,--minimum MIN        Minimum extent length"
-//usage:     "\n        -v,--verbose            Print number of discarded bytes"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
 //usage:       "        -o OFFSET       Offset in bytes to discard from"
 //usage:     "\n        -l LEN          Bytes to discard"
 //usage:     "\n        -m MIN          Minimum extent length"
 //usage:     "\n        -v              Print number of discarded bytes"
-//usage:        )
 
 #include "libbb.h"
 #include <linux/fs.h>
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 63a3bf504..23da32868 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -41,16 +41,16 @@
 //kbuild:lib-$(CONFIG_UMOUNT) += umount.o
 
 //usage:#define umount_trivial_usage
-//usage:       "[OPTIONS] FILESYSTEM|DIRECTORY"
+//usage:       "[-rlf"IF_FEATURE_MTAB_SUPPORT("m")IF_FEATURE_MOUNT_LOOP("d")IF_FEATURE_UMOUNT_ALL("a")"] [-t FSTYPE] FILESYSTEM|DIRECTORY"
 //usage:#define umount_full_usage "\n\n"
-//usage:       "Unmount file systems\n"
+//usage:       "Unmount filesystems\n"
 //usage:        IF_FEATURE_UMOUNT_ALL(
-//usage:     "\n        -a      Unmount all file systems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab")
+//usage:     "\n        -a      Unmount all filesystems" IF_FEATURE_MTAB_SUPPORT(" in /etc/mtab")
 //usage:        )
 //usage:        IF_FEATURE_MTAB_SUPPORT(
 //usage:     "\n        -n      Don't erase /etc/mtab entries"
 //usage:        )
-//usage:     "\n        -r      Try to remount devices as read-only if mount is busy"
+//usage:     "\n        -r      Remount devices read-only if mount is busy"
 //usage:     "\n        -l      Lazy umount (detach filesystem)"
 //usage:     "\n        -f      Force umount (i.e., unreachable NFS server)"
 //usage:        IF_FEATURE_MOUNT_LOOP(