author: Danilo G. Baio <dbaio@FreeBSD.org> 2024-09-14 18:02:34 +0000
committer: Danilo G. Baio <dbaio@FreeBSD.org> 2024-09-14 18:02:34 +0000
commit: e5b122222e92a0c4111f40c131266100756d1200 (patch)
tree: 25cf73d359ac7fe17c7fc9e9aa975b5158c11193 /documentation/content/en/articles/committers-guide
parent: 2493ecacfa596514b2a28003a04920aa32725840 (diff)
1 files changed, 1292 insertions, 1234 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po
index bb85f6fe75..57e15ce4af 100644
--- a/documentation/content/en/articles/committers-guide/_index.po
+++ b/documentation/content/en/articles/committers-guide/_index.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: FreeBSD Documentation VERSION\n"
-"POT-Creation-Date: 2024-01-17 20:35-0300\n"
+"POT-Creation-Date: 2024-09-14 15:00-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,8 +48,8 @@ msgid ""
 "Almost all FreeBSD developers have commit rights to one or more "
 "repositories.  However, a few developers do not, and some of the information "
 "here applies to them as well.  (For instance, some people only have rights "
-"to work with the Problem Report database.)  Please see <<non-committers>> "
-"for more information."
+"to work with the Problem Report database.)  Please see crossref:committers-"
+"guide[non-committers] for more information."
 msgstr ""
 
 #. type: Plain text
@@ -115,7 +115,7 @@ msgstr ""
 #. type: Table
 #: documentation/content/en/articles/committers-guide/_index.adoc:79
 #, no-wrap
-msgid "`smtp.FreeBSD.org:587` (see also <<smtp-setup>>)."
+msgid "`smtp.FreeBSD.org:587` (see also crossref:committers-guide[smtp-setup])."
 msgstr ""
 
 #. type: Table
@@ -203,42 +203,43 @@ msgid "`stable/n` (`n`-STABLE), `main` (-CURRENT)"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:102
+#: documentation/content/en/articles/committers-guide/_index.adoc:103
+#, no-wrap
 msgid ""
-"man:ssh[1] is required to connect to the project hosts. For more "
-"information, see <<ssh.guide>>."
+"man:ssh[1] is required to connect to the project hosts. For more information,\n"
+"\tsee crossref:committers-guide[ssh.guide].\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:104
+#: documentation/content/en/articles/committers-guide/_index.adoc:105
 msgid "Useful links:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:106
+#: documentation/content/en/articles/committers-guide/_index.adoc:107
 msgid "link:https://www.FreeBSD.org/internal/[FreeBSD Project Internal Pages]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:107
+#: documentation/content/en/articles/committers-guide/_index.adoc:108
 msgid "link:https://www.FreeBSD.org/internal/machines/[FreeBSD Project Hosts]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:108
+#: documentation/content/en/articles/committers-guide/_index.adoc:109
 msgid ""
 "link:https://www.FreeBSD.org/administration/[FreeBSD Project Administrative "
 "Groups]"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:110
+#: documentation/content/en/articles/committers-guide/_index.adoc:111
 #, no-wrap
 msgid "OpenPGP Keys for FreeBSD"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:115
+#: documentation/content/en/articles/committers-guide/_index.adoc:116
 msgid ""
 "Cryptographic keys conforming to the OpenPGP (__Pretty Good Privacy__) "
 "standard are used by the FreeBSD project to authenticate committers.  "
@@ -250,13 +251,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:117
+#: documentation/content/en/articles/committers-guide/_index.adoc:118
 #, no-wrap
 msgid "Creating a Key"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:121
+#: documentation/content/en/articles/committers-guide/_index.adoc:122
 msgid ""
 "Existing keys can be used, but should be checked with [."
 "filename]#documentation/tools/checkkey.sh# first.  In this case, make sure "
@@ -264,14 +265,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:123
+#: documentation/content/en/articles/committers-guide/_index.adoc:124
 msgid ""
 "For those who do not yet have an OpenPGP key, or need a new key to meet "
 "FreeBSD security requirements, here we show how to generate one."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:128
+#: documentation/content/en/articles/committers-guide/_index.adoc:129
 msgid ""
 "Install [.filename]#security/gnupg#. Enter these lines in [.filename]#~/."
 "gnupg/gpg.conf# to set minimum acceptable defaults for signing and new key "
@@ -280,7 +281,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:135
+#: documentation/content/en/articles/committers-guide/_index.adoc:136
 #, no-wrap
 msgid ""
 "# Sorted list of preferred algorithms for signing (strongest to weakest).\n"
@@ -290,12 +291,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:137
+#: documentation/content/en/articles/committers-guide/_index.adoc:138
 msgid "Generate a key:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:144
+#: documentation/content/en/articles/committers-guide/_index.adoc:145
 #, no-wrap
 msgid ""
 "% gpg --full-gen-key\n"
@@ -305,7 +306,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:165
+#: documentation/content/en/articles/committers-guide/_index.adoc:166
 #, no-wrap
 msgid ""
 "Warning: using insecure memory!\n"
@@ -331,7 +332,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:171
+#: documentation/content/en/articles/committers-guide/_index.adoc:172
 #, no-wrap
 msgid ""
 "Real name: Chucky Daemon <.>\n"
@@ -342,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:174
+#: documentation/content/en/articles/committers-guide/_index.adoc:175
 #, no-wrap
 msgid ""
 "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o\n"
@@ -350,21 +351,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:177
+#: documentation/content/en/articles/committers-guide/_index.adoc:178
 msgid ""
 "2048-bit keys with a three-year expiration provide adequate protection at "
 "present (2022-10)."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:179
+#: documentation/content/en/articles/committers-guide/_index.adoc:180
 msgid ""
 "A three year key lifespan is short enough to obsolete keys weakened by "
 "advancing computer power, but long enough to reduce key management problems."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:181
+#: documentation/content/en/articles/committers-guide/_index.adoc:182
 msgid ""
 "Use your real name here, preferably matching that shown on government-issued "
 "ID to make it easier for others to verify your identity. Text that may help "
@@ -372,7 +373,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:185
+#: documentation/content/en/articles/committers-guide/_index.adoc:186
 msgid ""
 "After the email address is entered, a passphrase is requested.  Methods of "
 "creating a secure passphrase are contentious.  Rather than suggest a single "
@@ -383,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:189
+#: documentation/content/en/articles/committers-guide/_index.adoc:190
 msgid ""
 "Protect the private key and passphrase.  If either the private key or "
 "passphrase may have been compromised or disclosed, immediately notify mailto:"
@@ -391,20 +392,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:191
+#: documentation/content/en/articles/committers-guide/_index.adoc:193
 msgid ""
-"Committing the new key is shown in <<commit-steps, Steps for New "
-"Committers>>."
+"Committing the new key is shown in crossref:committers-guide[commit-steps, "
+"Steps for New Committers]."
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:193
+#: documentation/content/en/articles/committers-guide/_index.adoc:195
 #, no-wrap
 msgid "Kerberos and LDAP web Password for FreeBSD Cluster"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:198
+#: documentation/content/en/articles/committers-guide/_index.adoc:200
 msgid ""
 "The FreeBSD cluster requires a Kerberos password to access certain "
 "services.  The Kerberos password also serves as the LDAP web password, since "
@@ -413,48 +414,48 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:200
+#: documentation/content/en/articles/committers-guide/_index.adoc:202
 msgid "https://bugs.freebsd.org/bugzilla[Bugzilla]"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:201
+#: documentation/content/en/articles/committers-guide/_index.adoc:203
 msgid "https://ci.freebsd.org[Jenkins]"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:203
+#: documentation/content/en/articles/committers-guide/_index.adoc:205
 msgid ""
 "To create a new Kerberos account in the FreeBSD cluster, or to reset a "
 "Kerberos password for an existing account using a random password generator:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:207
+#: documentation/content/en/articles/committers-guide/_index.adoc:209
 #, no-wrap
 msgid "% ssh kpasswd.freebsd.org\n"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:212
+#: documentation/content/en/articles/committers-guide/_index.adoc:214
 msgid "This must be done from a machine outside of the FreeBSD.org cluster."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:215
+#: documentation/content/en/articles/committers-guide/_index.adoc:217
 msgid ""
 "A Kerberos password can also be set manually by logging into `freefall."
 "FreeBSD.org` and running:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:219
+#: documentation/content/en/articles/committers-guide/_index.adoc:221
 #, no-wrap
 msgid "% kpasswd\n"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:225
+#: documentation/content/en/articles/committers-guide/_index.adoc:227
 msgid ""
 "Unless the Kerberos-authenticated services of the FreeBSD.org cluster have "
 "been used previously, `Client unknown` will be shown.  This error means that "
@@ -463,13 +464,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:228
+#: documentation/content/en/articles/committers-guide/_index.adoc:230
 #, no-wrap
 msgid "Commit Bit Types"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:234
+#: documentation/content/en/articles/committers-guide/_index.adoc:236
 msgid ""
 "The FreeBSD repository has a number of components which, when combined, "
 "support the basic operating system source, documentation, third party "
@@ -484,79 +485,79 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:240
+#: documentation/content/en/articles/committers-guide/_index.adoc:242
 #, no-wrap
 msgid "__Committer Type__"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:241
+#: documentation/content/en/articles/committers-guide/_index.adoc:243
 #, no-wrap
 msgid "__Responsible__"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:243
+#: documentation/content/en/articles/committers-guide/_index.adoc:245
 #, no-wrap
 msgid "__Tree Components__"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:244
+#: documentation/content/en/articles/committers-guide/_index.adoc:246
 #, no-wrap
 msgid "src"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:245
+#: documentation/content/en/articles/committers-guide/_index.adoc:247
 #, no-wrap
 msgid "core@"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:247
+#: documentation/content/en/articles/committers-guide/_index.adoc:249
 #, no-wrap
 msgid "src/"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:248
+#: documentation/content/en/articles/committers-guide/_index.adoc:250
 #, no-wrap
 msgid "doc"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:249
+#: documentation/content/en/articles/committers-guide/_index.adoc:251
 #, no-wrap
 msgid "doceng@"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:251
+#: documentation/content/en/articles/committers-guide/_index.adoc:253
 #, no-wrap
 msgid "doc/, ports/, src/ documentation"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:252
+#: documentation/content/en/articles/committers-guide/_index.adoc:254
 #, no-wrap
 msgid "ports"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:253
+#: documentation/content/en/articles/committers-guide/_index.adoc:255
 #, no-wrap
 msgid "portmgr@"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:254
+#: documentation/content/en/articles/committers-guide/_index.adoc:256
 #, no-wrap
 msgid "ports/"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:259
+#: documentation/content/en/articles/committers-guide/_index.adoc:261
 msgid ""
 "Commit bits allocated prior to the development of the notion of areas of "
 "authority may be appropriate for use in many parts of the tree.  However, "
@@ -569,7 +570,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:261
+#: documentation/content/en/articles/committers-guide/_index.adoc:263
 msgid ""
 "Committers are encouraged to seek review for their work as part of the "
 "normal development process, regardless of the area of the tree where the "
@@ -577,13 +578,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:262
+#: documentation/content/en/articles/committers-guide/_index.adoc:264
 #, no-wrap
 msgid "Policy for Committer Activity in Other Trees"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:265
+#: documentation/content/en/articles/committers-guide/_index.adoc:267
 msgid ""
 "All committers may modify [.filename]#src/share/misc/committers-*.dot#, [."
 "filename]#src/usr.bin/calendar/calendars/calendar.freebsd#, and [."
@@ -591,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:266
+#: documentation/content/en/articles/committers-guide/_index.adoc:268
 msgid ""
 "doc committers may commit documentation changes to [.filename]#src# files, "
 "such as manual pages, READMEs, fortune databases, calendar files, and "
@@ -600,7 +601,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:268
+#: documentation/content/en/articles/committers-guide/_index.adoc:270
 msgid ""
 "Any committer may make changes to any other tree with an \"Approved by\" "
 "from a non-mentored committer with the appropriate bit.  Mentored committers "
@@ -608,7 +609,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:269
+#: documentation/content/en/articles/committers-guide/_index.adoc:271
 msgid ""
 "Committers can acquire an additional bit by the usual process of finding a "
 "mentor who will propose them to core, doceng, or portmgr, as appropriate. "
@@ -618,13 +619,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:271
+#: documentation/content/en/articles/committers-guide/_index.adoc:273
 #, no-wrap
 msgid "Documentation Implicit (Blanket) Approval"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:275
+#: documentation/content/en/articles/committers-guide/_index.adoc:277
 msgid ""
 "Some types of fixes have \"blanket approval\" from the {doceng}, allowing "
 "any committer to fix those categories of problems on any part of the doc "
@@ -633,87 +634,87 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:277
+#: documentation/content/en/articles/committers-guide/_index.adoc:279
 msgid "Blanket approval applies to these types of fixes:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:279
+#: documentation/content/en/articles/committers-guide/_index.adoc:281
 msgid "Typos"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:280
+#: documentation/content/en/articles/committers-guide/_index.adoc:282
 msgid "Trivial fixes"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:282
+#: documentation/content/en/articles/committers-guide/_index.adoc:284
 msgid ""
 "Punctuation, URLs, dates, paths and file names with outdated or incorrect "
 "information, and other common mistakes that may confound the readers."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:285
+#: documentation/content/en/articles/committers-guide/_index.adoc:287
 msgid ""
 "Over the years, some implicit approvals were granted in the doc tree.  This "
 "list shows the most common cases:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:287
+#: documentation/content/en/articles/committers-guide/_index.adoc:289
 msgid ""
 "Changes in [.filename]#documentation/content/en/books/porters-handbook/"
 "versions/_index.adoc#"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:289
+#: documentation/content/en/articles/committers-guide/_index.adoc:291
 msgid ""
 "extref:{porters-handbook}versions/[__FreeBSD_version Values (Porter's "
 "Handbook)], mainly used for src committers."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:290
+#: documentation/content/en/articles/committers-guide/_index.adoc:292
 msgid "Changes in [.filename]#doc/shared/contrib-additional.adoc#"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:292
+#: documentation/content/en/articles/committers-guide/_index.adoc:294
 msgid ""
 "extref:{contributors}[Additional FreeBSD Contributors, contrib-additional] "
 "maintenance."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:293
+#: documentation/content/en/articles/committers-guide/_index.adoc:295
 msgid "All link:#commit-steps[Steps for New Committers], doc related"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:294
+#: documentation/content/en/articles/committers-guide/_index.adoc:296
 msgid "Security advisories; Errata Notices; Releases;"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:296
+#: documentation/content/en/articles/committers-guide/_index.adoc:298
 msgid "Used by {security-officer} and {re}."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:297
+#: documentation/content/en/articles/committers-guide/_index.adoc:299
 msgid "Changes in [.filename]#website/content/en/donations/donors.adoc#"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:299
+#: documentation/content/en/articles/committers-guide/_index.adoc:301
 msgid "Used by {donations}."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:301
+#: documentation/content/en/articles/committers-guide/_index.adoc:303
 msgid ""
 "Before any commit, a build test is necessary; see the 'Overview' and 'The "
 "FreeBSD Documentation Build Process' sections of the extref:{fdp-primer}"
@@ -721,19 +722,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:303
+#: documentation/content/en/articles/committers-guide/_index.adoc:305
 #, no-wrap
 msgid "Git Primer"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:306
+#: documentation/content/en/articles/committers-guide/_index.adoc:308
 #, no-wrap
 msgid "Git basics"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:313
+#: documentation/content/en/articles/committers-guide/_index.adoc:315
 msgid ""
 "When one searches for \"Git Primer\" a number of good ones come up.  Daniel "
 "Miessler's link:https://danielmiessler.com/study/git/[A git primer] and "
@@ -748,33 +749,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:315
+#: documentation/content/en/articles/committers-guide/_index.adoc:317
 msgid ""
 "This document will assume that you've read through it and will try not to "
 "belabor the basics (though it will cover them briefly)."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:317
+#: documentation/content/en/articles/committers-guide/_index.adoc:319
 #, no-wrap
 msgid "Git Mini Primer"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:320
+#: documentation/content/en/articles/committers-guide/_index.adoc:322
 msgid ""
 "This primer is less ambitiously scoped than the old Subversion Primer, but "
 "should cover the basics."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:321
+#: documentation/content/en/articles/committers-guide/_index.adoc:323
 #, no-wrap
 msgid "Scope"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:327
+#: documentation/content/en/articles/committers-guide/_index.adoc:329
 msgid ""
 "If you want to download FreeBSD, compile it from sources, and generally keep "
 "up to date that way, this primer is for you.  It covers getting the sources, "
@@ -786,7 +787,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:331
+#: documentation/content/en/articles/committers-guide/_index.adoc:333
 msgid ""
 "The goal of this section is to highlight those bits of Git needed to track "
 "sources.  They assume a basic understanding of Git.  There are many primers "
@@ -795,49 +796,49 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:333
+#: documentation/content/en/articles/committers-guide/_index.adoc:335
 #, no-wrap
 msgid "Getting Started For Developers"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:336
+#: documentation/content/en/articles/committers-guide/_index.adoc:338
 msgid ""
 "This section describes the read-write access for committers to push the "
 "commits from developers or contributors."
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:338
+#: documentation/content/en/articles/committers-guide/_index.adoc:340
 #, no-wrap
 msgid "Daily use"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:343
+#: documentation/content/en/articles/committers-guide/_index.adoc:345
 msgid ""
 "In the examples below, replace `${repo}` with the name of the desired "
 "FreeBSD repository: `doc`, `ports`, or `src`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:346
+#: documentation/content/en/articles/committers-guide/_index.adoc:348
 msgid "Clone the repository:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:350
+#: documentation/content/en/articles/committers-guide/_index.adoc:352
 #, no-wrap
 msgid "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/${repo}.git\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:353
+#: documentation/content/en/articles/committers-guide/_index.adoc:355
 msgid "Then you should have the official mirrors as your remote:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:359
+#: documentation/content/en/articles/committers-guide/_index.adoc:361
 #, no-wrap
 msgid ""
 "% git remote -v\n"
@@ -846,12 +847,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:362
+#: documentation/content/en/articles/committers-guide/_index.adoc:364
 msgid "Configure the FreeBSD committer data:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:365
+#: documentation/content/en/articles/committers-guide/_index.adoc:367
 msgid ""
 "The commit hook in repo.freebsd.org checks the \"Commit\" field matches the "
 "committer's information in FreeBSD.org.  The easiest way to get the "
@@ -860,7 +861,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:372
+#: documentation/content/en/articles/committers-guide/_index.adoc:374
 #, no-wrap
 msgid ""
 "% gen-gitconfig.sh\n"
@@ -870,25 +871,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:375
+#: documentation/content/en/articles/committers-guide/_index.adoc:377
 msgid "Set the push URL:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:379
+#: documentation/content/en/articles/committers-guide/_index.adoc:381
 #, no-wrap
 msgid "% git remote set-url --push freebsd git@gitrepo.freebsd.org:${repo}.git\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:382
+#: documentation/content/en/articles/committers-guide/_index.adoc:384
 msgid ""
 "Then you should have separated fetch and push URLs as the most efficient "
 "setup:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:388
+#: documentation/content/en/articles/committers-guide/_index.adoc:390
 #, no-wrap
 msgid ""
 "% git remote -v\n"
@@ -897,24 +898,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:391
+#: documentation/content/en/articles/committers-guide/_index.adoc:393
 msgid ""
 "Again, note that `gitrepo.freebsd.org` has been canonicalized to `repo."
 "freebsd.org`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:393
+#: documentation/content/en/articles/committers-guide/_index.adoc:395
 msgid "Install commit message template hook:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:395
+#: documentation/content/en/articles/committers-guide/_index.adoc:397
 msgid "For doc repository:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:400
+#: documentation/content/en/articles/committers-guide/_index.adoc:402
 #, no-wrap
 msgid ""
 "% cd .git/hooks\n"
@@ -922,23 +923,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:403
+#: documentation/content/en/articles/committers-guide/_index.adoc:405
 msgid "For ports repository:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:407
+#: documentation/content/en/articles/committers-guide/_index.adoc:409
 #, no-wrap
 msgid "% git config --add core.hooksPath .hooks\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:410
+#: documentation/content/en/articles/committers-guide/_index.adoc:412
 msgid "For src repository:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:415
+#: documentation/content/en/articles/committers-guide/_index.adoc:417
 #, no-wrap
 msgid ""
 "% cd .git/hooks\n"
@@ -946,27 +947,27 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:418
+#: documentation/content/en/articles/committers-guide/_index.adoc:420
 #, no-wrap
 msgid "\"admin\" branch"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:421
+#: documentation/content/en/articles/committers-guide/_index.adoc:423
 msgid ""
 "The `access` and `mentors` files are stored in an orphan branch, `internal/"
 "admin`, in each repository."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:423
+#: documentation/content/en/articles/committers-guide/_index.adoc:425
 msgid ""
 "Following example is how to check out the `internal/admin` branch to a local "
 "branch named `admin`:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:429
+#: documentation/content/en/articles/committers-guide/_index.adoc:431
 #, no-wrap
 msgid ""
 "% git config --add remote.freebsd.fetch '+refs/internal/*:refs/internal/*'\n"
@@ -975,42 +976,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:431
+#: documentation/content/en/articles/committers-guide/_index.adoc:433
 msgid "Alternatively, you can add a worktree for the `admin` branch:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:435
+#: documentation/content/en/articles/committers-guide/_index.adoc:437
 #, no-wrap
 msgid "git worktree add -b admin ../${repo}-admin internal/admin\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:439
+#: documentation/content/en/articles/committers-guide/_index.adoc:441
 msgid ""
 "For browsing `internal/admin` branch on web: `https://cgit.freebsd.org/"
 "${repo}/log/?h=internal/admin`"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:441
+#: documentation/content/en/articles/committers-guide/_index.adoc:443
 msgid "For pushing, specify the full refspec:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:445
+#: documentation/content/en/articles/committers-guide/_index.adoc:447
 #, no-wrap
 msgid "git push freebsd HEAD:refs/internal/admin\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:447
+#: documentation/content/en/articles/committers-guide/_index.adoc:449
 #, no-wrap
 msgid "Keeping Current With The FreeBSD src Tree"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:454
+#: documentation/content/en/articles/committers-guide/_index.adoc:456
 msgid ""
 "First step: cloning a tree.  This downloads the entire tree.  There are two "
 "ways to download.  Most people will want to do a deep clone of the "
@@ -1019,82 +1020,83 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:455
+#: documentation/content/en/articles/committers-guide/_index.adoc:457
 #, no-wrap
 msgid "Branch Names"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:457
+#: documentation/content/en/articles/committers-guide/_index.adoc:459
 msgid "FreeBSD-CURRENT uses the `main` branch."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:459
+#: documentation/content/en/articles/committers-guide/_index.adoc:461
 msgid "`main` is the default branch."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:461
+#: documentation/content/en/articles/committers-guide/_index.adoc:463
 msgid "For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:463
+#: documentation/content/en/articles/committers-guide/_index.adoc:465
 msgid ""
 "For FreeBSD-RELEASE, release engineering branch names include `releng/12.4` "
 "and `releng/13.2`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:465
+#: documentation/content/en/articles/committers-guide/_index.adoc:467
 msgid "https://www.freebsd.org/releng/[] shows:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:467
+#: documentation/content/en/articles/committers-guide/_index.adoc:469
 msgid "`main` and `stable/⋯` branches open"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:468
+#: documentation/content/en/articles/committers-guide/_index.adoc:470
 msgid "`releng/⋯` branches, each of which is frozen when a release is tagged."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:470
+#: documentation/content/en/articles/committers-guide/_index.adoc:472
 msgid "Examples:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:472
+#: documentation/content/en/articles/committers-guide/_index.adoc:474
 msgid ""
 "tag https://cgit.freebsd.org/src/tag/?h=release/13.1.0[release/13.1.0] on "
 "the https://cgit.freebsd.org/src/log/?h=releng/13.1[releng/13.1] branch"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:473
+#: documentation/content/en/articles/committers-guide/_index.adoc:475
 msgid ""
 "tag https://cgit.freebsd.org/src/tag/?h=release/13.2.0[release/13.2.0] on "
 "the https://cgit.freebsd.org/src/log/?h=releng/13.2[releng/13.2] branch."
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:474
+#: documentation/content/en/articles/committers-guide/_index.adoc:476
 #, no-wrap
 msgid "Repositories"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:477
+#: documentation/content/en/articles/committers-guide/_index.adoc:479
 msgid ""
-"Please see the <<admin,Administrative Details>> for the latest information "
-"on where to get FreeBSD sources.  $URL below can be obtained from that page."
+"Please see the crossref:committers-guide[admin,Administrative Details] for "
+"the latest information on where to get FreeBSD sources.  $URL below can be "
+"obtained from that page."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:480
+#: documentation/content/en/articles/committers-guide/_index.adoc:482
 msgid ""
 "Note: The project doesn't use submodules as they are a poor fit for our "
 "workflows and development model.  How we track changes in third-party "
@@ -1103,13 +1105,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:481
+#: documentation/content/en/articles/committers-guide/_index.adoc:483
 #, no-wrap
 msgid "Deep Clone"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:485
+#: documentation/content/en/articles/committers-guide/_index.adoc:487
 msgid ""
 "A deep clone pulls in the entire tree, as well as all the history and "
 "branches.  It is the easiest to do.  It also allows you to use Git's "
@@ -1118,13 +1120,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:488
+#: documentation/content/en/articles/committers-guide/_index.adoc:490
 #, no-wrap
 msgid "% git clone -o freebsd $URL -b branch [<directory>]\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:493
+#: documentation/content/en/articles/committers-guide/_index.adoc:495
 msgid ""
 "will create a deep clone.  `branch` should be one of the branches listed in "
 "the previous section.  If no `branch` is given: the default (`main`) will be "
@@ -1134,7 +1136,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:498
+#: documentation/content/en/articles/committers-guide/_index.adoc:500
 msgid ""
 "You will want a deep clone if you are interested in the history, plan on "
 "making local changes, or plan on working on more than one branch.  It is the "
@@ -1146,13 +1148,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:499
+#: documentation/content/en/articles/committers-guide/_index.adoc:501
 #, no-wrap
 msgid "Shallow Clone"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:505
+#: documentation/content/en/articles/committers-guide/_index.adoc:507
 msgid ""
 "A shallow clone copies just the most current code, but none or little of the "
 "history.  This can be useful when you need to build a specific revision of "
@@ -1162,13 +1164,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:509
+#: documentation/content/en/articles/committers-guide/_index.adoc:511
 #, no-wrap
 msgid "% git clone -o freebsd -b branch --depth 1 $URL [dir]\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:514
+#: documentation/content/en/articles/committers-guide/_index.adoc:516
 msgid ""
 "This clones the repository, but only has the most recent version in the "
 "repository.  The rest of the history is not downloaded.  Should you change "
@@ -1176,7 +1178,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:519
+#: documentation/content/en/articles/committers-guide/_index.adoc:521
 msgid ""
 "When you make a shallow clone, you will lose the commit count in your uname "
 "output.  This can make it more difficult to determine if your system needs "
@@ -1184,19 +1186,19 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:521
+#: documentation/content/en/articles/committers-guide/_index.adoc:523
 #, no-wrap
 msgid "Building"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:525
+#: documentation/content/en/articles/committers-guide/_index.adoc:527
 msgid ""
 "Once you've downloaded, building is done as described in the handbook, e.g.:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:532
+#: documentation/content/en/articles/committers-guide/_index.adoc:534
 #, no-wrap
 msgid ""
 "% cd src\n"
@@ -1207,12 +1209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:534
+#: documentation/content/en/articles/committers-guide/_index.adoc:536
 msgid "so that won't be covered in depth here."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:537
+#: documentation/content/en/articles/committers-guide/_index.adoc:539
 msgid ""
 "If you want to build a custom kernel, extref:{handbook}[the kernel config "
 "section, kernelconfig] of the FreeBSD Handbook recommends creating a file "
@@ -1221,26 +1223,26 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:538
+#: documentation/content/en/articles/committers-guide/_index.adoc:540
 #, no-wrap
 msgid "Updating"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:542
+#: documentation/content/en/articles/committers-guide/_index.adoc:544
 msgid ""
 "To update both types of trees uses the same commands.  This pulls in all the "
 "revisions since your last update."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:545
+#: documentation/content/en/articles/committers-guide/_index.adoc:547
 #, no-wrap
 msgid "% git pull --ff-only\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:550
+#: documentation/content/en/articles/committers-guide/_index.adoc:552
 msgid ""
 "will update the tree.  In Git, a 'fast forward' merge is one that only needs "
 "to set a new branch pointer and doesn't need to re-create the commits.  By "
@@ -1250,7 +1252,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:553
+#: documentation/content/en/articles/committers-guide/_index.adoc:555
 msgid ""
 "See below for how to manage local changes.  The simplest is to use `--"
 "autostash` on the `git pull` command, but more sophisticated options are "
@@ -1258,20 +1260,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:554
+#: documentation/content/en/articles/committers-guide/_index.adoc:556
 #, no-wrap
 msgid "Selecting a Specific Version"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:558
+#: documentation/content/en/articles/committers-guide/_index.adoc:560
 msgid ""
 "In Git, `git checkout` checks out both branches and specific versions.  "
 "Git's versions are the long hashes rather than a sequential number."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:560
+#: documentation/content/en/articles/committers-guide/_index.adoc:562
 msgid ""
 "When you checkout a specific version, just specify the hash you want on the "
 "command line (the git log command can help you decide which hash you might "
@@ -1279,26 +1281,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:563
+#: documentation/content/en/articles/committers-guide/_index.adoc:565
 #, no-wrap
 msgid "% git checkout 08b8197a74\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:566
