svn commit: r258064 - head/usr.sbin/etcupdate
John Baldwin
jhb at FreeBSD.org
Tue Nov 12 19:18:00 UTC 2013
Author: jhb
Date: Tue Nov 12 19:18:00 2013
New Revision: 258064
URL: http://svnweb.freebsd.org/changeset/base/258064
Log:
Sort option flags and fix the width of the options list. This is a purely
mechanical change, no content changes.
Modified:
head/usr.sbin/etcupdate/etcupdate.8
Modified: head/usr.sbin/etcupdate/etcupdate.8
==============================================================================
--- head/usr.sbin/etcupdate/etcupdate.8 Tue Nov 12 19:15:06 2013 (r258063)
+++ head/usr.sbin/etcupdate/etcupdate.8 Tue Nov 12 19:18:00 2013 (r258064)
@@ -342,27 +342,7 @@ then nothing will be output.
.Sh OPTIONS
The following options are available.
Note that most options do not apply to all modes.
-.Bl -tag -width ".Fl d Ar workdir"
-.It Fl B
-Do not build generated files in a private object tree.
-Instead,
-reuse the generated files from a previously built object tree that matches
-the source tree.
-This can be useful to avoid gratuitous conflicts in
-.Xr sendmail 8
-configuration
-files when bootstrapping.
-It can also be useful for building a tarball that matches a specific
-world build.
-.It Fl d Ar workdir
-Specify an alternate directory to use as the work directory.
-The work directory is used to store the
-.Dq current
-and
-.Dq previous
-trees as well as unresolved conflicts.
-The default work directory is
-.Pa <destdir>/var/db/etcupdate .
+.Bl -tag -width ".Fl A Ar patterns"
.It Fl A Ar patterns
Always install the new version of any files that match any of the patterns
listed in
@@ -378,6 +358,17 @@ Note that ignored files specified via th
variable or the
.Fl I
option will not be installed.
+.It Fl B
+Do not build generated files in a private object tree.
+Instead,
+reuse the generated files from a previously built object tree that matches
+the source tree.
+This can be useful to avoid gratuitous conflicts in
+.Xr sendmail 8
+configuration
+files when bootstrapping.
+It can also be useful for building a tarball that matches a specific
+world build.
.It Fl D Ar destdir
Specify an alternate destination directory as the target of a merge.
This is analogous to the
@@ -388,6 +379,15 @@ The default destination directory is an
merges updating
.Pa /etc
on the local machine.
+.It Fl d Ar workdir
+Specify an alternate directory to use as the work directory.
+The work directory is used to store the
+.Dq current
+and
+.Dq previous
+trees as well as unresolved conflicts.
+The default work directory is
+.Pa <destdir>/var/db/etcupdate .
.It Fl F
Ignore changes in the FreeBSD ID string when comparing files in the
destination directory to files in either of the
More information about the svn-src-head
mailing list