From nobody Tue Mar 21 23:35:25 2023 X-Original-To: dev-commits-doc-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 4Ph7JF6mdXz41020 for ; Tue, 21 Mar 2023 23:35:25 +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 4Ph7JF6Gbvz4LrL; Tue, 21 Mar 2023 23:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679441725; 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=aDkjsNaRpgkUfqKVTRhvyv6s2stafjTEXU5K8ywRNG4=; b=nWvkAEuNtnnKC7N7hy1njldN1j6suy84GWbmEXKuNqxyYfH2t7q4vqz2iYVkdt1k7H66WX /UlOlbxzBSHv6o1sAryMusOCgYXe5qCBocxsheCgE3S2QDFwLbXtRbnLyvIn7Kc2MPlACa TvB6cwL7JooHkBzoRL/Ryr/72njm5piufUqZ8H84UVwypy6b5EDndj44LuRM4qTBB5dMRy UJKybnudIwOjCAxT/H1jxW+UITT4i/WKegZ0kLUTHuF2jM1nHx2aGxQtkppu9oUNtDP+4D vdt6K7im/MDSA+0QHr7Jslg9U/Gg7NuTgBn/nqu0XTsevCv/FYxGlKA7P9wtjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679441725; 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=aDkjsNaRpgkUfqKVTRhvyv6s2stafjTEXU5K8ywRNG4=; b=IBTzAFSfcFtyfaCk1YHxN4bqh62Hdt9COMcFnVDeQ9aw3A4brgErcSD77WoBo7C4XcPq1t 2ifHt+GbZ+1GCQeERMFs1Rj/E+ex1zbWIcsapjCq9JljV2S8J+OzS4rrrfqixsHyOxrcQ2 771kPRcow7xR050PXMwAHFsZ/CgqnmoUZx9DAerCi6Rcydlid5leaFK+9kKDHotn23uD2Q lk0IjUeRConHFjnWhJZRJ8Zfr98XMJS8ghiUbRlT8vKgFjm3TmKL/fIW7hBtCtrf1D/E3c a3rBK7LgOrxjb/rN/w3mw0+Q3idkcTyIHWvfmyTbWugpj6Oo7Hp+VRW1NOdkKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679441725; a=rsa-sha256; cv=none; b=hCEOT4ZalZ8Hy1jEexMEPee78dC4IuwJhl0HwrZxeli/eyGl/DrfdOX99MNlG6CLyEsbHk sPAocJA2lWZcUvF9Devbk/z//cGGN5UJjHV3m3xRwN85CC8xsQuCKyMZPQdD0/Y3pHz11L j6dG36zhvDrDyexjG/Kp0qaKCOgQs9uDWOSVJ1zi2Jba/QIdHJ5J6LXSk5Fm1TXSQpyhaT 5K7FdYVzdfQyrbO0LVAg5vPsLWKhu2I5JIveRdUVrXUuxs0dqTpxZTBsPgmGVEkvZcfCep sR6z0Ztu+A81pi0mHxXuGjpGaJl2EIqUlXnVOoW6N+xWrxcG9JQ4p1z3TFf3JA== 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 4Ph7JF5Kx7zWmL; Tue, 21 Mar 2023 23:35:25 +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 32LNZPpl051788; Tue, 21 Mar 2023 23:35:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LNZPLT051787; Tue, 21 Mar 2023 23:35:25 GMT (envelope-from git) Date: Tue, 21 Mar 2023 23:35:25 GMT Message-Id: <202303212335.32LNZPLT051787@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Ed Maste Subject: git: 652ccfcb23 - main - committers guide: remove "MFC with" tag List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-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: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 652ccfcb237302476b7bc187e1580328729461ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/doc/commit/?id=652ccfcb237302476b7bc187e1580328729461ba commit 652ccfcb237302476b7bc187e1580328729461ba Author: Ed Maste AuthorDate: 2023-03-21 19:34:45 +0000 Commit: Ed Maste CommitDate: 2023-03-21 23:34:48 +0000 committers guide: remove "MFC with" tag "Fixes" and "MFC with" are used for approximately the same purpose, but the former is standard in the Git-based deveopment world. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D39190 --- documentation/content/en/articles/committers-guide/_index.adoc | 3 --- documentation/content/en/articles/committers-guide/_index.po | 6 ------ 2 files changed, 9 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index efdd1d18b0..935541a992 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2545,9 +2545,6 @@ Approved by: re (username) |`MFC to:` |If the commit should be merged to a subset of stable branches, specify the branch names. -|`MFC with:` -|If the commit should be merged together with a previous one in a single MFC commit (for example, where this commit corrects a bug in the previous change), specify the corresponding Git hash. - |`MFH:` |If the commit is to be merged into a ports quarterly branch name, specify the quarterly branch. For example `2021Q2`. diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index cd4083faf1..da585d7800 100644 --- a/documentation/content/en/articles/committers-guide/_index.po +++ b/documentation/content/en/articles/committers-guide/_index.po @@ -6311,12 +6311,6 @@ msgstr "" msgid "If the commit should be merged to a subset of stable branches, specify the branch names." msgstr "" -#. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2946 -#, no-wrap -msgid "`MFC with:`" -msgstr "" - #. type: Table #: documentation/content/en/articles/committers-guide/_index.adoc:2948 #, no-wrap