+#: documentation/content/en/articles/committers-guide/_index.adoc:568
 msgid ""
 "and you have that checked out.  You will be greeted with a message similar "
 "to the following:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:569
+#: documentation/content/en/articles/committers-guide/_index.adoc:571
 #, no-wrap
 msgid "Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:573
+#: documentation/content/en/articles/committers-guide/_index.adoc:575
 #, no-wrap
 msgid ""
 "You are in a 'detached HEAD' state. You can look around, make experimental\n"
@@ -1307,7 +1309,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:576
+#: documentation/content/en/articles/committers-guide/_index.adoc:578
 #, no-wrap
 msgid ""
 "If you want to create a new branch to retain commits you create, you may\n"
@@ -1315,20 +1317,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:578
-#: documentation/content/en/articles/committers-guide/_index.adoc:1686
+#: documentation/content/en/articles/committers-guide/_index.adoc:580
+#: documentation/content/en/articles/committers-guide/_index.adoc:1737
 #, no-wrap
 msgid "  git checkout -b <new-branch-name>\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:580
+#: documentation/content/en/articles/committers-guide/_index.adoc:582
 #, no-wrap
 msgid "HEAD is now at 08b8197a742a hook gpiokeys.4 to the build\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:584
+#: documentation/content/en/articles/committers-guide/_index.adoc:586
 msgid ""
 "where the last line is generated from the hash you are checking out and the "
 "first line of the commit message from that revision.  The hash can be "
@@ -1337,13 +1339,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:585
+#: documentation/content/en/articles/committers-guide/_index.adoc:587
 #, no-wrap
 msgid "Bisecting"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:589
+#: documentation/content/en/articles/committers-guide/_index.adoc:591
 msgid ""
 "Sometimes, things go wrong.  The last version worked, but the one you just "
 "updated to does not.  A developer may ask you to bisect the problem to track "
@@ -1351,7 +1353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:594
+#: documentation/content/en/articles/committers-guide/_index.adoc:596
 msgid ""
 "Git makes bisecting changes easy with a powerful `git bisect` command.  "
 "Here's a brief outline of how to use it.  For more information, you can view "
@@ -1363,7 +1365,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:601
+#: documentation/content/en/articles/committers-guide/_index.adoc:603
 msgid ""
 "`git bisect start --first-parent` will start the bisection process.  Next, "
 "you need to tell a range to go through.  `git bisect good XXXXXX` will tell "
@@ -1376,14 +1378,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:605
+#: documentation/content/en/articles/committers-guide/_index.adoc:607
 msgid ""
 "If you want to know the last version you checked out, you should use `git "
 "reflog`:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:610
+#: documentation/content/en/articles/committers-guide/_index.adoc:612
 #, no-wrap
 msgid ""
 "5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward\n"
@@ -1392,7 +1394,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:614
+#: documentation/content/en/articles/committers-guide/_index.adoc:616
 msgid ""
 "shows me moving the working tree to the `main` branch (a816...) and then "
 "updating from upstream (to 5ef0...).  In this case, bad would be HEAD (or "
@@ -1403,7 +1405,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:618
+#: documentation/content/en/articles/committers-guide/_index.adoc:620
 msgid ""
 "Set the 'good' version first, then set the bad (though the order doesn't "
 "matter).  When you set the bad version, it will give you some statistics on "
@@ -1411,7 +1413,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:625
+#: documentation/content/en/articles/committers-guide/_index.adoc:627
 #, no-wrap
 msgid ""
 "% git bisect start --first-parent\n"
@@ -1422,7 +1424,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:634
+#: documentation/content/en/articles/committers-guide/_index.adoc:636
 msgid ""
 "You would then build/install that version.  If it's good you'd type `git "
 "bisect good` otherwise `git bisect bad`.  If the version doesn't compile, "
@@ -1435,13 +1437,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:636
+#: documentation/content/en/articles/committers-guide/_index.adoc:638
 #, no-wrap
 msgid "Signing the commits, tags, and pushes, with GnuPG"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:641
+#: documentation/content/en/articles/committers-guide/_index.adoc:643
 msgid ""
 "Git knows how to sign commits, tags, and pushes.  When you sign a Git commit "
 "or a tag, you can prove that the code you submitted came from you and wasn't "
@@ -1450,7 +1452,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:643
+#: documentation/content/en/articles/committers-guide/_index.adoc:645
 msgid ""
 "A more in-depth documentation on signing commits and tags can be found in "
 "the https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work[Git Tools - "
@@ -1458,7 +1460,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:645
+#: documentation/content/en/articles/committers-guide/_index.adoc:647
 msgid ""
 "The rationale behind signing pushes can be found in the https://github.com/"
 "git/git/commit/a85b377d0419a9dfaca8af2320cc33b051cbed04[commit that "
@@ -1466,14 +1468,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:648
+#: documentation/content/en/articles/committers-guide/_index.adoc:650
 msgid ""
 "The best way is to simply tell Git you always want to sign commits, tags, "
 "and pushes.  You can do this by setting a few configuration variables:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:655
+#: documentation/content/en/articles/committers-guide/_index.adoc:657
 #, no-wrap
 msgid ""
 "% git config --add user.signingKey LONG-KEY-ID\n"
@@ -1484,14 +1486,14 @@ msgstr ""
 
 #.  push.gpgSign should probably be set to `yes` once we enable it, or be set with --global, so that it is enabled for all repositories.
 #. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:663
+#: documentation/content/en/articles/committers-guide/_index.adoc:665
 msgid ""
 "To avoid possible collisions, make sure you give a long key id to Git.  You "
 "can get the long id with: `gpg --list-secret-keys --keyid-format LONG`."
 msgstr ""
 
 #. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:669
+#: documentation/content/en/articles/committers-guide/_index.adoc:671
 msgid ""
 "To use specific subkeys, and not have GnuPG to resolve the subkey to a "
 "primary key, attach `!` to the key.  For example, to encrypt for the subkey "
@@ -1499,20 +1501,20 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:671
+#: documentation/content/en/articles/committers-guide/_index.adoc:673
 #, no-wrap
 msgid "Verifying signatures"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:674
+#: documentation/content/en/articles/committers-guide/_index.adoc:676
 msgid ""
 "Commit signatures can be verified by running either `git verify-commit "
 "<commit hash>`, or `git log --show-signature`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:676
+#: documentation/content/en/articles/committers-guide/_index.adoc:678
 msgid ""
 "Tag signatures can be verified with `git verify-tag <tag name>`, or `git tag "
 "-v <tag name>`."
@@ -1524,20 +1526,20 @@ msgstr ""
 #. Git pushes are a bit different, they live in a special ref in the repository.
 #. TODO: write how to verify them
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:685
+#: documentation/content/en/articles/committers-guide/_index.adoc:687
 #, no-wrap
 msgid "Ports Considerations"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:688
+#: documentation/content/en/articles/committers-guide/_index.adoc:690
 msgid ""
 "The ports tree operates the same way.  The branch names are different and "
 "the repositories are in different locations."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:691
+#: documentation/content/en/articles/committers-guide/_index.adoc:693
 msgid ""
 "The cgit repository web interface for use with web browsers is at https://"
 "cgit.FreeBSD.org/ports/ .  The production Git repository is at https://git."
@@ -1546,7 +1548,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:695
+#: documentation/content/en/articles/committers-guide/_index.adoc:697
 msgid ""
 "There is also a mirror on GitHub, see extref:{handbook}/mirrors[External "
 "mirrors, mirrors] for an overview.  The _latest_ branch is `main`.  The "
@@ -1554,13 +1556,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:697
+#: documentation/content/en/articles/committers-guide/_index.adoc:699
 #, no-wrap
 msgid "Commit message formats"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:701
+#: documentation/content/en/articles/committers-guide/_index.adoc:703
 msgid ""
 "A hook is available in the ports repository to help you write up your commit "
 "messages in https://cgit.freebsd.org/ports/tree/.hooks/prepare-commit-msg[."
@@ -1569,32 +1571,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:703
+#: documentation/content/en/articles/committers-guide/_index.adoc:705
 msgid ""
 "The main point being that a commit message should be formatted in the "
 "following way:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:706
+#: documentation/content/en/articles/committers-guide/_index.adoc:708
 #, no-wrap
 msgid "category/port: Summary.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:708
+#: documentation/content/en/articles/committers-guide/_index.adoc:710
 #, no-wrap
 msgid "Description of why the changes where made.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:710
+#: documentation/content/en/articles/committers-guide/_index.adoc:712
 #, no-wrap
 msgid "PR:\t    12345\n"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:716
+#: documentation/content/en/articles/committers-guide/_index.adoc:718
 msgid ""
 "The first line is the subject of the commit, it contains what port was "
 "changed, and a summary of the commit.  It should contain 50 characters or "
@@ -1602,39 +1604,39 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:718
+#: documentation/content/en/articles/committers-guide/_index.adoc:720
 msgid "A blank line should separate it from the rest of the commit message."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:720
+#: documentation/content/en/articles/committers-guide/_index.adoc:722
 msgid ""
 "The rest of the commit message should be wrapped at the 72 characters "
 "boundary."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:722
+#: documentation/content/en/articles/committers-guide/_index.adoc:724
 msgid ""
 "Another blank line should be added if there are any metadata fields, so that "
 "they are easily distinguishable from the commit message."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:724
+#: documentation/content/en/articles/committers-guide/_index.adoc:726
 #, no-wrap
 msgid "Managing Local Changes"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:727
+#: documentation/content/en/articles/committers-guide/_index.adoc:729
 msgid ""
 "This section addresses tracking local changes.  If you have no local changes "
 "you can skip this section."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:733
+#: documentation/content/en/articles/committers-guide/_index.adoc:735
 msgid ""
 "One item that is important for all of them: all changes are local until "
 "pushed.  Unlike Subversion, Git uses a distributed model.  For users, for "
@@ -1645,13 +1647,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:734
+#: documentation/content/en/articles/committers-guide/_index.adoc:736
 #, no-wrap
 msgid "Keeping local changes"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:741
+#: documentation/content/en/articles/committers-guide/_index.adoc:743
 msgid ""
 "The simplest way to keep local changes (especially trivial ones) is to use "
 "`git stash`.  In its simplest form, you use `git stash` to record the "
@@ -1663,7 +1665,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:745
+#: documentation/content/en/articles/committers-guide/_index.adoc:747
 msgid ""
 "This method is suitable when you have tiny tweaks to the tree.  When you "
 "have anything non trivial, you'll likely be better off keeping a local "
@@ -1672,13 +1674,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:746
+#: documentation/content/en/articles/committers-guide/_index.adoc:748
 #, no-wrap
 msgid "Keeping a local branch"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:753
+#: documentation/content/en/articles/committers-guide/_index.adoc:755
 msgid ""
 "It is much easier to keep a local branch with Git than Subversion.  In "
 "Subversion you need to merge the commit, and resolve the conflicts.  This is "
@@ -1689,7 +1691,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:757
+#: documentation/content/en/articles/committers-guide/_index.adoc:759
 msgid ""
 "In addition to merging, Git supports the concept of 'rebasing' which avoids "
 "these issues.  The `git rebase` command replays all the commits of a branch "
@@ -1698,12 +1700,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:759
+#: documentation/content/en/articles/committers-guide/_index.adoc:761
 msgid "====== Create a branch"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:764
+#: documentation/content/en/articles/committers-guide/_index.adoc:766
 msgid ""
 "Let's say you want to make a change to FreeBSD's ls command to never, ever "
 "do color.  There are many reasons to do this, but this example will use that "
@@ -1713,7 +1715,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:786
+#: documentation/content/en/articles/committers-guide/_index.adoc:788
 #, no-wrap
 msgid ""
 "% cd src\n"
@@ -1739,7 +1741,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:793
+#: documentation/content/en/articles/committers-guide/_index.adoc:795
 msgid ""
 "The commit will pop you into an editor to describe what you've done.  Once "
 "you enter that, you have your own **local** branch in the Git repo.  Build "
@@ -1751,12 +1753,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:795
+#: documentation/content/en/articles/committers-guide/_index.adoc:797
 msgid "====== Time to update"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:800
+#: documentation/content/en/articles/committers-guide/_index.adoc:802
 msgid ""
 "When it is time to bring in a new version, it is almost the same as w/o the "
 "branches.  You would update like you would above, but there is one extra "
@@ -1766,7 +1768,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:806
+#: documentation/content/en/articles/committers-guide/_index.adoc:808
 #, no-wrap
 msgid ""
 "% git checkout main\n"
@@ -1775,7 +1777,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:811
+#: documentation/content/en/articles/committers-guide/_index.adoc:813
 msgid ""
 "This will bring up an editor that lists all the commits in it.  For this "
 "example, do not change it at all.  This is typically what you are doing "
@@ -1784,14 +1786,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:813
+#: documentation/content/en/articles/committers-guide/_index.adoc:815
 msgid ""
 "Once you are done with the above, you have to move the commits to ls.c "
 "forward from the old version of FreeBSD to the newer one."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:820
+#: documentation/content/en/articles/committers-guide/_index.adoc:822
 msgid ""
 "Sometimes there are merge conflicts.  That is OK.  Do not panic.  Instead, "
 "handle them the same as any other merge conflicts.  To keep it simple, I "
@@ -1800,7 +1802,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:823
+#: documentation/content/en/articles/committers-guide/_index.adoc:825
 msgid ""
 "Let's say the includes changes upstream in a radical shift to terminfo as "
 "well as a name change for the option.  When you updated, you might see "
@@ -1808,7 +1810,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:833
+#: documentation/content/en/articles/committers-guide/_index.adoc:835
 #, no-wrap
 msgid ""
 "Auto-merging bin/ls/ls.c\n"
@@ -1822,7 +1824,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:836
+#: documentation/content/en/articles/committers-guide/_index.adoc:838
 msgid ""
 "which looks scary.  If you bring up an editor, you will see it is a typical "
 "3-way merge conflict resolution that you may be familiar with from other "
@@ -1830,7 +1832,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:845
+#: documentation/content/en/articles/committers-guide/_index.adoc:847
 #, no-wrap
 msgid ""
 " <<<<<<< HEAD\n"
@@ -1844,7 +1846,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:849
+#: documentation/content/en/articles/committers-guide/_index.adoc:851
 #, no-wrap
 msgid ""
 "The new code is first, and your code is second.\n"
@@ -1853,12 +1855,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:853
+#: documentation/content/en/articles/committers-guide/_index.adoc:855
 msgid "#undef COLORLS_NEW #ifdef COLORLS_NEW #include <terminfo.h>"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:857
+#: documentation/content/en/articles/committers-guide/_index.adoc:859
 #, no-wrap
 msgid ""
 "save the file.\n"
@@ -1867,12 +1869,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:860
+#: documentation/content/en/articles/committers-guide/_index.adoc:862
 msgid "% git add ls.c % git rebase --continue"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:865
+#: documentation/content/en/articles/committers-guide/_index.adoc:867
 #, no-wrap
 msgid ""
 "which tells Git that ls.c has been fixed and to continue the rebase operation.\n"
@@ -1881,7 +1883,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:870
+#: documentation/content/en/articles/committers-guide/_index.adoc:872
 #, no-wrap
 msgid ""
 "If you get stuck during the rebase, do not panic.\n"
@@ -1891,7 +1893,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:873
+#: documentation/content/en/articles/committers-guide/_index.adoc:875
 #, no-wrap
 msgid ""
 "For more on this topic, https://www.freecodecamp.org/news/the-ultimate-guide-to-git-merge-and-git-rebase/ provides a rather extensive treatment.\n"
@@ -1899,25 +1901,25 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:874
+#: documentation/content/en/articles/committers-guide/_index.adoc:876
 #, no-wrap
 msgid "Switching to a Different FreeBSD Branch"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:878
+#: documentation/content/en/articles/committers-guide/_index.adoc:880
 msgid ""
 "If you wish to shift from stable/12 to the current branch.  If you have a "
 "deep clone, the following will suffice: [source,shell]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:881
+#: documentation/content/en/articles/committers-guide/_index.adoc:883
 msgid "% git checkout main % # build and install here..."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:887
+#: documentation/content/en/articles/committers-guide/_index.adoc:889
 #, no-wrap
 msgid ""
 "If you have a local branch, though, there are one or two caveats.\n"
@@ -1928,7 +1930,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:891
+#: documentation/content/en/articles/committers-guide/_index.adoc:893
 #, no-wrap
 msgid ""
 "% git checkout no-color-ls\n"
@@ -1937,7 +1939,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:898
+#: documentation/content/en/articles/committers-guide/_index.adoc:900
 #, no-wrap
 msgid ""
 "What the above does is checkout no-color-ls.\n"
@@ -1948,25 +1950,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:900
+#: documentation/content/en/articles/committers-guide/_index.adoc:902
 #, no-wrap
 msgid "[[mfc-with-git]]\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:900
+#: documentation/content/en/articles/committers-guide/_index.adoc:902
 #, no-wrap
 msgid "MFC (Merge From Current) Procedures"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:901
+#: documentation/content/en/articles/committers-guide/_index.adoc:903
 #, no-wrap
 msgid "Summary"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:905
+#: documentation/content/en/articles/committers-guide/_index.adoc:907
 msgid ""
 "MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --"
 "amend` to adjust the commit message.  For multiple commits, use `git rebase -"
@@ -1974,39 +1976,39 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:906
+#: documentation/content/en/articles/committers-guide/_index.adoc:908
 #, no-wrap
 msgid "Single commit MFC"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:909
-#: documentation/content/en/articles/committers-guide/_index.adoc:949
-#: documentation/content/en/articles/committers-guide/_index.adoc:985
-#: documentation/content/en/articles/committers-guide/_index.adoc:1101
-#: documentation/content/en/articles/committers-guide/_index.adoc:1114
-#: documentation/content/en/articles/committers-guide/_index.adoc:1141
-#: documentation/content/en/articles/committers-guide/_index.adoc:1153
-#: documentation/content/en/articles/committers-guide/_index.adoc:1219
-#: documentation/content/en/articles/committers-guide/_index.adoc:1237
-#: documentation/content/en/articles/committers-guide/_index.adoc:1259
-#: documentation/content/en/articles/committers-guide/_index.adoc:1277
-#: documentation/content/en/articles/committers-guide/_index.adoc:1297
-#: documentation/content/en/articles/committers-guide/_index.adoc:1312
-#: documentation/content/en/articles/committers-guide/_index.adoc:1331
+#: documentation/content/en/articles/committers-guide/_index.adoc:911
+#: documentation/content/en/articles/committers-guide/_index.adoc:951
+#: documentation/content/en/articles/committers-guide/_index.adoc:987
+#: documentation/content/en/articles/committers-guide/_index.adoc:1103
+#: documentation/content/en/articles/committers-guide/_index.adoc:1116
+#: documentation/content/en/articles/committers-guide/_index.adoc:1159
+#: documentation/content/en/articles/committers-guide/_index.adoc:1177
+#: documentation/content/en/articles/committers-guide/_index.adoc:1269
+#: documentation/content/en/articles/committers-guide/_index.adoc:1287
+#: documentation/content/en/articles/committers-guide/_index.adoc:1309
+#: documentation/content/en/articles/committers-guide/_index.adoc:1327
+#: documentation/content/en/articles/committers-guide/_index.adoc:1348
 #: documentation/content/en/articles/committers-guide/_index.adoc:1363
-#: documentation/content/en/articles/committers-guide/_index.adoc:1410
-#: documentation/content/en/articles/committers-guide/_index.adoc:1474
+#: documentation/content/en/articles/committers-guide/_index.adoc:1382
+#: documentation/content/en/articles/committers-guide/_index.adoc:1414
+#: documentation/content/en/articles/committers-guide/_index.adoc:1461
+#: documentation/content/en/articles/committers-guide/_index.adoc:1525
 msgid "[source,shell]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:912
+#: documentation/content/en/articles/committers-guide/_index.adoc:914
 msgid "% git checkout stable/X % git cherry-pick -x $HASH --edit"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:916
+#: documentation/content/en/articles/committers-guide/_index.adoc:918
 #, no-wrap
 msgid ""
 "For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick purposes.\n"
@@ -2014,65 +2016,65 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:918
-#: documentation/content/en/articles/committers-guide/_index.adoc:939
-#: documentation/content/en/articles/committers-guide/_index.adoc:962
-#: documentation/content/en/articles/committers-guide/_index.adoc:973
-#: documentation/content/en/articles/committers-guide/_index.adoc:1191
-#: documentation/content/en/articles/committers-guide/_index.adoc:1285
-#: documentation/content/en/articles/committers-guide/_index.adoc:1370
-#: documentation/content/en/articles/committers-guide/_index.adoc:1382
-#: documentation/content/en/articles/committers-guide/_index.adoc:1394
-#: documentation/content/en/articles/committers-guide/_index.adoc:1420
-#: documentation/content/en/articles/committers-guide/_index.adoc:1432
-#: documentation/content/en/articles/committers-guide/_index.adoc:1439
-#: documentation/content/en/articles/committers-guide/_index.adoc:1481
-#: documentation/content/en/articles/committers-guide/_index.adoc:1515
-#: documentation/content/en/articles/committers-guide/_index.adoc:1522
-#: documentation/content/en/articles/committers-guide/_index.adoc:1531
-#: documentation/content/en/articles/committers-guide/_index.adoc:1560
-#: documentation/content/en/articles/committers-guide/_index.adoc:1576
-#: documentation/content/en/articles/committers-guide/_index.adoc:1609
-#: documentation/content/en/articles/committers-guide/_index.adoc:1630
-#: documentation/content/en/articles/committers-guide/_index.adoc:1661
-#: documentation/content/en/articles/committers-guide/_index.adoc:1673
-#: documentation/content/en/articles/committers-guide/_index.adoc:1704
-#: documentation/content/en/articles/committers-guide/_index.adoc:1713
-#: documentation/content/en/articles/committers-guide/_index.adoc:1723
-#: documentation/content/en/articles/committers-guide/_index.adoc:1739
+#: documentation/content/en/articles/committers-guide/_index.adoc:920
+#: documentation/content/en/articles/committers-guide/_index.adoc:941
+#: documentation/content/en/articles/committers-guide/_index.adoc:964
+#: documentation/content/en/articles/committers-guide/_index.adoc:975
+#: documentation/content/en/articles/committers-guide/_index.adoc:1241
+#: documentation/content/en/articles/committers-guide/_index.adoc:1335
+#: documentation/content/en/articles/committers-guide/_index.adoc:1421
+#: documentation/content/en/articles/committers-guide/_index.adoc:1433
+#: documentation/content/en/articles/committers-guide/_index.adoc:1445
+#: documentation/content/en/articles/committers-guide/_index.adoc:1471
+#: documentation/content/en/articles/committers-guide/_index.adoc:1483
+#: documentation/content/en/articles/committers-guide/_index.adoc:1490
+#: documentation/content/en/articles/committers-guide/_index.adoc:1532
+#: documentation/content/en/articles/committers-guide/_index.adoc:1566
+#: documentation/content/en/articles/committers-guide/_index.adoc:1573
+#: documentation/content/en/articles/committers-guide/_index.adoc:1582
+#: documentation/content/en/articles/committers-guide/_index.adoc:1611
+#: documentation/content/en/articles/committers-guide/_index.adoc:1627
+#: documentation/content/en/articles/committers-guide/_index.adoc:1660
+#: documentation/content/en/articles/committers-guide/_index.adoc:1681
+#: documentation/content/en/articles/committers-guide/_index.adoc:1712
+#: documentation/content/en/articles/committers-guide/_index.adoc:1724
 #: documentation/content/en/articles/committers-guide/_index.adoc:1755
-#: documentation/content/en/articles/committers-guide/_index.adoc:1766
-#: documentation/content/en/articles/committers-guide/_index.adoc:1773
-#: documentation/content/en/articles/committers-guide/_index.adoc:1786
+#: documentation/content/en/articles/committers-guide/_index.adoc:1764
+#: documentation/content/en/articles/committers-guide/_index.adoc:1774
+#: documentation/content/en/articles/committers-guide/_index.adoc:1790
 #: documentation/content/en/articles/committers-guide/_index.adoc:1806
-#: documentation/content/en/articles/committers-guide/_index.adoc:1820
-#: documentation/content/en/articles/committers-guide/_index.adoc:1836
-#: documentation/content/en/articles/committers-guide/_index.adoc:1848
-#: documentation/content/en/articles/committers-guide/_index.adoc:1867
-#: documentation/content/en/articles/committers-guide/_index.adoc:1878
-#: documentation/content/en/articles/committers-guide/_index.adoc:1888
-#: documentation/content/en/articles/committers-guide/_index.adoc:1926
-#: documentation/content/en/articles/committers-guide/_index.adoc:1934
-#: documentation/content/en/articles/committers-guide/_index.adoc:1945
-#: documentation/content/en/articles/committers-guide/_index.adoc:1966
-#: documentation/content/en/articles/committers-guide/_index.adoc:2026
+#: documentation/content/en/articles/committers-guide/_index.adoc:1817
+#: documentation/content/en/articles/committers-guide/_index.adoc:1824
+#: documentation/content/en/articles/committers-guide/_index.adoc:1837
+#: documentation/content/en/articles/committers-guide/_index.adoc:1857
+#: documentation/content/en/articles/committers-guide/_index.adoc:1871
+#: documentation/content/en/articles/committers-guide/_index.adoc:1887
+#: documentation/content/en/articles/committers-guide/_index.adoc:1899
+#: documentation/content/en/articles/committers-guide/_index.adoc:1918
+#: documentation/content/en/articles/committers-guide/_index.adoc:1929
+#: documentation/content/en/articles/committers-guide/_index.adoc:1939
+#: documentation/content/en/articles/committers-guide/_index.adoc:1979
+#: documentation/content/en/articles/committers-guide/_index.adoc:1987
+#: documentation/content/en/articles/committers-guide/_index.adoc:1998
+#: documentation/content/en/articles/committers-guide/_index.adoc:2019
+#: documentation/content/en/articles/committers-guide/_index.adoc:2080
 #, no-wrap
 msgid "[source,shell]\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:921
+#: documentation/content/en/articles/committers-guide/_index.adoc:923
 msgid "% git checkout stable/X % git cherry-pick -x $HASH -m 1 --edit"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:924
+#: documentation/content/en/articles/committers-guide/_index.adoc:926
 #, no-wrap
 msgid "If things go wrong, you'll either need to abort the cherry-pick with `git cherry-pick --abort` or fix it up and do a `git cherry-pick --continue`.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:927
+#: documentation/content/en/articles/committers-guide/_index.adoc:929
 #, no-wrap
 msgid ""
 "Once the cherry-pick is finished, push with `git push`.\n"
@@ -2080,20 +2082,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:928
+#: documentation/content/en/articles/committers-guide/_index.adoc:930
 #, no-wrap
 msgid "MFC to RELENG branch"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:932
+#: documentation/content/en/articles/committers-guide/_index.adoc:934
 msgid ""
 "MFCs to branches that require approval require a bit more care.  The process "
 "is the same for either a typical merge or an exceptional direct commit."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:937
+#: documentation/content/en/articles/committers-guide/_index.adoc:939
 #, no-wrap
 msgid ""
 "* Merge or direct commit to the appropriate `stable/X` branch first before merging to the `releng/X.Y` branch.\n"
@@ -2103,24 +2105,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:942
+#: documentation/content/en/articles/committers-guide/_index.adoc:944
 msgid "% git checkout releng/13.0 % git cherry-pick -x $HASH --edit"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:945
+#: documentation/content/en/articles/committers-guide/_index.adoc:947
 #, no-wrap
 msgid "If you forget to to add the `Approved by:` line, you can do a `git commit --amend` to edit the commit message before you push the change.\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:946
+#: documentation/content/en/articles/committers-guide/_index.adoc:948
 #, no-wrap
 msgid "Multiple commit MFC"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:957
+#: documentation/content/en/articles/committers-guide/_index.adoc:959
 msgid ""
 "% git checkout -b tmp-branch stable/X % for h in $HASH_LIST; do git cherry-"
 "pick -x $h; done % git rebase -i stable/X # mark each of the commits after "
@@ -2130,37 +2132,37 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:960
+#: documentation/content/en/articles/committers-guide/_index.adoc:962
 #, no-wrap
 msgid "If the push fails due to losing the commit race, rebase and try again:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:968
+#: documentation/content/en/articles/committers-guide/_index.adoc:970
 msgid ""
 "% git checkout stable/X % git pull % git checkout tmp-branch % git rebase "
 "stable/X % git push freebsd HEAD:stable/X"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:971
+#: documentation/content/en/articles/committers-guide/_index.adoc:973
 #, no-wrap
 msgid "Once the MFC is complete, you can delete the temporary branch:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:976
+#: documentation/content/en/articles/committers-guide/_index.adoc:978
 msgid "% git checkout stable/X % git branch -d tmp-branch"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:978
+#: documentation/content/en/articles/committers-guide/_index.adoc:980
 #, no-wrap
 msgid "MFC a vendor import"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:983
+#: documentation/content/en/articles/committers-guide/_index.adoc:985
 msgid ""
 "Vendor imports are the only thing in the tree that creates a merge commit in "
 "the `main` branch.  Cherry picking merge commits into stable/XX presents an "
@@ -2170,12 +2172,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:987
+#: documentation/content/en/articles/committers-guide/_index.adoc:989
 msgid "% git cherry-pick -x -m 1 $HASH"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:990
+#: documentation/content/en/articles/committers-guide/_index.adoc:992
 #, no-wrap
 msgid ""
 "is typically what you want.\n"
@@ -2183,7 +2185,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:995
+#: documentation/content/en/articles/committers-guide/_index.adoc:997
 #, no-wrap
 msgid ""
 "There are some, hopefully, rare cases where it's possible that the `main` branch was merged backwards by the conversion script.\n"
