From: jmc Date: Thu, 5 Sep 2024 06:39:53 +0000 (+0000) Subject: have sysmerge and sysupgrade Xr each other; X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=79053326db65537c15b12912982218ee11460118;p=openbsd have sysmerge and sysupgrade Xr each other; diff originally from peter n. m. hansteen ok ajacoutot --- diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index 4d1abadaab0..4892ec8cb1e 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.79 2016/09/06 12:32:13 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.80 2024/09/05 06:39:53 jmc Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot .\" @@ -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: September 6 2016 $ +.Dd $Mdocdate: September 5 2024 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -154,7 +154,8 @@ corresponding to the currently installed release. .El .Sh SEE ALSO .Xr more 1 , -.Xr sdiff 1 +.Xr sdiff 1 , +.Xr sysupgrade 8 .Pp .Lk https://www.openbsd.org/faq/current.html .Lk https://www.openbsd.org/faq/upgradeXX.html diff --git a/usr.sbin/sysupgrade/sysupgrade.8 b/usr.sbin/sysupgrade/sysupgrade.8 index 2dad07706b4..7fb1f18b430 100644 --- a/usr.sbin/sysupgrade/sysupgrade.8 +++ b/usr.sbin/sysupgrade/sysupgrade.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysupgrade.8,v 1.13 2022/06/08 09:03:11 mglocker Exp $ +.\" $OpenBSD: sysupgrade.8,v 1.14 2024/09/05 06:39:54 jmc Exp $ .\" .\" Copyright (c) 2019 Florian Obser .\" @@ -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 8 2022 $ +.Dd $Mdocdate: September 5 2024 $ .Dt SYSUPGRADE 8 .Os .Sh NAME @@ -94,7 +94,8 @@ Directory the upgrade is downloaded to. .Xr installurl 5 , .Xr upgrade.site 5 , .Xr autoinstall 8 , -.Xr release 8 +.Xr release 8 , +.Xr sysmerge 8 .Sh HISTORY .Nm first appeared in