From nobody Tue Jul 16 01:38:03 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 4WNMCH67Mpz5QfH2; Tue, 16 Jul 2024 01:38:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WNMCH5f08z4PRG; Tue, 16 Jul 2024 01:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721093883; 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=I9Kn0W2ZNBseNffDE1hK3XXUkUZGX8YA4ivT8TTpQMI=; b=J5NE0zWQ+3o7CPoOwlVaAPCHwbZmqiTAgM72uHmRfGNKtykhbvr67v0moOzz9PUIQdsQa8 syEJR1m8V3KYhTjuppGjrgO6WxzuRkjmzS5tEDwsu1tgWBUe80FFtTyeUx5w2o/wTKxmrx 13VzzKm88ntT4Lcz8XeMxxKoqWKvhWeBbL96xZShdHaGgw64PQ5ajSW09SYmEK1CFDYb++ gVXxW7ST8sKAk6HvGBYwQ9y0Imv144yf/JzX3cU+z7gC1a09cBpzkKs3LLsBpLo7aDMkAQ A5svr/wfgJshY0vbEu1MTqU+5XrEua8/zBrjQbDj42XJ3Yrjj/lME20MZ2BpSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721093883; a=rsa-sha256; cv=none; b=SGcbVrLtJsWZ1B+yN05JQTFJLC9K8+KhoqpVjhebt1YB3lESeGI6PZmt6/Eoae43KD7AtU VS3uShfeiDfeu35yiMEoBxDUDkG8ZU8EMoUpZU8Q8sBm+Drw7g72eTr9GpsjtBdSnaIuAU zarV1P+VWxCv5gPHaiTpfnP9FIzpOZoxoC6zvwfY0SPWP0phbmnL3cHB4LoFGhzr4HhVLD t5L4iHlw6xpCbq7kjSgH6rts7PkuUjdvtDceDIIWT8ZWwIrl/ezWEGBKFLcqhbCZ8p4jf/ JLD0LYqxLjqAoKC3eJwcOSMTl7OPqrIbQ5DV3GA/b1tA52pWbEOTZ8QnD7BnbA== 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=1721093883; 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=I9Kn0W2ZNBseNffDE1hK3XXUkUZGX8YA4ivT8TTpQMI=; b=EPzpdLLVXL8SkEwxp45gjI16YxUxRp3lmq4gw16epD06LpNdpEvfQ9O85MCPBo60VYcEv0 dfAa8eIuzRj6F7Is+XsRRkHjzgiHgIH56IK53ZrDYz4ddddKzXPCHwDSku/wNdkX6Bk7st lybi7qj/DzpvK8LrhupYQC3sxgsACIEcinxd7y7atGWJi86nJ5zK+vtFT+WKFv+Cvtf55d pqu5Ogv5bAHL6d9+puMssC9MHLozNUOt381gqVAxCQe4txNoBZamqJtCUcz4hqy1NX/s7H 09QIZwp2nSj75O3OYmdqYRdTqeGDzyvskcc5NuTHA7LGbXGHRDEXWTSMygcxmw== 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 4WNMCH5BgnzGth; Tue, 16 Jul 2024 01:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46G1c3f7081868; Tue, 16 Jul 2024 01:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46G1c31B081865; Tue, 16 Jul 2024 01:38:03 GMT (envelope-from git) Date: Tue, 16 Jul 2024 01:38:03 GMT Message-Id: <202407160138.46G1c31B081865@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: a39decd73f82 - main - etcupdate: remove mergemaster cross-reference 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: a39decd73f82c74cbe2cecb8f71ca5d3417e5978 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a39decd73f82c74cbe2cecb8f71ca5d3417e5978 commit a39decd73f82c74cbe2cecb8f71ca5d3417e5978 Author: Ed Maste AuthorDate: 2024-07-16 01:36:34 +0000 Commit: Ed Maste CommitDate: 2024-07-16 01:37:14 +0000 etcupdate: remove mergemaster cross-reference It will be retired soon. Sponsored by: The FreeBSD Foundation --- usr.sbin/etcupdate/etcupdate.8 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index 82c36fc9cb68..22d3d91bb6eb 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 9, 2022 +.Dd July 15, 2024 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -894,7 +894,6 @@ but it has been removed in the destination directory. .Xr make 1 , .Xr newaliases 1 , .Xr sh 1 , -.Xr mergemaster 8 , .Xr pwd_mkdb 8 , .Xr services_mkdb 8 , .Xr tzsetup 8