@@ -2193,36 +2195,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:998
+#: documentation/content/en/articles/committers-guide/_index.adoc:1000
 msgid "% git cherry-pick --abort % git cherry-pick -x -m 2 $HASH"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1000
+#: documentation/content/en/articles/committers-guide/_index.adoc:1002
 #, no-wrap
 msgid "to do that. The `--abort` will cleanup the failed first attempt.\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1001
+#: documentation/content/en/articles/committers-guide/_index.adoc:1003
 #, no-wrap
 msgid "Redoing a MFC"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1006
+#: documentation/content/en/articles/committers-guide/_index.adoc:1008
 msgid ""
 "If you do a MFC, and it goes horribly wrong and you want to start over, then "
 "the easiest way is to use `git reset --hard` like so: [source,shell]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1008
+#: documentation/content/en/articles/committers-guide/_index.adoc:1010
 msgid "% git reset --hard freebsd/stable/12"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1011
+#: documentation/content/en/articles/committers-guide/_index.adoc:1013
 #, no-wrap
 msgid ""
 "though if you have some revs you want to keep, and others you don't,\n"
@@ -2230,20 +2232,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1012
+#: documentation/content/en/articles/committers-guide/_index.adoc:1014
 #, no-wrap
 msgid "Considerations when MFCing"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1015
+#: documentation/content/en/articles/committers-guide/_index.adoc:1017
 msgid ""
 "When committing source commits to stable and releng branches, we have the "
 "following goals:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1019
+#: documentation/content/en/articles/committers-guide/_index.adoc:1021
 #, no-wrap
 msgid ""
 "* Clearly mark direct commits distinct from commits that land a change from another branch.\n"
@@ -2252,13 +2254,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1021
+#: documentation/content/en/articles/committers-guide/_index.adoc:1023
 #, no-wrap
 msgid "With Subversion, we used the following practices to achieve these goals:\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1025
+#: documentation/content/en/articles/committers-guide/_index.adoc:1027
 #, no-wrap
 msgid ""
 "* Using `MFC` and `MFS` tags to mark commits that merged changes from another branch.\n"
@@ -2267,7 +2269,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1029
+#: documentation/content/en/articles/committers-guide/_index.adoc:1031
 #, no-wrap
 msgid ""
 "With Git, we will need to use different strategies to achieve the same goals.\n"
@@ -2276,7 +2278,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1032
+#: documentation/content/en/articles/committers-guide/_index.adoc:1034
 #, no-wrap
 msgid ""
 "One general note: due to technical differences with Git, we will not be using Git \"merge commits\" (created via `git merge`) in stable or releng branches.\n"
@@ -2284,13 +2286,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1033
+#: documentation/content/en/articles/committers-guide/_index.adoc:1035
 #, no-wrap
 msgid "Finding Eligible Hashes to MFC"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1039
+#: documentation/content/en/articles/committers-guide/_index.adoc:1041
 msgid ""
 "Git provides some built-in support for this via the `git cherry` and `git "
 "log --cherry` commands.  These commands compare the raw diffs of commits "
@@ -2304,42 +2306,42 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1040
+#: documentation/content/en/articles/committers-guide/_index.adoc:1042
 #, no-wrap
 msgid "Commit message standards"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1041
+#: documentation/content/en/articles/committers-guide/_index.adoc:1043
 #, no-wrap
 msgid "Marking MFCs"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1044
+#: documentation/content/en/articles/committers-guide/_index.adoc:1046
 msgid "The project has adopted the following practice for marking MFCs:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1046
+#: documentation/content/en/articles/committers-guide/_index.adoc:1048
 #, no-wrap
 msgid "* Use the `-x` flag with `git cherry-pick`.  This adds a line to the commit message that includes the hash of the original commit when merging. Since it is added by Git directly, committers do not have to manually edit the commit log when merging.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1048
+#: documentation/content/en/articles/committers-guide/_index.adoc:1050
 #, no-wrap
 msgid "When merging multiple commits, keep all the \"cherry picked from\" lines.\n"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1049
+#: documentation/content/en/articles/committers-guide/_index.adoc:1051
 #, no-wrap
 msgid "Trim Metadata?"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1053
+#: documentation/content/en/articles/committers-guide/_index.adoc:1055
 msgid ""
 "One area that was not clearly documented with Subversion (or even CVS) is "
 "how to format metadata in log messages for MFC commits.  Should it include "
@@ -2348,7 +2350,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1062
+#: documentation/content/en/articles/committers-guide/_index.adoc:1064
 msgid ""
 "Historical practice has varied, though some of the variance is by field.  "
 "For example, MFCs that are relevant to a PR generally include the PR field "
@@ -2367,7 +2369,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1066
+#: documentation/content/en/articles/committers-guide/_index.adoc:1068
 msgid ""
 "For MFCs regulated by re@, new metadata fields are added, such as the "
 "Approved by tag for approved commits.  This new metadata will have to be "
@@ -2377,14 +2379,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1069
+#: documentation/content/en/articles/committers-guide/_index.adoc:1071
 msgid ""
 "Preserving existing metadata provides a very simple workflow.  Developers "
 "use `git cherry-pick -x` without having to edit the log message."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1072
+#: documentation/content/en/articles/committers-guide/_index.adoc:1074
 msgid ""
 "If instead we choose to adjust metadata in MFCs, developers will have to "
 "edit log messages explicitly via the use of `git cherry-pick --edit` or `git "
@@ -2394,43 +2396,43 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1074
+#: documentation/content/en/articles/committers-guide/_index.adoc:1076
 msgid ""
 "The bottom line is that developers will likely need to curate their commit "
 "message for MFCs that are non-trivial."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1076
+#: documentation/content/en/articles/committers-guide/_index.adoc:1078
 msgid "[[vendor-import-git]]"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:1076
+#: documentation/content/en/articles/committers-guide/_index.adoc:1078
 #, no-wrap
 msgid "Vendor Imports with Git"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1079
+#: documentation/content/en/articles/committers-guide/_index.adoc:1081
 msgid "This section describes the vendor import procedure with Git in detail."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1080
+#: documentation/content/en/articles/committers-guide/_index.adoc:1082
 #, no-wrap
 msgid "Branch naming convention"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1083
+#: documentation/content/en/articles/committers-guide/_index.adoc:1085
 msgid ""
 "All vendor branches and tags start with `vendor/`. These branches and tags "
 "are visible by default."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1089
+#: documentation/content/en/articles/committers-guide/_index.adoc:1091
 msgid ""
 "[NOTE] ==== This chapter follows the convention that the `freebsd` origin is "
 "the origin name for the official FreeBSD Git repository.  If you use a "
@@ -2439,20 +2441,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1092
+#: documentation/content/en/articles/committers-guide/_index.adoc:1094
 msgid ""
 "We will explore an example for updating NetBSD's mtree that is in our tree.  "
 "The vendor branch for this is `vendor/NetBSD/mtree`."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1093
+#: documentation/content/en/articles/committers-guide/_index.adoc:1095
 #, no-wrap
 msgid "Updating an old vendor import"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1099
+#: documentation/content/en/articles/committers-guide/_index.adoc:1101
 msgid ""
 "The vendor trees usually have only the subset of the third-party software "
 "that is appropriate to FreeBSD.  These trees are usually tiny in comparison "
@@ -2462,25 +2464,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1103
+#: documentation/content/en/articles/committers-guide/_index.adoc:1105
 msgid "% git worktree add ../mtree vendor/NetBSD/mtree"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1105
+#: documentation/content/en/articles/committers-guide/_index.adoc:1107
 #, no-wrap
 msgid "Update the Sources in the Vendor Branch"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1108
+#: documentation/content/en/articles/committers-guide/_index.adoc:1110
 msgid ""
 "Prepare a full, clean tree of the vendor sources. Import everything but "
 "merge only what is needed."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1112
+#: documentation/content/en/articles/committers-guide/_index.adoc:1114
 msgid ""
 "This example assumes the NetBSD source is checked out from their GitHub "
 "mirror in `~/git/NetBSD`.  Note that \"upstream\" might have added or "
@@ -2489,7 +2491,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1126
+#: documentation/content/en/articles/committers-guide/_index.adoc:1128
 #, no-wrap
 msgid ""
 "% cd ../mtree\n"
@@ -2506,15 +2508,41 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1130
+#: documentation/content/en/articles/committers-guide/_index.adoc:1141
+#, no-wrap
+msgid ""
+"It is critical to verify that the source code you are importing comes from a\n"
+"trustworthy source. Many open-source projects use cryptographic signatures to\n"
+"sign code changes, git tags, and/or source code tarballs. Always verify these\n"
+"signatures, and use isolation mechanisms like jails, chroot, in combination with\n"
+"a dedicated, non-privileged user account that is different from the one you\n"
+"regularly use (see the Updating the FreeBSD source tree section below for\n"
+"more details), until you are confident that the source code you are importing\n"
+"looks safe. Following the upstream development and occasionally reviewing the\n"
+"upstream code changes can greatly help in improving code quality and benefit\n"
+"everyone involved. It is also a good idea to examine the git diff results\n"
+"before importing them into the vendor area.\n"
+msgstr ""
+
+#. type: delimited block . 4
+#: documentation/content/en/articles/committers-guide/_index.adoc:1145
+#, no-wrap
+msgid ""
+"Always run the `git diff` and `git status` commands and examine the results\n"
+"carefully. When in doubt, it is useful to do a `git annotate` on the vendor\n"
+"branch or the upstream git repository to see who and why a change was made.\n"
+msgstr ""
+
+#. type: delimited block . 4
+#: documentation/content/en/articles/committers-guide/_index.adoc:1148
 #, no-wrap
 msgid ""
-"Note: I run the `git diff` and `git status` commands to make sure nothing weird was present.\n"
-"Also I used `-m` to illustrate, but you should compose a proper message in an editor (using a commit message template).\n"
+"In the example above we used `-m` to illustrate, but you should compose a\n"
+"proper message in an editor (using a commit message template).\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1135
+#: documentation/content/en/articles/committers-guide/_index.adoc:1153
 #, no-wrap
 msgid ""
 "It is also important to create an annotated tag using `git tag -a`, otherwise the push will be rejected.\n"
@@ -2524,62 +2552,108 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1136
+#: documentation/content/en/articles/committers-guide/_index.adoc:1154
 #, no-wrap
 msgid "Updating the FreeBSD Copy"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1139
+#: documentation/content/en/articles/committers-guide/_index.adoc:1157
 msgid "At this point you can push the import to `vendor` into our repo."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1143
+#: documentation/content/en/articles/committers-guide/_index.adoc:1161
 msgid "% git push --follow-tags freebsd vendor/NetBSD/mtree"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1146
+#: documentation/content/en/articles/committers-guide/_index.adoc:1164
 #, no-wrap
 msgid "`--follow-tags` tells `git push` to also push tags associated with the locally committed revision.\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1147
+#: documentation/content/en/articles/committers-guide/_index.adoc:1165
 #, no-wrap
 msgid "Updating the FreeBSD source tree"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1151
+#: documentation/content/en/articles/committers-guide/_index.adoc:1169
 msgid ""
 "Now you need to update the mtree in FreeBSD.  The sources live in `contrib/"
 "mtree` since it is upstream software."
 msgstr ""
 
+#. type: delimited block . 4
+#: documentation/content/en/articles/committers-guide/_index.adoc:1175
+msgid ""
+"From time to time, we may have to make changes to the contributed code to "
+"better satisfy FreeBSD's needs. Whenever possible, please try to contribute "
+"the local changes back to the upstream projects, this helps them to better "
+"support FreeBSD, and also saves your time for future conflict resolutions "
+"when importing updates."
+msgstr ""
+
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1156
+#: documentation/content/en/articles/committers-guide/_index.adoc:1180
 msgid "% cd ../src % git subtree merge -P contrib/mtree vendor/NetBSD/mtree"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1161
+#: documentation/content/en/articles/committers-guide/_index.adoc:1190
 #, no-wrap
 msgid ""
 "This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch.\n"
+"Examine the diff from the merge result and the contents of the\n"
+"upstream branch. If the merge reduced our local changes to more\n"
+"trivial difference like blank line or indenting changes, try amending\n"
+"the local changes to reduce diff against upstream, or try to\n"
+"contribute the remaining changes back to the upstream project.\n"
 "If there were conflicts, you would need to fix them before committing.\n"
 "Include details about the changes being merged in the merge commit message.\n"
 msgstr ""
 
+#. type: delimited block . 4
+#: documentation/content/en/articles/committers-guide/_index.adoc:1204
+#, no-wrap
+msgid ""
+"Some open-source software includes a `configure` script that generates files\n"
+"used to define how the code is built; usually, these generated files like\n"
+"`config.h` should be updated as part of the import process. When doing\n"
+"this, always keep in mind that these scripts are executable code running\n"
+"under the current user's credentials. This process should always be run\n"
+"in an isolated environment, ideally inside a jail that does not have\n"
+"network access, and with an unprivileged account; or, at minimum, a\n"
+"dedicated account that is different from the user account you normally\n"
+"use for everyday purposes or for pushing to the FreeBSD source\n"
+"code repository. This minimizes the risk of encountering bugs that can\n"
+"cause data loss or, in worse cases, maliciously planted code. Using an\n"
+"isolated jail also prevents the configure scripts from detecting locally\n"
+"installed software packages, which may lead to unexpected results.\n"
+msgstr ""
+
+#. type: delimited block . 4
+#: documentation/content/en/articles/committers-guide/_index.adoc:1211
+#, no-wrap
+msgid ""
+"When testing your changes, run them in a chroot or jailed environment,\n"
+"or even within a virtual machine first, especially for kernel or library\n"
+"modifications. This approach helps prevent adverse interactions with\n"
+"your working environment. It can be particularly beneficial for\n"
+"changes to libraries that many base system components use,\n"
+"among others.\n"
+msgstr ""
+
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1162
+#: documentation/content/en/articles/committers-guide/_index.adoc:1212
 #, no-wrap
 msgid "Rebasing your change against latest FreeBSD source tree"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1165
+#: documentation/content/en/articles/committers-guide/_index.adoc:1215
 msgid ""
 "Because the current policy recommends against using merges, if the upstream "
 "FreeBSD `main` moved forward before you get a chance to push, you would have "
@@ -2587,7 +2661,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1168
+#: documentation/content/en/articles/committers-guide/_index.adoc:1218
 msgid ""
 "Regular `git rebase` or `git pull --rebase` doesn't know how to rebase a "
 "merge commit **as a merge commit**, so instead of that you would have to "
@@ -2595,14 +2669,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1170
+#: documentation/content/en/articles/committers-guide/_index.adoc:1220
 msgid ""
 "The following steps should be taken to easily recreate the merge commit as "
 "if `git rebase --merge-commits` worked properly:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1187
+#: documentation/content/en/articles/committers-guide/_index.adoc:1237
 #, no-wrap
 msgid ""
 "* cd to the top of the repo\n"
@@ -2624,13 +2698,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1189
+#: documentation/content/en/articles/committers-guide/_index.adoc:1239
 #, no-wrap
 msgid "The commands one would use, following the above example of mtree, would be like so (the `#` starts a comment to help link commands to descriptions above):\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1202
+#: documentation/content/en/articles/committers-guide/_index.adoc:1252
 #, no-wrap
 msgid ""
 "% cd ../src\t\t\t# CD to top of tree\n"
@@ -2646,7 +2720,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1206
+#: documentation/content/en/articles/committers-guide/_index.adoc:1256
 #, no-wrap
 msgid ""
 "Note: if things go wrong with the commit, you can reset the `YYY` branch by reissuing the checkout command that created it with -B to start over:\n"
@@ -2654,20 +2728,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1208
+#: documentation/content/en/articles/committers-guide/_index.adoc:1258
 msgid ""
 "% git checkout -B YYY freebsd/main # Create new throw-away YYY branch if "
 "starting over is just going to be easier"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1210
+#: documentation/content/en/articles/committers-guide/_index.adoc:1260
 #, no-wrap
 msgid "Pushing the changes"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1215
+#: documentation/content/en/articles/committers-guide/_index.adoc:1265
 msgid ""
 "Once you think you have a set of changes that are good, you can push it to a "
 "fork off GitHub or GitLab for others to review.  One nice thing about Git is "
@@ -2678,14 +2752,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1217
+#: documentation/content/en/articles/committers-guide/_index.adoc:1267
 msgid ""
 "After review, when you are sure it is a good change, you can push it to the "
 "FreeBSD repo:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1223
+#: documentation/content/en/articles/committers-guide/_index.adoc:1273
 msgid ""
 "% git push freebsd YYY:main\t# put the commit on upstream's 'main' branch % "
 "git branch -D XXX\t\t# Throw away the throw-a-way branches.  % git branch -D "
@@ -2693,7 +2767,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1230
+#: documentation/content/en/articles/committers-guide/_index.adoc:1280
 #, no-wrap
 msgid ""
 "Note: I used `XXX` and `YYY` to make it obvious they are terrible names and should not leave your machine.\n"
@@ -2704,13 +2778,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1231
+#: documentation/content/en/articles/committers-guide/_index.adoc:1281
 #, no-wrap
 msgid "How to redo things if need be"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1235
+#: documentation/content/en/articles/committers-guide/_index.adoc:1285
 msgid ""
 "If you've tried to do the push in the previous section and it fails, then "
 "you should do the following to 'redo' things.  This sequence keeps the "
@@ -2718,7 +2792,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1244
+#: documentation/content/en/articles/committers-guide/_index.adoc:1294
 msgid ""
 "% git checkout -B XXX YYY\t# recreate that throw-away-branch XXX and switch "
 "to it % git merge freebsd/main\t# Merge the changes and resolve conflicts % "
@@ -2729,19 +2803,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1247
+#: documentation/content/en/articles/committers-guide/_index.adoc:1297
 #, no-wrap
 msgid "Then go check it out as above and push as above when ready.\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:1248
+#: documentation/content/en/articles/committers-guide/_index.adoc:1298
 #, no-wrap
 msgid "Creating a new vendor branch"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1255
+#: documentation/content/en/articles/committers-guide/_index.adoc:1305
 msgid ""
 "There are a number of ways to create a new vendor branch.  The recommended "
 "way is to create a new repository and then merge that with FreeBSD.  If one "
@@ -2752,38 +2826,38 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1256
+#: documentation/content/en/articles/committers-guide/_index.adoc:1306
 #, no-wrap
 msgid "Create the repo"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1265
+#: documentation/content/en/articles/committers-guide/_index.adoc:1315
 msgid ""
 "% cd /some/where % mkdir glorbnitz % cd glorbnitz % git init % git checkout -"
 "b vendor/glorbnitz"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1268
+#: documentation/content/en/articles/committers-guide/_index.adoc:1318
 #, no-wrap
 msgid "At this point, you have a new repo, where all new commits will go on the `vendor/glorbnitz` branch.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1270
+#: documentation/content/en/articles/committers-guide/_index.adoc:1320
 #, no-wrap
 msgid "Git experts can also do this right in their FreeBSD clone, using `git checkout --orphan vendor/glorbnitz` if they are more comfortable with that.\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1271
+#: documentation/content/en/articles/committers-guide/_index.adoc:1321
 #, no-wrap
 msgid "Copy the sources in"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1275
+#: documentation/content/en/articles/committers-guide/_index.adoc:1325
 msgid ""
 "Since this is a new import, you can just cp the sources in, or use tar or "
 "even rsync as shown above.  And we will add everything, assuming no dot "
@@ -2791,49 +2865,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1280
+#: documentation/content/en/articles/committers-guide/_index.adoc:1330
 msgid "% cp -r ~/glorbnitz/* .  % git add *"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1283
+#: documentation/content/en/articles/committers-guide/_index.adoc:1333
 #, no-wrap
 msgid "At this point, you should have a pristine copy of glorbnitz ready to commit.\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1287
+#: documentation/content/en/articles/committers-guide/_index.adoc:1337
 msgid "% git commit -m \"Import GlorbNitz frobnosticator revision 3.1415\""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1291
+#: documentation/content/en/articles/committers-guide/_index.adoc:1342
 #, no-wrap
 msgid ""
 "As above, I used `-m` for simplicity, but you should likely create a commit message that explains what a Glorb is and why you'd use a Nitz to get it.\n"
-"Not everybody will know so, for your actual commit, you should follow the <<commit-log-message,commit log message>> section instead of emulating the brief style used here.\n"
+"Not everybody will know so, for your actual commit, you should follow the\n"
+"crossref:committers-guide[commit-log-message,commit log message] section instead of emulating the brief style used here.\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1292
+#: documentation/content/en/articles/committers-guide/_index.adoc:1343
 #, no-wrap
 msgid "Now import it into our repository"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1295
+#: documentation/content/en/articles/committers-guide/_index.adoc:1346
 msgid "Now you need to import the branch into our repository."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1301
+#: documentation/content/en/articles/committers-guide/_index.adoc:1352
 msgid ""
 "% cd /path/to/freebsd/repo/src % git remote add glorbnitz /some/where/"
 "glorbnitz % git fetch glorbnitz vendor/glorbnitz"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1306
+#: documentation/content/en/articles/committers-guide/_index.adoc:1357
 #, no-wrap
 msgid ""
 "Note the vendor/glorbnitz branch is in the repo. At this point the `/some/where/glorbnitz` can be deleted, if you like.\n"
@@ -2842,20 +2917,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1307
+#: documentation/content/en/articles/committers-guide/_index.adoc:1358
 #, no-wrap
 msgid "Tag and push"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1310
+#: documentation/content/en/articles/committers-guide/_index.adoc:1361
 msgid ""
 "Steps from here on out are much the same as they are in the case of updating "
 "a vendor branch, though without the updating the vendor branch step."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1318
+#: documentation/content/en/articles/committers-guide/_index.adoc:1369
 msgid ""
 "% git worktree add ../glorbnitz vendor/glorbnitz % cd ../glorbnitz % git tag "
 "--annotate vendor/glorbnitz/3.1415 # Make sure the commit is good with \"git "
@@ -2863,13 +2938,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1321
+#: documentation/content/en/articles/committers-guide/_index.adoc:1372
 #, no-wrap
 msgid "By 'good' we mean:\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1327
+#: documentation/content/en/articles/committers-guide/_index.adoc:1378
 #, no-wrap
 msgid ""
 ". All the right files are present\n"
@@ -2880,13 +2955,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1328
+#: documentation/content/en/articles/committers-guide/_index.adoc:1379
 #, no-wrap
 msgid "Time to finally merge it into the base tree"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1337
+#: documentation/content/en/articles/committers-guide/_index.adoc:1388
 #, no-wrap
 msgid ""
 "% cd ../src\n"
@@ -2897,23 +2972,23 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1340
+#: documentation/content/en/articles/committers-guide/_index.adoc:1391
 #, no-wrap
 msgid "Here 'good' means:\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1345
+#: documentation/content/en/articles/committers-guide/_index.adoc:1396
 #, no-wrap
 msgid ""
 ". All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.\n"
 ". No other changes are in the tree.\n"
-". The commit messages look <<commit-log-message,good>>. It should contain a summary of what's changed since the last merge to the FreeBSD `main` branch and any caveats.\n"
+". The commit messages look crossref:committers-guide[commit-log-message,good]. It should contain a summary of what's changed since the last merge to the FreeBSD `main` branch and any caveats.\n"
 ". UPDATING should be updated if there is anything of note, such as user visible changes, important upgrade concerns, etc.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1351
+#: documentation/content/en/articles/committers-guide/_index.adoc:1402
 #, no-wrap
 msgid ""
 "[NOTE]\n"
@@ -2924,13 +2999,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1352
+#: documentation/content/en/articles/committers-guide/_index.adoc:1403
 #, no-wrap
 msgid "Keeping current"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1358
+#: documentation/content/en/articles/committers-guide/_index.adoc:1409
 msgid ""
 "So, time passes.  It's time now to update the tree for the latest changes "
 "upstream.  When you checkout `main` make sure that you have no diffs.  It's "
@@ -2939,7 +3014,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1361
+#: documentation/content/en/articles/committers-guide/_index.adoc:1412
 msgid ""
 "If you are used to `git pull`, we strongly recommend using the `--ff-only` "
 "option, and further setting it as the default option.  Alternatively, `git "
@@ -2947,23 +3022,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1365
+#: documentation/content/en/articles/committers-guide/_index.adoc:1416
 msgid "% git config --global pull.ff only"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1368
+#: documentation/content/en/articles/committers-guide/_index.adoc:1419
 #, no-wrap
 msgid "You may need to omit the --global if you want this setting to apply to only this repository.\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1374
+#: documentation/content/en/articles/committers-guide/_index.adoc:1425
 msgid "% cd freebsd-src % git checkout main % git pull (--ff-only|--rebase)"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1378
+#: documentation/content/en/articles/committers-guide/_index.adoc:1429
 #, no-wrap
 msgid ""
 "There is a common trap, that the combination command `git pull` will try to perform a merge, which would sometimes creates a merge commit that didn't exist before.\n"
@@ -2971,20 +3046,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1380
+#: documentation/content/en/articles/committers-guide/_index.adoc:1431
 #, no-wrap
 msgid "The longer form is also recommended.\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1387
+#: documentation/content/en/articles/committers-guide/_index.adoc:1438
 msgid ""
 "% cd freebsd-src % git checkout main % git fetch freebsd % git merge --ff-"
 "only freebsd/main"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1392
+#: documentation/content/en/articles/committers-guide/_index.adoc:1443
 #, no-wrap
 msgid ""
 "These commands reset your tree to the `main` branch, and then update it from where you pulled the tree from originally.\n"
@@ -2993,12 +3068,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1396
+#: documentation/content/en/articles/committers-guide/_index.adoc:1447
 msgid "% git rebase -i main working"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1403
+#: documentation/content/en/articles/committers-guide/_index.adoc:1454
 #, no-wrap
 msgid ""
 "This will bring up an interactive screen to change the defaults.\n"
@@ -3009,32 +3084,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1405
+#: documentation/content/en/articles/committers-guide/_index.adoc:1456
 #, no-wrap
 msgid "[[git-push-upstream]]\n"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1405
+#: documentation/content/en/articles/committers-guide/_index.adoc:1456
 #, no-wrap
 msgid "Time to push changes upstream"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1408
+#: documentation/content/en/articles/committers-guide/_index.adoc:1459
 msgid ""
 "First, ensure that the push URL is properly configured for the upstream "
 "repository."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1412
+#: documentation/content/en/articles/committers-guide/_index.adoc:1463
 msgid ""
 "% git remote set-url --push freebsd ssh://git@gitrepo.freebsd.org/src.git"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1416
+#: documentation/content/en/articles/committers-guide/_index.adoc:1467
 #, no-wrap
 msgid ""
 "Then, verify that user name and email are configured right.\n"
@@ -3042,24 +3117,24 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1418
+#: documentation/content/en/articles/committers-guide/_index.adoc:1469
 #, no-wrap
 msgid "Use\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1422
+#: documentation/content/en/articles/committers-guide/_index.adoc:1473
 msgid "freefall% gen-gitconfig.sh"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1425
+#: documentation/content/en/articles/committers-guide/_index.adoc:1476
 #, no-wrap
 msgid "on freefall.freebsd.org to get a recipe that you can use directly, assuming /usr/local/bin is in the PATH.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1430
+#: documentation/content/en/articles/committers-guide/_index.adoc:1481
 #, no-wrap
 msgid ""
 "The below command merges the `working` branch into the upstream `main` branch.\n"
@@ -3069,37 +3144,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1434
+#: documentation/content/en/articles/committers-guide/_index.adoc:1485
 msgid "% git push freebsd working:main"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1437
+#: documentation/content/en/articles/committers-guide/_index.adoc:1488
 #, no-wrap
 msgid "If your push is rejected due to losing a commit race, rebase your branch before trying again:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1444
+#: documentation/content/en/articles/committers-guide/_index.adoc:1495
 msgid ""
 "% git checkout working % git fetch freebsd % git rebase freebsd/main % git "
 "push freebsd working:main"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1447
+#: documentation/content/en/articles/committers-guide/_index.adoc:1498
 #, no-wrap
 msgid "[[git-push-upstream-alt]]\n"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1447
+#: documentation/content/en/articles/committers-guide/_index.adoc:1498
 #, no-wrap
 msgid "Time to push changes upstream (alternative)"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1453
+#: documentation/content/en/articles/committers-guide/_index.adoc:1504
 msgid ""
 "Some people find it easier to merge their changes to their local `main` "
 "before pushing to the remote repository.  Also, `git arc stage` moves "
@@ -3108,12 +3183,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1457
+#: documentation/content/en/articles/committers-guide/_index.adoc:1508
 msgid "% git checkout main % git merge --ff-only `working` % git push freebsd"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1461
+#: documentation/content/en/articles/committers-guide/_index.adoc:1512
 #, no-wrap
 msgid ""
 "If you lose the race, then try again with\n"
@@ -3121,12 +3196,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1464
+#: documentation/content/en/articles/committers-guide/_index.adoc:1515
 msgid "% git pull --rebase % git push freebsd"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1467
+#: documentation/content/en/articles/committers-guide/_index.adoc:1518
 #, no-wrap
 msgid ""
 "These commands will fetch the most recent `freebsd/main` and then rebase the local `main` changes on top of that, which is what you want when you lose the commit race.\n"
@@ -3134,37 +3209,37 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1468
+#: documentation/content/en/articles/committers-guide/_index.adoc:1519
 #, no-wrap
 msgid "Finding the Subversion Revision"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1472
+#: documentation/content/en/articles/committers-guide/_index.adoc:1523
 msgid ""
