From nobody Tue Apr 16 14:21:02 2024 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 4VJmRf4jWLz5GxJq; Tue, 16 Apr 2024 14:21:02 +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 4VJmRf26rLz4FSr; Tue, 16 Apr 2024 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713277262; 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=lmvPoG/lzxjfTbBeOVvVcpy25bXzQaru+ZepC2DT+Ow=; b=qM3jZyUVnA0KZgfNI+D9h8qmCj3KRjtjsYCU2S6NCWOeB0EVVSkU71i5gBXzJEfbXImUfb wac39x6NgC8RafzNkMdtfzfePQ/29qBYA9leh8f/kBB+TeefN814RiE197kVD3XcE6cbik UXo8LlSpVqYJOpR8lseUoEGusnhgjoNFQicCGTSWeaLHiNtK0lhyAf+93O+1mv3JmUFY5/ cE2+XA4DKodLe582XEQFspb6m71DkmY7A95QhLSaVwQoAw0Fvc+3J+jcW6nvGvKJolaond mjVkUeDSVDBEVtQK+ejRz6a0pRtJbQFFlnQcZz1uOKQgChmy9ryJiKYII6uEwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713277262; a=rsa-sha256; cv=none; b=xjlO37ca1n/hCi/2j4VJuTfULAgPqmspzJ7u0kUajcZZ2Q6tVbdQoDdWuD2HR/PsAL5Mni H522po/iVWgrpw6ZZtd0RMj96jgQa+FJwW0SeACC1WQ0trL2UJCiOL1xmQOowCZNNju4ev tYmG0RZIWhygbQz4CGeXdcdpremKQw8PgOfcu1gtr6ohOCKgqC4ZBS34krEDJ1hzFU0j8c tbSy+sSXoSO7RLfDqHogrr6R4AOdGZpCTF7AJeEnDU3KlevnuQEisYjaLFsE5endtxb6Cl OLro97kaeSf8V6UabhdMbcH8MYEjYo3KXiJM7WBJizhPsrbJhFJVWE1D4bRStw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713277262; 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=lmvPoG/lzxjfTbBeOVvVcpy25bXzQaru+ZepC2DT+Ow=; b=X7P1FDMtVKd8gvy2za2wcjY9D7vqt9DLCIwhUHh+WnjnFiHa1D23G5iytfwObPmsKeLuH5 +Hm2Mh4ZpX5Cs68hTtmrHVQ7OTichCX9MGnKohZKodqo15X//rXCX4Hvae7gbwSsEnqOHv qCxFv2YZKQJ+bI1OBsx0napwphpaQ8coyIEKFNCU+3UgJaTi0iIGotyVy4hnQAxJAlgh10 VuXQsBjg2wtzgZqwzU7G/g1l0BFDTpdeg5n3Bx+AaK09El329yKs3SpD90bQ+UZqIJ9c1n LwUVmEKrdX7KuFYLBxk296UKVUYUVCu/hAQrMp2CxyC2JugqHzIh+/jVn7BeQg== 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 4VJmRf1jm5zmgk; Tue, 16 Apr 2024 14:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GEL2xZ034059; Tue, 16 Apr 2024 14:21:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GEL2Wd034056; Tue, 16 Apr 2024 14:21:02 GMT (envelope-from git) Date: Tue, 16 Apr 2024 14:21:02 GMT Message-Id: <202404161421.43GEL2Wd034056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 73cce7d8886b - main - mergemaster: postpone removal to FreeBSD 15 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 73cce7d8886bc59284c757decb49deba046e73fc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=73cce7d8886bc59284c757decb49deba046e73fc commit 73cce7d8886bc59284c757decb49deba046e73fc Author: Ed Maste AuthorDate: 2024-04-16 14:19:14 +0000 Commit: Ed Maste CommitDate: 2024-04-16 14:19:14 +0000 mergemaster: postpone removal to FreeBSD 15 Mergemaster has been deprecated for quite some time, but was not removed prior to FreeBSD 14.0. Update the deprecation notice in the man page to reflect this. PR: 274967 Reported by: naddy Sponsored by: The FreeBSD Foundation --- usr.sbin/mergemaster/mergemaster.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 695f1bba3474..20d746de347c 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 2, 2023 +.Dd April 16, 2024 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -45,7 +45,7 @@ The .Nm utility is deprecated and may not be available in -.Fx 14.0 +.Fx 15.0 or later. Users are advised to use .Xr etcupdate 8