[src/trunk]: src/usr.sbin/makefs Re-order `usage' alphabetically;

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d25a7ae2a565
branches:  trunk
changeset: 768363:d25a7ae2a565
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Aug 15 14:45:01 2011 +0000

description:
Re-order `usage' alphabetically;
rename option arguments in the manpage's `SYNOPSIS' section to
match those from `usage' (not the other way around; the `usage'-line
(and other parts of makefs.c) contain the correct names);
minor punctuation improvements.

>From Snader_LB.

diffstat:

 usr.sbin/makefs/makefs.8 |  24 ++++++++++++------------
 usr.sbin/makefs/makefs.c |  12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diffs (119 lines):

diff -r 70edb2394350 -r d25a7ae2a565 usr.sbin/makefs/makefs.8
--- a/usr.sbin/makefs/makefs.8  Mon Aug 15 14:43:17 2011 +0000
+++ b/usr.sbin/makefs/makefs.8  Mon Aug 15 14:45:01 2011 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: makefs.8,v 1.35 2011/07/22 13:04:00 wiz Exp $
+.\"    $NetBSD: makefs.8,v 1.36 2011/08/15 14:45:01 wiz Exp $
 .\"
 .\" Copyright (c) 2001-2003 Wasabi Systems, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 18, 2011
+.Dd August 13, 2011
 .Dt MAKEFS 8
 .Os
 .Sh NAME
@@ -42,10 +42,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl x
-.Op Fl B Ar byte-order
+.Op Fl B Ar endian
 .Op Fl b Ar free-blocks
 .Op Fl d Ar debug-mask
-.Op Fl F Ar specfile
+.Op Fl F Ar mtree-specfile
 .Op Fl f Ar free-files
 .Op Fl M Ar minimum-size
 .Op Fl m Ar maximum-size
@@ -67,9 +67,9 @@
 .Pp
 The options are as follows:
 .Bl -tag -width flag
-.It Fl B Ar byte-order
+.It Fl B Ar endian
 Set the byte order of the image to
-.Ar byte-order .
+.Ar endian .
 Valid byte orders are
 .Ql 4321 ,
 .Ql big ,
@@ -97,9 +97,9 @@
 set in
 .Ar debug-mask .
 XXX: document these
-.It Fl F Ar specfile
+.It Fl F Ar mtree-specfile
 Use
-.Ar specfile
+.Ar mtree-specfile
 as an
 .Xr mtree 8
 .Sq specfile
@@ -156,13 +156,13 @@
 .Ar maximum-size .
 An error will be raised if the target file system needs to be larger
 than this to accommodate the provided directory tree.
-.It Fl N Ar dbdir
+.It Fl N Ar userdb-dir
 Use the user database text file
 .Pa master.passwd
 and group database text file
 .Pa group
 from
-.Ar dbdir ,
+.Ar userdb-dir ,
 rather than using the results from the system's
 .Xr getpwnam 3
 and
@@ -352,7 +352,7 @@
 .Sh AUTHORS
 .An Luke Mewburn
 .Aq lukem%NetBSD.org@localhost
-(original program)
+(original program),
 .An Daniel Watt ,
 .An Walter Deignan ,
 .An Ryan Gabrys ,
@@ -360,4 +360,4 @@
 .An Ram Vedam
 (cd9660 support),
 .An UCHIYAMA Yasushi
-(v7fs support)
+(v7fs support).
diff -r 70edb2394350 -r d25a7ae2a565 usr.sbin/makefs/makefs.c
--- a/usr.sbin/makefs/makefs.c  Mon Aug 15 14:43:17 2011 +0000
+++ b/usr.sbin/makefs/makefs.c  Mon Aug 15 14:45:01 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: makefs.c,v 1.29 2011/07/18 22:52:37 tron Exp $ */
+/*     $NetBSD: makefs.c,v 1.30 2011/08/15 14:45:01 wiz Exp $  */
 
 /*
  * Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.29 2011/07/18 22:52:37 tron Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.30 2011/08/15 14:45:01 wiz Exp $");
 #endif /* !__lint */
 
 #include <assert.h>
@@ -316,10 +316,10 @@
 
        prog = getprogname();
        fprintf(stderr,
-"usage: %s [-t fs-type] [-o fs-options] [-d debug-mask] [-B endian]\n"
-"\t[-S sector-size] [-M minimum-size] [-m maximum-size] [-s image-size]\n"
-"\t[-b free-blocks] [-f free-files] [-F mtree-specfile] [-x]\n"
-"\t[-N userdb-dir] image-file directory\n",
+"usage: %s [-x] [-B endian] [-b free-blocks] [-d debug-mask]\n"
+"\t[-F mtree-specfile] [-f free-files] [-M minimum-size]\n"
+"\t[-m maximum-size] [-N userdb-dir] [-o fs-options] [-S sector-size]\n"
+"\t[-s image-size] [-t fs-type] image-file directory\n",
            prog);
        exit(1);
 }