-"You'll need to make sure that you've fetched the notes (see the <<git-mini-"
-"daily-use>> for details).  Once you have these, notes will show up in the "
-"git log command like so:"
+"You'll need to make sure that you've fetched the notes (see the crossref:"
+"committers-guide[git-mini-daily-use]for details).  Once you have these, "
+"notes will show up in the git log command like so:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1476
+#: documentation/content/en/articles/committers-guide/_index.adoc:1527
 msgid "% git log"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1479
+#: documentation/content/en/articles/committers-guide/_index.adoc:1530
 #, no-wrap
 msgid "If you have a specific version in mind, you can use this construct:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1483
+#: documentation/content/en/articles/committers-guide/_index.adoc:1534
 msgid "% git log --grep revision=XXXX"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1487
+#: documentation/content/en/articles/committers-guide/_index.adoc:1538
 #, no-wrap
 msgid ""
 "to find the specific revision.\n"
@@ -3172,26 +3247,26 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1489
+#: documentation/content/en/articles/committers-guide/_index.adoc:1540
 #, no-wrap
 msgid "[[git-faq]]\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:1489
+#: documentation/content/en/articles/committers-guide/_index.adoc:1540
 #, no-wrap
 msgid "Git FAQ"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1492
+#: documentation/content/en/articles/committers-guide/_index.adoc:1543
 msgid ""
 "This section provides a number of targeted answers to questions that are "
 "likely to come up often for users and developers."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1498
+#: documentation/content/en/articles/committers-guide/_index.adoc:1549
 msgid ""
 "[NOTE] ==== We use the common convention of having the origin for the "
 "FreeBSD repository being 'freebsd' rather than the default 'origin' to allow "
@@ -3200,19 +3275,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1499
+#: documentation/content/en/articles/committers-guide/_index.adoc:1550
 #, no-wrap
 msgid "Users"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1501
+#: documentation/content/en/articles/committers-guide/_index.adoc:1552
 #, no-wrap
 msgid "How do I track -current and -stable with only one copy of the repository?"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1506
+#: documentation/content/en/articles/committers-guide/_index.adoc:1557
 #, no-wrap
 msgid ""
 "**Q:** Although disk space is not a huge issue, it's more efficient to use only one copy of the repository.\n"
@@ -3221,7 +3296,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1510
+#: documentation/content/en/articles/committers-guide/_index.adoc:1561
 #, no-wrap
 msgid ""
 "**A:** You can use Git worktrees.\n"
@@ -3230,7 +3305,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1513
+#: documentation/content/en/articles/committers-guide/_index.adoc:1564
 #, no-wrap
 msgid ""
 "First, you need to clone the FreeBSD repository, shown here cloning into `freebsd-current` to reduce confusion.\n"
@@ -3238,25 +3313,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1517
+#: documentation/content/en/articles/committers-guide/_index.adoc:1568
 msgid ""
 "% git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/"
 "notes/*' $URL freebsd-current"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1520
+#: documentation/content/en/articles/committers-guide/_index.adoc:1571
 #, no-wrap
 msgid "then once that's cloned, you can simply create a worktree from it:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1525
+#: documentation/content/en/articles/committers-guide/_index.adoc:1576
 msgid "% cd freebsd-current % git worktree add ../freebsd-stable-12 stable/12"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1529
+#: documentation/content/en/articles/committers-guide/_index.adoc:1580
 #, no-wrap
 msgid ""
 "this will checkout `stable/12` into a directory named `freebsd-stable-12` that's a peer to the `freebsd-current` directory.\n"
@@ -3264,7 +3339,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1539
+#: documentation/content/en/articles/committers-guide/_index.adoc:1590
 msgid ""
 "% cd freebsd-current % git checkout main % git pull --ff-only # changes from "
 "upstream now local and current tree updated % cd ../freebsd-stable-12 % git "
@@ -3272,43 +3347,43 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1542
+#: documentation/content/en/articles/committers-guide/_index.adoc:1593
 #, no-wrap
 msgid "I recommend using `--ff-only` because it's safer and you avoid accidentally getting into a 'merge nightmare' where you have an extra change in your tree, forcing a complicated merge rather than a simple one.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1544
+#: documentation/content/en/articles/committers-guide/_index.adoc:1595
 #, no-wrap
 msgid "Here's https://adventurist.me/posts/00296[a good writeup] that goes into more detail.\n"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1545
+#: documentation/content/en/articles/committers-guide/_index.adoc:1596
 #, no-wrap
 msgid "Developers"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1547
+#: documentation/content/en/articles/committers-guide/_index.adoc:1598
 #, no-wrap
 msgid "Ooops! I committed to `main`, instead of another branch."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1550
+#: documentation/content/en/articles/committers-guide/_index.adoc:1601
 #, no-wrap
 msgid "**Q:** From time to time, I goof up and mistakenly commit to the `main` branch. What do I do?\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1552
+#: documentation/content/en/articles/committers-guide/_index.adoc:1603
 #, no-wrap
 msgid "**A:** First, don't panic.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1556
+#: documentation/content/en/articles/committers-guide/_index.adoc:1607
 #, no-wrap
 msgid ""
 "Second, don't push.\n"
@@ -3317,13 +3392,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1558
+#: documentation/content/en/articles/committers-guide/_index.adoc:1609
 #, no-wrap
 msgid "The following answer assumes you committed to `main` and want to create a branch called `issue`:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1564
+#: documentation/content/en/articles/committers-guide/_index.adoc:1615
 #, no-wrap
 msgid ""
 "% git branch issue                # Create the 'issue' branch\n"
@@ -3332,13 +3407,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1566
+#: documentation/content/en/articles/committers-guide/_index.adoc:1617
 #, no-wrap
 msgid "Ooops! I committed something to the wrong branch!"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1570
+#: documentation/content/en/articles/committers-guide/_index.adoc:1621
 #, no-wrap
 msgid ""
 "**Q:** I was working on feature on the `wilma` branch, but accidentally committed a change relevant to the `fred` branch in 'wilma'.\n"
@@ -3346,7 +3421,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1574
+#: documentation/content/en/articles/committers-guide/_index.adoc:1625
 #, no-wrap
 msgid ""
 "**A:** The answer is similar to the previous one, but with cherry picking.\n"
@@ -3355,7 +3430,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1582
+#: documentation/content/en/articles/committers-guide/_index.adoc:1633
 msgid ""
 "# We're on branch wilma % git checkout fred\t\t# move to fred branch % git "
 "cherry-pick wilma\t\t# copy the misplaced commit % git checkout wilma\t\t# "
@@ -3364,7 +3439,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1586
+#: documentation/content/en/articles/committers-guide/_index.adoc:1637
 #, no-wrap
 msgid ""
 "Git experts would first rewind the wilma branch by 1 commit, switch over to fred and then use `git reflog` to see what that 1 deleted commit was and\n"
@@ -3372,13 +3447,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1588
+#: documentation/content/en/articles/committers-guide/_index.adoc:1639
 #, no-wrap
 msgid "**Q:** But what if I want to commit a few changes to `main`, but keep the rest in `wilma` for some reason?\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1594
+#: documentation/content/en/articles/committers-guide/_index.adoc:1645
 #, no-wrap
 msgid ""
 "**A:** The same technique above also works if you are wanting to 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug).\n"
@@ -3389,13 +3464,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1596
+#: documentation/content/en/articles/committers-guide/_index.adoc:1647
 #, no-wrap
 msgid "**Q:** I want to split off some changes from branch `wilma` into branch `fred`\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1602
+#: documentation/content/en/articles/committers-guide/_index.adoc:1653
 #, no-wrap
 msgid ""
 "**A:** The more general answer would be the same as the previous.\n"
@@ -3406,7 +3481,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1607
+#: documentation/content/en/articles/committers-guide/_index.adoc:1658
 #, no-wrap
 msgid ""
 "The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree.\n"
@@ -3416,7 +3491,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1614
+#: documentation/content/en/articles/committers-guide/_index.adoc:1665
 msgid ""
 "% git checkout pre-split\t# Go back % git branch -D fred\t\t# delete the "
 "fred branch % git checkout -B wilma\t\t# reset the wilma branch % git branch "
@@ -3424,7 +3499,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1618
+#: documentation/content/en/articles/committers-guide/_index.adoc:1669
 #, no-wrap
 msgid ""
 "The last step is optional.\n"
@@ -3432,7 +3507,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1622
+#: documentation/content/en/articles/committers-guide/_index.adoc:1673
 #, no-wrap
 msgid ""
 "**Q:** But I did things as I read along and didn't see your advice at the end to create a branch, and now `fred` and `wilma` are all screwed up.\n"
@@ -3441,13 +3516,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1624
+#: documentation/content/en/articles/committers-guide/_index.adoc:1675
 #, no-wrap
 msgid "**A:** All is not lost. You can figure out it, so long as it hasn't been too long, or too many commits (hundreds).\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1628
+#: documentation/content/en/articles/committers-guide/_index.adoc:1679
 #, no-wrap
 msgid ""
 "So I created a wilma branch and committed a couple of things to it, then decided I wanted to split it into fred and wilma.\n"
@@ -3456,7 +3531,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1643
+#: documentation/content/en/articles/committers-guide/_index.adoc:1694
 msgid ""
 "% git reflog 6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning "
 "to refs/heads/wilma 6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): "
@@ -3469,7 +3544,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1651
+#: documentation/content/en/articles/committers-guide/_index.adoc:1702
 #, no-wrap
 msgid ""
 "Here we see the changes I've made.\n"
@@ -3481,7 +3556,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1659
+#: documentation/content/en/articles/committers-guide/_index.adoc:1710
 #, no-wrap
 msgid ""
 "Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up.\n"
@@ -3494,12 +3569,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1664
+#: documentation/content/en/articles/committers-guide/_index.adoc:1715
 msgid "% git checkout -B wilma 869cbd3 % git branch -D fred"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1671
+#: documentation/content/en/articles/committers-guide/_index.adoc:1722
 #, no-wrap
 msgid ""
 "and you are ready to try again.\n"
@@ -3510,12 +3585,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1677
+#: documentation/content/en/articles/committers-guide/_index.adoc:1728
 msgid "% git checkout 869cbd3 M\tfaq.md Note: checking out '869cbd3'."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1681
+#: documentation/content/en/articles/committers-guide/_index.adoc:1732
 msgid ""
 "You are in 'detached HEAD' state. You can look around, make experimental "
 "changes and commit them, and you can discard any commits you make in this "
@@ -3523,31 +3598,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1684
+#: documentation/content/en/articles/committers-guide/_index.adoc:1735
 msgid ""
 "If you want to create a new branch to retain commits you create, you may do "
 "so (now or later) by using -b with the checkout command again. Example:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1689
+#: documentation/content/en/articles/committers-guide/_index.adoc:1740
 msgid "HEAD is now at 869cbd3 Encourage contributions % git checkout -B wilma"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1692
+#: documentation/content/en/articles/committers-guide/_index.adoc:1743
 #, no-wrap
 msgid "this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate.\n"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1693
+#: documentation/content/en/articles/committers-guide/_index.adoc:1744
 #, no-wrap
 msgid "Ooops! I did a `git pull` and it created a merge commit, what do I do?"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1697
+#: documentation/content/en/articles/committers-guide/_index.adoc:1748
 #, no-wrap
 msgid ""
 "**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on `main`.\n"
@@ -3555,13 +3630,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1699
+#: documentation/content/en/articles/committers-guide/_index.adoc:1750
 #, no-wrap
 msgid "**A:** This can happen when you invoke the pull with your development branch checked out.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1702
+#: documentation/content/en/articles/committers-guide/_index.adoc:1753
 #, no-wrap
 msgid ""
 "Right after the pull, you will have the new merge commit checked out.\n"
@@ -3569,7 +3644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1707
+#: documentation/content/en/articles/committers-guide/_index.adoc:1758
 #, no-wrap
 msgid ""
 "git log --oneline HEAD^1   # Look at the first parent's commits\n"
@@ -3577,7 +3652,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1711
+#: documentation/content/en/articles/committers-guide/_index.adoc:1762
 #, no-wrap
 msgid ""
 "From those logs, you can easily identify which commit is your development work.\n"
@@ -3585,18 +3660,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1715
+#: documentation/content/en/articles/committers-guide/_index.adoc:1766
 msgid "git reset --hard HEAD^2"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1718
+#: documentation/content/en/articles/committers-guide/_index.adoc:1769
 #, no-wrap
 msgid "**Q:** But I also need to fix my `main` branch. How do I do that?\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1721
+#: documentation/content/en/articles/committers-guide/_index.adoc:1772
 #, no-wrap
 msgid ""
 "**A:** Git keeps track of the remote repository branches in a `freebsd/` namespace.\n"
@@ -3604,12 +3679,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1725
+#: documentation/content/en/articles/committers-guide/_index.adoc:1776
 msgid "git branch -f main freebsd/main"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1730
+#: documentation/content/en/articles/committers-guide/_index.adoc:1781
 #, no-wrap
 msgid ""
 "There's nothing magical about branches in Git: they are just labels on a graph that are automatically moved forward by making commits.\n"
@@ -3618,13 +3693,13 @@ msgid ""
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1731
+#: documentation/content/en/articles/committers-guide/_index.adoc:1782
 #, no-wrap
 msgid "Mixing and matching branches"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1735
+#: documentation/content/en/articles/committers-guide/_index.adoc:1786
 #, no-wrap
 msgid ""
 "**Q:** So I have two branches `worker` and `async` that I'd like to combine into one branch called `feature`\n"
@@ -3632,20 +3707,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1737
+#: documentation/content/en/articles/committers-guide/_index.adoc:1788
 #, no-wrap
 msgid "**A:** This is a job for cherry pick.\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1743
+#: documentation/content/en/articles/committers-guide/_index.adoc:1794
 msgid ""
 "% git checkout worker % git checkout -b feature\t# create a new branch % git "
 "cherry-pick main..async\t# bring in the changes"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1748
+#: documentation/content/en/articles/committers-guide/_index.adoc:1799
 #, no-wrap
 msgid ""
 "You now have a new branch called `feature`.\n"
@@ -3654,13 +3729,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1750
+#: documentation/content/en/articles/committers-guide/_index.adoc:1801
 #, no-wrap
 msgid "**Q:** I have a branch called `driver` and I'd like to break it up into `kernel` and `userland` so I can evolve them separately and commit each branch as it becomes ready.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1753
+#: documentation/content/en/articles/committers-guide/_index.adoc:1804
 #, no-wrap
 msgid ""
 "**A:** This takes a little bit of prep work, but `git rebase` will do the heavy\n"
@@ -3668,14 +3743,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1759
+#: documentation/content/en/articles/committers-guide/_index.adoc:1810
 msgid ""
 "% git checkout driver\t\t# Checkout the driver % git checkout -b kernel\t# "
 "Create kernel branch % git checkout -b userland\t# Create userland branch"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1764
+#: documentation/content/en/articles/committers-guide/_index.adoc:1815
 #, no-wrap
 msgid ""
 "Now you have two identical branches.\n"
@@ -3684,29 +3759,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1768
+#: documentation/content/en/articles/committers-guide/_index.adoc:1819
 msgid "% git rebase -i main kernel"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1771
+#: documentation/content/en/articles/committers-guide/_index.adoc:1822
 #, no-wrap
 msgid "and just include the changes you want (with a 'p' or 'pick' line) and just delete the commits you don't (this sounds scary, but if worse comes to worse, you can throw this all away and start over with the `driver` branch since you've not yet moved it).\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1775
+#: documentation/content/en/articles/committers-guide/_index.adoc:1826
 msgid "% git rebase -i main userland"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1778
+#: documentation/content/en/articles/committers-guide/_index.adoc:1829
 #, no-wrap
 msgid "and do the same thing you did with the `kernel` branch.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1781
+#: documentation/content/en/articles/committers-guide/_index.adoc:1832
 #, no-wrap
 msgid ""
 "**Q:** Oh great! I followed the above and forgot a commit in the `kernel` branch.\n"
@@ -3714,7 +3789,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1784
+#: documentation/content/en/articles/committers-guide/_index.adoc:1835
 #, no-wrap
 msgid ""
 "**A:** You can use the `driver` branch to find the hash of the commit is missing and\n"
@@ -3722,12 +3797,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1790
+#: documentation/content/en/articles/committers-guide/_index.adoc:1841
 msgid "% git checkout kernel % git log driver % git cherry-pick $HASH"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1796
+#: documentation/content/en/articles/committers-guide/_index.adoc:1847
 #, no-wrap
 msgid ""
 "**Q:** OK. I have the same situation as the above, but my commits are all mixed up.\n"
@@ -3737,7 +3812,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1799
+#: documentation/content/en/articles/committers-guide/_index.adoc:1850
 #, no-wrap
 msgid ""
 "**A:** In this situation, you'd be better off to curate the original branch to separate\n"
@@ -3745,7 +3820,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1804
+#: documentation/content/en/articles/committers-guide/_index.adoc:1855
 #, no-wrap
 msgid ""
 "So let's assume that there's just one commit with a clean tree.\n"
@@ -3755,18 +3830,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1808
+#: documentation/content/en/articles/committers-guide/_index.adoc:1859
 msgid "% git reset HEAD^"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1811
+#: documentation/content/en/articles/committers-guide/_index.adoc:1862
 #, no-wrap
 msgid "Note: Do not, repeat do not, add `--hard` here since that also removes the changes from your tree.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1815
+#: documentation/content/en/articles/committers-guide/_index.adoc:1866
 #, no-wrap
 msgid ""
 "Now, if you are lucky, the change needing to be split up falls entirely along file lines.\n"
@@ -3775,7 +3850,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1818
+#: documentation/content/en/articles/committers-guide/_index.adoc:1869
 #, no-wrap
 msgid ""
 "If you are not lucky, you'll need to split apart files.\n"
@@ -3783,12 +3858,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1822
+#: documentation/content/en/articles/committers-guide/_index.adoc:1873
 msgid "git add -i foo/bar.c"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1828
+#: documentation/content/en/articles/committers-guide/_index.adoc:1879
 #, no-wrap
 msgid ""
 "will step through the diffs, prompting you, one at time, whether to include or exclude the hunk.\n"
@@ -3798,30 +3873,30 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:1829
+#: documentation/content/en/articles/committers-guide/_index.adoc:1880
 #, no-wrap
 msgid "Cloning and Mirroring"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1832
+#: documentation/content/en/articles/committers-guide/_index.adoc:1883
 #, no-wrap
 msgid "**Q:** I'd like to mirror the entire Git repository, how do I do that?\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1834
+#: documentation/content/en/articles/committers-guide/_index.adoc:1885
 #, no-wrap
 msgid "**A:** If all you want to do is mirror, then\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1838
+#: documentation/content/en/articles/committers-guide/_index.adoc:1889
 msgid "% git clone --mirror $URL"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1842
+#: documentation/content/en/articles/committers-guide/_index.adoc:1893
 #, no-wrap
 msgid ""
 "will do the trick.\n"
@@ -3829,7 +3904,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1846
+#: documentation/content/en/articles/committers-guide/_index.adoc:1897
 #, no-wrap
 msgid ""
 "First, this is a 'bare repository' which has the repository database, but no checked out worktree.\n"
@@ -3838,7 +3913,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1854
+#: documentation/content/en/articles/committers-guide/_index.adoc:1905
 msgid ""
 "% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd ports."
 "git % git worktree add ../ports main % git worktree add ../quarterly "
@@ -3846,13 +3921,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1857
+#: documentation/content/en/articles/committers-guide/_index.adoc:1908
 #, no-wrap
 msgid "But if you aren't using your mirror for further local clones, then it's a poor match.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1860
+#: documentation/content/en/articles/committers-guide/_index.adoc:1911
 #, no-wrap
 msgid ""
 "The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) from upstream so that your local refs can evolve independently of upstream.\n"
@@ -3860,13 +3935,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1862
+#: documentation/content/en/articles/committers-guide/_index.adoc:1913
 #, no-wrap
 msgid "**Q:** So what can I do instead?\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1865
+#: documentation/content/en/articles/committers-guide/_index.adoc:1916
 #, no-wrap
 msgid ""
 "**A:** Well, you can stuff all of the upstream repository's refs into a private namespace in your local repository.\n"
@@ -3874,19 +3949,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1869
+#: documentation/content/en/articles/committers-guide/_index.adoc:1920
 #, no-wrap
 msgid "        fetch = +refs/heads/*:refs/remotes/freebsd/*\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1872
+#: documentation/content/en/articles/committers-guide/_index.adoc:1923
 #, no-wrap
 msgid "which says just fetch the branch refs.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1876
+#: documentation/content/en/articles/committers-guide/_index.adoc:1927
 #, no-wrap
 msgid ""
 "However, the FreeBSD repository has a number of other things in it.\n"
@@ -3895,12 +3970,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1880
+#: documentation/content/en/articles/committers-guide/_index.adoc:1931
 msgid "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1884
+#: documentation/content/en/articles/committers-guide/_index.adoc:1935
 #, no-wrap
 msgid ""
 "which will put everything in the upstream repository into your local repository's `refs/freebsd/` namespace.\n"
@@ -3908,30 +3983,30 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1886
+#: documentation/content/en/articles/committers-guide/_index.adoc:1937
 #, no-wrap
 msgid "You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces.\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1890
+#: documentation/content/en/articles/committers-guide/_index.adoc:1941
 msgid "git log refs/freebsd/vendor/zlib/1.2.10"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1893
+#: documentation/content/en/articles/committers-guide/_index.adoc:1944
 #, no-wrap
 msgid "would look at the log for the vendor branch for zlib starting at 1.2.10.\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:1894
+#: documentation/content/en/articles/committers-guide/_index.adoc:1945
 #, no-wrap
 msgid "Collaborating with others"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1898
+#: documentation/content/en/articles/committers-guide/_index.adoc:1949
 msgid ""
 "One of the keys to good software development on a project as large as "
 "FreeBSD is the ability to collaborate with others before you push your "
@@ -3943,28 +4018,29 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1900
+#: documentation/content/en/articles/committers-guide/_index.adoc:1951
 msgid ""
 "The following instructions show how to set up a user-generated branch, based "
 "on the FreeBSD `main` branch, and push it to GitHub."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1902
+#: documentation/content/en/articles/committers-guide/_index.adoc:1954
 msgid ""
 "Before you begin, make sure that your local Git repo is up to date and has "
-"the correct origins set <<keeping_current,as shown above.>>"
+"the correct origins set crossref:committers-guide[keeping_current,as shown "
+"above]."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1909
+#: documentation/content/en/articles/committers-guide/_index.adoc:1961
 msgid ""
 "[source,shell] ```` % git remote -v freebsd https://git.freebsd.org/src.git "
 "(fetch)  freebsd ssh://git@gitrepo.freebsd.org/src.git (push)  ````"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1912
+#: documentation/content/en/articles/committers-guide/_index.adoc:1964
 msgid ""
 "The first step is to create a fork of https://github.com/freebsd/freebsd-"
 "src[FreeBSD] on GitHub following these https://docs.github.com/en/github/"
@@ -3973,14 +4049,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1915
+#: documentation/content/en/articles/committers-guide/_index.adoc:1967
 msgid ""
 "Now add a remote on your local system that points to your fork: [source,"
 "shell]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1922
+#: documentation/content/en/articles/committers-guide/_index.adoc:1974
 msgid ""
 "% git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v "
 "github\tgit@github.com:gvnn3/freebsd-src.git (fetch)  github\tgit@github.com:"
@@ -3989,18 +4065,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1924
+#: documentation/content/en/articles/committers-guide/_index.adoc:1977
 #, no-wrap
-msgid "With this in place you can create a branch <<keeping_a_local_branch,as shown above.>>\n"
+msgid ""
+"With this in place you can create a branch\n"
+"crossref:committers-guide[keeping_a_local_branch,as shown above].\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1928
+#: documentation/content/en/articles/committers-guide/_index.adoc:1981
 msgid "% git checkout -b gnn-pr2001-fix"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1932
+#: documentation/content/en/articles/committers-guide/_index.adoc:1985
 #, no-wrap
 msgid ""
 "Make whatever modifications you wish in your branch.  Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch.\n"
@@ -4008,26 +4086,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1938
+#: documentation/content/en/articles/committers-guide/_index.adoc:1991
 msgid ""
 "% git push github fatal: The current branch gnn-pr2001-fix has no upstream "
 "branch.  To push the current branch and set the remote as upstream, use"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1940
+#: documentation/content/en/articles/committers-guide/_index.adoc:1993
 #, no-wrap
 msgid "    git push --set-upstream github gnn-pr2001-fix\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1943
+#: documentation/content/en/articles/committers-guide/_index.adoc:1996
 #, no-wrap
 msgid "Setting the push as +git+ advises allows it to succeed:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1959
+#: documentation/content/en/articles/committers-guide/_index.adoc:2012
 #, no-wrap
 msgid ""
 "% git push --set-upstream github gnn-feature\n"
@@ -4046,7 +4124,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1961
+#: documentation/content/en/articles/committers-guide/_index.adoc:2014
 #, no-wrap
 msgid ""
 "[new branch]                gnn-feature -> gnn-feature\n"
@@ -4054,13 +4132,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1964
+#: documentation/content/en/articles/committers-guide/_index.adoc:2017
 #, no-wrap
 msgid "Subsequent changes to the same branch will push correctly by default:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1977
+#: documentation/content/en/articles/committers-guide/_index.adoc:2030
 #, no-wrap
 msgid ""
 "% git push\n"
@@ -4076,7 +4154,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1981
+#: documentation/content/en/articles/committers-guide/_index.adoc:2034
 #, no-wrap
 msgid ""
 "At this point your work is now in your branch on +GitHub+ and you can\n"
@@ -4084,19 +4162,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1983
+#: documentation/content/en/articles/committers-guide/_index.adoc:2036
 #, no-wrap
 msgid "[[github-pull-land]]\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:1983
+#: documentation/content/en/articles/committers-guide/_index.adoc:2036
 #, no-wrap
 msgid "Landing a github pull request"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1988
+#: documentation/content/en/articles/committers-guide/_index.adoc:2041
 msgid ""
 "This section documents how to land a GitHub pull request that's submitted "
 "against the FreeBSD Git mirrors at GitHub.  While this is not an official "
@@ -4109,15 +4187,15 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:1992
+#: documentation/content/en/articles/committers-guide/_index.adoc:2046
 msgid ""
 "Before beginning, make sure that the local Git repo is up to date and has "
-"the correct origins set <<keeping_current,as shown above.>> In addition, "
-"make sure to have the following origins: [source,shell]"
+"the correct origins set crossref:committers-guide[keeping_current,as shown "
+"above].  In addition, make sure to have the following origins: [source,shell]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:1998
+#: documentation/content/en/articles/committers-guide/_index.adoc:2052
 msgid ""
 "% git remote -v freebsd https://git.freebsd.org/src.git (fetch)  freebsd "
 "ssh://git@gitrepo.freebsd.org/src.git (push)  github https://github.com/"
@@ -4126,7 +4204,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2018
+#: documentation/content/en/articles/committers-guide/_index.adoc:2072
 #, no-wrap
 msgid ""
 "Often pull requests are simple: requests that contain only a single commit.\n"
@@ -4151,13 +4229,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2020
+#: documentation/content/en/articles/committers-guide/_index.adoc:2074
 #, no-wrap
 msgid "Author:     github-user <38923459+github-user@users.noreply.github.com>\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2024
+#: documentation/content/en/articles/committers-guide/_index.adoc:2078
 #, no-wrap
 msgid ""
 "A polite request to the author for a better name and/or email should be made.\n"
@@ -4166,7 +4244,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2036
+#: documentation/content/en/articles/committers-guide/_index.adoc:2090
 msgid ""
 "% git fetch github pull/$PR/head:staging % git rebase -i main staging\t# to "
 "move the staging branch forward, adjust commit message here <do testing "
@@ -4176,7 +4254,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2041
+#: documentation/content/en/articles/committers-guide/_index.adoc:2095
 #, no-wrap
 msgid ""
 "[.procedure]\n"
@@ -4185,7 +4263,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2049
+#: documentation/content/en/articles/committers-guide/_index.adoc:2103
 #, no-wrap
 msgid ""
 ". checkout the pull request `git checkout github/pull/XXX`\n"
@@ -4198,7 +4276,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2054
+#: documentation/content/en/articles/committers-guide/_index.adoc:2108
 #, no-wrap
 msgid ""
 "This will also work when bringing branches developed elsewhere into the local tree for committing.\n"
@@ -4208,24 +4286,24 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2056
+#: documentation/content/en/articles/committers-guide/_index.adoc:2110
 #, no-wrap
 msgid "[[vcs-history]]\n"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2056
+#: documentation/content/en/articles/committers-guide/_index.adoc:2110
 #, no-wrap
 msgid "Version Control History"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2059
-msgid "The project has moved to <<git-primer,git>>."
+#: documentation/content/en/articles/committers-guide/_index.adoc:2113
+msgid "The project has moved to crossref:committers-guide[git-primer,git]."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2065
+#: documentation/content/en/articles/committers-guide/_index.adoc:2119
 msgid ""
 "The FreeBSD source repository switched from CVS to Subversion on May 31st, "
 "2008.  The first real SVN commit is __r179447__.  The source repository "
@@ -4235,7 +4313,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2071
+#: documentation/content/en/articles/committers-guide/_index.adoc:2125
 msgid ""
 "The FreeBSD `doc/www` repository switched from CVS to Subversion on May "
 "19th, 2012.  The first real SVN commit is __r38821__.  The documentation "
@@ -4245,7 +4323,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2077
+#: documentation/content/en/articles/committers-guide/_index.adoc:2131
 msgid ""
 "The FreeBSD `ports` repository switched from CVS to Subversion on July 14th, "
 "2012.  The first real SVN commit is __r300894__.  The ports repository "
