diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-03-21 19:34:45 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-03-21 23:34:48 +0000 |
| commit | 652ccfcb237302476b7bc187e1580328729461ba (patch) | |
| tree | 4765da8ee2394af086b641e1634b4aa966901abc | |
| parent | 84b3c465a201d3cc9fea228b0547bc8673afa1a6 (diff) | |
| download | doc-652ccfcb23.tar.gz doc-652ccfcb23.zip | |
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
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 3 | ||||
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.po | 6 |
2 files changed, 0 insertions, 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 @@ -6312,12 +6312,6 @@ msgid "If the commit should be merged to a subset of stable branches, specify th 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 msgid "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." |