From nobody Mon Mar 06 13:03:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVdzy6884z3wt9f; Mon, 6 Mar 2023 13:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVdzy5J5Nz3G7X; Mon, 6 Mar 2023 13:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzFs4HHn/PxiYGSYCV2DWkZ9splRLmYy+pWE4nKPhmQ=; b=Zze8S32Osf/EbOhZcGw9DFqTqjOiw9BHcDLvzwjq0RlNgYrvYspNqSQGLm9KqEs9wHsRxv ALKJWDtP0fvxAi7bDMPI+EmOtcrnVSdSUyVPn7X0dy3edlSbJ6gDgNR5Dru2quW59Yzep6 4zonOFlF/w0A86lvRQp654xbPElgNbensDJz1NMWxOP03id9pjvXC7z3fWScgXAsokw3Vh 9rqa2ovOIXj/U8Uvbu2kN1wRZHDD0ZtghHGN6ED2VZwQ+gX7kzhMVvQWAtstiPRn1xTApP h0qho+2JyxIqIY1vlQhDVE7kMT4dKxYEWcARXNbL5LChKMsCnigdT4SkUDBJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678107806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NzFs4HHn/PxiYGSYCV2DWkZ9splRLmYy+pWE4nKPhmQ=; b=UsWkdb2pmhnKl5HEhwGOg4bSmDIMopQ40oX/3fmIr20C8P2KeF51jaHtIU/XC8LGqK41QE /H6e599woSm3CgciEyBRFCMeEIbid6RJxsiyidBAo+CrxvO5jPO4knmhl9pwBFB/SlwUh1 N6dpGHW0Qd5dshSdKP/f7IwGKAyi78hskUGuXEXZxBJaks4p/tEmGBxIPfs7E/omp40AAC DWWv+FO6eQsozgs2FR949ngoKTAB4HB9clAdzJEPLqSzy6uaTLoRBVH2433CXXcEaZaYuT GUNT8HYjB6JtFJUd1clvb3R3i2T9BtKMjMYtv36Jq5k1HZpCL+Qgw/Y2/Bi3SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678107806; a=rsa-sha256; cv=none; b=MJS7jPCtiaLB2ZMZdILDX8VPZYvTijaIblhuiTneQ6nFX8tM2ax6tOMXUWw82fpiVeiViR oBuNqs5Fseo74TI1TQHDU/Z3GBWoyr0XXx45jMhCfgCLCD6vLtp6hg4zuVcUVtdfjbT1LI Y5ND45oAMUN4cYHAYEhzUpJeZJ1i/Zq/gwNJDv7QQQQNaS195wFgvCdWymnqCALaNkpg3a e5w7HxY/Dwz4Dusp5Cjkf6OYB85prfJ7wx/IPvDWjjFThiyb0zbA29PgKR5Y0OIwaO6Pa0 yWLgWFUwRAzyV+vT+IqCGnO39pKMsEwofJlpnVbtQ1vScbj7TU26rx5n1x41nQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVdzy4MFMz13Cx; Mon, 6 Mar 2023 13:03:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326D3Qk8078864; Mon, 6 Mar 2023 13:03:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326D3QRZ078863; Mon, 6 Mar 2023 13:03:26 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:03:26 GMT Message-Id: <202303061303.326D3QRZ078863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5fa16e3c50c5 - releng/13.2 - mergemaster: add deprecation notice to man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 5fa16e3c50c5083acd52a61a76f726c759c82ffd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa16e3c50c5083acd52a61a76f726c759c82ffd commit 5fa16e3c50c5083acd52a61a76f726c759c82ffd Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:02:01 +0000 mergemaster: add deprecation notice to man page PR: 252417 Reviewed by: bapt, gjb, kevans (all earlier) Approved by: re (cperciva) 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 b76799e39cd5..60c4b9e8ac63 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 27, 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