@@ -4255,18 +4333,18 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2079
+#: documentation/content/en/articles/committers-guide/_index.adoc:2133
 msgid "[[conventions]]"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2079
+#: documentation/content/en/articles/committers-guide/_index.adoc:2133
 #, no-wrap
 msgid "Setup, Conventions, and Traditions"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2084
+#: documentation/content/en/articles/committers-guide/_index.adoc:2138
 msgid ""
 "There are a number of things to do as a new developer.  The first set of "
 "steps is specific to committers only.  These steps must be done by a mentor "
@@ -4274,25 +4352,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2086
+#: documentation/content/en/articles/committers-guide/_index.adoc:2140
 msgid "[[conventions-committers]]"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2086
+#: documentation/content/en/articles/committers-guide/_index.adoc:2140
 #, no-wrap
 msgid "For New Committers"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2089
+#: documentation/content/en/articles/committers-guide/_index.adoc:2143
 msgid ""
 "Those who have been given commit rights to the FreeBSD repositories must "
 "follow these steps."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2092
+#: documentation/content/en/articles/committers-guide/_index.adoc:2146
 #, no-wrap
 msgid ""
 "* Get mentor approval before committing each of these changes!\n"
@@ -4300,7 +4378,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2097
+#: documentation/content/en/articles/committers-guide/_index.adoc:2151
 #, no-wrap
 msgid ""
 "[[commit-steps]]\n"
@@ -4310,7 +4388,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2144
+#: documentation/content/en/articles/committers-guide/_index.adoc:2198
 #, no-wrap
 msgid ""
 ". Add an Author Entity\n"
@@ -4343,7 +4421,7 @@ msgid ""
 "Add an entry for each additional mentor/mentee relationship in the bottom section.\n"
 ". Generate a Kerberos Password\n"
 "+\n"
-"See <<kerberos-ldap>> to generate or set a Kerberos account for use with other FreeBSD services like the link:https://bugs.freebsd.org/bugzilla/[bug-tracking database] (you get a bug-tracking account as part of that step).\n"
+"See crossref:committers-guide[kerberos-ldap] to generate or set a Kerberos account for use with other FreeBSD services like the link:https://bugs.freebsd.org/bugzilla/[bug-tracking database] (you get a bug-tracking account as part of that step).\n"
 ". Optional: Enable Wiki Account\n"
 "+\n"
 "link:https://wiki.freebsd.org[FreeBSD Wiki] Account - A wiki account allows sharing projects and ideas.\n"
@@ -4362,19 +4440,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2146
+#: documentation/content/en/articles/committers-guide/_index.adoc:2200
 #, no-wrap
 msgid "[[conventions-everyone]]\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2146
+#: documentation/content/en/articles/committers-guide/_index.adoc:2200
 #, no-wrap
 msgid "For Everyone"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2166
+#: documentation/content/en/articles/committers-guide/_index.adoc:2220
 msgid ""
 "[[conventions-everyone-steps]] [.procedure] ==== . Introduce yourself to the "
 "other developers, otherwise no one will have any idea who you are or what "
@@ -4403,65 +4481,76 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2168
+#: documentation/content/en/articles/committers-guide/_index.adoc:2222
 msgid "[[smtp-setup]]"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:2168
+#: documentation/content/en/articles/committers-guide/_index.adoc:2222
 #, no-wrap
 msgid "SMTP Access Setup"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2171
+#: documentation/content/en/articles/committers-guide/_index.adoc:2225
 msgid ""
 "For those willing to send e-mail messages through the FreeBSD.org "
 "infrastructure, follow the instructions below:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2192
+#: documentation/content/en/articles/committers-guide/_index.adoc:2247
+#, no-wrap
 msgid ""
-"[.procedure] ==== . Point your mail client at `smtp.FreeBSD.org:587`.  . "
-"Enable STARTTLS.  . Ensure your `From:` address is set to "
-"`_yourusername_@FreeBSD.org`.  . For authentication, you can use your "
-"FreeBSD Kerberos username and password (see <<kerberos-ldap>>). The "
-"`_yourusername_/mail` principal is preferred, as it is only valid for "
-"authenticating to mail resources.  + [NOTE] ====== Do not include `@FreeBSD."
-"org` when entering in your username.  ====== + .Additional Notes [NOTE] "
-"====== * Will only accept mail from `_yourusername_@FreeBSD.org`. If you are "
-"authenticated as one user, you are not permitted to send mail from another.  "
-"* A header will be appended with the SASL username: (`Authenticated sender: "
-"_username_`).  * Host has various rate limits in place to cut down on brute "
-"force attempts.  ====== ===="
+"[.procedure]\n"
+"====\n"
+". Point your mail client at `smtp.FreeBSD.org:587`.\n"
+". Enable STARTTLS.\n"
+". Ensure your `From:` address is set to `_yourusername_@FreeBSD.org`.\n"
+". For authentication, you can use your FreeBSD Kerberos username and password\n"
+"  (see crossref:committers-guide[kerberos-ldap]). The `_yourusername_/mail` principal is preferred, as it is only valid for authenticating to mail resources.\n"
+"+\n"
+"[NOTE]\n"
+"======\n"
+"Do not include `@FreeBSD.org` when entering in your username.\n"
+"======\n"
+"+\n"
+".Additional Notes\n"
+"[NOTE]\n"
+"======\n"
+"* Will only accept mail from `_yourusername_@FreeBSD.org`. If you are authenticated as one user, you are not permitted to send mail from another.\n"
+"* A header will be appended with the SASL username: (`Authenticated sender: _username_`).\n"
+"* Host has various rate limits in place to cut down on brute force attempts.\n"
+"======\n"
+"====\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2194
-msgid "[[smtp-setup-local-mta]]"
+#: documentation/content/en/articles/committers-guide/_index.adoc:2249
+#, no-wrap
+msgid "[[smtp-setup-local-mta]]\n"
 msgstr ""
 
 #. type: Title =====
-#: documentation/content/en/articles/committers-guide/_index.adoc:2194
+#: documentation/content/en/articles/committers-guide/_index.adoc:2249
 #, no-wrap
 msgid "Using a Local MTA to Forward Emails to the FreeBSD.org SMTP Service"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2197
+#: documentation/content/en/articles/committers-guide/_index.adoc:2252
 msgid ""
 "It is also possible to use a local MTA to forward locally sent emails to the "
 "FreeBSD.org SMTP servers."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2202
+#: documentation/content/en/articles/committers-guide/_index.adoc:2257
 msgid "[[smtp-setup-local-postfix]] .Using Postfix [example] ===="
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2204
+#: documentation/content/en/articles/committers-guide/_index.adoc:2259
 msgid ""
 "To tell a local Postfix instance that anything from `_yourusername_@FreeBSD."
 "org` should be forwarded to the FreeBSD.org servers, add this to your [."
@@ -4469,12 +4558,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2206
+#: documentation/content/en/articles/committers-guide/_index.adoc:2261
 msgid "[.programlisting]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2212
+#: documentation/content/en/articles/committers-guide/_index.adoc:2267
 msgid ""
 "sender_dependent_relayhost_maps = hash:/usr/local/etc/postfix/relayhost_maps "
 "smtp_sasl_auth_enable = yes smtp_sasl_security_options = noanonymous "
@@ -4483,67 +4572,67 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2215
+#: documentation/content/en/articles/committers-guide/_index.adoc:2270
 #, no-wrap
 msgid "Create [.filename]#/usr/local/etc/postfix/relayhost_maps# with the following content:\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2217
-#: documentation/content/en/articles/committers-guide/_index.adoc:2224
-#: documentation/content/en/articles/committers-guide/_index.adoc:2231
-#: documentation/content/en/articles/committers-guide/_index.adoc:2239
-#: documentation/content/en/articles/committers-guide/_index.adoc:2254
-#: documentation/content/en/articles/committers-guide/_index.adoc:2264
-#: documentation/content/en/articles/committers-guide/_index.adoc:2278
-#: documentation/content/en/articles/committers-guide/_index.adoc:2308
+#: documentation/content/en/articles/committers-guide/_index.adoc:2272
+#: documentation/content/en/articles/committers-guide/_index.adoc:2279
+#: documentation/content/en/articles/committers-guide/_index.adoc:2286
+#: documentation/content/en/articles/committers-guide/_index.adoc:2294
+#: documentation/content/en/articles/committers-guide/_index.adoc:2309
+#: documentation/content/en/articles/committers-guide/_index.adoc:2319
+#: documentation/content/en/articles/committers-guide/_index.adoc:2333
+#: documentation/content/en/articles/committers-guide/_index.adoc:2364
 #, no-wrap
 msgid "[.programlisting]\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2219
+#: documentation/content/en/articles/committers-guide/_index.adoc:2274
 msgid "yourusername@FreeBSD.org [smtp.freebsd.org]:587"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2222
+#: documentation/content/en/articles/committers-guide/_index.adoc:2277
 #, no-wrap
 msgid "Create [.filename]#/usr/local/etc/postfix/sasl_passwd# with the following content:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2226
+#: documentation/content/en/articles/committers-guide/_index.adoc:2281
 #, no-wrap
 msgid "[smtp.freebsd.org]:587          yourusername:yourpassword\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2229
+#: documentation/content/en/articles/committers-guide/_index.adoc:2284
 #, no-wrap
 msgid "If the email server is used by other people, you may want to prevent them from sending e-mails from your address. To achieve this, add this to your [.filename]#main.cf#:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2234
+#: documentation/content/en/articles/committers-guide/_index.adoc:2289
 msgid ""
 "smtpd_sender_login_maps = hash:/usr/local/etc/postfix/sender_login_maps "
 "smtpd_sender_restrictions = reject_known_sender_login_mismatch"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2237
+#: documentation/content/en/articles/committers-guide/_index.adoc:2292
 #, no-wrap
 msgid "Create [.filename]#/usr/local/etc/postfix/sender_login_maps# with the following content:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2241
+#: documentation/content/en/articles/committers-guide/_index.adoc:2296
 msgid "yourusername@FreeBSD.org yourlocalusername"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2245
+#: documentation/content/en/articles/committers-guide/_index.adoc:2300
 #, no-wrap
 msgid ""
 "Where _yourlocalusername_ is the SASL username used to connect to the local instance of Postfix.\n"
@@ -4551,7 +4640,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2250
+#: documentation/content/en/articles/committers-guide/_index.adoc:2305
 #, no-wrap
 msgid ""
 "[[smtp-setup-local-opensmtpd]]\n"
@@ -4561,13 +4650,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2252
+#: documentation/content/en/articles/committers-guide/_index.adoc:2307
 #, no-wrap
 msgid "To tell a local OpenSMTPD instance that anything from `_yourusername_@FreeBSD.org` should be forwarded to the FreeBSD.org servers, add this to your [.filename]#smtpd.conf#:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2257
+#: documentation/content/en/articles/committers-guide/_index.adoc:2312
 msgid ""
 "action \"freebsd\" relay host smtp+tls://freebsd@smtp.freebsd.org:587 auth "
 "<secrets> match from any auth yourlocalusername mail-from "
@@ -4575,24 +4664,24 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2260
+#: documentation/content/en/articles/committers-guide/_index.adoc:2315
 #, no-wrap
 msgid "Where _yourlocalusername_ is the SASL username used to connect to the local instance of OpenSMTPD.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2262
+#: documentation/content/en/articles/committers-guide/_index.adoc:2317
 #, no-wrap
 msgid "Create [.filename]#/usr/local/etc/mail/secrets# with the following content:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2266
+#: documentation/content/en/articles/committers-guide/_index.adoc:2321
 msgid "freebsd\tyourusername:yourpassword"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2273
+#: documentation/content/en/articles/committers-guide/_index.adoc:2328
 #, no-wrap
 msgid ""
 "====\n"
@@ -4603,7 +4692,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2276
+#: documentation/content/en/articles/committers-guide/_index.adoc:2331
 #, no-wrap
 msgid ""
 "To direct a local Exim instance to forward all mail from `_example_@FreeBSD.org`\n"
@@ -4611,7 +4700,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2285
+#: documentation/content/en/articles/committers-guide/_index.adoc:2340
 #, no-wrap
 msgid ""
 "Routers section: (at the top of the list):\n"
@@ -4623,7 +4712,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2297
+#: documentation/content/en/articles/committers-guide/_index.adoc:2352
 #, no-wrap
 msgid ""
 "Transport Section:\n"
@@ -4640,47 +4729,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2303
+#: documentation/content/en/articles/committers-guide/_index.adoc:2359
 #, no-wrap
 msgid ""
 "Authenticators:\n"
-"fixed_plain:\n"
+"freebsd_plain:\n"
 "  driver = plaintext\n"
 "  public_name = PLAIN\n"
 "  client_send = ^example/mail^examplePassword\n"
+"  client_condition = ${if eq{$host}{smtp.freebsd.org}}\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2306
+#: documentation/content/en/articles/committers-guide/_index.adoc:2362
 #, no-wrap
 msgid "Create [.filename]#/usr/local/etc/exim/freebsd_send# with the following content:\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2310
+#: documentation/content/en/articles/committers-guide/_index.adoc:2366
 msgid "example@freebsd.org:smtp.freebsd.org::587"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2313
+#: documentation/content/en/articles/committers-guide/_index.adoc:2369
 #, no-wrap
 msgid "====\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2315
+#: documentation/content/en/articles/committers-guide/_index.adoc:2371
 #, no-wrap
 msgid "[[mentors]]\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2315
+#: documentation/content/en/articles/committers-guide/_index.adoc:2371
 #, no-wrap
 msgid "Mentors"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2320
+#: documentation/content/en/articles/committers-guide/_index.adoc:2376
 msgid ""
 "All new developers have a mentor assigned to them for the first few months.  "
 "A mentor is responsible for teaching the mentee the rules and conventions of "
@@ -4690,7 +4780,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2323
+#: documentation/content/en/articles/committers-guide/_index.adoc:2379
 msgid ""
 "For committers: do not commit anything without first getting mentor "
 "approval.  Document that approval with an `Approved by:` line in the commit "
@@ -4698,28 +4788,28 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2327
+#: documentation/content/en/articles/committers-guide/_index.adoc:2384
 msgid ""
 "When the mentor decides that a mentee has learned the ropes and is ready to "
 "commit on their own, the mentor announces it with a commit to [."
 "filename]#mentors#.  This file is in the [.filename]#admin# orphan branch of "
 "each repository.  Detailed information on how to access these branches can "
-"be found in <<admin-branch>>."
+"be found in crossref:committers-guide[admin-branch]."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2329
+#: documentation/content/en/articles/committers-guide/_index.adoc:2386
 msgid "[[pre-commit-review]]"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2329
+#: documentation/content/en/articles/committers-guide/_index.adoc:2386
 #, no-wrap
 msgid "Pre-Commit Review"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2334
+#: documentation/content/en/articles/committers-guide/_index.adoc:2391
 msgid ""
 "Code review is one way to increase the quality of software.  The following "
 "guidelines apply to commits to the `main` (-CURRENT) branch of the `src` "
@@ -4729,7 +4819,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2340
+#: documentation/content/en/articles/committers-guide/_index.adoc:2397
 #, no-wrap
 msgid ""
 "* All non-trivial changes should be reviewed before they are committed to the repository.\n"
@@ -4740,13 +4830,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2342
+#: documentation/content/en/articles/committers-guide/_index.adoc:2399
 #, no-wrap
 msgid "Sometimes code reviews will take longer than you would hope for, especially for larger features. Accepted ways to speed up review times for your patches are:\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2349
+#: documentation/content/en/articles/committers-guide/_index.adoc:2406
 #, no-wrap
 msgid ""
 "* Review other people's patches. If you help out, everybody will be more willing to do the same for you; goodwill is our currency.\n"
@@ -4758,7 +4848,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2354
+#: documentation/content/en/articles/committers-guide/_index.adoc:2411
 #, no-wrap
 msgid ""
 "Developers should participate in code reviews as both reviewers and reviewees.\n"
@@ -4768,7 +4858,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2357
+#: documentation/content/en/articles/committers-guide/_index.adoc:2414
 #, no-wrap
 msgid ""
 "In some cases, no subject-matter expert may be available.\n"
@@ -4776,42 +4866,42 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2359
+#: documentation/content/en/articles/committers-guide/_index.adoc:2416
 #, no-wrap
 msgid "[[commit-log-message]]\n"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2359
+#: documentation/content/en/articles/committers-guide/_index.adoc:2416
 #, no-wrap
 msgid "Commit Log Messages"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2362
+#: documentation/content/en/articles/committers-guide/_index.adoc:2419
 msgid ""
 "This section contains some suggestions and traditions for how commit logs "
 "are formatted."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2363
+#: documentation/content/en/articles/committers-guide/_index.adoc:2420
 #, no-wrap
 msgid "Why are commit messages important?"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2367
+#: documentation/content/en/articles/committers-guide/_index.adoc:2424
 msgid ""
 "When you commit a change in Git, Subversion, or another version control "
 "system (VCS), you're prompted to write some text describing the commit -- a "
 "commit message.  How important is this commit message? Should you spend some "
 "significant effort writing it? Does it really matter if you write simply "
-"fixed a bug?"
+"`fixed a bug`?"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2370
+#: documentation/content/en/articles/committers-guide/_index.adoc:2427
 msgid ""
 "Most projects have more than one developer and last for some length of "
 "time.  Commit messages are a very important method of communicating with "
@@ -4819,7 +4909,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2373
+#: documentation/content/en/articles/committers-guide/_index.adoc:2430
 msgid ""
 "FreeBSD has hundreds of active developers and hundreds of thousands of "
 "commits spanning decades of history.  Over that time the developer community "
@@ -4828,12 +4918,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2375
+#: documentation/content/en/articles/committers-guide/_index.adoc:2432
 msgid "Commit messages serve at least three purposes:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2382
+#: documentation/content/en/articles/committers-guide/_index.adoc:2439
 #, no-wrap
 msgid ""
 "* Communicating with other developers\n"
@@ -4845,7 +4935,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2388
+#: documentation/content/en/articles/committers-guide/_index.adoc:2445
 #, no-wrap
 msgid ""
 "* Making Changes Discoverable\n"
@@ -4856,7 +4946,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2394
+#: documentation/content/en/articles/committers-guide/_index.adoc:2451
 #, no-wrap
 msgid ""
 "* Providing historical documentation\n"
@@ -4867,25 +4957,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2396
+#: documentation/content/en/articles/committers-guide/_index.adoc:2453
 #, no-wrap
 msgid "The `git blame` command annotates each line of a source file with the change (hash and subject line) that brought it in.\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2398
+#: documentation/content/en/articles/committers-guide/_index.adoc:2455
 #, no-wrap
 msgid "Having established the importance, here are elements of a good FreeBSD commit message:\n"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2399
+#: documentation/content/en/articles/committers-guide/_index.adoc:2456
 #, no-wrap
 msgid "Start with a subject line"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2403
+#: documentation/content/en/articles/committers-guide/_index.adoc:2460
 msgid ""
 "Commit messages should start with a single-line subject that briefly "
 "summarizes the change.  The subject should, by itself, allow the reader to "
@@ -4893,13 +4983,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2404
+#: documentation/content/en/articles/committers-guide/_index.adoc:2461
 #, no-wrap
 msgid "Keep subject lines short"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2409
+#: documentation/content/en/articles/committers-guide/_index.adoc:2466
 msgid ""
 "The subject line should be as short as possible while still retaining the "
 "required information.  This is to make browsing Git log more efficient, and "
@@ -4909,86 +4999,86 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2410
+#: documentation/content/en/articles/committers-guide/_index.adoc:2467
 #, no-wrap
 msgid "Prefix the subject line with a component, if applicable"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2413
+#: documentation/content/en/articles/committers-guide/_index.adoc:2470
 msgid ""
 "If the change relates to a specific component the subject line may be "
 "prefixed with that component name and a colon (:)."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2415
+#: documentation/content/en/articles/committers-guide/_index.adoc:2472
 msgid "✓ `foo: Add -k option to keep temporary data`"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2417
+#: documentation/content/en/articles/committers-guide/_index.adoc:2474
 msgid ""
 "Include the prefix in the 63-character limit suggested above, so that `git "
 "log --oneline` avoids wrapping."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2418
+#: documentation/content/en/articles/committers-guide/_index.adoc:2475
 #, no-wrap
 msgid "Capitalize the first letter of the subject"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2422
+#: documentation/content/en/articles/committers-guide/_index.adoc:2479
 msgid ""
 "Capitalize the first letter of the subject itself.  The prefix, if any, is "
 "not capitalized unless necessary (e.g., `USB:` is capitalized)."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2423
+#: documentation/content/en/articles/committers-guide/_index.adoc:2480
 #, no-wrap
 msgid "Do not end the subject line with punctuation"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2427
+#: documentation/content/en/articles/committers-guide/_index.adoc:2484
 msgid ""
 "Do not end with a period or other punctuation.  In this regard the subject "
 "line is like a newspaper headline."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2428
+#: documentation/content/en/articles/committers-guide/_index.adoc:2485
 #, no-wrap
 msgid "Separate the subject and body with a blank line"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2431
+#: documentation/content/en/articles/committers-guide/_index.adoc:2488
 msgid "Separate the body from the subject with a blank line."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2433
+#: documentation/content/en/articles/committers-guide/_index.adoc:2490
 msgid ""
 "Some trivial commits do not require a body, and will have only a subject."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2435
+#: documentation/content/en/articles/committers-guide/_index.adoc:2492
 msgid "✓ `ls: Fix typo in usage text`"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2436
+#: documentation/content/en/articles/committers-guide/_index.adoc:2493
 #, no-wrap
 msgid "Limit messages to 72 columns"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2442
+#: documentation/content/en/articles/committers-guide/_index.adoc:2499
 msgid ""
 "`git log` and `git format-patch` indent the commit message by four spaces.  "
 "Wrapping at 72 columns provides a matching margin on the right edge.  "
@@ -4999,13 +5089,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2443
+#: documentation/content/en/articles/committers-guide/_index.adoc:2500
 #, no-wrap
 msgid "Use the present tense, imperative mood"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2448
+#: documentation/content/en/articles/committers-guide/_index.adoc:2505
 msgid ""
 "This facilitates short subject lines and provides consistency, including "
 "with automatically generated commit messages (e.g., as generated by git "
@@ -5015,7 +5105,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2453
+#: documentation/content/en/articles/committers-guide/_index.adoc:2510
 #, no-wrap
 msgid ""
 "✓ `foo: Implement the -k (keep) option`\n"
@@ -5025,20 +5115,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2454
+#: documentation/content/en/articles/committers-guide/_index.adoc:2511
 #, no-wrap
 msgid "Focus on what and why, not how"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2457
+#: documentation/content/en/articles/committers-guide/_index.adoc:2514
 msgid ""
 "Explain what the change accomplishes and why it is being done, rather than "
 "how."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2461
+#: documentation/content/en/articles/committers-guide/_index.adoc:2518
 msgid ""
 "Do not assume that the reader is familiar with the issue.  Explain the "
 "background and motivation for the change.  Include benchmark data if you "
@@ -5046,20 +5136,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2463
+#: documentation/content/en/articles/committers-guide/_index.adoc:2520
 msgid ""
 "If there are limitations or incomplete aspects of the change, describe them "
 "in the commit message."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2464
+#: documentation/content/en/articles/committers-guide/_index.adoc:2521
 #, no-wrap
 msgid "Consider whether parts of the commit message could be code comments instead"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2467
+#: documentation/content/en/articles/committers-guide/_index.adoc:2524
 msgid ""
 "Sometimes while writing a commit message you may find yourself writing a "
 "sentence or two explaining some tricky or confusing aspect of the change. "
@@ -5068,13 +5158,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2468
+#: documentation/content/en/articles/committers-guide/_index.adoc:2525
 #, no-wrap
 msgid "Write commit messages for your future self"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2472
+#: documentation/content/en/articles/committers-guide/_index.adoc:2529
 msgid ""
 "While writing the commit message for a change you have all of the context in "
 "mind - what prompted the change, alternate approaches that were considered "
@@ -5084,13 +5174,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2473
+#: documentation/content/en/articles/committers-guide/_index.adoc:2530
 #, no-wrap
 msgid "Commit messages should stand alone"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2477
+#: documentation/content/en/articles/committers-guide/_index.adoc:2534
 msgid ""
 "You may include references to mailing list postings, benchmark result web "
 "sites, or code review links.  However, the commit message should contain all "
@@ -5099,7 +5189,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2481
+#: documentation/content/en/articles/committers-guide/_index.adoc:2538
 msgid ""
 "Similarly, a commit may refer to a previous commit, for example in the case "
 "of a bug fix or revert.  In addition to the commit identifier (revision or "
@@ -5110,32 +5200,32 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:2482
+#: documentation/content/en/articles/committers-guide/_index.adoc:2539
 #, no-wrap
 msgid "Include appropriate metadata in a footer"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2485
+#: documentation/content/en/articles/committers-guide/_index.adoc:2542
 msgid ""
 "As well as including an informative message with each commit, some "
 "additional information may be needed."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2487
+#: documentation/content/en/articles/committers-guide/_index.adoc:2544
 msgid ""
 "This information consists of one or more lines containing the key word or "
 "phrase, a colon, tabs for formatting, and then the additional information."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2489
+#: documentation/content/en/articles/committers-guide/_index.adoc:2546
 msgid "The key words or phrases are:"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2494
+#: documentation/content/en/articles/committers-guide/_index.adoc:2551
 #, no-wrap
 msgid ""
 "[.informaltable]\n"
@@ -5143,25 +5233,25 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2495
+#: documentation/content/en/articles/committers-guide/_index.adoc:2552
 #, no-wrap
 msgid "`PR:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2497
+#: documentation/content/en/articles/committers-guide/_index.adoc:2554
 #, no-wrap
 msgid "The problem report (if any) which is affected (typically, by being closed) by this commit. Multiple PRs may be specified on one line, separated by commas or spaces."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2498
+#: documentation/content/en/articles/committers-guide/_index.adoc:2555
 #, no-wrap
 msgid "`Reported by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2502
+#: documentation/content/en/articles/committers-guide/_index.adoc:2559
 #, no-wrap
 msgid ""
 "The name and e-mail address of the person that reported the issue; for developers, just the username on the FreeBSD cluster.\n"
@@ -5170,7 +5260,7 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2504
+#: documentation/content/en/articles/committers-guide/_index.adoc:2561
 #, no-wrap
 msgid ""
 "`Submitted by:` +\n"
@@ -5178,19 +5268,19 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2506
+#: documentation/content/en/articles/committers-guide/_index.adoc:2563
 #, no-wrap
 msgid "This has been deprecated with git; submitted patches should have the author set by using `git commit --author` with a full name and valid email."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2507
+#: documentation/content/en/articles/committers-guide/_index.adoc:2564
 #, no-wrap
 msgid "`Reviewed by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2522
+#: documentation/content/en/articles/committers-guide/_index.adoc:2579
 #, no-wrap
 msgid ""
 "The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. If the reviewer is not a member of the project, provide the name, email, and if ports an external role like maintainer:\n"
@@ -5209,25 +5299,25 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2523
+#: documentation/content/en/articles/committers-guide/_index.adoc:2580
 #, no-wrap
 msgid "`Tested by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2525
+#: documentation/content/en/articles/committers-guide/_index.adoc:2582
 #, no-wrap
 msgid "The name and e-mail address of the person or people that tested the change; for developers, just the username on the FreeBSD cluster."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2526
+#: documentation/content/en/articles/committers-guide/_index.adoc:2583
 #, no-wrap
 msgid "`Approved by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2552
+#: documentation/content/en/articles/committers-guide/_index.adoc:2609
 #, no-wrap
 msgid ""
 "The name and e-mail address of the person or people that approved the change; for developers, just the username on the FreeBSD cluster.\n"
@@ -5256,121 +5346,121 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2553
+#: documentation/content/en/articles/committers-guide/_index.adoc:2610
 #, no-wrap
 msgid "`Obtained from:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2555
+#: documentation/content/en/articles/committers-guide/_index.adoc:2612
 #, no-wrap
 msgid "The name of the project (if any) from which the code was obtained. Do not use this line for the name of an individual person."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2556
+#: documentation/content/en/articles/committers-guide/_index.adoc:2613
 #, no-wrap
 msgid "`Fixes:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2558
+#: documentation/content/en/articles/committers-guide/_index.adoc:2615
 #, no-wrap
 msgid "The Git short hash and the title line of a commit that is fixed by this change as returned by `git log -n 1 --oneline GIT-COMMIT-HASH`."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2559
+#: documentation/content/en/articles/committers-guide/_index.adoc:2616
 #, no-wrap
 msgid "`MFC after:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2561
+#: documentation/content/en/articles/committers-guide/_index.adoc:2618
 #, no-wrap
 msgid "To receive an e-mail reminder to MFC at a later date, specify the number of days, weeks, or months after which an MFC is planned."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2562
+#: documentation/content/en/articles/committers-guide/_index.adoc:2619
 #, no-wrap
 msgid "`MFC to:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2564
+#: documentation/content/en/articles/committers-guide/_index.adoc:2621
 #, no-wrap
 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:2565
+#: documentation/content/en/articles/committers-guide/_index.adoc:2622
 #, no-wrap
 msgid "`MFH:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2567
+#: documentation/content/en/articles/committers-guide/_index.adoc:2624
 #, no-wrap
 msgid "If the commit is to be merged into a ports quarterly branch name, specify the quarterly branch. For example `2021Q2`."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2568
+#: documentation/content/en/articles/committers-guide/_index.adoc:2625
 #, no-wrap
 msgid "`Relnotes:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2570
