diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index ca655384060..df94b12be4e 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.22 2009/05/11 20:25:55 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.23 2009/05/12 13:04:18 jmc 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: May 11 2009 $ +.Dd $Mdocdate: May 12 2009 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -101,7 +101,7 @@ The options are as follows: Automatic mode. If this option is specified, .Nm -will only compare files which reference sources have changed since +will only compare files whose reference sources have changed since the last run and will attempt to automatically upgrade them to the newest version provided that they have no local changes. It will automatically install missing files diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index d9bd10d4705..a60ece3f178 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.40 2009/05/11 20:25:55 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.41 2009/05/12 13:04:18 jmc Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -57,7 +57,7 @@ error_rm_wrkdir() { } usage() { - echo "usage: ${0##*/} [-ab] [-S etcXX.tgz] [-s src | etcXX.tgz] [-X xetcXX.tgz] [-x xetcXX.tgz]" >&2 + echo "usage: ${0##*/} [-ab] [-s src | etcXX.tgz] [-x xetcXX.tgz]" >&2 } trap "restore_bak; clean_src; rm -rf ${WRKDIR}; exit 1" 1 2 3 13 15 |