From nobody Fri May 05 01:19:13 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 4QCCWj3r05z4B8Hw; Fri, 5 May 2023 01:19:13 +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 4QCCWj2vYcz4L0j; Fri, 5 May 2023 01:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683249553; 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=6gf1iLoFe8O73xLFTce9gTA5fnXyeHkdIyR/xne8BKA=; b=gVtIZiaiSydr3T0FM+PzWgt5spc+FhDyf1kYijpoeydWrjbkQ9c3q9O3JAQEsSTA7YKngt ADO2CNQYYqhO2dxgZhlPc2MX7H4qiBOys1GJK73fP8wRvm2FrgYJRMEUxPRcTt5QqJQZkB B81YXc09aSPHAG/uGhVcPJ6ar6fhZlzVFinftP7uT53a5kuiW3NA+8LuOYmuqhs5+CtUxg yM4XBEUx+LsB/uAK+1X8b5+8aeBQsrwwgtTJnRTCx7fw8brTi9RABousItiZNRytsabQMb hVybYgxreeTxaQ8nxlUUGSf8E9Icn/6mA33SxTuzeKdhrTK6v5ghcXVsJUb8XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683249553; 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=6gf1iLoFe8O73xLFTce9gTA5fnXyeHkdIyR/xne8BKA=; b=gvNSWHYuT7i2qXVNjBzuPeLm3m1MH5Squn3uI7vQfibrSVnLQHG31VDuiXDspKaMenJ5jm hDpGMoQen3plbtF6/k1PphHQeln9RqygXEoYdE9Lpe6VzDvLDlY/oUKG8NcbI81E8Y0EoR ls5K8M7cLg8GNiz5lq/ZgZvJvNqzTScmgD005uWRf7YE4KYEOSru+wBmnoKewnhi+r6UZP Rj88LYhO/34H38i2tBuvp2xHl54khcd46WuIExRfkD09CFcXBK0w6gsubK9Ya5nN7nhQ5N Droh7RneQxs/F4adgOV7DJBb41aiOVe7uVjfpZiogd3g4HSKX22qs97vvPeYRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683249553; a=rsa-sha256; cv=none; b=cSPQODakoXibWA5DBuZZlleOl2El/ql55LyzZrXEknxJiCFkvJtk+x6b4CTeV3FRbKl5kP SGwU/NXCLdl0Cb0xPtrKDXqdZPkZT1VH4CZei77C6pbL4v/SJifmJ89spI0lcM4HkDrSuw Dz0IYeEeeGtGS7gXh5OLlYKvTdENxyU96VlKBZDHcZDIU58/k1rO3iUHv8BKBfRya8jHEb MkcXR9xTMeqd80D1MWOZWROgxgnTfl/sLtVTu1eKdXRGAx/VJGOGVXcbPgMz9hqqLKm9lS G/vBWmR8cR86OuMdUwyGcz7W8CRq2HRQn6+w8drQEIPSNPVa0f6sVjlcZTeQlA== 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 4QCCWj1zYQzZBP; Fri, 5 May 2023 01:19:13 +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 3451JDdX010803; Fri, 5 May 2023 01:19:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3451JDQj010802; Fri, 5 May 2023 01:19:13 GMT (envelope-from git) Date: Fri, 5 May 2023 01:19:13 GMT Message-Id: <202305050119.3451JDQj010802@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: fa4651d7ea5b - main - build.7: remove reference to deprecated mergemaster 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/main X-Git-Reftype: branch X-Git-Commit: fa4651d7ea5bd7679e7ac5f17cd28581bb8db57f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fa4651d7ea5bd7679e7ac5f17cd28581bb8db57f commit fa4651d7ea5bd7679e7ac5f17cd28581bb8db57f Author: Ed Maste AuthorDate: 2023-03-03 13:54:22 +0000 Commit: Ed Maste CommitDate: 2023-05-05 01:14:06 +0000 build.7: remove reference to deprecated mergemaster Sponsored by: The FreeBSD Foundation --- share/man/man7/build.7 | 1 - 1 file changed, 1 deletion(-) diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 4e499c81b45c..a2fb5ea77149 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -887,7 +887,6 @@ manpage first appeared in .Xr tests 7 , .Xr config 8 , .Xr etcupdate 8 , -.Xr mergemaster 8 , .Xr reboot 8 , .Xr shutdown 8 .Sh AUTHORS