Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Mar 2023 12:50:28 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 8ebda77aa1de - stable/12 - mergemaster: add deprecation notice to man page
Message-ID:  <202303231250.32NCoSOh022909@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=8ebda77aa1de531003e6aa123db0a2b35f618cd1

commit 8ebda77aa1de531003e6aa123db0a2b35f618cd1
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2020-01-22 21:04:03 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-03-23 12:49:43 +0000

    mergemaster: add deprecation notice to man page
    
    PR:             252417
    Reviewed by:    bapt, gjb, kevans (all earlier)
    Relnotes:       Yes
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D23327
    
    (cherry picked from commit 398b12691b4f1e7a73afca4c051c182bfcaf9671)
    (cherry picked from commit ab53efd14237b71c3c0e4e212ada6526ef14402c)
---
 usr.sbin/mergemaster/mergemaster.8 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index b37b173d3c67..a4f8da0d9c44 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 8, 2018
+.Dd March 2, 2023
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -43,6 +43,17 @@
 .Op Fl A Ar Target architecture
 .Op Fl D Ar /destdir/path
 .Sh DESCRIPTION
+.Bf -symbolic
+The
+.Nm
+utility is deprecated and may not be available in
+.Fx 14.0
+or later.
+Users are advised to use
+.Xr etcupdate 8
+instead.
+.Ef
+.Pp
 The
 .Nm
 utility is a Bourne shell script which is designed to aid you



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303231250.32NCoSOh022909>