Module Name: src
Committed By: wiz
Date: Wed Oct 3 19:27:48 UTC 2012
Modified Files:
src/usr.sbin/mtree: mtree.8
Log Message:
- Sort order of options mentioned in text;
- improve wording;
- remove unneeded macros (fixes mandoc(1) warnings);
- in the `EXAMPLES' section, for `-d', mention the use of `-U'
besides that of `-u' (as the former is a variant on the latter).
>From Bug Hunting.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/usr.sbin/mtree/mtree.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mtree/mtree.8
diff -u src/usr.sbin/mtree/mtree.8:1.53 src/usr.sbin/mtree/mtree.8:1.54
--- src/usr.sbin/mtree/mtree.8:1.53 Wed Jan 20 14:00:48 2010
+++ src/usr.sbin/mtree/mtree.8 Wed Oct 3 19:27:48 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mtree.8,v 1.53 2010/01/20 14:00:48 wiz Exp $
+.\" $NetBSD: mtree.8,v 1.54 2012/10/03 19:27:48 wiz Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -104,8 +104,8 @@ The full path name
(beginning with
.Dq \&./ )
is always printed as the first field;
-.Fl k ,
.Fl K ,
+.Fl k ,
and
.Fl R
can be used to control which other keywords are printed;
@@ -113,6 +113,7 @@ can be used to control which other keywo
and
.Fl I
can be used to control which files are printed;
+and the
.Fl S
option can be used to sort the output.
.It Fl c
@@ -187,13 +188,13 @@ particular, if other bits like the stick
set either in the specification or the file, exact checking will be
performed.
This option may not be set at the same time as the
-.Fl u
-or
.Fl U
+or
+.Fl u
option.
.It Fl M
Permit merging of specification entries with different types,
-with the last entry take precedence.
+with the last entry taking precedence.
.It Fl m
If the schg and/or sappnd flags are specified, reset these flags.
Note that this is only possible with securelevel less than 1 (i.e.,
@@ -287,9 +288,9 @@ Don't attempt to set various file attrib
ownership, mode, flags, or time
when creating new directories or changing existing entries.
This option will be most useful when used in conjunction with
-.Fl u
+.Fl U
or
-.Fl U .
+.Fl u .
.It Fl X Ar exclude-file
The specified file contains
.Xr fnmatch 3
@@ -329,7 +330,6 @@ or
.Sy char
file types.
The argument must be one of the following forms:
-.Pp
.Bl -tag -width 4n
.It Ar format , Ns Ar major , Ns Ar minor
A device with
@@ -498,7 +498,6 @@ and
.Sy uid .
.Pp
There are four types of lines in a specification:
-.Pp
.Bl -enum
.It
Set global values for a keyword.
@@ -581,7 +580,7 @@ appropriately.
Multiple entries for the same full path are permitted if the types
are the same (unless
.Fl M
-is given, and then the types may differ);
+is given, in which case the types may differ);
in this case the settings for the last entry take precedence.
.Pp
A path name that does not contain a slash will be treated as a relative path.
@@ -631,10 +630,11 @@ can be used to detect which of the binar
.Pp
The
.Fl d
-and
+option can be used in combination with
+.Fl U
+or
.Fl u
-options can be used in combination to create directory hierarchies
-for distributions and other such things.
+to create directory hierarchies for, for example, distributions.
.Sh SEE ALSO
.Xr chflags 1 ,
.Xr chgrp 1 ,
@@ -681,8 +681,8 @@ keywords,
.Fl D ,
.Fl E ,
.Fl I ,
-.Fl l ,
.Fl L ,
+.Fl l ,
.Fl N ,
.Fl P ,
.Fl R ,
