From nobody Mon Mar 6 00:31:29 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 4PVKJK65YMz3w9B4; Mon, 6 Mar 2023 00:31:29 +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 4PVKJK5V0hz4KDH; Mon, 6 Mar 2023 00:31:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062689; 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=Xx18VvtybgCYIOWYIKaRiHWhfYZbSRy5PIBviORpxes=; b=LsG3DZW9D+yrJZJUzomJtoOpwgWBToKPHT8PeOX8z2u7/ZJdUHbIZYZRa9ANAtXKx50aEK Xmsky/OZXaaYNXBam4ZXdbY1Sa24Q94/XOEsbZHeLQsW3v4ok46ooyrrwbyZ/1YIsowwYO 2IPbx9DieXG4oLqH6mNznsQS7CPZr1N5J+stl143tZ2YdkXCFqygL8GvSItQvNpWG7K5Fj SYVUkh0JP2Hyns7qXkTG0SiXy0NlWWkSK4aqErlGLCJ9tyao8z13ESc+ITNx1cAoU2w5hf uywsfhlX9EMwPaAFwr+Z5RU8uqzgQBj2BdjFyM6In7yxvxNmi/5itNLX4w88bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678062689; 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=Xx18VvtybgCYIOWYIKaRiHWhfYZbSRy5PIBviORpxes=; b=E4SxCQFfORyLoFPPj2DKNLimeLTR7m1eXIr18xf2tfoicmTScod/2+u65bQTqkWXrE+PFm iuZ3KkqoybDu+0mUGJyAsX5HIF0FmdpL6RPW/0Ft/1RdG06+V1jkjuuTTkeDHB2MdEhIPk H0z3ZHRCggVL6nK21owqhpH4IUzgSaoC5O0jtAMIVP6dvIPbSREAv1adzkXIz7eWr5hk7P 2fiMNetdD+XCx24KJEELSIlcZFO1xAVEzEYu8MfsghpW2zqqbYMTfZc4KiwkWxLnezdRgd XFS4/u6DOXUpQV/2AEykYkLMbHe9SUsjRmhDUJz/HIYcZ8zDIFsdmY9o0Oazww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678062689; a=rsa-sha256; cv=none; b=Bj8f8FgFlugvIkHEQtKRdX6QiBWwa9MWpOomNYMcZIhhabI4edyDAkHPa0qrQ42thnI2Oj cjlDRwHO3p7USHMWhqIn/TWNHAxhUcjDb4wV1sxtyVjOzwUAVg6cUYfnOBxeAwP2PCgrOn ocleKvsFFzb9f6O7IIiu2sF/d/c1k4r2FS5FcOjVaLbgsn1gMtdBXwMvjSyoWEefGjhnEY t5efhvxUQs6M3ixB7IUx2P1w5E1rhdzSoR32gpIpGq2aO58Ec0m1SNT7YxWnqapmX/CjaL bR6LTXa2jUzeX7t1klNyC6lIHZzURc1J8qpQUcUMAEjdurwfGqWQednkpogQcw== 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 4PVKJK4YFjzhSb; Mon, 6 Mar 2023 00:31:29 +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 3260VTm3043763; Mon, 6 Mar 2023 00:31:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3260VTAV043762; Mon, 6 Mar 2023 00:31:29 GMT (envelope-from git) Date: Mon, 6 Mar 2023 00:31:29 GMT Message-Id: <202303060031.3260VTAV043762@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: ab53efd14237 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ab53efd14237b71c3c0e4e212ada6526ef14402c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ab53efd14237b71c3c0e4e212ada6526ef14402c commit ab53efd14237b71c3c0e4e212ada6526ef14402c Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste CommitDate: 2023-03-06 00:30:57 +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) --- 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