+#: documentation/content/en/articles/committers-guide/_index.adoc:2627
 #, no-wrap
 msgid "If the change is a candidate for inclusion in the release notes for the next release from the branch, set to `yes`."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2571
+#: documentation/content/en/articles/committers-guide/_index.adoc:2628
 #, no-wrap
 msgid "`Security:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2573
+#: documentation/content/en/articles/committers-guide/_index.adoc:2630
 #, no-wrap
 msgid "If the change is related to a security vulnerability or security exposure, include one or more references or a description of the issue. If possible, include a VuXML URL or a CVE ID."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2574
+#: documentation/content/en/articles/committers-guide/_index.adoc:2631
 #, no-wrap
 msgid "`Event:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2576
+#: documentation/content/en/articles/committers-guide/_index.adoc:2633
 #, no-wrap
 msgid "The description for the event where this commit was made. If this is a recurring event, add the year or even the month to it. For example, this could be `FooBSDcon 2019`. The idea behind this line is to put recognition to conferences, gatherings, and other types of meetups and to show that these are useful to have. Please do not use the `Sponsored by:` line for this as that is meant for organizations sponsoring certain features or developers working on them."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2577
+#: documentation/content/en/articles/committers-guide/_index.adoc:2634
 #, no-wrap
 msgid "`Sponsored by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2579
+#: documentation/content/en/articles/committers-guide/_index.adoc:2636
 #, no-wrap
 msgid "Sponsoring organizations for this change, if any. Separate multiple organizations with commas. If only a portion of the work was sponsored, or different amounts of sponsorship were provided to different authors, please give appropriate credit in parentheses after each sponsor name. For example, `Example.com (alice, code refactoring), Wormulon (bob), Momcorp (cindy)` shows that Alice was sponsored by Example.com to do code refactoring, while Wormulon sponsored Bob's work and Momcorp sponsored Cindy's work. Other authors were either not sponsored or chose not to list sponsorship."
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2580
+#: documentation/content/en/articles/committers-guide/_index.adoc:2637
 #, no-wrap
 msgid "`Pull Request:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2584
+#: documentation/content/en/articles/committers-guide/_index.adoc:2641
 #, no-wrap
 msgid ""
 "This change was submitted as a pull request or merge request against one of FreeBSD's public read-only Git repositories.\n"
@@ -5379,13 +5469,13 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2585
+#: documentation/content/en/articles/committers-guide/_index.adoc:2642
 #, no-wrap
 msgid "`Co-authored-by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2588
+#: documentation/content/en/articles/committers-guide/_index.adoc:2645
 #, no-wrap
 msgid ""
 "The name and email address of an additional author of the commit.\n"
@@ -5393,73 +5483,73 @@ msgid ""
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2589
+#: documentation/content/en/articles/committers-guide/_index.adoc:2646
 #, no-wrap
 msgid "`Signed-off-by:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2591
+#: documentation/content/en/articles/committers-guide/_index.adoc:2648
 #, no-wrap
 msgid "ID certifies compliance with https://developercertificate.org/"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2592
+#: documentation/content/en/articles/committers-guide/_index.adoc:2649
 #, no-wrap
 msgid "`Differential Revision:`"
 msgstr ""
 
 #. type: Table
-#: documentation/content/en/articles/committers-guide/_index.adoc:2594
+#: documentation/content/en/articles/committers-guide/_index.adoc:2651
 #, no-wrap
 msgid "The full URL of the Phabricator review. This line __must be the last line__. For example: `https://reviews.freebsd.org/D1708`."
 msgstr ""
 
 #. type: Block title
-#: documentation/content/en/articles/committers-guide/_index.adoc:2596
+#: documentation/content/en/articles/committers-guide/_index.adoc:2653
 #, no-wrap
 msgid "Commit Log for a Commit Based on a PR"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2602
+#: documentation/content/en/articles/committers-guide/_index.adoc:2659
 msgid ""
 "The commit is based on a patch from a PR submitted by John Smith.  The "
 "commit message \"PR\" field is filled."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2606
-#: documentation/content/en/articles/committers-guide/_index.adoc:2624
-#: documentation/content/en/articles/committers-guide/_index.adoc:2639
-#: documentation/content/en/articles/committers-guide/_index.adoc:2655
-#: documentation/content/en/articles/committers-guide/_index.adoc:2670
+#: documentation/content/en/articles/committers-guide/_index.adoc:2663
+#: documentation/content/en/articles/committers-guide/_index.adoc:2681
+#: documentation/content/en/articles/committers-guide/_index.adoc:2696
+#: documentation/content/en/articles/committers-guide/_index.adoc:2712
+#: documentation/content/en/articles/committers-guide/_index.adoc:2727
 #, no-wrap
 msgid "...\n"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2608
+#: documentation/content/en/articles/committers-guide/_index.adoc:2665
 #, no-wrap
 msgid "PR:\t\t12345\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2611
+#: documentation/content/en/articles/committers-guide/_index.adoc:2668
 msgid ""
 "The committer sets the author of the patch with `git commit --author \"John "
 "Smith <John.Smith@example.com>\"`."
 msgstr ""
 
 #. type: Block title
-#: documentation/content/en/articles/committers-guide/_index.adoc:2614
+#: documentation/content/en/articles/committers-guide/_index.adoc:2671
 #, no-wrap
 msgid "Commit Log for a Commit Needing Review"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2620
+#: documentation/content/en/articles/committers-guide/_index.adoc:2677
 msgid ""
 "The virtual memory system is being changed.  After posting patches to the "
 "appropriate mailing list (in this case, `freebsd-arch`) and the changes have "
@@ -5467,73 +5557,73 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2626
+#: documentation/content/en/articles/committers-guide/_index.adoc:2683
 #, no-wrap
 msgid "Reviewed by:\t-arch\n"
 msgstr ""
 
 #. type: Block title
-#: documentation/content/en/articles/committers-guide/_index.adoc:2630
+#: documentation/content/en/articles/committers-guide/_index.adoc:2687
 #, no-wrap
 msgid "Commit Log for a Commit Needing Approval"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2635
+#: documentation/content/en/articles/committers-guide/_index.adoc:2692
 msgid ""
 "Commit a port, after working with the listed MAINTAINER, who said to go "
 "ahead and commit."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2641
+#: documentation/content/en/articles/committers-guide/_index.adoc:2698
 #, no-wrap
 msgid "Approved by:\tabc (maintainer)\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2644
+#: documentation/content/en/articles/committers-guide/_index.adoc:2701
 msgid "Where _abc_ is the account name of the person who approved."
 msgstr ""
 
 #. type: Block title
-#: documentation/content/en/articles/committers-guide/_index.adoc:2646
+#: documentation/content/en/articles/committers-guide/_index.adoc:2703
 #, no-wrap
 msgid "Commit Log for a Commit Bringing in Code from OpenBSD"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2651
+#: documentation/content/en/articles/committers-guide/_index.adoc:2708
 msgid "Committing some code based on work done in the OpenBSD project."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2657
+#: documentation/content/en/articles/committers-guide/_index.adoc:2714
 #, no-wrap
 msgid "Obtained from:\tOpenBSD\n"
 msgstr ""
 
 #. type: Block title
-#: documentation/content/en/articles/committers-guide/_index.adoc:2661
+#: documentation/content/en/articles/committers-guide/_index.adoc:2718
 #, no-wrap
 msgid "Commit Log for a Change to FreeBSD-CURRENT with a Planned Commit to FreeBSD-STABLE to Follow at a Later Date."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2666
+#: documentation/content/en/articles/committers-guide/_index.adoc:2723
 msgid ""
 "Committing some code which will be merged from FreeBSD-CURRENT into the "
 "FreeBSD-STABLE branch after two weeks."
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2672
+#: documentation/content/en/articles/committers-guide/_index.adoc:2729
 #, no-wrap
 msgid "MFC after:\t2 weeks\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2675
+#: documentation/content/en/articles/committers-guide/_index.adoc:2732
 msgid ""
 "Where _2_ is the number of days, weeks, or months after which an MFC is "
 "planned. The _weeks_ option may be `day`, `days`, `week`, `weeks`, `month`, "
@@ -5541,12 +5631,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2678
+#: documentation/content/en/articles/committers-guide/_index.adoc:2735
 msgid "It is often necessary to combine these."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2682
+#: documentation/content/en/articles/committers-guide/_index.adoc:2739
 msgid ""
 "Consider the situation where a user has submitted a PR containing code from "
 "the NetBSD project.  Looking at the PR, the developer sees it is not an area "
@@ -5556,19 +5646,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2684
+#: documentation/content/en/articles/committers-guide/_index.adoc:2741
 msgid ""
 "The extra information to include in the commit would look something like"
 msgstr ""
 
 #. type: Block title
-#: documentation/content/en/articles/committers-guide/_index.adoc:2685
+#: documentation/content/en/articles/committers-guide/_index.adoc:2742
 #, no-wrap
 msgid "Example Combined Commit Log"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2696
+#: documentation/content/en/articles/committers-guide/_index.adoc:2753
 #, no-wrap
 msgid ""
 "PR:\t\t54321\n"
@@ -5579,13 +5669,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2701
+#: documentation/content/en/articles/committers-guide/_index.adoc:2758
 #, no-wrap
 msgid "Preferred License for New Files"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2707
+#: documentation/content/en/articles/committers-guide/_index.adoc:2764
 msgid ""
 "The FreeBSD Project's full license policy can be found at link:https://www."
 "FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/internal/"
@@ -5595,14 +5685,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2709
+#: documentation/content/en/articles/committers-guide/_index.adoc:2766
 msgid ""
 "The FreeBSD Project suggests and uses this text as the preferred license "
 "scheme:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2740
+#: documentation/content/en/articles/committers-guide/_index.adoc:2797
 #, no-wrap
 msgid ""
 "/*-\n"
@@ -5636,7 +5726,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2746
+#: documentation/content/en/articles/committers-guide/_index.adoc:2803
 msgid ""
 "The FreeBSD project strongly discourages the so-called \"advertising "
 "clause\" in new code.  Due to the large number of contributors to the "
@@ -5647,7 +5737,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2750
+#: documentation/content/en/articles/committers-guide/_index.adoc:2807
 msgid ""
 "The FreeBSD project discourages completely new licenses and variations on "
 "the standard licenses.  New licenses require the approval of {core-email} to "
@@ -5658,7 +5748,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2754
+#: documentation/content/en/articles/committers-guide/_index.adoc:2811
 msgid ""
 "Project policy dictates that code under some non-BSD licenses must be placed "
 "only in specific sections of the repository, and in some cases, compilation "
@@ -5669,7 +5759,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2757
+#: documentation/content/en/articles/committers-guide/_index.adoc:2814
 msgid ""
 "Developers are reminded that in open source, getting \"open\" right is just "
 "as important as getting \"source\" right, as improper handling of "
@@ -5678,13 +5768,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2759
+#: documentation/content/en/articles/committers-guide/_index.adoc:2816
 #, no-wrap
 msgid "Keeping Track of Licenses Granted to the FreeBSD Project"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2764
+#: documentation/content/en/articles/committers-guide/_index.adoc:2821
 msgid ""
 "Various software or data exist in the repositories where the FreeBSD project "
 "has been granted a special license to be able to use them.  A case in point "
@@ -5695,7 +5785,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2769
+#: documentation/content/en/articles/committers-guide/_index.adoc:2826
 msgid ""
 "It is clearly sensible to keep a record of any such license grants.  To that "
 "end, the {core-email} has decided to keep an archive of them.  Whenever the "
@@ -5705,13 +5795,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2771
+#: documentation/content/en/articles/committers-guide/_index.adoc:2828
 msgid ""
 "Contact details for people or organizations granting the special license."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2772
+#: documentation/content/en/articles/committers-guide/_index.adoc:2829
 msgid ""
 "What files, directories etc. in the repositories are covered by the license "
 "grant including the revision numbers where any specially licensed material "
@@ -5719,7 +5809,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2773
+#: documentation/content/en/articles/committers-guide/_index.adoc:2830
 msgid ""
 "The date the license comes into effect from. Unless otherwise agreed, this "
 "will be the date the license was issued by the authors of the software in "
@@ -5727,24 +5817,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2774
+#: documentation/content/en/articles/committers-guide/_index.adoc:2831
 msgid "The license text."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2775
+#: documentation/content/en/articles/committers-guide/_index.adoc:2832
 msgid ""
 "A note of any restrictions, limitations or exceptions that apply "
 "specifically to FreeBSD's usage of the licensed material."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2776
+#: documentation/content/en/articles/committers-guide/_index.adoc:2833
 msgid "Any other relevant information."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2779
+#: documentation/content/en/articles/committers-guide/_index.adoc:2836
 msgid ""
 "Once the {core-email} is satisfied that all the necessary details have been "
 "gathered and are correct, the secretary will send a PGP-signed "
@@ -5754,7 +5844,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2782
+#: documentation/content/en/articles/committers-guide/_index.adoc:2839
 msgid ""
 "The license archive should contain only details of license grants; this is "
 "not the place for any discussions around licensing or other subjects.  "
@@ -5763,13 +5853,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2784
+#: documentation/content/en/articles/committers-guide/_index.adoc:2841
 #, no-wrap
 msgid "SPDX Tags in the tree"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2795
+#: documentation/content/en/articles/committers-guide/_index.adoc:2852
 msgid ""
 "The project uses https://spdx.dev[SPDX] tags in our source base.  At "
 "present, these tags are indented to help automated tools reconstruct license "
@@ -5788,20 +5878,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2797
+#: documentation/content/en/articles/committers-guide/_index.adoc:2854
 msgid ""
 "As of March 2021, approximately 25,000 out of 90,000 files in the tree have "
 "been marked."
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2798
+#: documentation/content/en/articles/committers-guide/_index.adoc:2855
 #, no-wrap
 msgid "Developer Relations"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2804
+#: documentation/content/en/articles/committers-guide/_index.adoc:2861
 msgid ""
 "When working directly on your own code or on code which is already well "
 "established as your responsibility, then there is probably little need to "
@@ -5814,7 +5904,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2808
+#: documentation/content/en/articles/committers-guide/_index.adoc:2865
 msgid ""
 "To determine if an area of the tree is maintained, check the MAINTAINERS "
 "file at the root of the tree.  If nobody is listed, scan the revision "
@@ -5825,27 +5915,27 @@ msgid ""
 msgstr ""
 
 #. type: delimited block - 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2812
+#: documentation/content/en/articles/committers-guide/_index.adoc:2869
 #, no-wrap
 msgid "% git -C /path/to/repo shortlog -sne --since=\"2 years\" -- relative/path/to/file\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2815
+#: documentation/content/en/articles/committers-guide/_index.adoc:2872
 msgid ""
 "If queries go unanswered or the committer otherwise indicates a lack of "
 "interest in the area affected, go ahead and commit it."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2820
+#: documentation/content/en/articles/committers-guide/_index.adoc:2877
 msgid ""
 "Avoid sending private emails to maintainers.  Other people might be "
 "interested in the conversation, not just the final output."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2826
+#: documentation/content/en/articles/committers-guide/_index.adoc:2883
 msgid ""
 "If there is any doubt about a commit for any reason at all, have it reviewed "
 "before committing.  Better to have it flamed then and there rather than when "
@@ -5856,7 +5946,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2830
+#: documentation/content/en/articles/committers-guide/_index.adoc:2887
 msgid ""
 "Do not impugn the intentions of others.  If they see a different solution to "
 "a problem, or even a different problem, it is probably not because they are "
@@ -5866,7 +5956,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2833
+#: documentation/content/en/articles/committers-guide/_index.adoc:2890
 msgid ""
 "Disagree honestly.  Argue your position from its merits, be honest about any "
 "shortcomings it may have, and be open to seeing their solution, or even "
@@ -5874,7 +5964,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2839
+#: documentation/content/en/articles/committers-guide/_index.adoc:2896
 msgid ""
 "Accept correction.  We are all fallible.  When you have made a mistake, "
 "apologize and get on with life.  Do not beat up yourself, and certainly do "
@@ -5883,7 +5973,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2843
+#: documentation/content/en/articles/committers-guide/_index.adoc:2900
 msgid ""
 "Ask for help.  Seek out (and give) peer reviews.  One of the ways open "
 "source software is supposed to excel is in the number of eyeballs applied to "
@@ -5891,20 +5981,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2845
+#: documentation/content/en/articles/committers-guide/_index.adoc:2902
 #, no-wrap
 msgid "If in Doubt..."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2849
+#: documentation/content/en/articles/committers-guide/_index.adoc:2906
 msgid ""
 "When unsure about something, whether it be a technical issue or a project "
 "convention be sure to ask.  If you stay silent you will never make progress."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2853
+#: documentation/content/en/articles/committers-guide/_index.adoc:2910
 msgid ""
 "If it relates to a technical issue ask on the public mailing lists.  Avoid "
 "the temptation to email the individual person that knows the answer.  This "
@@ -5912,32 +6002,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2855
+#: documentation/content/en/articles/committers-guide/_index.adoc:2912
 msgid "For project specific or administrative questions ask, in order:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2857
+#: documentation/content/en/articles/committers-guide/_index.adoc:2914
 msgid "Your mentor or former mentor."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2858
+#: documentation/content/en/articles/committers-guide/_index.adoc:2915
 msgid "An experienced committer on IRC, email, etc."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2859
+#: documentation/content/en/articles/committers-guide/_index.adoc:2916
 msgid "Any team with a \"hat\", as they can give you a definitive answer."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2860
+#: documentation/content/en/articles/committers-guide/_index.adoc:2917
 msgid "If still not sure, ask on {developers-name}."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2862
+#: documentation/content/en/articles/committers-guide/_index.adoc:2919
 msgid ""
 "Once your question is answered, if no one pointed you to documentation that "
 "spelled out the answer to your question, document it, as others will have "
@@ -5945,13 +6035,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2864
+#: documentation/content/en/articles/committers-guide/_index.adoc:2921
 #, no-wrap
 msgid "Bugzilla"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2869
+#: documentation/content/en/articles/committers-guide/_index.adoc:2926
 msgid ""
 "The FreeBSD Project utilizes Bugzilla for tracking bugs and change "
 "requests.  If you commit a fix or suggestion found in the PR database, be "
@@ -5960,62 +6050,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2871
+#: documentation/content/en/articles/committers-guide/_index.adoc:2928
 msgid ""
 "Committers with non-``FreeBSD.org`` Bugzilla accounts can have the old "
 "account merged with the `FreeBSD.org` account by following these steps:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2875
+#: documentation/content/en/articles/committers-guide/_index.adoc:2932
 msgid "Log in using your old account."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2876
+#: documentation/content/en/articles/committers-guide/_index.adoc:2933
 msgid ""
 "Open new bug. Choose `Services` as the Product, and `Bug Tracker` as the "
 "Component. In bug description list accounts you wish to be merged."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2877
+#: documentation/content/en/articles/committers-guide/_index.adoc:2935
 msgid ""
 "Log in using `FreeBSD.org` account and post comment to newly opened bug to "
-"confirm ownership. See <<kerberos-ldap>> for more details on how to generate "
-"or set a password for your `FreeBSD.org` account."
+"confirm ownership. See crossref:committers-guide[kerberos-ldap] for more "
+"details on how to generate or set a password for your `FreeBSD.org` account."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2878
+#: documentation/content/en/articles/committers-guide/_index.adoc:2936
 msgid ""
 "If there are more than two accounts to merge, post comments from each of "
 "them."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2881
+#: documentation/content/en/articles/committers-guide/_index.adoc:2939
 msgid "You can find out more about Bugzilla at:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2883
+#: documentation/content/en/articles/committers-guide/_index.adoc:2941
 msgid "extref:{pr-guidelines}[FreeBSD Problem Report Handling Guidelines]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2884
+#: documentation/content/en/articles/committers-guide/_index.adoc:2942
 msgid "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2886
+#: documentation/content/en/articles/committers-guide/_index.adoc:2944
 #, no-wrap
 msgid "Phabricator"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2890
+#: documentation/content/en/articles/committers-guide/_index.adoc:2948
 msgid ""
 "The FreeBSD Project utilizes https://reviews.freebsd.org[Phabricator] for "
 "code review requests.  See the https://wiki.freebsd.org/"
@@ -6023,41 +6113,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2892
+#: documentation/content/en/articles/committers-guide/_index.adoc:2950
 msgid ""
 "Committers with non-``FreeBSD.org`` Phabricator accounts can have the old "
 "account renamed to the ``FreeBSD.org`` account by following these steps:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2896
+#: documentation/content/en/articles/committers-guide/_index.adoc:2954
 msgid "Change your Phabricator account email to your `FreeBSD.org` email."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2897
+#: documentation/content/en/articles/committers-guide/_index.adoc:2956
 msgid ""
 "Open new bug on our bug tracker using your `FreeBSD.org` account, see "
-"<<bugzilla>> for more information. Choose `Services` as the Product, and "
-"`Code Review` as the Component. In bug description request that your "
-"Phabricator account be renamed, and provide a link to your Phabricator user. "
-"For example, `https://reviews.freebsd.org/p/bob_example.com/`"
+"crossref:committers-guide[bugzilla] for more information. Choose `Services` "
+"as the Product, and `Code Review` as the Component. In bug description "
+"request that your Phabricator account be renamed, and provide a link to your "
+"Phabricator user. For example, `https://reviews.freebsd.org/p/bob_example."
+"com/`"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2902
+#: documentation/content/en/articles/committers-guide/_index.adoc:2961
 msgid ""
 "Phabricator accounts cannot be merged, please do not open a new account."
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2905
+#: documentation/content/en/articles/committers-guide/_index.adoc:2964
 #, no-wrap
 msgid "Who's Who"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2908
+#: documentation/content/en/articles/committers-guide/_index.adoc:2967
 msgid ""
 "Besides the repository meisters, there are other FreeBSD project members and "
 "teams whom you will probably get to know in your role as a committer. "
@@ -6065,13 +6156,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: documentation/content/en/articles/committers-guide/_index.adoc:2909
+#: documentation/content/en/articles/committers-guide/_index.adoc:2968
 #, no-wrap
 msgid "`{doceng}`"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2915
+#: documentation/content/en/articles/committers-guide/_index.adoc:2974
 msgid ""
 "doceng is the group responsible for the documentation build infrastructure, "
 "approving new documentation committers, and ensuring that the FreeBSD "
@@ -6085,13 +6176,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: documentation/content/en/articles/committers-guide/_index.adoc:2916
+#: documentation/content/en/articles/committers-guide/_index.adoc:2975
 #, no-wrap
 msgid "`{re-members}`"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2921
+#: documentation/content/en/articles/committers-guide/_index.adoc:2980
 msgid ""
 "These are the members of the `{re}`.  This team is responsible for setting "
 "release deadlines and controlling the release process.  During code freezes, "
@@ -6102,20 +6193,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: documentation/content/en/articles/committers-guide/_index.adoc:2922
+#: documentation/content/en/articles/committers-guide/_index.adoc:2981
 #, no-wrap
 msgid "`{so}`"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2924
+#: documentation/content/en/articles/committers-guide/_index.adoc:2983
 msgid ""
 "`{so-name}` is the link:https://www.FreeBSD.org/security/[FreeBSD Security "
 "Officer] and oversees the `{security-officer}`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2929
+#: documentation/content/en/articles/committers-guide/_index.adoc:2988
 msgid ""
 "{committers-name}:: {dev-src-all}, {dev-ports-all} and {dev-doc-all} are the "
 "mailing lists that the version control system uses to send commit messages "
@@ -6124,7 +6215,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2934
+#: documentation/content/en/articles/committers-guide/_index.adoc:2993
 msgid ""
 "{developers-name}:: All committers are subscribed to -developers.  This list "
 "was created to be a forum for the committers \"community\" issues.  Examples "
@@ -6132,7 +6223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2938
+#: documentation/content/en/articles/committers-guide/_index.adoc:2997
 msgid ""
 "The {developers-name} is for the exclusive use of FreeBSD committers.  To "
 "develop FreeBSD, committers must have the ability to openly discuss matters "
@@ -6142,7 +6233,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2942
+#: documentation/content/en/articles/committers-guide/_index.adoc:3001
 msgid ""
 "All FreeBSD committers are expected not to not publish or forward messages "
 "from the {developers-name} outside the list membership without permission of "
@@ -6152,7 +6243,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2948
+#: documentation/content/en/articles/committers-guide/_index.adoc:3007
 msgid ""
 "This list is _not_ intended as a place for code reviews or for any technical "
 "discussion.  In fact using it as such hurts the FreeBSD Project as it gives "
@@ -6165,13 +6256,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2949
+#: documentation/content/en/articles/committers-guide/_index.adoc:3008
 #, no-wrap
 msgid "SSH Quick-Start Guide"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2954
+#: documentation/content/en/articles/committers-guide/_index.adoc:3013
 msgid ""
 "If you do not wish to type your password in every time you use man:ssh[1], "
 "and you use keys to authenticate, man:ssh-agent[1] is there for your "
@@ -6182,19 +6273,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2955
+#: documentation/content/en/articles/committers-guide/_index.adoc:3014
 msgid ""
 "Generate a key pair using man:ssh-keygen[1]. The key pair will wind up in "
 "your [.filename]#$HOME/.ssh/# directory."
 msgstr ""
 
 #. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:2959
+#: documentation/content/en/articles/committers-guide/_index.adoc:3018
 msgid "Only ECDSA, Ed25519 or RSA keys are supported."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:2961
+#: documentation/content/en/articles/committers-guide/_index.adoc:3020
 msgid ""
 "Send your public key ([.filename]#$HOME/.ssh/id_ecdsa.pub#, [."
 "filename]#$HOME/.ssh/id_ed25519.pub#, or [.filename]#$HOME/.ssh/id_rsa.pub#) "
@@ -6203,7 +6294,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2966
+#: documentation/content/en/articles/committers-guide/_index.adoc:3025
 msgid ""
 "Now man:ssh-add[1] can be used for authentication once per session.  It "
 "prompts for the private key's pass phrase, and then stores it in the "
@@ -6212,32 +6303,32 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2968
+#: documentation/content/en/articles/committers-guide/_index.adoc:3027
 msgid "Test with a simple remote command: `ssh freefall.FreeBSD.org ls /usr`."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2970
+#: documentation/content/en/articles/committers-guide/_index.adoc:3029
 msgid ""
 "For more information, see package:security/openssh-portable[], man:ssh[1], "
 "man:ssh-add[1], man:ssh-agent[1], man:ssh-keygen[1], and man:scp[1]."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2972
+#: documentation/content/en/articles/committers-guide/_index.adoc:3031
 msgid ""
 "For information on adding, changing, or removing man:ssh[1] keys, see "
 "https://wiki.freebsd.org/clusteradm/ssh-keys[this article]."
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2974
+#: documentation/content/en/articles/committers-guide/_index.adoc:3033
 #, no-wrap
 msgid "Coverity(R) Availability for FreeBSD Committers"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2978
+#: documentation/content/en/articles/committers-guide/_index.adoc:3037
 msgid ""
 "All FreeBSD developers can obtain access to Coverity analysis results of all "
 "FreeBSD Project software.  All who are interested in obtaining access to the "
@@ -6246,7 +6337,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2981
+#: documentation/content/en/articles/committers-guide/_index.adoc:3040
 msgid ""
 "The FreeBSD wiki includes a mini-guide for developers who are interested in "
 "working with the Coverity(R) analysis reports: https://wiki.freebsd.org/"
@@ -6257,7 +6348,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2983
+#: documentation/content/en/articles/committers-guide/_index.adoc:3042
 msgid ""
 "Finally, all FreeBSD developers who are going to use Coverity(R) are always "
 "encouraged to ask for more details and usage information, by posting any "
@@ -6265,13 +6356,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:2985
+#: documentation/content/en/articles/committers-guide/_index.adoc:3044
 #, no-wrap
 msgid "The FreeBSD Committers' Big List of Rules"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2990
+#: documentation/content/en/articles/committers-guide/_index.adoc:3049
 msgid ""
 "Everyone involved with the FreeBSD project is expected to abide by the _Code "
 "of Conduct_ available from link:https://www.FreeBSD.org/internal/code-of-"
@@ -6282,25 +6373,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2992
-#: documentation/content/en/articles/committers-guide/_index.adoc:3022
+#: documentation/content/en/articles/committers-guide/_index.adoc:3051
+#: documentation/content/en/articles/committers-guide/_index.adoc:3081
 msgid "Respect other committers."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2993
-#: documentation/content/en/articles/committers-guide/_index.adoc:3038
+#: documentation/content/en/articles/committers-guide/_index.adoc:3052
+#: documentation/content/en/articles/committers-guide/_index.adoc:3097
 msgid "Respect other contributors."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2994
 #: documentation/content/en/articles/committers-guide/_index.adoc:3053
+#: documentation/content/en/articles/committers-guide/_index.adoc:3112
 msgid "Discuss any significant change _before_ committing."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2995
+#: documentation/content/en/articles/committers-guide/_index.adoc:3054
 msgid ""
 "Respect existing maintainers (if listed in the `MAINTAINER` field in [."
 "filename]#Makefile# or in [.filename]#MAINTAINER# in the top-level "
@@ -6308,8 +6399,8 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2996
-#: documentation/content/en/articles/committers-guide/_index.adoc:3068
+#: documentation/content/en/articles/committers-guide/_index.adoc:3055
+#: documentation/content/en/articles/committers-guide/_index.adoc:3127
 msgid ""
 "Any disputed change must be backed out pending resolution of the dispute if "
 "requested by a maintainer. Security related changes may override a "
@@ -6317,7 +6408,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2997
+#: documentation/content/en/articles/committers-guide/_index.adoc:3056
 msgid ""
 "Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically "
 "permitted by the release engineer or unless they are not applicable to "
