From 4ec32f6a891dfb76b15d3ee0d6be4f3033afc117 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 22 Jan 2013 11:56:58 +0100 Subject: [PATCH] mkfs: indicate that specifying fs-type and fs-options are independent Also standardize and improve the help text, and slice it into strips for ease of later translation maintenance. Signed-off-by: Benno Schulenberg --- disk-utils/mkfs.8 | 2 +- disk-utils/mkfs.c | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8 index af9304bc75..a4cdf71cb4 100644 --- a/disk-utils/mkfs.8 +++ b/disk-utils/mkfs.8 @@ -7,7 +7,7 @@ mkfs \- build a Linux filesystem .B mkfs .RI [ options ] .RB [ \-t -.IR "type fs-options" ] " device " [ size ] +.IR type "] [" fs-options ] " device " [ size ] .SH DESCRIPTION .B mkfs is used to build a Linux filesystem on a device, usually diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 55506c0559..c34f9f61bb 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -35,20 +35,20 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) { - fprintf(out, - _("Usage: %s [options] [-t type fs-options] device [size]\n"), - program_invocation_short_name); - - fprintf(out, _("\nOptions:\n" - " -t, --type=TYPE file system type, when undefined ext2 is used\n" - " fs-options parameters to real file system builder\n" - " device path to a device\n" - " size number of blocks on the device\n" - " -V, --verbose explain what is done\n" - " defining -V more than once will cause a dry-run\n" - " -V, --version output version information and exit\n" - " -V as version must be only option\n" - " -h, --help display this help and exit\n")); + fprintf(out, _("Usage:\n")); + fprintf(out, _(" %s [options] [-t ] [fs-options] []\n"), + program_invocation_short_name); + + fprintf(out, _("\nOptions:\n")); + fprintf(out, _(" -t, --type= filesystem type; when unspecified, ext2 is used\n")); + fprintf(out, _(" fs-options parameters for the real filesystem builder\n")); + fprintf(out, _(" path to the device to be used\n")); + fprintf(out, _(" number of blocks to be used on the device\n")); + fprintf(out, _(" -V, --verbose explain what is being done;\n" + " specifying -V more than once will cause a dry-run\n")); + fprintf(out, _(" -V, --version display version information and exit;\n" + " -V as --version must be the only option\n")); + fprintf(out, _(" -h, --help display this help text and exit\n")); fprintf(out, _("\nFor more information see mkfs(8).\n")); -- 2.47.2