svn commit: r290884 - stable/10/usr.sbin/makefs

[Garrett Cooper]

Author: ngie
Date: Sun Nov 15 20:48:10 2015
New Revision: 290884
URL: https://svnweb.freebsd.org/changeset/base/290884

Log:
  MFC r290259,r290601:
  
  r290259:
  
  Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8 at 1.53
  
  Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs) and
  options have been omitted.
  
  Obtained from: NetBSD
  Sponsored by: EMC / Isilon Storage Division
  
  r290601:
  
  Follow up to r290259 dealing with makefs(8)
  
  - Don't use contractions (don't -> do not)
  - Change "throw away" to "discard" when describing the -o keep-bad-images option
  - Revert author e-mail split I brought over from NetBSD, effectively reverting
    the change bapt made in r267668
  
  Submitted by: bjk
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/usr.sbin/makefs/makefs.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/makefs/makefs.8
==============================================================================
--- stable/10/usr.sbin/makefs/makefs.8	Sun Nov 15 20:44:22 2015	(r290883)
+++ stable/10/usr.sbin/makefs/makefs.8	Sun Nov 15 20:48:10 2015	(r290884)
@@ -44,10 +44,10 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl DxZ
-.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
@@ -69,9 +69,9 @@ from the directory tree
 .Ar directory
 or from the mtree manifest
 .Ar manifest .
-If optional directory tree
+If any optional directory trees are passed in the
 .Ar extra-directory
-is passed, then the directory tree of each argument will be merged
+arguments, then the directory tree of each argument will be merged
 into the
 .Ar directory
 or
@@ -82,9 +82,9 @@ No special devices or privileges are req
 .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 ,
@@ -114,9 +114,9 @@ Enable various levels of debugging, depe
 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
@@ -174,13 +174,13 @@ Set the maximum size of the file system 
 .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
@@ -226,7 +226,9 @@ ISO 9660 file system.
 .It Fl x
 Exclude file system nodes not explicitly listed in the specfile.
 .It Fl Z
-Create the image as a sparse file.
+Create a sparse file for
+.Sy ffs .
+This is useful for virtual machine images.
 .El
 .Pp
 Where sizes are specified, a decimal number of bytes is expected.
@@ -351,7 +353,7 @@ or
 .Ql 3
 is not implemented.
 .It Sy keep-bad-images
-Do not throw away images whose write was aborted due to an error.
+Do not discard images whose write was aborted due to an error.
 For debugging purposes.
 .It Sy label
 Label name of the image.
@@ -386,9 +388,8 @@ The
 utility appeared in
 .Nx 1.6 .
 .Sh AUTHORS
-.An Luke Mewburn
-.Aq lukem at NetBSD.org
-(original program)
+.An Luke Mewburn Aq Mt lukem at NetBSD.org
+(original program),
 .An Daniel Watt ,
 .An Walter Deignan ,
 .An Ryan Gabrys ,