@@ -6329,40 +6420,40 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2998
-#: documentation/content/en/articles/committers-guide/_index.adoc:3083
+#: documentation/content/en/articles/committers-guide/_index.adoc:3057
+#: documentation/content/en/articles/committers-guide/_index.adoc:3142
 msgid "Do not fight in public with other committers; it looks bad."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:2999
+#: documentation/content/en/articles/committers-guide/_index.adoc:3058
 msgid ""
 "Respect all code freezes and read the `committers` and `developers` mailing "
 "lists in a timely manner so you know when a code freeze is in effect."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3000
-#: documentation/content/en/articles/committers-guide/_index.adoc:3098
+#: documentation/content/en/articles/committers-guide/_index.adoc:3059
+#: documentation/content/en/articles/committers-guide/_index.adoc:3157
 msgid "When in doubt on any procedure, ask first!"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3001
-#: documentation/content/en/articles/committers-guide/_index.adoc:3103
+#: documentation/content/en/articles/committers-guide/_index.adoc:3060
+#: documentation/content/en/articles/committers-guide/_index.adoc:3162
 msgid "Test your changes before committing them."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3002
-#: documentation/content/en/articles/committers-guide/_index.adoc:3112
+#: documentation/content/en/articles/committers-guide/_index.adoc:3061
+#: documentation/content/en/articles/committers-guide/_index.adoc:3172
 msgid ""
 "Do not commit to contributed software without _explicit_ approval from the "
 "respective maintainers."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3013
+#: documentation/content/en/articles/committers-guide/_index.adoc:3072
 msgid ""
 "As noted, breaking some of these rules can be grounds for suspension or, "
 "upon repeated offense, permanent removal of commit privileges.  Individual "
@@ -6388,7 +6479,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3017
+#: documentation/content/en/articles/committers-guide/_index.adoc:3076
 msgid ""
 "In all other aspects of project operation, core is a subset of committers "
 "and is bound by the __same rules__.  Just because someone is in core this "
@@ -6399,13 +6490,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3018
+#: documentation/content/en/articles/committers-guide/_index.adoc:3077
 #, no-wrap
 msgid "Details"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3026
+#: documentation/content/en/articles/committers-guide/_index.adoc:3085
 msgid ""
 "This means that you need to treat other committers as the peer-group "
 "developers that they are.  Despite our occasional attempts to prove the "
@@ -6417,7 +6508,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3028
+#: documentation/content/en/articles/committers-guide/_index.adoc:3087
 msgid ""
 "Being able to work together long term is this project's greatest asset, one "
 "far more important than any set of changes to the code, and turning "
@@ -6427,7 +6518,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3034
+#: documentation/content/en/articles/committers-guide/_index.adoc:3093
 msgid ""
 "To comply with this rule, do not send email when you are angry or otherwise "
 "behave in a manner which is likely to strike others as needlessly "
@@ -6446,7 +6537,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3037
+#: documentation/content/en/articles/committers-guide/_index.adoc:3096
 msgid ""
 "All of this is never an option which the project's leadership enjoys in the "
 "slightest, but unity comes first.  No amount of code or good advice is worth "
@@ -6454,7 +6545,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3050
+#: documentation/content/en/articles/committers-guide/_index.adoc:3109
 msgid ""
 "You were not always a committer.  At one time you were a contributor.  "
 "Remember that at all times.  Remember what it was like trying to get help "
@@ -6468,14 +6559,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3052
+#: documentation/content/en/articles/committers-guide/_index.adoc:3111
 msgid ""
-"Consider the points raised under <<respect,Respect other committers>> and "
-"apply them also to contributors."
+"Consider the points raised under crossref:committers-guide[respect,Respect "
+"other committers] and apply them also to contributors."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3059
+#: documentation/content/en/articles/committers-guide/_index.adoc:3118
 msgid ""
 "The repository is not where changes are initially submitted for correctness "
 "or argued over, that happens first in the mailing lists or by use of the "
@@ -6491,17 +6582,17 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3061
+#: documentation/content/en/articles/committers-guide/_index.adoc:3120
 msgid "When in doubt, ask for review!"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3062
+#: documentation/content/en/articles/committers-guide/_index.adoc:3121
 msgid "Respect existing maintainers if listed."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3067
+#: documentation/content/en/articles/committers-guide/_index.adoc:3126
 msgid ""
 "Many parts of FreeBSD are not \"owned\" in the sense that any specific "
 "individual will jump up and yell if you commit a change to \"their\" area, "
@@ -6517,7 +6608,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3073
+#: documentation/content/en/articles/committers-guide/_index.adoc:3132
 msgid ""
 "This may be hard to swallow in times of conflict (when each side is "
 "convinced that they are in the right, of course) but a version control "
@@ -6535,7 +6626,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3074
+#: documentation/content/en/articles/committers-guide/_index.adoc:3133
 msgid ""
 "Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically "
 "permitted by the release engineer or unless they are not applicable to "
@@ -6546,7 +6637,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3080
+#: documentation/content/en/articles/committers-guide/_index.adoc:3139
 msgid ""
 "This is another \"do not argue about it\" issue since it is the release "
 "engineer who is ultimately responsible (and gets beaten up) if a change "
@@ -6565,7 +6656,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3082
+#: documentation/content/en/articles/committers-guide/_index.adoc:3141
 msgid ""
 "Changes to the security branches (for example, `releng/9.3`) must be "
 "approved by a member of the `{security-officer}`, or in some cases, by a "
@@ -6573,7 +6664,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3093
+#: documentation/content/en/articles/committers-guide/_index.adoc:3152
 msgid ""
 "This project has a public image to uphold and that image is very important "
 "to all of us, especially if we are to continue to attract new members.  "
@@ -6598,14 +6689,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3094
+#: documentation/content/en/articles/committers-guide/_index.adoc:3153
 msgid ""
 "Respect all code freezes and read the `committers` and `developers` mailing "
 "list on a timely basis so you know when a code freeze is in effect."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3097
+#: documentation/content/en/articles/committers-guide/_index.adoc:3156
 msgid ""
 "Committing unapproved changes during a code freeze is a really big mistake "
 "and committers are expected to keep up-to-date on what is going on before "
@@ -6616,7 +6707,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3102
+#: documentation/content/en/articles/committers-guide/_index.adoc:3161
 msgid ""
 "Many mistakes are made because someone is in a hurry and just assumes they "
 "know the right way of doing something.  If you have not done it before, "
@@ -6628,29 +6719,30 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3111
+#: documentation/content/en/articles/committers-guide/_index.adoc:3171
 msgid ""
 "If your changes are to the kernel, make sure you can still compile both "
 "GENERIC and LINT.  If your changes are anywhere else, make sure you can "
 "still make world.  If your changes are to a branch, make sure your testing "
 "occurs with a machine which is running that code.  If you have a change "
 "which also may break another architecture, be sure and test on all supported "
-"architectures.  Please ensure your change works for <<compilers,supported "
-"toolchains>>.  Please refer to the https://www.FreeBSD.org/internal/[FreeBSD "
-"Internal Page] for a list of available resources.  As other architectures "
-"are added to the FreeBSD supported platforms list, the appropriate shared "
-"testing resources will be made available."
+"architectures.  Please ensure your change works for crossref:committers-"
+"guide[compilers,supported toolchains].  Please refer to the https://www."
+"FreeBSD.org/internal/[FreeBSD Internal Page] for a list of available "
+"resources.  As other architectures are added to the FreeBSD supported "
+"platforms list, the appropriate shared testing resources will be made "
+"available."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3114
+#: documentation/content/en/articles/committers-guide/_index.adoc:3174
 msgid ""
 "Contributed software is anything under the [.filename]#src/contrib#, [."
 "filename]#src/crypto#, or [.filename]#src/sys/contrib# trees."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3119
+#: documentation/content/en/articles/committers-guide/_index.adoc:3179
 msgid ""
 "The trees mentioned above are for contributed software usually imported onto "
 "a vendor branch.  Committing something there may cause unnecessary headaches "
@@ -6660,7 +6752,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3123
+#: documentation/content/en/articles/committers-guide/_index.adoc:3183
 msgid ""
 "Reasons for modifying upstream software range from wanting strict control "
 "over a tightly coupled dependency to lack of portability in the canonical "
@@ -6672,7 +6764,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3126
+#: documentation/content/en/articles/committers-guide/_index.adoc:3186
 msgid ""
 "If a particular piece of software lacks a maintainer, you are encouraged to "
 "take up ownership.  If you are unsure of the current maintainership email "
@@ -6680,13 +6772,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3127
+#: documentation/content/en/articles/committers-guide/_index.adoc:3187
 #, no-wrap
 msgid "Policy on Multiple Architectures"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3131
+#: documentation/content/en/articles/committers-guide/_index.adoc:3191
 msgid ""
 "FreeBSD has added several new architecture ports during recent release "
 "cycles and is truly no longer an i386(TM) centric operating system.  In an "
@@ -6695,7 +6787,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3135
+#: documentation/content/en/articles/committers-guide/_index.adoc:3195
 msgid ""
 "Our 32-bit reference platform is i386, and our 64-bit reference platform is "
 "amd64.  Major design work (including major API and ABI changes) must prove "
@@ -6705,7 +6797,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3139
+#: documentation/content/en/articles/committers-guide/_index.adoc:3199
 msgid ""
 "Developers should also be aware of our Tier Policy for the long term support "
 "of hardware architectures.  The rules here are intended to provide guidance "
@@ -6716,13 +6808,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3141
+#: documentation/content/en/articles/committers-guide/_index.adoc:3201
 #, no-wrap
 msgid "Policy on Multiple Compilers"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3155
+#: documentation/content/en/articles/committers-guide/_index.adoc:3215
 msgid ""
 "FreeBSD builds with both Clang and GCC.  The project does this in a careful "
 "and controlled way to maximize benefits from this extra work, while keeping "
@@ -6748,7 +6840,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3160
+#: documentation/content/en/articles/committers-guide/_index.adoc:3220
 msgid ""
 "The FreeBSD project provides an in-tree Clang compiler.  Due to being in the "
 "tree, this compiler is the most supported compiler.  All changes must "
@@ -6757,7 +6849,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3168
+#: documentation/content/en/articles/committers-guide/_index.adoc:3228
 msgid ""
 "At any moment in time, the FreeBSD project also supports one or more out-of-"
 "tree compilers.  At present, this is GCC 12.x.  Ideally, committers should "
@@ -6772,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3172
+#: documentation/content/en/articles/committers-guide/_index.adoc:3232
 msgid ""
 "The FreeBSD project also has some CI pipelines on github.  For pull requests "
 "on github and some branches pushed to the github forks, a number of cross "
@@ -6781,7 +6873,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3178
+#: documentation/content/en/articles/committers-guide/_index.adoc:3238
 msgid ""
 "The FreeBSD project is also upgrading compilers.  Both Clang and GCC are "
 "fast moving targets.  Some work to change things in the tree, for example "
@@ -6794,7 +6886,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3182
+#: documentation/content/en/articles/committers-guide/_index.adoc:3242
 msgid ""
 "In addition to the compiler, LLVM's LLD and GNU's binutils are used "
 "indirectly by the compiler.  Committers should be mindful of variations in "
@@ -6804,7 +6896,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3188
+#: documentation/content/en/articles/committers-guide/_index.adoc:3248
 msgid ""
 "The FreeBSD project provides headers and libraries that allow other "
 "compilers to be used to build software not in the base system.  These "
@@ -6819,7 +6911,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3193
+#: documentation/content/en/articles/committers-guide/_index.adoc:3253
 msgid ""
 "The FreeBSD build system currently accommodates these different "
 "environments.  As new warnings are added to compilers, the project tries to "
@@ -6831,13 +6923,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3194
+#: documentation/content/en/articles/committers-guide/_index.adoc:3254
 #, no-wrap
 msgid "Current Compiler Versions"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3199
+#: documentation/content/en/articles/committers-guide/_index.adoc:3259
 msgid ""
 "The in-tree compiler is currently Clang 15.x.  Currently, GCC 12 and Clang "
 "12, 13, 14 and 15 are tested in the github and project's CI jenkins jobs.  "
@@ -6847,13 +6939,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3200
+#: documentation/content/en/articles/committers-guide/_index.adoc:3260
 #, no-wrap
 msgid "Other Suggestions"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3204
+#: documentation/content/en/articles/committers-guide/_index.adoc:3264
 msgid ""
 "When committing documentation changes, use a spell checker before "
 "committing.  For all XML docs, verify that the formatting directives are "
@@ -6861,7 +6953,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3206
+#: documentation/content/en/articles/committers-guide/_index.adoc:3266
 msgid ""
 "For manual pages, run package:sysutils/manck[] and package:textproc/igor[] "
 "over the manual page to verify all of the cross references and file "
@@ -6870,7 +6962,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3213
+#: documentation/content/en/articles/committers-guide/_index.adoc:3273
 msgid ""
 "Do not mix style fixes with new functionality.  A style fix is any change "
 "which does not modify the functionality of the code.  Mixing the changes "
@@ -6883,20 +6975,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3214
+#: documentation/content/en/articles/committers-guide/_index.adoc:3274
 #, no-wrap
 msgid "Deprecating Features"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3217
+#: documentation/content/en/articles/committers-guide/_index.adoc:3277
 msgid ""
 "When it is necessary to remove functionality from software in the base "
 "system, follow these guidelines whenever possible:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3219
+#: documentation/content/en/articles/committers-guide/_index.adoc:3279
 msgid ""
 "Mention is made in the manual page and possibly the release notes that the "
 "option, utility, or interface is deprecated. Use of the deprecated feature "
@@ -6904,14 +6996,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3220
+#: documentation/content/en/articles/committers-guide/_index.adoc:3280
 msgid ""
 "The option, utility, or interface is preserved until the next major (point "
 "zero) release."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3221
+#: documentation/content/en/articles/committers-guide/_index.adoc:3281
 msgid ""
 "The option, utility, or interface is removed and no longer documented. It is "
 "now obsolete. It is also generally a good idea to note its removal in the "
@@ -6919,18 +7011,18 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3222
+#: documentation/content/en/articles/committers-guide/_index.adoc:3282
 #, no-wrap
 msgid "Privacy and Confidentiality"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3225
+#: documentation/content/en/articles/committers-guide/_index.adoc:3285
 msgid "Most FreeBSD business is done in public."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3228
+#: documentation/content/en/articles/committers-guide/_index.adoc:3288
 msgid ""
 "FreeBSD is an _open_ project.  Which means that not only can anyone use the "
 "source code, but that most of the development process is open to public "
@@ -6938,12 +7030,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3229
+#: documentation/content/en/articles/committers-guide/_index.adoc:3289
 msgid "Certain sensitive matters must remain private or held under embargo."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3235
+#: documentation/content/en/articles/committers-guide/_index.adoc:3295
 msgid ""
 "There unfortunately cannot be complete transparency.  As a FreeBSD developer "
 "you will have a certain degree of privileged access to information.  "
@@ -6954,14 +7046,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3236
+#: documentation/content/en/articles/committers-guide/_index.adoc:3296
 msgid ""
 "The Security Officer has sole control over the release of security "
 "advisories."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3241
+#: documentation/content/en/articles/committers-guide/_index.adoc:3301
 msgid ""
 "Where there are security problems that affect many different operating "
 "systems, FreeBSD frequently depends on early access to be able to prepare "
@@ -6974,13 +7066,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3242
+#: documentation/content/en/articles/committers-guide/_index.adoc:3302
 msgid ""
 "Communications with Core are kept confidential for as long as necessary."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3247
+#: documentation/content/en/articles/committers-guide/_index.adoc:3307
 msgid ""
 "Communications to core will initially be treated as confidential.  "
 "Eventually however, most of Core's business will be summarized into the "
@@ -6991,14 +7083,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3248
+#: documentation/content/en/articles/committers-guide/_index.adoc:3308
 msgid ""
 "Non-disclosure Agreements may be required for access to certain commercially "
 "sensitive data."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3251
+#: documentation/content/en/articles/committers-guide/_index.adoc:3311
 msgid ""
 "Access to certain commercially sensitive data may only be available under a "
 "Non-Disclosure Agreement.  The FreeBSD Foundation legal staff must be "
@@ -7006,12 +7098,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3252
+#: documentation/content/en/articles/committers-guide/_index.adoc:3312
 msgid "Private communications must not be made public without permission."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3255
+#: documentation/content/en/articles/committers-guide/_index.adoc:3315
 msgid ""
 "Beyond the specific requirements above there is a general expectation not to "
 "publish private communications between developers without the consent of all "
@@ -7021,14 +7113,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3256
+#: documentation/content/en/articles/committers-guide/_index.adoc:3316
 msgid ""
 "Communications on project-only or restricted access channels must be kept "
 "private."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3259
+#: documentation/content/en/articles/committers-guide/_index.adoc:3319
 msgid ""
 "Similarly to personal communications, certain internal communications "
 "channels, including FreeBSD Committer only mailing lists and restricted "
@@ -7037,12 +7129,12 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3260
+#: documentation/content/en/articles/committers-guide/_index.adoc:3320
 msgid "Core may approve publication."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3262
+#: documentation/content/en/articles/committers-guide/_index.adoc:3322
 msgid ""
 "Where it is impractical to obtain permission due to the number of "
 "correspondents or where permission to publish is unreasonably withheld, Core "
@@ -7051,13 +7143,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:3264
+#: documentation/content/en/articles/committers-guide/_index.adoc:3324
 #, no-wrap
 msgid "Support for Multiple Architectures"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3271
+#: documentation/content/en/articles/committers-guide/_index.adoc:3331
 msgid ""
 "FreeBSD is a highly portable operating system intended to function on many "
 "different types of hardware architectures.  Maintaining clean separation of "
@@ -7073,13 +7165,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3272
+#: documentation/content/en/articles/committers-guide/_index.adoc:3332
 #, no-wrap
 msgid "Statement of General Intent"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3277
+#: documentation/content/en/articles/committers-guide/_index.adoc:3337
 msgid ""
 "The FreeBSD Project targets \"production quality commercial off-the-shelf "
 "(COTS) workstation, server, and high-end embedded systems\".  By retaining a "
@@ -7095,7 +7187,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3284
+#: documentation/content/en/articles/committers-guide/_index.adoc:3344
 msgid ""
 "The FreeBSD Project differentiates platform targets into four tiers.  Each "
 "tier includes a list of guarantees consumers may rely on as well as "
@@ -7109,13 +7201,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3285
+#: documentation/content/en/articles/committers-guide/_index.adoc:3345
 #, no-wrap
 msgid "Platform Targets"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3292
+#: documentation/content/en/articles/committers-guide/_index.adoc:3352
 msgid ""
 "Support for a hardware platform consists of two components: kernel support "
 "and userland Application Binary Interfaces (ABIs).  Kernel platform support "
@@ -7130,7 +7222,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3294
+#: documentation/content/en/articles/committers-guide/_index.adoc:3354
 msgid ""
 "A FreeBSD kernel also uses an ABI (sometimes referred to as the Kernel "
 "Binary Interface (KBI)) which includes the semantics and layouts of public "
@@ -7139,7 +7231,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3299
+#: documentation/content/en/articles/committers-guide/_index.adoc:3359
 msgid ""
 "A FreeBSD kernel may support multiple userland ABIs.  For example, FreeBSD's "
 "amd64 kernel supports FreeBSD amd64 and i386 userland ABIs as well as Linux "
@@ -7150,20 +7242,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3301
+#: documentation/content/en/articles/committers-guide/_index.adoc:3361
 msgid ""
 "Tiers are defined for both kernels and userland ABIs. In the common case, a "
 "platform's kernel and FreeBSD ABIs are assigned to the same tier."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3302
+#: documentation/content/en/articles/committers-guide/_index.adoc:3362
 #, no-wrap
 msgid "Tier 1: Fully-Supported Architectures"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3307
+#: documentation/content/en/articles/committers-guide/_index.adoc:3367
 msgid ""
 "Tier 1 platforms are the most mature FreeBSD platforms.  They are supported "
 "by the security officer, release engineering, and Ports Management Team.  "
@@ -7173,42 +7265,42 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3309
+#: documentation/content/en/articles/committers-guide/_index.adoc:3369
 msgid ""
 "The FreeBSD Project provides the following guarantees to consumers of Tier 1 "
 "platforms:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3311
+#: documentation/content/en/articles/committers-guide/_index.adoc:3371
 msgid ""
 "Official FreeBSD release images will be provided by the release engineering "
 "team."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3312
+#: documentation/content/en/articles/committers-guide/_index.adoc:3372
 msgid ""
 "Binary updates and source patches for Security Advisories and Errata Notices "
 "will be provided for supported releases."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3313
+#: documentation/content/en/articles/committers-guide/_index.adoc:3373
 msgid ""
 "Source patches for Security Advisories will be provided for supported "
 "branches."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3314
+#: documentation/content/en/articles/committers-guide/_index.adoc:3374
 msgid ""
 "Binary updates and source patches for cross-platform Security Advisories "
 "will typically be provided at the time of the announcement."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3315
+#: documentation/content/en/articles/committers-guide/_index.adoc:3375
 msgid ""
 "Changes to userland ABIs will generally include compatibility shims to "
 "ensure correct operation of binaries compiled against any stable branch "
@@ -7218,7 +7310,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3316
+#: documentation/content/en/articles/committers-guide/_index.adoc:3376
 msgid ""
 "Changes to certain portions of the kernel ABI will include compatibility "
 "shims to ensure correct operation of kernel modules compiled against the "
@@ -7227,7 +7319,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3317
+#: documentation/content/en/articles/committers-guide/_index.adoc:3377
 msgid ""
 "Official binary packages for third party software will be provided by the "
 "ports team. For embedded architectures, these packages may be cross-built "
@@ -7235,21 +7327,21 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3318
+#: documentation/content/en/articles/committers-guide/_index.adoc:3378
 msgid ""
 "Most relevant ports should either build or have the appropriate filters to "
 "prevent inappropriate ones from building."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3319
+#: documentation/content/en/articles/committers-guide/_index.adoc:3379
 msgid ""
 "New features which are not inherently platform-specific will be fully "
 "functional on all Tier 1 architectures."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3320
+#: documentation/content/en/articles/committers-guide/_index.adoc:3380
 msgid ""
 "Features and compatibility shims used by binaries compiled against older "
 "stable branches may be removed in newer major versions. Such removals will "
@@ -7257,19 +7349,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3321
+#: documentation/content/en/articles/committers-guide/_index.adoc:3381
 msgid ""
 "Tier 1 platforms should be fully documented. Basic operations will be "
 "documented in the FreeBSD Handbook."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3322
+#: documentation/content/en/articles/committers-guide/_index.adoc:3382
 msgid "Tier 1 platforms will be included in the source tree."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3323
+#: documentation/content/en/articles/committers-guide/_index.adoc:3383
 msgid ""
 "Tier 1 platforms should be self-hosting either via the in-tree toolchain or "
 "an external toolchain. If an external toolchain is required, official binary "
@@ -7277,14 +7369,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3325
+#: documentation/content/en/articles/committers-guide/_index.adoc:3385
 msgid ""
 "To maintain maturity of Tier 1 platforms, the FreeBSD Project will maintain "
 "the following resources to support development:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3327
+#: documentation/content/en/articles/committers-guide/_index.adoc:3387
 msgid ""
 "Build and test automation support either in the FreeBSD.org cluster or some "
 "other location easily available for all developers. Embedded platforms may "
@@ -7293,41 +7385,41 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3328
-#: documentation/content/en/articles/committers-guide/_index.adoc:3358
+#: documentation/content/en/articles/committers-guide/_index.adoc:3388
+#: documentation/content/en/articles/committers-guide/_index.adoc:3418
 msgid "Inclusion in the `make universe` and `make tinderbox` targets."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3329
+#: documentation/content/en/articles/committers-guide/_index.adoc:3389
 msgid ""
 "Dedicated hardware in one of the FreeBSD clusters for package building "
 "(either natively or via qemu-user)."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3331
+#: documentation/content/en/articles/committers-guide/_index.adoc:3391
 msgid ""
 "Collectively, developers are required to provide the following to maintain "
 "the Tier 1 status of a platform:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3333
+#: documentation/content/en/articles/committers-guide/_index.adoc:3393
 msgid ""
 "Changes to the source tree should not knowingly break the build of a Tier 1 "
 "platform."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3334
+#: documentation/content/en/articles/committers-guide/_index.adoc:3394
 msgid ""
 "Tier 1 architectures must have a mature, healthy ecosystem of users and "
 "active developers."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3335
+#: documentation/content/en/articles/committers-guide/_index.adoc:3395
 msgid ""
 "Developers should be able to build packages on commonly available, non-"
 "embedded Tier 1 systems. This can mean either native builds if non-embedded "
@@ -7336,7 +7428,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3336
+#: documentation/content/en/articles/committers-guide/_index.adoc:3396
 msgid ""
 "Changes cannot break the userland ABI. If an ABI change is required, ABI "
 "compatibility for existing binaries should be provided via use of symbol "
@@ -7344,7 +7436,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3337
+#: documentation/content/en/articles/committers-guide/_index.adoc:3397
 msgid ""
 "Changes merged to stable branches cannot break the protected portions of the "
 "kernel ABI. If a kernel ABI change is required, the change should be "
@@ -7352,13 +7444,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3338
+#: documentation/content/en/articles/committers-guide/_index.adoc:3398
 #, no-wrap
 msgid "Tier 2: Developmental and Niche Architectures"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3342
+#: documentation/content/en/articles/committers-guide/_index.adoc:3402
 msgid ""
 "Tier 2 platforms are functional, but less mature FreeBSD platforms.  They "
 "are not supported by the security officer, release engineering, and Ports "
@@ -7366,7 +7458,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3346
+#: documentation/content/en/articles/committers-guide/_index.adoc:3406
 msgid ""
 "Tier 2 platforms may be Tier 1 platform candidates that are still under "
 "active development.  Architectures reaching end of life may also be moved "
@@ -7376,14 +7468,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3348
+#: documentation/content/en/articles/committers-guide/_index.adoc:3408
 msgid ""
 "The FreeBSD Project provides the following guarantees to consumers of Tier 2 "
 "platforms:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3350
+#: documentation/content/en/articles/committers-guide/_index.adoc:3410
 msgid ""
 "The ports infrastructure should include basic support for Tier 2 "
 "architectures sufficient to support building ports and packages. This "
@@ -7392,19 +7484,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3351
+#: documentation/content/en/articles/committers-guide/_index.adoc:3411
 msgid ""
 "New features which are not inherently platform-specific should be feasible "
 "on all Tier 2 architectures if not implemented."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3352
+#: documentation/content/en/articles/committers-guide/_index.adoc:3412
 msgid "Tier 2 platforms will be included in the source tree."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3353
+#: documentation/content/en/articles/committers-guide/_index.adoc:3413
 msgid ""
 "Tier 2 platforms should be self-hosting either via the in-tree toolchain or "
 "an external toolchain. If an external toolchain is required, official binary "
@@ -7412,41 +7504,41 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3354
+#: documentation/content/en/articles/committers-guide/_index.adoc:3414
 msgid ""
 "Tier 2 platforms should provide functional kernels and userlands even if an "
 "official release distribution is not provided."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3356
+#: documentation/content/en/articles/committers-guide/_index.adoc:3416
 msgid ""
 "To maintain maturity of Tier 2 platforms, the FreeBSD Project will maintain "
 "the following resources to support development:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3360
+#: documentation/content/en/articles/committers-guide/_index.adoc:3420
 msgid ""
 "Collectively, developers are required to provide the following to maintain "
 "the Tier 2 status of a platform:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3362
+#: documentation/content/en/articles/committers-guide/_index.adoc:3422
 msgid ""
 "Changes to the source tree should not knowingly break the build of a Tier 2 "
 "platform."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3363
+#: documentation/content/en/articles/committers-guide/_index.adoc:3423
 msgid ""
 "Tier 2 architectures must have an active ecosystem of users and developers."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3364
+#: documentation/content/en/articles/committers-guide/_index.adoc:3424
 msgid ""
 "While changes are permitted to break the userland ABI, the ABI should not be "
 "broken gratuitously. Significant userland ABI changes should be restricted "
@@ -7454,20 +7546,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3365
+#: documentation/content/en/articles/committers-guide/_index.adoc:3425
 msgid ""
 "New features that are not yet implemented on Tier 2 architectures should "
 "provide a means of disabling them on those architectures."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3366
+#: documentation/content/en/articles/committers-guide/_index.adoc:3426
 #, no-wrap
 msgid "Tier 3: Experimental Architectures"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3370
+#: documentation/content/en/articles/committers-guide/_index.adoc:3430
 msgid ""
 "Tier 3 platforms have at least partial FreeBSD support.  They are _not_ "
 "supported by the security officer, release engineering, and Ports Management "
@@ -7475,7 +7567,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3373
+#: documentation/content/en/articles/committers-guide/_index.adoc:3433
 msgid ""
 "Tier 3 platforms are architectures in the early stages of development, for "
 "non-mainstream hardware platforms, or which are considered legacy systems "
@@ -7484,7 +7576,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3376
+#: documentation/content/en/articles/committers-guide/_index.adoc:3436
 msgid ""
 "The FreeBSD Project provides no guarantees to consumers of Tier 3 platforms "
 "and is not committed to maintaining resources to support development.  Tier "
@@ -7493,20 +7585,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3377
+#: documentation/content/en/articles/committers-guide/_index.adoc:3437
 #, no-wrap
 msgid "Unsupported Architectures"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3381
+#: documentation/content/en/articles/committers-guide/_index.adoc:3441
 msgid ""
 "Other platforms are not supported in any form by the project.  The project "
 "previously described these as Tier 4 systems."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3384
