summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2009-05-12 13:04:19 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2009-05-12 13:04:19 +0000
commit3b4f54403a1529985fca481d9252747f9877d542 (patch)
treeda1850ca30f793873e8a4721cb35d343ac408389 /usr.sbin/sysmerge/sysmerge.8
parent7e567f833b6c5e7be4e3917351fa4d9412dd0218 (diff)
- tweak the description of -a
- remove -SX from usage() ok ajacoutot
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.86
1 files changed, 3 insertions, 3 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