diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-08-09 12:34:05 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-08-09 12:34:05 +0000 |
| commit | 16a37c25cedda75263f3848869471c65b7f79755 (patch) | |
| tree | 24c1b28dfa1322afb03ede8c607d10625801acf5 /usr.sbin/sysmerge/sysmerge.8 | |
| parent | Add support for non-root hubs now that uhub(4) can deal with them. For (diff) | |
| download | wireguard-openbsd-16a37c25cedda75263f3848869471c65b7f79755.tar.xz wireguard-openbsd-16a37c25cedda75263f3848869471c65b7f79755.zip | |
sysctl.conf is an example.
Tweak error output.
Mention that `-S' has no effect when sets aren't used.
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index f8ebc0095d5..75759ef4619 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.51 2014/08/08 17:04:55 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.52 2014/08/09 12:34:05 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: August 8 2014 $ +.Dd $Mdocdate: August 9 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -137,6 +137,7 @@ In this mode, will not take any automatic action, allowing for a full diff comparison. .It Fl S Do not verify signatures for tgz sets. +This option has no effect when sets aren't used. .It Fl s Op Ar src \*(Ba etcXX.tgz Specify a path to an .Ox |