ubi-utils: reformat help text to fit in 80 columns

Reformat the help text of ubiattach and ubidetach to display nicely on
80 column terminals, also fix a couple of bits that did not make sense.

Signed-off-by: Jon Povey <jon.povey@racelogic.co.uk>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/src/ubiattach.c b/ubi-utils/src/ubiattach.c
index 4454c38ea34919a4db3f2a7acd7bb51675684aba..5a7d2cf1b25997a56cfdaaa285b2078ece2fe56b 100644 (file)
--- a/ubi-utils/src/ubiattach.c
+++ b/ubi-utils/src/ubiattach.c
@@ -56,17 +56,15 @@ static const char *doc = PROGRAM_NAME " version " PROGRAM_VERSION
                         " - a tool to attach MTD device to UBI.";
 
 static const char *optionsstr =
-"-d, --devn=<UBI device number>  the number to assign to the newly created UBI device\n"
-"                                (the number is assigned automatically if this is not\n"
-"                                specified\n"
-"-p, --dev-path=<path to device> path to MTD device node to attach\n"
-"-m, --mtdn=<MTD device number>  MTD device number to attach (alternative method, e.g\n"
-"                                if the character device node does not exist)\n"
-"-O, --vid-hdr-offset            VID header offset (do not specify this unless you\n"
-"                                really know what you do and the optimal defaults will\n"
-"                                be used)\n"
-"-h, --help                      print help message\n"
-"-V, --version                   print program version";
+"-d, --devn=<number>   the number to assign to the newly created UBI device\n"
+"                      (assigned automatically if this is not specified)\n"
+"-p, --dev-path=<path> path to MTD device node to attach\n"
+"-m, --mtdn=<number>   MTD device number to attach (alternative method, e.g\n"
+"                      if the character device node does not exist)\n"
+"-O, --vid-hdr-offset  VID header offset (do not specify this unless you really\n"
+"                      know what you are doing, the default should be optimal)\n"
+"-h, --help            print help message\n"
+"-V, --version         print program version";
 
 static const char *usage =
 "Usage: " PROGRAM_NAME " [<UBI control device node file name>]\n"

diff --git a/ubi-utils/src/ubidetach.c b/ubi-utils/src/ubidetach.c
index c4c05a5ec0ec2f25292800d7f85e7f1078b01c5b..e0bc0505bf29babec0b785af1debf182cc5460b9 100644 (file)
--- a/ubi-utils/src/ubidetach.c
+++ b/ubi-utils/src/ubidetach.c
@@ -50,7 +50,7 @@ static struct args args = {
 };
 
 static const char *doc = PROGRAM_NAME " version " PROGRAM_VERSION
-" - a tool to remove UBI devices (detach MTD devices from UBI)";
+" - tool to remove UBI devices (detach MTD devices from UBI)";
 
 static const char *optionsstr =
 "-d, --devn=<UBI device number>  UBI device number to delete\n"