+#: documentation/content/en/articles/committers-guide/_index.adoc:3444
 msgid ""
 "After a platform transitions to unsupported, all support for the platform is "
 "removed from the source, ports and documentation trees.  Note that ports "
@@ -7515,13 +7607,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3385
+#: documentation/content/en/articles/committers-guide/_index.adoc:3445
 #, no-wrap
 msgid "Policy on Changing the Tier of an Architecture"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3389
+#: documentation/content/en/articles/committers-guide/_index.adoc:3449
 msgid ""
 "Systems may only be moved from one tier to another by approval of the "
 "FreeBSD Core Team, which shall make that decision in collaboration with the "
@@ -7531,48 +7623,48 @@ msgid ""
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:3391
+#: documentation/content/en/articles/committers-guide/_index.adoc:3451
 #, no-wrap
 msgid "Ports Specific FAQ"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3394
+#: documentation/content/en/articles/committers-guide/_index.adoc:3454
 #, no-wrap
 msgid "Adding a New Port"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3397
+#: documentation/content/en/articles/committers-guide/_index.adoc:3457
 #, no-wrap
 msgid "How do I add a new port?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3401
+#: documentation/content/en/articles/committers-guide/_index.adoc:3462
 msgid ""
 "Adding a port to the tree is relatively simple. Once the port is ready to be "
-"added, as explained later <<ports-qa-add-new-extra,here>>, you need to add "
-"the port's directory entry in the category's [.filename]#Makefile#.  In this "
-"[.filename]#Makefile#, ports are listed in alphabetical order and added to "
-"the `SUBDIR` variable, like this:"
+"added, as explained later crossref:committers-guide[ports-qa-add-new-extra,"
+"here], you need to add the port's directory entry in the category's [."
+"filename]#Makefile#.  In this [.filename]#Makefile#, ports are listed in "
+"alphabetical order and added to the `SUBDIR` variable, like this:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3405
+#: documentation/content/en/articles/committers-guide/_index.adoc:3466
 #, no-wrap
 msgid "\tSUBDIR += newport\n"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3408
+#: documentation/content/en/articles/committers-guide/_index.adoc:3469
 msgid ""
 "Once the port and its category's Makefile are ready, the new port can be "
 "committed:"
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3413
+#: documentation/content/en/articles/committers-guide/_index.adoc:3474
 #, no-wrap
 msgid ""
 "% git add category/Makefile category/newport\n"
@@ -7581,27 +7673,27 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3417
+#: documentation/content/en/articles/committers-guide/_index.adoc:3478
 msgid ""
-"Don't forget to <<port-commit-message-formats,setup git hooks for the ports "
-"tree as explained here>>; a specific hook has been developed to verify the "
-"category's [.filename]#Makefile#."
+"Don't forget to crossref:committers-guide[port-commit-message-formats,setup "
+"git hooks for the ports tree as explained here]; a specific hook has been "
+"developed to verify the category's [.filename]#Makefile#."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3420
+#: documentation/content/en/articles/committers-guide/_index.adoc:3481
 #, no-wrap
 msgid "Any other things I need to know when I add a new port?"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3423
+#: documentation/content/en/articles/committers-guide/_index.adoc:3484
 msgid ""
 "Check the port, preferably to make sure it compiles and packages correctly."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3426
+#: documentation/content/en/articles/committers-guide/_index.adoc:3487
 msgid ""
 "The extref:{porters-handbook}testing[Porters Handbook's Testing Chapter] "
 "contains more detailed instructions.  See the extref:{porters-handbook}"
@@ -7610,14 +7702,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3428
+#: documentation/content/en/articles/committers-guide/_index.adoc:3489
 msgid ""
 "You do not necessarily have to eliminate all warnings but make sure you have "
 "fixed the simple ones."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3430
+#: documentation/content/en/articles/committers-guide/_index.adoc:3491
 msgid ""
 "If the port came from a submitter who has not contributed to the Project "
 "before, add that person's name to the extref:{contributors}[Additional "
@@ -7625,14 +7717,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3433
+#: documentation/content/en/articles/committers-guide/_index.adoc:3494
 msgid ""
 "Close the PR if the port came in as a PR.  To close a PR, change the state "
 "to `Issue Resolved` and the resolution as `Fixed`."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3437
+#: documentation/content/en/articles/committers-guide/_index.adoc:3498
 msgid ""
 "If for some reason using extref:{porters-handbook}testing[poudriere, testing-"
 "poudriere] to test the new port is not possible, the bare minimum of testing "
@@ -7640,7 +7732,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3447
+#: documentation/content/en/articles/committers-guide/_index.adoc:3508
 #, no-wrap
 msgid ""
 "# make install\n"
@@ -7653,85 +7745,85 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3450
+#: documentation/content/en/articles/committers-guide/_index.adoc:3511
 msgid ""
 "Note that poudriere is the reference for package building, it the port does "
 "not build in poudriere, it will be removed."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3453
+#: documentation/content/en/articles/committers-guide/_index.adoc:3514
 #, no-wrap
 msgid "Removing an Existing Port"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3456
+#: documentation/content/en/articles/committers-guide/_index.adoc:3517
 #, no-wrap
 msgid "How do I remove an existing port?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3459
+#: documentation/content/en/articles/committers-guide/_index.adoc:3520
 msgid ""
 "First, please read the section about repository copies. Before you remove "
 "the port, you have to verify there are no other ports depending on it."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3461
+#: documentation/content/en/articles/committers-guide/_index.adoc:3522
 msgid "Make sure there is no dependency on the port in the ports collection:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3462
+#: documentation/content/en/articles/committers-guide/_index.adoc:3523
 msgid "The port's PKGNAME appears in exactly one line in a recent INDEX file."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3463
+#: documentation/content/en/articles/committers-guide/_index.adoc:3524
 msgid ""
 "No other ports contains any reference to the port's directory or PKGNAME in "
 "their Makefiles"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3467
+#: documentation/content/en/articles/committers-guide/_index.adoc:3528
 msgid ""
 "When using Git, consider using man:git-grep[1], it is much faster than `grep "
 "-r`."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3470
+#: documentation/content/en/articles/committers-guide/_index.adoc:3531
 msgid "Then, remove the port:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3474
+#: documentation/content/en/articles/committers-guide/_index.adoc:3535
 msgid "Remove the port's files and directory with `git rm`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3475
+#: documentation/content/en/articles/committers-guide/_index.adoc:3536
 msgid ""
 "Remove the `SUBDIR` listing of the port in the parent directory [."
 "filename]#Makefile#."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3476
-#: documentation/content/en/articles/committers-guide/_index.adoc:3491
+#: documentation/content/en/articles/committers-guide/_index.adoc:3537
+#: documentation/content/en/articles/committers-guide/_index.adoc:3552
 msgid "Add an entry to [.filename]#ports/MOVED#."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3477
+#: documentation/content/en/articles/committers-guide/_index.adoc:3538
 msgid "Remove the port from [.filename]#ports/LEGAL# if it is there."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3482
+#: documentation/content/en/articles/committers-guide/_index.adoc:3543
 msgid ""
 "Alternatively, you can use the rmport script, from [.filename]#ports/Tools/"
 "scripts#.  This script was written by {vd}.  When sending questions about "
@@ -7740,13 +7832,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3484
+#: documentation/content/en/articles/committers-guide/_index.adoc:3545
 #, no-wrap
 msgid "How do I move a port to a new location?"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3489
+#: documentation/content/en/articles/committers-guide/_index.adoc:3550
 msgid ""
 "Perform a thorough check of the ports collection for any dependencies on the "
 "old port location/name, and update them. Running `grep` on [."
@@ -7756,14 +7848,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3490
+#: documentation/content/en/articles/committers-guide/_index.adoc:3551
 msgid ""
 "Remove the `SUBDIR` entry from the old category Makefile and add a `SUBDIR` "
 "entry to the new category Makefile."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3492
+#: documentation/content/en/articles/committers-guide/_index.adoc:3553
 msgid ""
 "Search for entries in xml files inside [.filename]#ports/security/vuxml# and "
 "adjust them accordingly. In particular, check for previous packages with the "
@@ -7771,51 +7863,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3493
+#: documentation/content/en/articles/committers-guide/_index.adoc:3554
 msgid "Move the port with `git mv`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3494
-#: documentation/content/en/articles/committers-guide/_index.adoc:3505
+#: documentation/content/en/articles/committers-guide/_index.adoc:3555
+#: documentation/content/en/articles/committers-guide/_index.adoc:3566
 msgid "Commit the changes."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3497
+#: documentation/content/en/articles/committers-guide/_index.adoc:3558
 #, no-wrap
 msgid "How do I copy a port to a new location?"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3502
+#: documentation/content/en/articles/committers-guide/_index.adoc:3563
 msgid "Copy port with `cp -R old-cat/old-port new-cat/new-port`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3503
+#: documentation/content/en/articles/committers-guide/_index.adoc:3564
 msgid "Add the new port to the [.filename]#new-cat/Makefile#."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3504
+#: documentation/content/en/articles/committers-guide/_index.adoc:3565
 msgid "Change stuff in [.filename]#new-cat/new-port#."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3508
+#: documentation/content/en/articles/committers-guide/_index.adoc:3569
 #, no-wrap
 msgid "Ports Freeze"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3511
+#: documentation/content/en/articles/committers-guide/_index.adoc:3572
 #, no-wrap
 msgid "What is a “ports freeze”?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3518
+#: documentation/content/en/articles/committers-guide/_index.adoc:3579
 msgid ""
 "A “ports freeze” was a restricted state the ports tree was put in before a "
 "release.  It was used to ensure a higher quality for the packages shipped "
@@ -7826,39 +7918,39 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3520
+#: documentation/content/en/articles/committers-guide/_index.adoc:3582
 msgid ""
 "For more information on how to merge commits to the quarterly branch, see "
-"<<ports-qa-misc-request-mfh>>."
+"crossref:committers-guide[ports-qa-misc-request-mfh]."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3522
+#: documentation/content/en/articles/committers-guide/_index.adoc:3584
 #, no-wrap
 msgid "Quarterly Branches"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3525
+#: documentation/content/en/articles/committers-guide/_index.adoc:3587
 #, no-wrap
 msgid "What is the procedure to request authorization for merging a commit to the quarterly branch?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3528
+#: documentation/content/en/articles/committers-guide/_index.adoc:3590
 msgid ""
 "As of November 30, 2020, there is no need to seek explicit approval to "
 "commit to the quarterly branch."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3530
+#: documentation/content/en/articles/committers-guide/_index.adoc:3592
 #, no-wrap
 msgid "What is the procedure for merging commits to the quarterly branch?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3533
+#: documentation/content/en/articles/committers-guide/_index.adoc:3595
 msgid ""
 "Merging commits to the quarterly branch (a process we call MFH for a "
 "historical reason) is very similar to MFC'ing a commit in the src "
@@ -7866,7 +7958,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block . 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3539
+#: documentation/content/en/articles/committers-guide/_index.adoc:3601
 #, no-wrap
 msgid ""
 "% git checkout 2021Q2\n"
@@ -7876,7 +7968,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3543
+#: documentation/content/en/articles/committers-guide/_index.adoc:3605
 msgid ""
 "where `$HASH` is the hash of the commit you want to copy over to the "
 "quarterly branch.  The `-x` parameter ensures the hash `$HASH` of the `main` "
@@ -7884,19 +7976,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3545
+#: documentation/content/en/articles/committers-guide/_index.adoc:3607
 #, no-wrap
 msgid "Creating a New Category"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3548
+#: documentation/content/en/articles/committers-guide/_index.adoc:3610
 #, no-wrap
 msgid "What is the procedure for creating a new category?"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3553
+#: documentation/content/en/articles/committers-guide/_index.adoc:3615
 msgid ""
 "Please see extref:{porters-handbook}[Proposing a New Category, proposing-"
 "categories] in the Porter's Handbook.  Once that procedure has been followed "
@@ -7905,42 +7997,42 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3557
+#: documentation/content/en/articles/committers-guide/_index.adoc:3619
 msgid "Perform any needed moves. (This only applies to physical categories.)"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3558
+#: documentation/content/en/articles/committers-guide/_index.adoc:3620
 msgid ""
 "Update the `VALID_CATEGORIES` definition in [.filename]#ports/Mk/bsd.port."
 "mk#."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3559
+#: documentation/content/en/articles/committers-guide/_index.adoc:3621
 msgid "Assign the PR back to you."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3562
+#: documentation/content/en/articles/committers-guide/_index.adoc:3624
 #, no-wrap
 msgid "What do I need to do to implement a new physical category?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3567
+#: documentation/content/en/articles/committers-guide/_index.adoc:3629
 msgid ""
 "Upgrade each moved port's [.filename]#Makefile#. Do not connect the new "
 "category to the build yet."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3569
+#: documentation/content/en/articles/committers-guide/_index.adoc:3631
 msgid "To do this, you will need to:"
 msgstr ""
 
 #. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:3573
+#: documentation/content/en/articles/committers-guide/_index.adoc:3635
 msgid ""
 "Change the port's `CATEGORIES` (this was the point of the exercise, "
 "remember?) The new category is listed first. This will help to ensure that "
@@ -7948,7 +8040,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:3574
+#: documentation/content/en/articles/committers-guide/_index.adoc:3636
 msgid ""
 "Run a `make describe`. Since the top-level `make index` that you will be "
 "running in a few steps is an iteration of `make describe` over the entire "
@@ -7957,14 +8049,14 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 6
-#: documentation/content/en/articles/committers-guide/_index.adoc:3575
+#: documentation/content/en/articles/committers-guide/_index.adoc:3637
 msgid ""
 "If you want to be really thorough, now might be a good time to run man:"
 "portlint[1]."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3578
+#: documentation/content/en/articles/committers-guide/_index.adoc:3640
 msgid ""
 "Check that the ``PKGORIGIN``s are correct. The ports system uses each port's "
 "`CATEGORIES` entry to create its `PKGORIGIN`, which is used to connect "
@@ -7974,7 +8066,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3580
+#: documentation/content/en/articles/committers-guide/_index.adoc:3642
 msgid ""
 "To do this, use the [.filename]#chkorigin.sh# tool: `env PORTSDIR=/path/to/"
 "ports sh -e /path/to/ports/Tools/scripts/chkorigin.sh`. This will check "
@@ -7984,7 +8076,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3581
+#: documentation/content/en/articles/committers-guide/_index.adoc:3643
 msgid ""
 "On your own local system, test the proposed changes: first, comment out the "
 "SUBDIR entries in the old ports' categories' [.filename]##Makefile##s; then "
@@ -7996,7 +8088,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3582
+#: documentation/content/en/articles/committers-guide/_index.adoc:3644
 msgid ""
 "Once this is done, you can commit the updated [.filename]#ports/Makefile# to "
 "connect the new category to the build and also commit the [."
@@ -8004,25 +8096,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3583
+#: documentation/content/en/articles/committers-guide/_index.adoc:3645
 msgid "Add appropriate entries to [.filename]#ports/MOVED#."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3584
+#: documentation/content/en/articles/committers-guide/_index.adoc:3646
 msgid "Update the documentation by modifying:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3585
-#: documentation/content/en/articles/committers-guide/_index.adoc:3594
+#: documentation/content/en/articles/committers-guide/_index.adoc:3647
+#: documentation/content/en/articles/committers-guide/_index.adoc:3656
 msgid ""
 "the extref:{porters-handbook}[list of categories, PORTING-CATEGORIES] in the "
 "Porter's Handbook"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3587
+#: documentation/content/en/articles/committers-guide/_index.adoc:3649
 msgid ""
 "Only once all the above have been done, and no one is any longer reporting "
 "problems with the new ports, should the old ports be deleted from their "
@@ -8030,38 +8122,38 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3589
+#: documentation/content/en/articles/committers-guide/_index.adoc:3651
 #, no-wrap
 msgid "What do I need to do to implement a new virtual category?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3592
+#: documentation/content/en/articles/committers-guide/_index.adoc:3654
 msgid ""
 "This is much simpler than a physical category. Only a few modifications are "
 "needed:"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:3596
-#: documentation/content/en/articles/committers-guide/_index.adoc:3690
+#: documentation/content/en/articles/committers-guide/_index.adoc:3658
+#: documentation/content/en/articles/committers-guide/_index.adoc:3752
 #, no-wrap
 msgid "Miscellaneous Questions"
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3599
+#: documentation/content/en/articles/committers-guide/_index.adoc:3661
 #, no-wrap
 msgid "Are there changes that can be committed without asking the maintainer for approval?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3602
+#: documentation/content/en/articles/committers-guide/_index.adoc:3664
 msgid "Blanket approval for most ports applies to these types of fixes:"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3604
+#: documentation/content/en/articles/committers-guide/_index.adoc:3666
 msgid ""
 "Most infrastructure changes to a port (that is, modernizing, but not "
 "changing the functionality). For example, the blanket covers converting to "
@@ -8070,19 +8162,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3605
+#: documentation/content/en/articles/committers-guide/_index.adoc:3667
 msgid "Trivial and _tested_ build and runtime fixes."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3606
+#: documentation/content/en/articles/committers-guide/_index.adoc:3668
 msgid ""
 "Documentations or metadata changes to ports, like [.filename]#pkg-descr# or "
 "`COMMENT`."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3611
+#: documentation/content/en/articles/committers-guide/_index.adoc:3673
 msgid ""
 "Exceptions to this are anything maintained by the {portmgr}, or the "
 "{security-officer}.  No unauthorized commits may ever be made to ports "
@@ -8090,20 +8182,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3614
+#: documentation/content/en/articles/committers-guide/_index.adoc:3676
 #, no-wrap
 msgid "How do I know if my port is building correctly or not?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3618
+#: documentation/content/en/articles/committers-guide/_index.adoc:3680
 msgid ""
 "The packages are built multiple times each week.  If a port fails, the "
 "maintainer will receive an email from `pkg-fallout@FreeBSD.org`."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3620
+#: documentation/content/en/articles/committers-guide/_index.adoc:3682
 msgid ""
 "Reports for all the package builds (official, experimental, and non-"
 "regression) are aggregated at link:pkg-status.FreeBSD.org[pkg-status.FreeBSD."
@@ -8111,26 +8203,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3622
+#: documentation/content/en/articles/committers-guide/_index.adoc:3684
 #, no-wrap
 msgid "I added a new port. Do I need to add it to the [.filename]#INDEX#?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3625
+#: documentation/content/en/articles/committers-guide/_index.adoc:3687
 msgid ""
 "No. The file can either be generated by running `make index`, or a pre-"
 "generated version can be downloaded with `make fetchindex`."
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3627
+#: documentation/content/en/articles/committers-guide/_index.adoc:3689
 #, no-wrap
 msgid "Are there any other files I am not allowed to touch?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3631
+#: documentation/content/en/articles/committers-guide/_index.adoc:3693
 msgid ""
 "Any file directly under [.filename]#ports/#, or any file under a "
 "subdirectory that starts with an uppercase letter ([.filename]#Mk/#, [."
@@ -8140,13 +8232,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3633
+#: documentation/content/en/articles/committers-guide/_index.adoc:3695
 #, no-wrap
 msgid "What is the proper procedure for updating the checksum for a port distfile when the file changes without a version change?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3637
+#: documentation/content/en/articles/committers-guide/_index.adoc:3699
 msgid ""
 "When the checksum for a distribution file is updated due to the author "
 "updating the file without changing the port revision, the commit message "
@@ -8159,20 +8251,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ====
-#: documentation/content/en/articles/committers-guide/_index.adoc:3639
+#: documentation/content/en/articles/committers-guide/_index.adoc:3701
 #, no-wrap
 msgid "How can an experimental test build of the ports tree (exp-run) be requested?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3643
+#: documentation/content/en/articles/committers-guide/_index.adoc:3705
 msgid ""
 "An exp-run must be completed before patches with a significant ports impact "
 "are committed.  The patch can be against the ports tree or the base system."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3645
+#: documentation/content/en/articles/committers-guide/_index.adoc:3707
 msgid ""
 "Full package builds will be done with the patches provided by the submitter, "
 "and the submitter is required to fix detected problems _(fallout)_ before "
@@ -8180,22 +8272,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3649
+#: documentation/content/en/articles/committers-guide/_index.adoc:3711
 msgid "Go to the link:https://bugs.freebsd.org/submit[Bugzilla new PR page]."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3650
+#: documentation/content/en/articles/committers-guide/_index.adoc:3712
 msgid "Select the product your patch is about."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3651
+#: documentation/content/en/articles/committers-guide/_index.adoc:3713
 msgid "Fill in the bug report as normal. Remember to attach the patch."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3652
+#: documentation/content/en/articles/committers-guide/_index.adoc:3714
 msgid ""
 "If at the top it says “Show Advanced Fields” click on it. It will now say "
 "“Hide Advanced Fields”. Many new fields will be available. If it already "
@@ -8203,56 +8295,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3653
+#: documentation/content/en/articles/committers-guide/_index.adoc:3715
 msgid ""
 "In the “Flags” section, set the “exp-run” one to `?`. As for all other "
 "fields, hovering the mouse over any field shows more details."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3654
+#: documentation/content/en/articles/committers-guide/_index.adoc:3716
 msgid "Submit. Wait for the build to run."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3655
+#: documentation/content/en/articles/committers-guide/_index.adoc:3717
 msgid "{portmgr} will reply with a possible fallout."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3656
+#: documentation/content/en/articles/committers-guide/_index.adoc:3718
 msgid "Depending on the fallout:"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3657
+#: documentation/content/en/articles/committers-guide/_index.adoc:3719
 msgid ""
 "If there is no fallout, the procedure stops here, and the change can be "
 "committed, pending any other approval required."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3658
+#: documentation/content/en/articles/committers-guide/_index.adoc:3720
 msgid ""
 "If there is fallout, it _must_ be fixed, either by fixing the ports directly "
 "in the ports tree, or adding to the submitted patch."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3659
+#: documentation/content/en/articles/committers-guide/_index.adoc:3721
 msgid ""
 "When this is done, go back to step 6 saying the fallout was fixed and wait "
 "for the exp-run to be run again. Repeat as long as there are broken ports."
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:3662
+#: documentation/content/en/articles/committers-guide/_index.adoc:3724
 #, no-wrap
 msgid "Issues Specific to Developers Who Are Not Committers"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3667
+#: documentation/content/en/articles/committers-guide/_index.adoc:3729
 msgid ""
 "A few people who have access to the FreeBSD machines do not have commit "
 "bits.  Almost all of this document will apply to these developers as well "
@@ -8261,17 +8353,17 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3669
-msgid "<<admin>>"
+#: documentation/content/en/articles/committers-guide/_index.adoc:3731
+msgid "crossref:committers-guide[admin]"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3670
-msgid "<<conventions-everyone>>"
+#: documentation/content/en/articles/committers-guide/_index.adoc:3732
+msgid "crossref:committers-guide[conventions-everyone]"
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3674
+#: documentation/content/en/articles/committers-guide/_index.adoc:3736
 msgid ""
 "Get your mentor to add you to the \"Additional Contributors\" ([."
 "filename]#doc/shared/contrib-additional.adoc#), if you are not already "
@@ -8279,47 +8371,47 @@ msgid ""
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3676
-msgid "<<developer.relations>>"
+#: documentation/content/en/articles/committers-guide/_index.adoc:3738
+msgid "crossref:committers-guide[developer.relations]"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3677
-msgid "<<ssh.guide>>"
+#: documentation/content/en/articles/committers-guide/_index.adoc:3739
+msgid "crossref:committers-guide[ssh.guide]"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3678
-msgid "<<rules>>"
+#: documentation/content/en/articles/committers-guide/_index.adoc:3740
+msgid "crossref:committers-guide[rules]"
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:3680
+#: documentation/content/en/articles/committers-guide/_index.adoc:3742
 #, no-wrap
 msgid "Information About Google Analytics"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3683
+#: documentation/content/en/articles/committers-guide/_index.adoc:3745
 msgid ""
 "As of December 12, 2012, Google Analytics was enabled on the FreeBSD Project "
 "website to collect anonymized usage statistics regarding usage of the site."
 msgstr ""
 
 #. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3687
+#: documentation/content/en/articles/committers-guide/_index.adoc:3749
 msgid ""
 "As of March 3, 2022, Google Analytics was removed from the FreeBSD Project."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3692
+#: documentation/content/en/articles/committers-guide/_index.adoc:3754
 #, no-wrap
 msgid "How do I access people.FreeBSD.org to put up personal or project information?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3696
+#: documentation/content/en/articles/committers-guide/_index.adoc:3758
 msgid ""
 "`people.FreeBSD.org` is the same as `freefall.FreeBSD.org`.  Just create a [."
 "filename]#public_html# directory. Anything you place in that directory will "
@@ -8328,45 +8420,45 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3697
+#: documentation/content/en/articles/committers-guide/_index.adoc:3759
 #, no-wrap
 msgid "Where are the mailing list archives stored?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3700
+#: documentation/content/en/articles/committers-guide/_index.adoc:3762
 msgid ""
 "The mailing lists are archived under [.filename]#/local/mail# on `freefall."
 "FreeBSD.org`."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3701
+#: documentation/content/en/articles/committers-guide/_index.adoc:3763
 #, no-wrap
 msgid "I would like to mentor a new committer. What process do I need to follow?"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3704
+#: documentation/content/en/articles/committers-guide/_index.adoc:3766
 msgid ""
 "See the https://www.freebsd.org/internal/new-account/[New Account Creation "
 "Procedure] document on the internal pages."
 msgstr ""
 
 #. type: Title ==
-#: documentation/content/en/articles/committers-guide/_index.adoc:3706
+#: documentation/content/en/articles/committers-guide/_index.adoc:3768
 #, no-wrap
 msgid "Benefits and Perks for FreeBSD Committers"
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3709
+#: documentation/content/en/articles/committers-guide/_index.adoc:3771
 #, no-wrap
 msgid "Recognition"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3713
+#: documentation/content/en/articles/committers-guide/_index.adoc:3775
 msgid ""
 "Recognition as a competent software engineer is the longest lasting value.  "
 "In addition, getting a chance to work with some of the best people that "
@@ -8374,33 +8466,33 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3715
+#: documentation/content/en/articles/committers-guide/_index.adoc:3777
 #, no-wrap
 msgid "FreeBSD Mall"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3718
+#: documentation/content/en/articles/committers-guide/_index.adoc:3780
 msgid ""
 "FreeBSD committers can get a free 4-CD or DVD set at conferences from http://"
 "www.freebsdmall.com[FreeBSD Mall, Inc.]."
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3720
+#: documentation/content/en/articles/committers-guide/_index.adoc:3782
 #, no-wrap
 msgid "`Gandi.net`"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3723
+#: documentation/content/en/articles/committers-guide/_index.adoc:3785
 msgid ""
 "https://gandi.net[Gandi] provides website hosting, cloud computing, domain "
 "registration, and X.509 certificate services."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3727
+#: documentation/content/en/articles/committers-guide/_index.adoc:3789
 msgid ""
 "Gandi offers an E-rate discount to all FreeBSD developers.  To streamline "
 "the process of getting the discount first set up a Gandi account, fill in "
@@ -8410,56 +8502,22 @@ msgid ""
 msgstr ""
 
 #. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3729
+#: documentation/content/en/articles/committers-guide/_index.adoc:3791
 #, no-wrap
 msgid "`rsync.net`"
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3732
+#: documentation/content/en/articles/committers-guide/_index.adoc:3794
 msgid ""
 "https://rsync.net[rsync.net] provides cloud storage for offsite backup that "
 "is optimized for UNIX users. Their service runs entirely on FreeBSD and ZFS."
 msgstr ""
 
 #. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3734
+#: documentation/content/en/articles/committers-guide/_index.adoc:3795
 msgid ""
 "rsync.net offers a free-forever 500 GB account to FreeBSD developers. Simply "
 "sign up at https://www.rsync.net/freebsd.html[https://www.rsync.net/freebsd."
 "html] using your `@freebsd.org` address to receive this free account."
 msgstr ""
-
-#. type: Title ===
-#: documentation/content/en/articles/committers-guide/_index.adoc:3736
-#, no-wrap
-msgid "`JetBrains`"
-msgstr ""
-
-#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3739
-msgid ""
-"https://www.jetbrains.com[JetBrains] is a software development company which "
-"makes tools for software developers and project managers. The company offers "
-"many integrated development environments (IDEs) for different programming "
-"languages."
-msgstr ""
-
-#. type: delimited block = 4
-#: documentation/content/en/articles/committers-guide/_index.adoc:3741
-msgid ""
-"JetBrains offers 100 free yearly licenses for all https://www.jetbrains.com/"
-"products[JetBrains IDE products]. Simply sign up at https://account."
-"jetbrains.com/a/322tl3z7[https://account.jetbrains.com/a/322tl3z7] using "
-"your `@freebsd.org` address and the account will have a license attached to "
-"it automatically. Once the account is active, use it in any of the products "
-"to activate them and you're done."
-msgstr ""
-
-#. type: Plain text
-#: documentation/content/en/articles/committers-guide/_index.adoc:3745
-msgid ""
-"Please, only use these licences personally and do not share them with anyone "
-"outside of the FreeBSD project, as that would be a violation of the terms of "
-"the donation."
-msgstr ""
author	Danilo G. Baio <dbaio@FreeBSD.org>	2024-09-14 18:02:34 +0000
committer	Danilo G. Baio <dbaio@FreeBSD.org>	2024-09-14 18:02:34 +0000
commit	e5b122222e92a0c4111f40c131266100756d1200 (patch)
tree	25cf73d359ac7fe17c7fc9e9aa975b5158c11193 /documentation/content/en/articles/committers-guide
parent	2493ecacfa596514b2a28003a04920aa32725840 (diff)