HEADS-UP: change the way sysmerge(8) runs by default.

Remove the '-a' switch (auto-mode) and make this behaviour the default.
Add a new '-d' switch to get former default (full diff) mode.

General idea ok for several.
man page improvements from jmc@
ok jim@ oga@ sobrado@
ok sthen@ "sane defaults++ :)"

1 files changed, 19 insertions, 13 deletions

diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 0c6369f189e..1cc4b1bfbfb 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysmerge.8,v 1.26 2009/06/05 06:27:52 jmc Exp $
+.\"	$OpenBSD: sysmerge.8,v 1.27 2009/08/18 08:27:32 ajacoutot Exp $
 .\"
 .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 5 2009 $
+.Dd $Mdocdate: August 18 2009 $
 .Dt SYSMERGE 8
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl ab
+.Op Fl bd
 .Op Fl s Ar src \*(Ba etcXX.tgz
 .Op Fl x Ar xetcXX.tgz
 .Ek
@@ -90,22 +90,15 @@ Should any problems occur,
 such as a failure to upgrade a file,
 the user will be notified and have to deal with the issue by hand.
 .Pp
-.Nm
-will finish by running
-.Xr mtree 8
-to make sure the directory structure has correct permissions.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl a
-Automatic mode.
+By default (if
+.Fl d
+is not used)
 .Nm
 only compares files whose reference sources have changed since the last run
 and attempts to automatically upgrade them to the newest version,
 provided that they have no local changes.
 It automatically installs missing files and binaries,
 and updates files differing only by CVS Id.
-.Pp
 Files whose reference sources have matching CVS Id are skipped from comparison.
 .Pa /etc/fbtab ,
 .Pa /etc/login.conf ,
@@ -115,11 +108,24 @@ and
 are created using helper scripts and are
 .Sy always
 compared.
+.Pp
+.Nm
+will finish by running
+.Xr mtree 8
+to make sure the directory structure has correct permissions.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
 .It Fl b
 Batch mode.
 .Nm
 runs non-interactively,
 saving differing files for later manual processing.
+.It Fl d
+Diff mode.
+In this mode,
+.Nm
+will not take any automatic action, allowing for a full diff comparison.
 .It Fl s Ar src \*(Ba etcXX.tgz
 Specify a path to an
 .Ox