From nobody Thu Mar 23 12:50:28 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 4Pj4v93B5nz41Jx4; Thu, 23 Mar 2023 12:50: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 4Pj4v847CPz4Mph; Thu, 23 Mar 2023 12:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575829; 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=2Nq5Ib9HxGRpa0PaG/56lcqMPp10ugzqYveF/I9MYuA=; b=NQ5aL3NMh3hAqhiC2ta+HllGHN5v2HAzme8ZLEMHeOeQVOA9UeYTo3vbfzwHQg2MUeNCdy HktnWn2CqDwQNJTVAd+Qa76Bxzm2FCGnFn+FtpKrTv4dlybODYypG7ReYBQhGbJLtxz5w/ Yjy/+EuVQNZuSNUPYWm/1Lu/b0mv6s3NVOA/1KlQIkQrTL7cUW9LaiDM/uSJqDVbU6HOqg G1ArMRC/8x1g1Zzw3aVsK4XOzomzcb1d1GLVzbmlXPmujOrHdvBf2GD51CFo5Z9pHqK95N DaDJXsy7Unlg5uO4/BoajMcb6IDpdFkUE+2hvM+rNahLFjHwRY5PlDA7qkqNAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575829; 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=2Nq5Ib9HxGRpa0PaG/56lcqMPp10ugzqYveF/I9MYuA=; b=OdIvY8w9r5WJmvob71ogxa+ucnhD34ot8FOeHPeoA1ICCfYJyCpbfxbusOnN+mH0WdBhbQ P5PGXRBXyweZpmbs61IGKAesXeJYPqrU3p5qzc4yafLiEV9rgF1aBfX32EGM+DVqgSZOn6 LAPk+tthNmJUcDFjAIDAFFzE5nfAfdeExt6idjLLL/XYMyGN9I8QsPD2aEYpY2XSCuaXJn aZ80xlk1GWYhik+l8CZwjSX/CnecI8L5W01IYKCPyWaMs3uGBudN5tjBie2DB0Gv1uK0iH gkZXvws14CGMflvIv/yX2IOKIH/7FbC32YT2+f7k2h0rsWOa2qHCZxlI1bipRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575829; a=rsa-sha256; cv=none; b=LWMLG4ZiDUvpRHFDjCJRuif7Bwerm/HxGtfpr4Qr68GXQc58kkV2o/9RdQd/+82H2QrE8a LRipyLccnWTOOe05Nw64DjNnu11NfX+q5bGDGhu4eN+nupqQFzAYryaomlsR0j8pjEPZtx WjSenyZQ/HvcYcxM6YA26uwlnlL1B5LV1xy5mbBHnQz1nrkzG7qXSbKm4vBFJXzwYDdJSb 1J+IBUuvkrfPDIsfWGJxcSS1amNl487MER4dL0xp/5IgmQe8RMN7HW2xQhQEjrnw79+EkB 5RYWl0I3ZZ+wb4eF3p1QkT4YniofIFR+ZE4vVyvMZUXquUAMpP4u19knLvlj1w== 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 4Pj4v83Cfzzc1D; Thu, 23 Mar 2023 12:50:28 +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 32NCoSph022910; Thu, 23 Mar 2023 12:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoSOh022909; Thu, 23 Mar 2023 12:50:28 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:28 GMT Message-Id: <202303231250.32NCoSOh022909@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: 8ebda77aa1de - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 8ebda77aa1de531003e6aa123db0a2b35f618cd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ebda77aa1de531003e6aa123db0a2b35f618cd1 commit 8ebda77aa1de531003e6aa123db0a2b35f618cd1 Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste 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