summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2009-03-25 18:02:13 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2009-03-25 18:02:13 +0000
commit86465ccc99adf376140fff9136e8d33931f8d6b9 (patch)
tree0ea0103a10e6dbb2cba8bcc0a6bf774aab64d10d /usr.sbin/sysmerge/sysmerge.8
parentca1192c86d47fe706f6b1d5b22bf6e528ae0b84b (diff)
Several cleanups:
* constistency in redirections (and fix a wrong one) * enclose variables * several UPPER -> lowercase rewordings * add "" on conditionals (suggested by jared r r spiegel a while ago) * use cmp instead of md5 for sets comparison (from sthen@) * some man page rewordings from sthen@ ok sthen@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.812
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 8e68203dc0a..b00315a7b7d 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.15 2009/03/25 13:20:02 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.16 2009/03/25 18:02:12 ajacoutot Exp $
.\"
.\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
.\"
@@ -116,14 +116,14 @@ 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
-If a tarball from an older snapshot or release is also specified
-using the
+When updating from sets, a tarball from an older snapshot or release
+may be provided using the
.Fl S
or
.Fl X
-options,
-installed files which have not been modified since the earlier referenced
-sources will automatically be updated to the eventual new version.
+options.
+Installed files which have not been modified from the originals
+will be updated automatically.
.Pp
Files and directories can be excluded from comparison
by listing them in the file