diff options
author | Danilo G. Baio <dbaio@FreeBSD.org> | 2023-09-09 21:15:57 +0000 |
---|---|---|
committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2023-09-09 21:15:57 +0000 |
commit | c54e4009208857f850f93f0ab3a6f3575c5edb7e (patch) | |
tree | e87f605b49d379746107c618eb784dbcb31d94e5 /documentation/content/en/articles/committers-guide | |
parent | 435e67c9c3631f536256dc7da76827e2c2b78d95 (diff) |
Diffstat (limited to 'documentation/content/en/articles/committers-guide')
-rw-r--r-- | documentation/content/en/articles/committers-guide/_index.po | 2336 |
1 files changed, 1192 insertions, 1144 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index 747ba14563..eeaf15cb0f 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: 2023-07-15 16:42-0300\n" +"POT-Creation-Date: 2023-09-09 18:13-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" @@ -274,30 +274,28 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:128 msgid "" "Install [.filename]#security/gnupg#. Enter these lines in [.filename]#~/." -"gnupg/gpg.conf# to set minimum acceptable defaults:" +"gnupg/gpg.conf# to set minimum acceptable defaults for signing and new key " +"preferences (see the link:https://www.gnupg.org/documentation/manuals/gnupg/" +"GPG-Options.html[GnuPG options documentation] for more details):" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:139 +#: documentation/content/en/articles/committers-guide/_index.adoc:135 #, no-wrap msgid "" -"fixed-list-mode\n" -"keyid-format 0xlong\n" +"# Sorted list of preferred algorithms for signing (strongest to weakest).\n" "personal-digest-preferences SHA512 SHA384 SHA256 SHA224\n" -"default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 BZIP2 ZLIB ZIP Uncompressed\n" -"verify-options show-uid-validity\n" -"list-options show-uid-validity\n" -"sig-notation issuer-fpr@notations.openpgp.fifthhorseman.net=%g\n" -"cert-digest-algo SHA512\n" +"# Default preferences for new keys\n" +"default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 CAMELLIA256 AES192 CAMELLIA192 AES CAMELLIA128 CAST5 BZIP2 ZLIB ZIP Uncompressed\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:141 +#: documentation/content/en/articles/committers-guide/_index.adoc:137 msgid "Generate a key:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:148 +#: documentation/content/en/articles/committers-guide/_index.adoc:144 #, no-wrap msgid "" "% gpg --full-gen-key\n" @@ -307,7 +305,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:169 +#: documentation/content/en/articles/committers-guide/_index.adoc:165 #, no-wrap msgid "" "Warning: using insecure memory!\n" @@ -333,7 +331,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:175 +#: documentation/content/en/articles/committers-guide/_index.adoc:171 #, no-wrap msgid "" "Real name: Chucky Daemon <.>\n" @@ -344,7 +342,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:178 +#: documentation/content/en/articles/committers-guide/_index.adoc:174 #, no-wrap msgid "" "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o\n" @@ -352,21 +350,21 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:181 +#: documentation/content/en/articles/committers-guide/_index.adoc:177 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:183 +#: documentation/content/en/articles/committers-guide/_index.adoc:179 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:185 +#: documentation/content/en/articles/committers-guide/_index.adoc:181 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 " @@ -374,7 +372,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:189 +#: documentation/content/en/articles/committers-guide/_index.adoc:185 msgid "" "After the email address is entered, a passphrase is requested. Methods of " "creating a secure passphrase are contentious. Rather than suggest a single " @@ -385,7 +383,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:193 +#: documentation/content/en/articles/committers-guide/_index.adoc:189 msgid "" "Protect the private key and passphrase. If either the private key or " "passphrase may have been compromised or disclosed, immediately notify mailto:" @@ -393,20 +391,20 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:195 +#: documentation/content/en/articles/committers-guide/_index.adoc:191 msgid "" "Committing the new key is shown in <<commit-steps, Steps for New " "Committers>>." msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:197 +#: documentation/content/en/articles/committers-guide/_index.adoc:193 #, no-wrap msgid "Kerberos and LDAP web Password for FreeBSD Cluster" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:202 +#: documentation/content/en/articles/committers-guide/_index.adoc:198 msgid "" "The FreeBSD cluster requires a Kerberos password to access certain " "services. The Kerberos password also serves as the LDAP web password, since " @@ -415,48 +413,48 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:204 +#: documentation/content/en/articles/committers-guide/_index.adoc:200 msgid "https://bugs.freebsd.org/bugzilla[Bugzilla]" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:205 +#: documentation/content/en/articles/committers-guide/_index.adoc:201 msgid "https://ci.freebsd.org[Jenkins]" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:207 +#: documentation/content/en/articles/committers-guide/_index.adoc:203 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:211 +#: documentation/content/en/articles/committers-guide/_index.adoc:207 #, no-wrap msgid "% ssh kpasswd.freebsd.org\n" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:216 +#: documentation/content/en/articles/committers-guide/_index.adoc:212 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:219 +#: documentation/content/en/articles/committers-guide/_index.adoc:215 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:223 +#: documentation/content/en/articles/committers-guide/_index.adoc:219 #, no-wrap msgid "% kpasswd\n" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:229 +#: documentation/content/en/articles/committers-guide/_index.adoc:225 msgid "" "Unless the Kerberos-authenticated services of the FreeBSD.org cluster have " "been used previously, `Client unknown` will be shown. This error means that " @@ -465,13 +463,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:232 +#: documentation/content/en/articles/committers-guide/_index.adoc:228 #, no-wrap msgid "Commit Bit Types" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:238 +#: documentation/content/en/articles/committers-guide/_index.adoc:234 msgid "" "The FreeBSD repository has a number of components which, when combined, " "support the basic operating system source, documentation, third party " @@ -486,79 +484,79 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:244 +#: documentation/content/en/articles/committers-guide/_index.adoc:240 #, no-wrap msgid "__Committer Type__" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:245 +#: documentation/content/en/articles/committers-guide/_index.adoc:241 #, no-wrap msgid "__Responsible__" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:247 +#: documentation/content/en/articles/committers-guide/_index.adoc:243 #, no-wrap msgid "__Tree Components__" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:248 +#: documentation/content/en/articles/committers-guide/_index.adoc:244 #, no-wrap msgid "src" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:249 +#: documentation/content/en/articles/committers-guide/_index.adoc:245 #, no-wrap msgid "core@" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:251 +#: documentation/content/en/articles/committers-guide/_index.adoc:247 #, no-wrap msgid "src/" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:252 +#: documentation/content/en/articles/committers-guide/_index.adoc:248 #, no-wrap msgid "doc" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:253 +#: documentation/content/en/articles/committers-guide/_index.adoc:249 #, no-wrap msgid "doceng@" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:255 +#: documentation/content/en/articles/committers-guide/_index.adoc:251 #, no-wrap msgid "doc/, ports/, src/ documentation" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:256 +#: documentation/content/en/articles/committers-guide/_index.adoc:252 #, no-wrap msgid "ports" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:257 +#: documentation/content/en/articles/committers-guide/_index.adoc:253 #, no-wrap msgid "portmgr@" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:258 +#: documentation/content/en/articles/committers-guide/_index.adoc:254 #, no-wrap msgid "ports/" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:263 +#: documentation/content/en/articles/committers-guide/_index.adoc:259 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, " @@ -571,7 +569,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:265 +#: documentation/content/en/articles/committers-guide/_index.adoc:261 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 " @@ -579,13 +577,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:266 +#: documentation/content/en/articles/committers-guide/_index.adoc:262 #, no-wrap msgid "Policy for Committer Activity in Other Trees" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:269 +#: documentation/content/en/articles/committers-guide/_index.adoc:265 msgid "" "All committers may modify [.filename]#src/share/misc/committers-*.dot#, [." "filename]#src/usr.bin/calendar/calendars/calendar.freebsd#, and [." @@ -593,7 +591,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:270 +#: documentation/content/en/articles/committers-guide/_index.adoc:266 msgid "" "doc committers may commit documentation changes to [.filename]#src# files, " "such as manual pages, READMEs, fortune databases, calendar files, and " @@ -602,7 +600,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:272 +#: documentation/content/en/articles/committers-guide/_index.adoc:268 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 " @@ -610,7 +608,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:273 +#: documentation/content/en/articles/committers-guide/_index.adoc:269 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. " @@ -620,13 +618,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:275 +#: documentation/content/en/articles/committers-guide/_index.adoc:271 #, no-wrap msgid "Documentation Implicit (Blanket) Approval" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:279 +#: documentation/content/en/articles/committers-guide/_index.adoc:275 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 " @@ -635,87 +633,87 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:281 +#: documentation/content/en/articles/committers-guide/_index.adoc:277 msgid "Blanket approval applies to these types of fixes:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:283 +#: documentation/content/en/articles/committers-guide/_index.adoc:279 msgid "Typos" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:284 +#: documentation/content/en/articles/committers-guide/_index.adoc:280 msgid "Trivial fixes" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:286 +#: documentation/content/en/articles/committers-guide/_index.adoc:282 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:289 +#: documentation/content/en/articles/committers-guide/_index.adoc:285 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:291 +#: documentation/content/en/articles/committers-guide/_index.adoc:287 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:293 +#: documentation/content/en/articles/committers-guide/_index.adoc:289 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:294 +#: documentation/content/en/articles/committers-guide/_index.adoc:290 msgid "Changes in [.filename]#doc/shared/contrib-additional.adoc#" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:296 +#: documentation/content/en/articles/committers-guide/_index.adoc:292 msgid "" "extref:{contributors}[Additional FreeBSD Contributors, contrib-additional] " "maintenance." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:297 +#: documentation/content/en/articles/committers-guide/_index.adoc:293 msgid "All link:#commit-steps[Steps for New Committers], doc related" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:298 +#: documentation/content/en/articles/committers-guide/_index.adoc:294 msgid "Security advisories; Errata Notices; Releases;" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:300 +#: documentation/content/en/articles/committers-guide/_index.adoc:296 msgid "Used by {security-officer} and {re}." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:301 +#: documentation/content/en/articles/committers-guide/_index.adoc:297 msgid "Changes in [.filename]#website/content/en/donations/donors.adoc#" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:303 +#: documentation/content/en/articles/committers-guide/_index.adoc:299 msgid "Used by {donations}." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:305 +#: documentation/content/en/articles/committers-guide/_index.adoc:301 msgid "" "Before any commit, a build test is necessary; see the 'Overview' and 'The " "FreeBSD Documentation Build Process' sections of the extref:{fdp-primer}" @@ -723,19 +721,19 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:307 +#: documentation/content/en/articles/committers-guide/_index.adoc:303 #, no-wrap msgid "Git Primer" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:310 +#: documentation/content/en/articles/committers-guide/_index.adoc:306 #, no-wrap msgid "Git basics" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:317 +#: documentation/content/en/articles/committers-guide/_index.adoc:313 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 " @@ -750,33 +748,33 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:319 +#: documentation/content/en/articles/committers-guide/_index.adoc:315 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:321 +#: documentation/content/en/articles/committers-guide/_index.adoc:317 #, no-wrap msgid "Git Mini Primer" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:324 +#: documentation/content/en/articles/committers-guide/_index.adoc:320 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:325 +#: documentation/content/en/articles/committers-guide/_index.adoc:321 #, no-wrap msgid "Scope" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:331 +#: documentation/content/en/articles/committers-guide/_index.adoc:327 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, " @@ -788,7 +786,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:335 +#: documentation/content/en/articles/committers-guide/_index.adoc:331 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 " @@ -797,42 +795,49 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:337 +#: documentation/content/en/articles/committers-guide/_index.adoc:333 #, no-wrap msgid "Getting Started For Developers" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:340 +#: documentation/content/en/articles/committers-guide/_index.adoc:336 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:342 +#: documentation/content/en/articles/committers-guide/_index.adoc:338 #, no-wrap msgid "Daily use" msgstr "" +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:343 +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:345 +#: documentation/content/en/articles/committers-guide/_index.adoc:346 msgid "Clone the repository:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:349 +#: documentation/content/en/articles/committers-guide/_index.adoc:350 #, 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:352 +#: documentation/content/en/articles/committers-guide/_index.adoc:353 msgid "Then you should have the official mirrors as your remote:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:358 +#: documentation/content/en/articles/committers-guide/_index.adoc:359 #, no-wrap msgid "" "% git remote -v\n" @@ -841,12 +846,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:361 +#: documentation/content/en/articles/committers-guide/_index.adoc:362 msgid "Configure the FreeBSD committer data:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:364 +#: documentation/content/en/articles/committers-guide/_index.adoc:365 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 " @@ -855,7 +860,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:371 +#: documentation/content/en/articles/committers-guide/_index.adoc:372 #, no-wrap msgid "" "% gen-gitconfig.sh\n" @@ -865,25 +870,25 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:374 +#: documentation/content/en/articles/committers-guide/_index.adoc:375 msgid "Set the push URL:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:378 +#: documentation/content/en/articles/committers-guide/_index.adoc:379 #, 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:381 +#: documentation/content/en/articles/committers-guide/_index.adoc:382 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:387 +#: documentation/content/en/articles/committers-guide/_index.adoc:388 #, no-wrap msgid "" "% git remote -v\n" @@ -892,47 +897,76 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:390 +#: documentation/content/en/articles/committers-guide/_index.adoc:391 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:392 +#: documentation/content/en/articles/committers-guide/_index.adoc:393 msgid "Install commit message template hook:" msgstr "" +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:395 +msgid "For doc repository:" +msgstr "" + #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:397 +#: documentation/content/en/articles/committers-guide/_index.adoc:400 #, no-wrap msgid "" -"% fetch https://cgit.freebsd.org/src/plain/tools/tools/git/hooks/prepare-commit-msg -o .git/hooks\n" -"% chmod 755 .git/hooks/prepare-commit-msg\n" +"% cd .git/hooks\n" +"% ln -s ../../.hooks/prepare-commit-msg\n" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:403 +msgid "For ports repository:" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:407 +#, no-wrap +msgid "% git config --add core.hooksPath .hooks\n" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:410 +msgid "For src repository:" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:415 +#, no-wrap +msgid "" +"% cd .git/hooks\n" +"% ln -s ../../tools/tools/git/hooks/prepare-commit-msg\n" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:400 +#: documentation/content/en/articles/committers-guide/_index.adoc:418 #, no-wrap msgid "\"admin\" branch" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:403 +#: documentation/content/en/articles/committers-guide/_index.adoc:421 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:405 +#: documentation/content/en/articles/committers-guide/_index.adoc:423 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:411 +#: documentation/content/en/articles/committers-guide/_index.adoc:429 #, no-wrap msgid "" "% git config --add remote.freebsd.fetch '+refs/internal/*:refs/internal/*'\n" @@ -941,42 +975,42 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:413 +#: documentation/content/en/articles/committers-guide/_index.adoc:431 msgid "Alternatively, you can add a worktree for the `admin` branch:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:417 +#: documentation/content/en/articles/committers-guide/_index.adoc:435 #, 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:421 +#: documentation/content/en/articles/committers-guide/_index.adoc:439 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:423 -msgid "For pushing, either specify the full refspec:" +#: documentation/content/en/articles/committers-guide/_index.adoc:441 +msgid "For pushing, specify the full refspec:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:427 +#: documentation/content/en/articles/committers-guide/_index.adoc:445 #, no-wrap msgid "git push freebsd HEAD:refs/internal/admin\n" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:429 +#: documentation/content/en/articles/committers-guide/_index.adoc:447 #, no-wrap msgid "Keeping Current With The FreeBSD src Tree" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:436 +#: documentation/content/en/articles/committers-guide/_index.adoc:454 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 " @@ -985,82 +1019,82 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:437 +#: documentation/content/en/articles/committers-guide/_index.adoc:455 #, no-wrap msgid "Branch Names" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:439 +#: documentation/content/en/articles/committers-guide/_index.adoc:457 msgid "FreeBSD-CURRENT uses the `main` branch." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:441 +#: documentation/content/en/articles/committers-guide/_index.adoc:459 msgid "`main` is the default branch." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:443 +#: documentation/content/en/articles/committers-guide/_index.adoc:461 msgid "For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:445 +#: documentation/content/en/articles/committers-guide/_index.adoc:463 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:447 +#: documentation/content/en/articles/committers-guide/_index.adoc:465 msgid "https://www.freebsd.org/releng/[] shows:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:449 +#: documentation/content/en/articles/committers-guide/_index.adoc:467 msgid "`main` and `stable/⋯` branches open" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:450 +#: documentation/content/en/articles/committers-guide/_index.adoc:468 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:452 +#: documentation/content/en/articles/committers-guide/_index.adoc:470 msgid "Examples:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:454 +#: documentation/content/en/articles/committers-guide/_index.adoc:472 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:455 +#: documentation/content/en/articles/committers-guide/_index.adoc:473 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:456 +#: documentation/content/en/articles/committers-guide/_index.adoc:474 #, no-wrap msgid "Repositories" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:459 +#: documentation/content/en/articles/committers-guide/_index.adoc:477 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." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:462 +#: documentation/content/en/articles/committers-guide/_index.adoc:480 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 " @@ -1069,13 +1103,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:463 +#: documentation/content/en/articles/committers-guide/_index.adoc:481 #, no-wrap msgid "Deep Clone" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:467 +#: documentation/content/en/articles/committers-guide/_index.adoc:485 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 " @@ -1084,13 +1118,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:470 +#: documentation/content/en/articles/committers-guide/_index.adoc:488 #, no-wrap msgid "% git clone -o freebsd $URL -b branch [<directory>]\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:475 +#: documentation/content/en/articles/committers-guide/_index.adoc:493 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 " @@ -1100,7 +1134,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:480 +#: documentation/content/en/articles/committers-guide/_index.adoc:498 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 " @@ -1112,13 +1146,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:481 +#: documentation/content/en/articles/committers-guide/_index.adoc:499 #, no-wrap msgid "Shallow Clone" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:487 +#: documentation/content/en/articles/committers-guide/_index.adoc:505 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 " @@ -1128,13 +1162,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:491 +#: documentation/content/en/articles/committers-guide/_index.adoc:509 #, 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:496 +#: documentation/content/en/articles/committers-guide/_index.adoc:514 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 " @@ -1142,7 +1176,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:501 +#: documentation/content/en/articles/committers-guide/_index.adoc:519 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 " @@ -1150,19 +1184,19 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:503 +#: documentation/content/en/articles/committers-guide/_index.adoc:521 #, no-wrap msgid "Building" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:507 +#: documentation/content/en/articles/committers-guide/_index.adoc:525 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:514 +#: documentation/content/en/articles/committers-guide/_index.adoc:532 #, no-wrap msgid "" "% cd src\n" @@ -1173,12 +1207,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:516 +#: documentation/content/en/articles/committers-guide/_index.adoc:534 msgid "so that won't be covered in depth here." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:519 +#: documentation/content/en/articles/committers-guide/_index.adoc:537 msgid "" "If you want to build a custom kernel, extref:{handbook}[the kernel config " "section, kernelconfig] of the FreeBSD Handbook recommends creating a file " @@ -1187,26 +1221,26 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:520 +#: documentation/content/en/articles/committers-guide/_index.adoc:538 #, no-wrap msgid "Updating" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:524 +#: documentation/content/en/articles/committers-guide/_index.adoc:542 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:527 +#: documentation/content/en/articles/committers-guide/_index.adoc:545 #, no-wrap msgid "% git pull --ff-only\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:532 +#: documentation/content/en/articles/committers-guide/_index.adoc:550 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 " @@ -1216,7 +1250,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:535 +#: documentation/content/en/articles/committers-guide/_index.adoc:553 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 " @@ -1224,20 +1258,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:536 +#: documentation/content/en/articles/committers-guide/_index.adoc:554 #, no-wrap msgid "Selecting a Specific Version" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:540 +#: documentation/content/en/articles/committers-guide/_index.adoc:558 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:542 +#: documentation/content/en/articles/committers-guide/_index.adoc:560 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 " @@ -1245,26 +1279,26 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:545 +#: documentation/content/en/articles/committers-guide/_index.adoc:563 #, no-wrap msgid "% git checkout 08b8197a74\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:548 +#: documentation/content/en/articles/committers-guide/_index.adoc:566 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:551 +#: documentation/content/en/articles/committers-guide/_index.adoc:569 #, no-wrap msgid "Note: checking out '08b8197a742a96964d2924391bf9fdfeb788865d'.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:555 +#: documentation/content/en/articles/committers-guide/_index.adoc:573 #, no-wrap msgid "" "You are in a 'detached HEAD' state. You can look around, make experimental\n" @@ -1273,7 +1307,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:558 +#: documentation/content/en/articles/committers-guide/_index.adoc:576 #, no-wrap msgid "" "If you want to create a new branch to retain commits you create, you may\n" @@ -1281,20 +1315,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:560 -#: documentation/content/en/articles/committers-guide/_index.adoc:1668 +#: documentation/content/en/articles/committers-guide/_index.adoc:578 +#: documentation/content/en/articles/committers-guide/_index.adoc:1686 #, no-wrap msgid " git checkout -b <new-branch-name>\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:562 +#: documentation/content/en/articles/committers-guide/_index.adoc:580 #, 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:566 +#: documentation/content/en/articles/committers-guide/_index.adoc:584 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 " @@ -1303,13 +1337,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:567 +#: documentation/content/en/articles/committers-guide/_index.adoc:585 #, no-wrap msgid "Bisecting" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:571 +#: documentation/content/en/articles/committers-guide/_index.adoc:589 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 " @@ -1317,7 +1351,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:576 +#: documentation/content/en/articles/committers-guide/_index.adoc:594 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 " @@ -1329,7 +1363,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:583 +#: documentation/content/en/articles/committers-guide/_index.adoc:601 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 " @@ -1342,14 +1376,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:587 +#: documentation/content/en/articles/committers-guide/_index.adoc:605 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:592 +#: documentation/content/en/articles/committers-guide/_index.adoc:610 #, no-wrap msgid "" "5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward\n" @@ -1358,7 +1392,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:596 +#: documentation/content/en/articles/committers-guide/_index.adoc:614 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 " @@ -1368,7 +1402,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:600 +#: documentation/content/en/articles/committers-guide/_index.adoc:618 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 " @@ -1376,7 +1410,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:607 +#: documentation/content/en/articles/committers-guide/_index.adoc:625 #, no-wrap msgid "" "% git bisect start --first-parent\n" @@ -1387,7 +1421,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:616 +#: documentation/content/en/articles/committers-guide/_index.adoc:634 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, " @@ -1400,13 +1434,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:618 +#: documentation/content/en/articles/committers-guide/_index.adoc:636 #, no-wrap msgid "Signing the commits, tags, and pushes, with GnuPG" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:623 +#: documentation/content/en/articles/committers-guide/_index.adoc:641 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 " @@ -1415,7 +1449,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:625 +#: documentation/content/en/articles/committers-guide/_index.adoc:643 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 - " @@ -1423,7 +1457,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:627 +#: documentation/content/en/articles/committers-guide/_index.adoc:645 msgid "" "The rationale behind signing pushes can be found in the https://github.com/" "git/git/commit/a85b377d0419a9dfaca8af2320cc33b051cbed04[commit that " @@ -1431,14 +1465,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:630 +#: documentation/content/en/articles/committers-guide/_index.adoc:648 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:637 +#: documentation/content/en/articles/committers-guide/_index.adoc:655 #, no-wrap msgid "" "% git config --add user.signingKey LONG-KEY-ID\n" @@ -1449,14 +1483,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:645 +#: documentation/content/en/articles/committers-guide/_index.adoc:663 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:651 +#: documentation/content/en/articles/committers-guide/_index.adoc:669 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 " @@ -1464,20 +1498,20 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:653 +#: documentation/content/en/articles/committers-guide/_index.adoc:671 #, no-wrap msgid "Verifying signatures" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:656 +#: documentation/content/en/articles/committers-guide/_index.adoc:674 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:658 +#: documentation/content/en/articles/committers-guide/_index.adoc:676 msgid "" "Tag signatures can be verified with `git verity-tag <tag name>`, or `git tag " "-v <tag name>`." @@ -1489,20 +1523,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:667 +#: documentation/content/en/articles/committers-guide/_index.adoc:685 #, no-wrap msgid "Ports Considerations" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:670 +#: documentation/content/en/articles/committers-guide/_index.adoc:688 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:673 +#: documentation/content/en/articles/committers-guide/_index.adoc:691 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." @@ -1511,7 +1545,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:677 +#: documentation/content/en/articles/committers-guide/_index.adoc:695 msgid "" "There is also a mirror on GitHub, see extref:{handbook}/mirrors[External " "mirrors, mirrors] for an overview. The _latest_ branch is `main`. The " @@ -1519,13 +1553,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:679 +#: documentation/content/en/articles/committers-guide/_index.adoc:697 #, no-wrap msgid "Commit message formats" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:683 +#: documentation/content/en/articles/committers-guide/_index.adoc:701 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[." @@ -1534,32 +1568,32 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:685 +#: documentation/content/en/articles/committers-guide/_index.adoc:703 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:688 +#: documentation/content/en/articles/committers-guide/_index.adoc:706 #, no-wrap msgid "category/port: Summary.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:690 +#: documentation/content/en/articles/committers-guide/_index.adoc:708 #, no-wrap msgid "Description of why the changes where made.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:692 +#: documentation/content/en/articles/committers-guide/_index.adoc:710 #, no-wrap msgid "PR:\t 12345\n" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:698 +#: documentation/content/en/articles/committers-guide/_index.adoc:716 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 " @@ -1567,39 +1601,39 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:700 +#: documentation/content/en/articles/committers-guide/_index.adoc:718 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:702 +#: documentation/content/en/articles/committers-guide/_index.adoc:720 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:704 +#: documentation/content/en/articles/committers-guide/_index.adoc:722 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:706 +#: documentation/content/en/articles/committers-guide/_index.adoc:724 #, no-wrap msgid "Managing Local Changes" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:709 +#: documentation/content/en/articles/committers-guide/_index.adoc:727 msgid "" -"This section addresses tracking local changes. If you have no local " -"changes, you can stop reading now (it is the last section and OK to skip)." +"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:715 +#: documentation/content/en/articles/committers-guide/_index.adoc:733 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 " @@ -1610,13 +1644,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:716 +#: documentation/content/en/articles/committers-guide/_index.adoc:734 #, no-wrap msgid "Keeping local changes" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:723 +#: documentation/content/en/articles/committers-guide/_index.adoc:741 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 " @@ -1628,7 +1662,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:727 +#: documentation/content/en/articles/committers-guide/_index.adoc:745 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 " @@ -1637,13 +1671,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:728 +#: documentation/content/en/articles/committers-guide/_index.adoc:746 #, no-wrap msgid "Keeping a local branch" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:735 +#: documentation/content/en/articles/committers-guide/_index.adoc:753 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 " @@ -1654,7 +1688,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:739 +#: documentation/content/en/articles/committers-guide/_index.adoc:757 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 " @@ -1663,12 +1697,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:741 +#: documentation/content/en/articles/committers-guide/_index.adoc:759 msgid "====== Create a branch" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:746 +#: documentation/content/en/articles/committers-guide/_index.adoc:764 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 " @@ -1678,7 +1712,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:768 +#: documentation/content/en/articles/committers-guide/_index.adoc:786 #, no-wrap msgid "" "% cd src\n" @@ -1704,7 +1738,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:775 +#: documentation/content/en/articles/committers-guide/_index.adoc:793 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 " @@ -1716,12 +1750,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:777 +#: documentation/content/en/articles/committers-guide/_index.adoc:795 msgid "====== Time to update" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:782 +#: documentation/content/en/articles/committers-guide/_index.adoc:800 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 " @@ -1731,7 +1765,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:788 +#: documentation/content/en/articles/committers-guide/_index.adoc:806 #, no-wrap msgid "" "% git checkout main\n" @@ -1740,7 +1774,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:793 +#: documentation/content/en/articles/committers-guide/_index.adoc:811 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 " @@ -1749,14 +1783,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:795 +#: documentation/content/en/articles/committers-guide/_index.adoc:813 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:802 +#: documentation/content/en/articles/committers-guide/_index.adoc:820 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 " @@ -1765,7 +1799,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:805 +#: documentation/content/en/articles/committers-guide/_index.adoc:823 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 " @@ -1773,7 +1807,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:815 +#: documentation/content/en/articles/committers-guide/_index.adoc:833 #, no-wrap msgid "" "Auto-merging bin/ls/ls.c\n" @@ -1787,7 +1821,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:818 +#: documentation/content/en/articles/committers-guide/_index.adoc:836 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 " @@ -1795,7 +1829,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:827 +#: documentation/content/en/articles/committers-guide/_index.adoc:845 #, no-wrap msgid "" " <<<<<<< HEAD\n" @@ -1809,7 +1843,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:831 +#: documentation/content/en/articles/committers-guide/_index.adoc:849 #, no-wrap msgid "" "The new code is first, and your code is second.\n" @@ -1818,12 +1852,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:835 +#: documentation/content/en/articles/committers-guide/_index.adoc:853 msgid "#undef COLORLS_NEW #ifdef COLORLS_NEW #include <terminfo.h>" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:839 +#: documentation/content/en/articles/committers-guide/_index.adoc:857 #, no-wrap msgid "" "save the file.\n" @@ -1832,12 +1866,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:842 +#: documentation/content/en/articles/committers-guide/_index.adoc:860 msgid "% git add ls.c % git rebase --continue" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:847 +#: documentation/content/en/articles/committers-guide/_index.adoc:865 #, no-wrap msgid "" "which tells Git that ls.c has been fixed and to continue the rebase operation.\n" @@ -1846,7 +1880,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:852 +#: documentation/content/en/articles/committers-guide/_index.adoc:870 #, no-wrap msgid "" "If you get stuck during the rebase, do not panic.\n" @@ -1856,7 +1890,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:855 +#: documentation/content/en/articles/committers-guide/_index.adoc:873 #, 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" @@ -1864,25 +1898,25 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:856 +#: documentation/content/en/articles/committers-guide/_index.adoc:874 #, no-wrap msgid "Switching to a Different FreeBSD Branch" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:860 +#: documentation/content/en/articles/committers-guide/_index.adoc:878 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:863 +#: documentation/content/en/articles/committers-guide/_index.adoc:881 msgid "% git checkout main % # build and install here..." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:869 +#: documentation/content/en/articles/committers-guide/_index.adoc:887 #, no-wrap msgid "" "If you have a local branch, though, there are one or two caveats.\n" @@ -1893,7 +1927,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:873 +#: documentation/content/en/articles/committers-guide/_index.adoc:891 #, no-wrap msgid "" "% git checkout no-color-ls\n" @@ -1902,7 +1936,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:880 +#: documentation/content/en/articles/committers-guide/_index.adoc:898 #, no-wrap msgid "" "What the above does is checkout no-color-ls.\n" @@ -1913,25 +1947,25 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:882 +#: documentation/content/en/articles/committers-guide/_index.adoc:900 #, no-wrap msgid "[[mfc-with-git]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:882 +#: documentation/content/en/articles/committers-guide/_index.adoc:900 #, no-wrap msgid "MFC (Merge From Current) Procedures" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:883 +#: documentation/content/en/articles/committers-guide/_index.adoc:901 #, no-wrap msgid "Summary" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:887 +#: documentation/content/en/articles/committers-guide/_index.adoc:905 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 -" @@ -1939,39 +1973,39 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:888 +#: documentation/content/en/articles/committers-guide/_index.adoc:906 #, no-wrap msgid "Single commit MFC" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:891 -#: documentation/content/en/articles/committers-guide/_index.adoc:931 -#: documentation/content/en/articles/committers-guide/_index.adoc:967 -#: documentation/content/en/articles/committers-guide/_index.adoc:1083 -#: documentation/content/en/articles/committers-guide/_index.adoc:1096 -#: documentation/content/en/articles/committers-guide/_index.adoc:1123 -#: documentation/content/en/articles/committers-guide/_index.adoc:1135 -#: documentation/content/en/articles/committers-guide/_index.adoc:1201 +#: 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:1241 +#: 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:1279 -#: documentation/content/en/articles/committers-guide/_index.adoc:1294 -#: documentation/content/en/articles/committers-guide/_index.adoc:1313 -#: documentation/content/en/articles/committers-guide/_index.adoc:1345 -#: documentation/content/en/articles/committers-guide/_index.adoc:1392 -#: documentation/content/en/articles/committers-guide/_index.adoc:1456 +#: 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:1363 +#: documentation/content/en/articles/committers-guide/_index.adoc:1410 +#: documentation/content/en/articles/committers-guide/_index.adoc:1474 msgid "[source,shell]" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:894 +#: documentation/content/en/articles/committers-guide/_index.adoc:912 msgid "% git checkout stable/X % git cherry-pick -x $HASH --edit" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:898 +#: documentation/content/en/articles/committers-guide/_index.adoc:916 #, no-wrap msgid "" "For MFC commits, for example a vendor import, you would need to specify one parent for cherry-pick purposes.\n" @@ -1979,65 +2013,65 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:900 -#: documentation/content/en/articles/committers-guide/_index.adoc:921 -#: documentation/content/en/articles/committers-guide/_index.adoc:944 -#: documentation/content/en/articles/committers-guide/_index.adoc:955 -#: documentation/content/en/articles/committers-guide/_index.adoc:1173 -#: documentation/content/en/articles/committers-guide/_index.adoc:1267 -#: documentation/content/en/articles/committers-guide/_index.adoc:1352 -#: documentation/content/en/articles/committers-guide/_index.adoc:1364 -#: documentation/content/en/articles/committers-guide/_index.adoc:1376 -#: documentation/content/en/articles/committers-guide/_index.adoc:1402 -#: documentation/content/en/articles/committers-guide/_index.adoc:1414 -#: documentation/content/en/articles/committers-guide/_index.adoc:1421 -#: documentation/content/en/articles/committers-guide/_index.adoc:1463 -#: documentation/content/en/articles/committers-guide/_index.adoc:1497 -#: documentation/content/en/articles/committers-guide/_index.adoc:1504 -#: documentation/content/en/articles/committers-guide/_index.adoc:1513 -#: documentation/content/en/articles/committers-guide/_index.adoc:1542 -#: documentation/content/en/articles/committers-guide/_index.adoc:1558 -#: documentation/content/en/articles/committers-guide/_index.adoc:1591 -#: documentation/content/en/articles/committers-guide/_index.adoc:1612 -#: documentation/content/en/articles/committers-guide/_index.adoc:1643 -#: documentation/content/en/articles/committers-guide/_index.adoc:1655 -#: documentation/content/en/articles/committers-guide/_index.adoc:1686 -#: documentation/content/en/articles/committers-guide/_index.adoc:1695 -#: documentation/content/en/articles/committers-guide/_index.adoc:1705 -#: documentation/content/en/articles/committers-guide/_index.adoc:1721 -#: documentation/content/en/articles/committers-guide/_index.adoc:1737 -#: documentation/content/en/articles/committers-guide/_index.adoc:1748 +#: 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:1755 -#: documentation/content/en/articles/committers-guide/_index.adoc:1768 -#: documentation/content/en/articles/committers-guide/_index.adoc:1788 -#: documentation/content/en/articles/committers-guide/_index.adoc:1802 -#: documentation/content/en/articles/committers-guide/_index.adoc:1818 -#: documentation/content/en/articles/committers-guide/_index.adoc:1830 -#: documentation/content/en/articles/committers-guide/_index.adoc:1849 -#: documentation/content/en/articles/committers-guide/_index.adoc:1860 -#: documentation/content/en/articles/committers-guide/_index.adoc:1870 -#: documentation/content/en/articles/committers-guide/_index.adoc:1908 -#: documentation/content/en/articles/committers-guide/_index.adoc:1916 -#: documentation/content/en/articles/committers-guide/_index.adoc:1927 -#: documentation/content/en/articles/committers-guide/_index.adoc:1948 -#: documentation/content/en/articles/committers-guide/_index.adoc:2008 +#: 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: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 #, no-wrap msgid "[source,shell]\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:903 +#: documentation/content/en/articles/committers-guide/_index.adoc:921 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:906 +#: documentation/content/en/articles/committers-guide/_index.adoc:924 #, 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:909 +#: documentation/content/en/articles/committers-guide/_index.adoc:927 #, no-wrap msgid "" "Once the cherry-pick is finished, push with `git push`.\n" @@ -2045,20 +2079,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:910 +#: documentation/content/en/articles/committers-guide/_index.adoc:928 #, no-wrap msgid "MFC to RELENG branch" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:914 +#: documentation/content/en/articles/committers-guide/_index.adoc:932 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:919 +#: documentation/content/en/articles/committers-guide/_index.adoc:937 #, no-wrap msgid "" "* Merge or direct commit to the appropriate `stable/X` branch first before merging to the `releng/X.Y` branch.\n" @@ -2068,24 +2102,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:924 +#: documentation/content/en/articles/committers-guide/_index.adoc:942 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:927 +#: documentation/content/en/articles/committers-guide/_index.adoc:945 #, 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:928 +#: documentation/content/en/articles/committers-guide/_index.adoc:946 #, no-wrap msgid "Multiple commit MFC" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:939 +#: documentation/content/en/articles/committers-guide/_index.adoc:957 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 " @@ -2095,37 +2129,37 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:942 +#: documentation/content/en/articles/committers-guide/_index.adoc:960 #, 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:950 +#: documentation/content/en/articles/committers-guide/_index.adoc:968 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:953 +#: documentation/content/en/articles/committers-guide/_index.adoc:971 #, 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:958 +#: documentation/content/en/articles/committers-guide/_index.adoc:976 msgid "% git checkout stable/X % git branch -d tmp-branch" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:960 +#: documentation/content/en/articles/committers-guide/_index.adoc:978 #, no-wrap msgid "MFC a vendor import" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:965 +#: documentation/content/en/articles/committers-guide/_index.adoc:983 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 " @@ -2135,12 +2169,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:969 +#: documentation/content/en/articles/committers-guide/_index.adoc:987 msgid "% git cherry-pick -x -m 1 $HASH" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:972 +#: documentation/content/en/articles/committers-guide/_index.adoc:990 #, no-wrap msgid "" "is typically what you want.\n" @@ -2148,7 +2182,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:977 +#: documentation/content/en/articles/committers-guide/_index.adoc:995 #, 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" @@ -2158,36 +2192,36 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:980 +#: documentation/content/en/articles/committers-guide/_index.adoc:998 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:982 +#: documentation/content/en/articles/committers-guide/_index.adoc:1000 #, 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:983 +#: documentation/content/en/articles/committers-guide/_index.adoc:1001 #, no-wrap msgid "Redoing a MFC" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:988 +#: documentation/content/en/articles/committers-guide/_index.adoc:1006 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:990 +#: documentation/content/en/articles/committers-guide/_index.adoc:1008 msgid "% git reset --hard freebsd/stable/12" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:993 +#: documentation/content/en/articles/committers-guide/_index.adoc:1011 #, no-wrap msgid "" "though if you have some revs you want to keep, and others you don't,\n" @@ -2195,20 +2229,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:994 +#: documentation/content/en/articles/committers-guide/_index.adoc:1012 #, no-wrap msgid "Considerations when MFCing" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:997 +#: documentation/content/en/articles/committers-guide/_index.adoc:1015 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:1001 +#: documentation/content/en/articles/committers-guide/_index.adoc:1019 #, no-wrap msgid "" "* Clearly mark direct commits distinct from commits that land a change from another branch.\n" @@ -2217,13 +2251,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1003 +#: documentation/content/en/articles/committers-guide/_index.adoc:1021 #, 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:1007 +#: documentation/content/en/articles/committers-guide/_index.adoc:1025 #, no-wrap msgid "" "* Using `MFC` and `MFS` tags to mark commits that merged changes from another branch.\n" @@ -2232,7 +2266,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1011 +#: documentation/content/en/articles/committers-guide/_index.adoc:1029 #, no-wrap msgid "" "With Git, we will need to use different strategies to achieve the same goals.\n" @@ -2241,7 +2275,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1014 +#: documentation/content/en/articles/committers-guide/_index.adoc:1032 #, 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" @@ -2249,13 +2283,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1015 +#: documentation/content/en/articles/committers-guide/_index.adoc:1033 #, no-wrap msgid "Finding Eligible Hashes to MFC" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1021 +#: documentation/content/en/articles/committers-guide/_index.adoc:1039 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 " @@ -2269,42 +2303,42 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1022 +#: documentation/content/en/articles/committers-guide/_index.adoc:1040 #, no-wrap msgid "Commit message standards" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1023 +#: documentation/content/en/articles/committers-guide/_index.adoc:1041 #, no-wrap msgid "Marking MFCs" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1026 +#: documentation/content/en/articles/committers-guide/_index.adoc:1044 msgid "The project has adopted the following practice for marking MFCs:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1028 +#: documentation/content/en/articles/committers-guide/_index.adoc:1046 #, 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:1030 +#: documentation/content/en/articles/committers-guide/_index.adoc:1048 #, 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:1031 +#: documentation/content/en/articles/committers-guide/_index.adoc:1049 #, no-wrap msgid "Trim Metadata?" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1035 +#: documentation/content/en/articles/committers-guide/_index.adoc:1053 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 " @@ -2313,7 +2347,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1044 +#: documentation/content/en/articles/committers-guide/_index.adoc:1062 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 " @@ -2332,7 +2366,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1048 +#: documentation/content/en/articles/committers-guide/_index.adoc:1066 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 " @@ -2342,14 +2376,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1051 +#: documentation/content/en/articles/committers-guide/_index.adoc:1069 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:1054 +#: documentation/content/en/articles/committers-guide/_index.adoc:1072 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 " @@ -2359,43 +2393,43 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1056 +#: documentation/content/en/articles/committers-guide/_index.adoc:1074 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:1058 +#: documentation/content/en/articles/committers-guide/_index.adoc:1076 msgid "[[vendor-import-git]]" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1058 +#: documentation/content/en/articles/committers-guide/_index.adoc:1076 #, no-wrap msgid "Vendor Imports with Git" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1061 +#: documentation/content/en/articles/committers-guide/_index.adoc:1079 msgid "This section describes the vendor import procedure with Git in detail." msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1062 +#: documentation/content/en/articles/committers-guide/_index.adoc:1080 #, no-wrap msgid "Branch naming convention" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1065 +#: documentation/content/en/articles/committers-guide/_index.adoc:1083 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:1071 +#: documentation/content/en/articles/committers-guide/_index.adoc:1089 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 " @@ -2404,20 +2438,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1074 +#: documentation/content/en/articles/committers-guide/_index.adoc:1092 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:1075 +#: documentation/content/en/articles/committers-guide/_index.adoc:1093 #, no-wrap msgid "Updating an old vendor import" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1081 +#: documentation/content/en/articles/committers-guide/_index.adoc:1099 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 " @@ -2427,25 +2461,25 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1085 +#: documentation/content/en/articles/committers-guide/_index.adoc:1103 msgid "% git worktree add ../mtree vendor/NetBSD/mtree" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1087 +#: documentation/content/en/articles/committers-guide/_index.adoc:1105 #, no-wrap msgid "Update the Sources in the Vendor Branch" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1090 +#: documentation/content/en/articles/committers-guide/_index.adoc:1108 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:1094 +#: documentation/content/en/articles/committers-guide/_index.adoc:1112 msgid "" "This example assumes the NetBSD source is checked out from their GitHub " "mirror in `~/git/NetBSD`. Note that \"upstream\" might have added or " @@ -2454,7 +2488,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1108 +#: documentation/content/en/articles/committers-guide/_index.adoc:1126 #, no-wrap msgid "" "% cd ../mtree\n" @@ -2471,7 +2505,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1112 +#: documentation/content/en/articles/committers-guide/_index.adoc:1130 #, no-wrap msgid "" "Note: I run the `git diff` and `git status` commands to make sure nothing weird was present.\n" @@ -2479,7 +2513,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1117 +#: documentation/content/en/articles/committers-guide/_index.adoc:1135 #, no-wrap msgid "" "It is also important to create an annotated tag using `git tag -a`, otherwise the push will be rejected.\n" @@ -2489,47 +2523,47 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1118 +#: documentation/content/en/articles/committers-guide/_index.adoc:1136 #, no-wrap msgid "Updating the FreeBSD Copy" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1121 +#: documentation/content/en/articles/committers-guide/_index.adoc:1139 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:1125 +#: documentation/content/en/articles/committers-guide/_index.adoc:1143 msgid "% git push --follow-tags freebsd vendor/NetBSD/mtree" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1128 +#: documentation/content/en/articles/committers-guide/_index.adoc:1146 #, 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:1129 +#: documentation/content/en/articles/committers-guide/_index.adoc:1147 #, no-wrap msgid "Updating the FreeBSD source tree" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1133 +#: documentation/content/en/articles/committers-guide/_index.adoc:1151 msgid "" "Now you need to update the mtree in FreeBSD. The sources live in `contrib/" "mtree` since it is upstream software." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1138 +#: documentation/content/en/articles/committers-guide/_index.adoc:1156 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:1143 +#: documentation/content/en/articles/committers-guide/_index.adoc:1161 #, no-wrap msgid "" "This would generate a subtree merge commit of `contrib/mtree` against the local `vendor/NetBSD/mtree` branch.\n" @@ -2538,13 +2572,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1144 +#: documentation/content/en/articles/committers-guide/_index.adoc:1162 #, no-wrap msgid "Rebasing your change against latest FreeBSD source tree" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1147 +#: documentation/content/en/articles/committers-guide/_index.adoc:1165 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 " @@ -2552,7 +2586,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1150 +#: documentation/content/en/articles/committers-guide/_index.adoc:1168 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 " @@ -2560,14 +2594,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1152 +#: documentation/content/en/articles/committers-guide/_index.adoc:1170 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:1169 +#: documentation/content/en/articles/committers-guide/_index.adoc:1187 #, no-wrap msgid "" "* cd to the top of the repo\n" @@ -2589,13 +2623,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1171 +#: documentation/content/en/articles/committers-guide/_index.adoc:1189 #, 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:1184 +#: documentation/content/en/articles/committers-guide/_index.adoc:1202 #, no-wrap msgid "" "% cd ../src\t\t\t# CD to top of tree\n" @@ -2611,7 +2645,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1188 +#: documentation/content/en/articles/committers-guide/_index.adoc:1206 #, 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" @@ -2619,20 +2653,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1190 +#: documentation/content/en/articles/committers-guide/_index.adoc:1208 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:1192 +#: documentation/content/en/articles/committers-guide/_index.adoc:1210 #, no-wrap msgid "Pushing the changes" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1197 +#: documentation/content/en/articles/committers-guide/_index.adoc:1215 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 " @@ -2643,14 +2677,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1199 +#: documentation/content/en/articles/committers-guide/_index.adoc:1217 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:1205 +#: documentation/content/en/articles/committers-guide/_index.adoc:1223 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 " @@ -2658,7 +2692,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1212 +#: documentation/content/en/articles/committers-guide/_index.adoc:1230 #, no-wrap msgid "" "Note: I used `XXX` and `YYY` to make it obvious they are terrible names and should not leave your machine.\n" @@ -2669,13 +2703,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1213 +#: documentation/content/en/articles/committers-guide/_index.adoc:1231 #, no-wrap msgid "How to redo things if need be" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1217 +#: documentation/content/en/articles/committers-guide/_index.adoc:1235 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 " @@ -2683,7 +2717,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1226 +#: documentation/content/en/articles/committers-guide/_index.adoc:1244 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 % " @@ -2694,19 +2728,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1229 +#: documentation/content/en/articles/committers-guide/_index.adoc:1247 #, 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:1230 +#: documentation/content/en/articles/committers-guide/_index.adoc:1248 #, no-wrap msgid "Creating a new vendor branch" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1237 +#: documentation/content/en/articles/committers-guide/_index.adoc:1255 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 " @@ -2717,38 +2751,38 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1238 +#: documentation/content/en/articles/committers-guide/_index.adoc:1256 #, no-wrap msgid "Create the repo" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1247 +#: documentation/content/en/articles/committers-guide/_index.adoc:1265 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:1250 +#: documentation/content/en/articles/committers-guide/_index.adoc:1268 #, 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:1252 +#: documentation/content/en/articles/committers-guide/_index.adoc:1270 #, 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:1253 +#: documentation/content/en/articles/committers-guide/_index.adoc:1271 #, no-wrap msgid "Copy the sources in" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1257 +#: documentation/content/en/articles/committers-guide/_index.adoc:1275 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 " @@ -2756,23 +2790,23 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1262 +#: documentation/content/en/articles/committers-guide/_index.adoc:1280 msgid "% cp -r ~/glorbnitz/* . % git add *" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1265 +#: documentation/content/en/articles/committers-guide/_index.adoc:1283 #, 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:1269 +#: documentation/content/en/articles/committers-guide/_index.adoc:1287 msgid "% git commit -m \"Import GlorbNitz frobnosticator revision 3.1415\"" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1273 +#: documentation/content/en/articles/committers-guide/_index.adoc:1291 #, 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" @@ -2780,25 +2814,25 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1274 +#: documentation/content/en/articles/committers-guide/_index.adoc:1292 #, no-wrap msgid "Now import it into our repository" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1277 +#: documentation/content/en/articles/committers-guide/_index.adoc:1295 msgid "Now you need to import the branch into our repository." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1283 +#: documentation/content/en/articles/committers-guide/_index.adoc:1301 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:1288 +#: documentation/content/en/articles/committers-guide/_index.adoc:1306 #, 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" @@ -2807,20 +2841,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1289 +#: documentation/content/en/articles/committers-guide/_index.adoc:1307 #, no-wrap msgid "Tag and push" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1292 +#: documentation/content/en/articles/committers-guide/_index.adoc:1310 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:1300 +#: documentation/content/en/articles/committers-guide/_index.adoc:1318 msgid "" "% git worktree add ../glorbnitz vendor/glorbnitz % cd ../glorbnitz % git tag " "--annotate vendor/glorbnitz/3.1415 # Make sure the commit is good with \"git " @@ -2828,13 +2862,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1303 +#: documentation/content/en/articles/committers-guide/_index.adoc:1321 #, no-wrap msgid "By 'good' we mean:\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1309 +#: documentation/content/en/articles/committers-guide/_index.adoc:1327 #, no-wrap msgid "" ". All the right files are present\n" @@ -2845,13 +2879,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1310 +#: documentation/content/en/articles/committers-guide/_index.adoc:1328 #, no-wrap msgid "Time to finally merge it into the base tree" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1319 +#: documentation/content/en/articles/committers-guide/_index.adoc:1337 #, no-wrap msgid "" "% cd ../src\n" @@ -2862,13 +2896,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1322 +#: documentation/content/en/articles/committers-guide/_index.adoc:1340 #, no-wrap msgid "Here 'good' means:\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1327 +#: documentation/content/en/articles/committers-guide/_index.adoc:1345 #, no-wrap msgid "" ". All the right files, and none of the wrong ones, were merged into contrib/glorbnitz.\n" @@ -2878,7 +2912,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1333 +#: documentation/content/en/articles/committers-guide/_index.adoc:1351 #, no-wrap msgid "" "[NOTE]\n" @@ -2889,13 +2923,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1334 +#: documentation/content/en/articles/committers-guide/_index.adoc:1352 #, no-wrap msgid "Keeping current" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1340 +#: documentation/content/en/articles/committers-guide/_index.adoc:1358 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 " @@ -2904,7 +2938,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1343 +#: documentation/content/en/articles/committers-guide/_index.adoc:1361 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 " @@ -2912,23 +2946,23 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1347 +#: documentation/content/en/articles/committers-guide/_index.adoc:1365 msgid "% git config --global pull.ff only" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1350 +#: documentation/content/en/articles/committers-guide/_index.adoc:1368 #, 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:1356 +#: documentation/content/en/articles/committers-guide/_index.adoc:1374 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:1360 +#: documentation/content/en/articles/committers-guide/_index.adoc:1378 #, 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" @@ -2936,20 +2970,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1362 +#: documentation/content/en/articles/committers-guide/_index.adoc:1380 #, no-wrap msgid "The longer form is also recommended.\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1369 +#: documentation/content/en/articles/committers-guide/_index.adoc:1387 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:1374 +#: documentation/content/en/articles/committers-guide/_index.adoc:1392 #, 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" @@ -2958,12 +2992,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1378 +#: documentation/content/en/articles/committers-guide/_index.adoc:1396 msgid "% git rebase -i main working" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1385 +#: documentation/content/en/articles/committers-guide/_index.adoc:1403 #, no-wrap msgid "" "This will bring up an interactive screen to change the defaults.\n" @@ -2974,32 +3008,32 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1387 +#: documentation/content/en/articles/committers-guide/_index.adoc:1405 #, no-wrap msgid "[[git-push-upstream]]\n" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1387 +#: documentation/content/en/articles/committers-guide/_index.adoc:1405 #, no-wrap msgid "Time to push changes upstream" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1390 +#: documentation/content/en/articles/committers-guide/_index.adoc:1408 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:1394 +#: documentation/content/en/articles/committers-guide/_index.adoc:1412 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:1398 +#: documentation/content/en/articles/committers-guide/_index.adoc:1416 #, no-wrap msgid "" "Then, verify that user name and email are configured right.\n" @@ -3007,24 +3041,24 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1400 +#: documentation/content/en/articles/committers-guide/_index.adoc:1418 #, no-wrap msgid "Use\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1404 +#: documentation/content/en/articles/committers-guide/_index.adoc:1422 msgid "freefall% gen-gitconfig.sh" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1407 +#: documentation/content/en/articles/committers-guide/_index.adoc:1425 #, 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:1412 +#: documentation/content/en/articles/committers-guide/_index.adoc:1430 #, no-wrap msgid "" "The below command merges the `working` branch into the upstream `main` branch.\n" @@ -3034,37 +3068,37 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1416 +#: documentation/content/en/articles/committers-guide/_index.adoc:1434 msgid "% git push freebsd working:main" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1419 +#: documentation/content/en/articles/committers-guide/_index.adoc:1437 #, 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:1426 +#: documentation/content/en/articles/committers-guide/_index.adoc:1444 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:1429 +#: documentation/content/en/articles/committers-guide/_index.adoc:1447 #, no-wrap msgid "[[git-push-upstream-alt]]\n" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1429 +#: documentation/content/en/articles/committers-guide/_index.adoc:1447 #, no-wrap msgid "Time to push changes upstream (alternative)" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1435 +#: documentation/content/en/articles/committers-guide/_index.adoc:1453 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 " @@ -3073,12 +3107,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1439 +#: documentation/content/en/articles/committers-guide/_index.adoc:1457 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:1443 +#: documentation/content/en/articles/committers-guide/_index.adoc:1461 #, no-wrap msgid "" "If you lose the race, then try again with\n" @@ -3086,12 +3120,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1446 +#: documentation/content/en/articles/committers-guide/_index.adoc:1464 msgid "% git pull --rebase % git push freebsd" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1449 +#: documentation/content/en/articles/committers-guide/_index.adoc:1467 #, 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" @@ -3099,13 +3133,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1450 +#: documentation/content/en/articles/committers-guide/_index.adoc:1468 #, no-wrap msgid "Finding the Subversion Revision" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1454 +#: documentation/content/en/articles/committers-guide/_index.adoc:1472 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 " @@ -3113,23 +3147,23 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1458 +#: documentation/content/en/articles/committers-guide/_index.adoc:1476 msgid "% git log" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1461 +#: documentation/content/en/articles/committers-guide/_index.adoc:1479 #, 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:1465 +#: documentation/content/en/articles/committers-guide/_index.adoc:1483 msgid "% git log --grep revision=XXXX" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1469 +#: documentation/content/en/articles/committers-guide/_index.adoc:1487 #, no-wrap msgid "" "to find the specific revision.\n" @@ -3137,26 +3171,26 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1471 +#: documentation/content/en/articles/committers-guide/_index.adoc:1489 #, no-wrap msgid "[[git-faq]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1471 +#: documentation/content/en/articles/committers-guide/_index.adoc:1489 #, no-wrap msgid "Git FAQ" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1474 +#: documentation/content/en/articles/committers-guide/_index.adoc:1492 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:1480 +#: documentation/content/en/articles/committers-guide/_index.adoc:1498 msgid "" "[NOTE] ==== We use the common convention of having the origin for the " "FreeBSD repository being 'freebsd' rather than the default 'origin' to allow " @@ -3165,19 +3199,19 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1481 +#: documentation/content/en/articles/committers-guide/_index.adoc:1499 #, no-wrap msgid "Users" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1483 +#: documentation/content/en/articles/committers-guide/_index.adoc:1501 #, 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:1488 +#: documentation/content/en/articles/committers-guide/_index.adoc:1506 #, 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" @@ -3186,7 +3220,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1492 +#: documentation/content/en/articles/committers-guide/_index.adoc:1510 #, no-wrap msgid "" "**A:** You can use Git worktrees.\n" @@ -3195,7 +3229,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1495 +#: documentation/content/en/articles/committers-guide/_index.adoc:1513 #, no-wrap msgid "" "First, you need to clone the FreeBSD repository, shown here cloning into `freebsd-current` to reduce confusion.\n" @@ -3203,25 +3237,25 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1499 +#: documentation/content/en/articles/committers-guide/_index.adoc:1517 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:1502 +#: documentation/content/en/articles/committers-guide/_index.adoc:1520 #, 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:1507 +#: documentation/content/en/articles/committers-guide/_index.adoc:1525 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:1511 +#: documentation/content/en/articles/committers-guide/_index.adoc:1529 #, 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" @@ -3229,7 +3263,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1521 +#: documentation/content/en/articles/committers-guide/_index.adoc:1539 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 " @@ -3237,43 +3271,43 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1524 +#: documentation/content/en/articles/committers-guide/_index.adoc:1542 #, 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:1526 +#: documentation/content/en/articles/committers-guide/_index.adoc:1544 #, 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:1527 +#: documentation/content/en/articles/committers-guide/_index.adoc:1545 #, no-wrap msgid "Developers" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1529 +#: documentation/content/en/articles/committers-guide/_index.adoc:1547 #, 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:1532 +#: documentation/content/en/articles/committers-guide/_index.adoc:1550 #, 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:1534 +#: documentation/content/en/articles/committers-guide/_index.adoc:1552 #, no-wrap msgid "**A:** First, don't panic.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1538 +#: documentation/content/en/articles/committers-guide/_index.adoc:1556 #, no-wrap msgid "" "Second, don't push.\n" @@ -3282,13 +3316,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1540 +#: documentation/content/en/articles/committers-guide/_index.adoc:1558 #, 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:1546 +#: documentation/content/en/articles/committers-guide/_index.adoc:1564 #, no-wrap msgid "" "% git branch issue # Create the 'issue' branch\n" @@ -3297,13 +3331,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1548 +#: documentation/content/en/articles/committers-guide/_index.adoc:1566 #, no-wrap msgid "Ooops! I committed something to the wrong branch!" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1552 +#: documentation/content/en/articles/committers-guide/_index.adoc:1570 #, 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" @@ -3311,7 +3345,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1556 +#: documentation/content/en/articles/committers-guide/_index.adoc:1574 #, no-wrap msgid "" "**A:** The answer is similar to the previous one, but with cherry picking.\n" @@ -3320,7 +3354,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1564 +#: documentation/content/en/articles/committers-guide/_index.adoc:1582 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# " @@ -3329,7 +3363,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1568 +#: documentation/content/en/articles/committers-guide/_index.adoc:1586 #, 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" @@ -3337,13 +3371,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1570 +#: documentation/content/en/articles/committers-guide/_index.adoc:1588 #, 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:1576 +#: documentation/content/en/articles/committers-guide/_index.adoc:1594 #, 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" @@ -3354,13 +3388,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1578 +#: documentation/content/en/articles/committers-guide/_index.adoc:1596 #, 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:1584 +#: documentation/content/en/articles/committers-guide/_index.adoc:1602 #, no-wrap msgid "" "**A:** The more general answer would be the same as the previous.\n" @@ -3371,7 +3405,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1589 +#: documentation/content/en/articles/committers-guide/_index.adoc:1607 #, 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" @@ -3381,7 +3415,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1596 +#: documentation/content/en/articles/committers-guide/_index.adoc:1614 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 " @@ -3389,7 +3423,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1600 +#: documentation/content/en/articles/committers-guide/_index.adoc:1618 #, no-wrap msgid "" "The last step is optional.\n" @@ -3397,7 +3431,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1604 +#: documentation/content/en/articles/committers-guide/_index.adoc:1622 #, 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" @@ -3406,13 +3440,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1606 +#: documentation/content/en/articles/committers-guide/_index.adoc:1624 #, 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:1610 +#: documentation/content/en/articles/committers-guide/_index.adoc:1628 #, 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" @@ -3421,7 +3455,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1625 +#: documentation/content/en/articles/committers-guide/_index.adoc:1643 msgid "" "% git reflog 6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning " "to refs/heads/wilma 6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): " @@ -3434,7 +3468,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1633 +#: documentation/content/en/articles/committers-guide/_index.adoc:1651 #, no-wrap msgid "" "Here we see the changes I've made.\n" @@ -3446,7 +3480,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1641 +#: documentation/content/en/articles/committers-guide/_index.adoc:1659 #, no-wrap msgid "" "Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up.\n" @@ -3459,12 +3493,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1646 +#: documentation/content/en/articles/committers-guide/_index.adoc:1664 msgid "% git checkout -B wilma 869cbd3 % git branch -D fred" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1653 +#: documentation/content/en/articles/committers-guide/_index.adoc:1671 #, no-wrap msgid "" "and you are ready to try again.\n" @@ -3475,12 +3509,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1659 +#: documentation/content/en/articles/committers-guide/_index.adoc:1677 msgid "% git checkout 869cbd3 M\tfaq.md Note: checking out '869cbd3'." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1663 +#: documentation/content/en/articles/committers-guide/_index.adoc:1681 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 " @@ -3488,31 +3522,31 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1666 +#: documentation/content/en/articles/committers-guide/_index.adoc:1684 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:1671 +#: documentation/content/en/articles/committers-guide/_index.adoc:1689 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:1674 +#: documentation/content/en/articles/committers-guide/_index.adoc:1692 #, 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:1675 +#: documentation/content/en/articles/committers-guide/_index.adoc:1693 #, 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:1679 +#: documentation/content/en/articles/committers-guide/_index.adoc:1697 #, 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" @@ -3520,13 +3554,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1681 +#: documentation/content/en/articles/committers-guide/_index.adoc:1699 #, 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:1684 +#: documentation/content/en/articles/committers-guide/_index.adoc:1702 #, no-wrap msgid "" "Right after the pull, you will have the new merge commit checked out.\n" @@ -3534,7 +3568,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1689 +#: documentation/content/en/articles/committers-guide/_index.adoc:1707 #, no-wrap msgid "" "git log --oneline HEAD^1 # Look at the first parent's commits\n" @@ -3542,7 +3576,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1693 +#: documentation/content/en/articles/committers-guide/_index.adoc:1711 #, no-wrap msgid "" "From those logs, you can easily identify which commit is your development work.\n" @@ -3550,18 +3584,18 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1697 +#: documentation/content/en/articles/committers-guide/_index.adoc:1715 msgid "git reset --hard HEAD^2" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1700 +#: documentation/content/en/articles/committers-guide/_index.adoc:1718 #, 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:1703 +#: documentation/content/en/articles/committers-guide/_index.adoc:1721 #, no-wrap msgid "" "**A:** Git keeps track of the remote repository branches in a `freebsd/` namespace.\n" @@ -3569,12 +3603,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1707 +#: documentation/content/en/articles/committers-guide/_index.adoc:1725 msgid "git branch -f main freebsd/main" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1712 +#: documentation/content/en/articles/committers-guide/_index.adoc:1730 #, 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" @@ -3583,13 +3617,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1713 +#: documentation/content/en/articles/committers-guide/_index.adoc:1731 #, no-wrap msgid "Mixing and matching branches" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1717 +#: documentation/content/en/articles/committers-guide/_index.adoc:1735 #, no-wrap msgid "" "**Q:** So I have two branches `worker` and `async` that I'd like to combine into one branch called `feature`\n" @@ -3597,20 +3631,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1719 +#: documentation/content/en/articles/committers-guide/_index.adoc:1737 #, no-wrap msgid "**A:** This is a job for cherry pick.\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1725 +#: documentation/content/en/articles/committers-guide/_index.adoc:1743 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:1730 +#: documentation/content/en/articles/committers-guide/_index.adoc:1748 #, no-wrap msgid "" "You now have a new branch called `feature`.\n" @@ -3619,13 +3653,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1732 +#: documentation/content/en/articles/committers-guide/_index.adoc:1750 #, 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:1735 +#: documentation/content/en/articles/committers-guide/_index.adoc:1753 #, no-wrap msgid "" "**A:** This takes a little bit of prep work, but `git rebase` will do the heavy\n" @@ -3633,14 +3667,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1741 +#: documentation/content/en/articles/committers-guide/_index.adoc:1759 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:1746 +#: documentation/content/en/articles/committers-guide/_index.adoc:1764 #, no-wrap msgid "" "Now you have two identical branches.\n" @@ -3649,29 +3683,29 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1750 +#: documentation/content/en/articles/committers-guide/_index.adoc:1768 msgid "% git rebase -i main kernel" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1753 +#: documentation/content/en/articles/committers-guide/_index.adoc:1771 #, 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:1757 +#: documentation/content/en/articles/committers-guide/_index.adoc:1775 msgid "% git rebase -i main userland" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1760 +#: documentation/content/en/articles/committers-guide/_index.adoc:1778 #, 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:1763 +#: documentation/content/en/articles/committers-guide/_index.adoc:1781 #, no-wrap msgid "" "**Q:** Oh great! I followed the above and forgot a commit in the `kernel` branch.\n" @@ -3679,7 +3713,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1766 +#: documentation/content/en/articles/committers-guide/_index.adoc:1784 #, no-wrap msgid "" "**A:** You can use the `driver` branch to find the hash of the commit is missing and\n" @@ -3687,12 +3721,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1772 +#: documentation/content/en/articles/committers-guide/_index.adoc:1790 msgid "% git checkout kernel % git log driver % git cherry-pick $HASH" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1778 +#: documentation/content/en/articles/committers-guide/_index.adoc:1796 #, no-wrap msgid "" "**Q:** OK. I have the same situation as the above, but my commits are all mixed up.\n" @@ -3702,7 +3736,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1781 +#: documentation/content/en/articles/committers-guide/_index.adoc:1799 #, no-wrap msgid "" "**A:** In this situation, you'd be better off to curate the original branch to separate\n" @@ -3710,7 +3744,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1786 +#: documentation/content/en/articles/committers-guide/_index.adoc:1804 #, no-wrap msgid "" "So let's assume that there's just one commit with a clean tree.\n" @@ -3720,18 +3754,18 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1790 +#: documentation/content/en/articles/committers-guide/_index.adoc:1808 msgid "% git reset HEAD^" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1793 +#: documentation/content/en/articles/committers-guide/_index.adoc:1811 #, 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:1797 +#: documentation/content/en/articles/committers-guide/_index.adoc:1815 #, no-wrap msgid "" "Now, if you are lucky, the change needing to be split up falls entirely along file lines.\n" @@ -3740,7 +3774,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1800 +#: documentation/content/en/articles/committers-guide/_index.adoc:1818 #, no-wrap msgid "" "If you are not lucky, you'll need to split apart files.\n" @@ -3748,12 +3782,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1804 +#: documentation/content/en/articles/committers-guide/_index.adoc:1822 msgid "git add -i foo/bar.c" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1810 +#: documentation/content/en/articles/committers-guide/_index.adoc:1828 #, no-wrap msgid "" "will step through the diffs, prompting you, one at time, whether to include or exclude the hunk.\n" @@ -3763,30 +3797,30 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1811 +#: documentation/content/en/articles/committers-guide/_index.adoc:1829 #, no-wrap msgid "Cloning and Mirroring" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1814 +#: documentation/content/en/articles/committers-guide/_index.adoc:1832 #, 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:1816 +#: documentation/content/en/articles/committers-guide/_index.adoc:1834 #, 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:1820 +#: documentation/content/en/articles/committers-guide/_index.adoc:1838 msgid "% git clone --mirror $URL" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1824 +#: documentation/content/en/articles/committers-guide/_index.adoc:1842 #, no-wrap msgid "" "will do the trick.\n" @@ -3794,7 +3828,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1828 +#: documentation/content/en/articles/committers-guide/_index.adoc:1846 #, no-wrap msgid "" "First, this is a 'bare repository' which has the repository database, but no checked out worktree.\n" @@ -3803,7 +3837,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1836 +#: documentation/content/en/articles/committers-guide/_index.adoc:1854 msgid "" "% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd ports." "git % git worktree add ../ports main % git worktree add ../quarterly " @@ -3811,13 +3845,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1839 +#: documentation/content/en/articles/committers-guide/_index.adoc:1857 #, 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:1842 +#: documentation/content/en/articles/committers-guide/_index.adoc:1860 #, 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" @@ -3825,13 +3859,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1844 +#: documentation/content/en/articles/committers-guide/_index.adoc:1862 #, no-wrap msgid "**Q:** So what can I do instead?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1847 +#: documentation/content/en/articles/committers-guide/_index.adoc:1865 #, no-wrap msgid "" "**A:** Well, you can stuff all of the upstream repository's refs into a private namespace in your local repository.\n" @@ -3839,19 +3873,19 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1851 +#: documentation/content/en/articles/committers-guide/_index.adoc:1869 #, no-wrap msgid " fetch = +refs/heads/*:refs/remotes/freebsd/*\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1854 +#: documentation/content/en/articles/committers-guide/_index.adoc:1872 #, no-wrap msgid "which says just fetch the branch refs.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1858 +#: documentation/content/en/articles/committers-guide/_index.adoc:1876 #, no-wrap msgid "" "However, the FreeBSD repository has a number of other things in it.\n" @@ -3860,12 +3894,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1862 +#: documentation/content/en/articles/committers-guide/_index.adoc:1880 msgid "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1866 +#: documentation/content/en/articles/committers-guide/_index.adoc:1884 #, no-wrap msgid "" "which will put everything in the upstream repository into your local repository's `refs/freebsd/` namespace.\n" @@ -3873,30 +3907,30 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1868 +#: documentation/content/en/articles/committers-guide/_index.adoc:1886 #, 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:1872 +#: documentation/content/en/articles/committers-guide/_index.adoc:1890 msgid "git log refs/freebsd/vendor/zlib/1.2.10" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1875 +#: documentation/content/en/articles/committers-guide/_index.adoc:1893 #, 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:1876 +#: documentation/content/en/articles/committers-guide/_index.adoc:1894 #, no-wrap msgid "Collaborating with others" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1880 +#: documentation/content/en/articles/committers-guide/_index.adoc:1898 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 " @@ -3908,28 +3942,28 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1882 +#: documentation/content/en/articles/committers-guide/_index.adoc:1900 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:1884 +#: documentation/content/en/articles/committers-guide/_index.adoc:1902 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.>>" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1891 +#: documentation/content/en/articles/committers-guide/_index.adoc:1909 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:1894 +#: documentation/content/en/articles/committers-guide/_index.adoc:1912 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/" @@ -3938,14 +3972,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1897 +#: documentation/content/en/articles/committers-guide/_index.adoc:1915 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:1904 +#: documentation/content/en/articles/committers-guide/_index.adoc:1922 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:" @@ -3954,18 +3988,18 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1906 +#: documentation/content/en/articles/committers-guide/_index.adoc:1924 #, no-wrap msgid "With this in place you can create a branch <<keeping_a_local_branch,as shown above.>>\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1910 +#: documentation/content/en/articles/committers-guide/_index.adoc:1928 msgid "% git checkout -b gnn-pr2001-fix" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1914 +#: documentation/content/en/articles/committers-guide/_index.adoc:1932 #, 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" @@ -3973,26 +4007,26 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1920 +#: documentation/content/en/articles/committers-guide/_index.adoc:1938 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:1922 +#: documentation/content/en/articles/committers-guide/_index.adoc:1940 #, 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:1925 +#: documentation/content/en/articles/committers-guide/_index.adoc:1943 #, 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:1941 +#: documentation/content/en/articles/committers-guide/_index.adoc:1959 #, no-wrap msgid "" "% git push --set-upstream github gnn-feature\n" @@ -4011,7 +4045,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1943 +#: documentation/content/en/articles/committers-guide/_index.adoc:1961 #, no-wrap msgid "" "[new branch] gnn-feature -> gnn-feature\n" @@ -4019,13 +4053,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1946 +#: documentation/content/en/articles/committers-guide/_index.adoc:1964 #, 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:1959 +#: documentation/content/en/articles/committers-guide/_index.adoc:1977 #, no-wrap msgid "" "% git push\n" @@ -4041,7 +4075,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1963 +#: documentation/content/en/articles/committers-guide/_index.adoc:1981 #, no-wrap msgid "" "At this point your work is now in your branch on +GitHub+ and you can\n" @@ -4049,19 +4083,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1965 +#: documentation/content/en/articles/committers-guide/_index.adoc:1983 #, no-wrap msgid "[[github-pull-land]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1965 +#: documentation/content/en/articles/committers-guide/_index.adoc:1983 #, no-wrap msgid "Landing a github pull request" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1970 +#: documentation/content/en/articles/committers-guide/_index.adoc:1988 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 " @@ -4074,7 +4108,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1974 +#: documentation/content/en/articles/committers-guide/_index.adoc:1992 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, " @@ -4082,7 +4116,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1980 +#: documentation/content/en/articles/committers-guide/_index.adoc:1998 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/" @@ -4091,7 +4125,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2000 +#: documentation/content/en/articles/committers-guide/_index.adoc:2018 #, no-wrap msgid "" "Often pull requests are simple: requests that contain only a single commit.\n" @@ -4116,13 +4150,13 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2002 +#: documentation/content/en/articles/committers-guide/_index.adoc:2020 #, 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:2006 +#: documentation/content/en/articles/committers-guide/_index.adoc:2024 #, no-wrap msgid "" "A polite request to the author for a better name and/or email should be made.\n" @@ -4131,7 +4165,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2018 +#: documentation/content/en/articles/committers-guide/_index.adoc:2036 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 " @@ -4141,7 +4175,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2023 +#: documentation/content/en/articles/committers-guide/_index.adoc:2041 #, no-wrap msgid "" "[.procedure]\n" @@ -4150,7 +4184,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2031 +#: documentation/content/en/articles/committers-guide/_index.adoc:2049 #, no-wrap msgid "" ". checkout the pull request `git checkout github/pull/XXX`\n" @@ -4163,7 +4197,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2036 +#: documentation/content/en/articles/committers-guide/_index.adoc:2054 #, no-wrap msgid "" "This will also work when bringing branches developed elsewhere into the local tree for committing.\n" @@ -4173,24 +4207,24 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2038 +#: documentation/content/en/articles/committers-guide/_index.adoc:2056 #, no-wrap msgid "[[vcs-history]]\n" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2038 +#: documentation/content/en/articles/committers-guide/_index.adoc:2056 #, no-wrap msgid "Version Control History" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2041 +#: documentation/content/en/articles/committers-guide/_index.adoc:2059 msgid "The project has moved to <<git-primer,git>>." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2047 +#: documentation/content/en/articles/committers-guide/_index.adoc:2065 msgid "" "The FreeBSD source repository switched from CVS to Subversion on May 31st, " "2008. The first real SVN commit is __r179447__. The source repository " @@ -4200,7 +4234,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2053 +#: documentation/content/en/articles/committers-guide/_index.adoc:2071 msgid "" "The FreeBSD `doc/www` repository switched from CVS to Subversion on May " "19th, 2012. The first real SVN commit is __r38821__. The documentation " @@ -4210,7 +4244,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2059 +#: documentation/content/en/articles/committers-guide/_index.adoc:2077 msgid "" "The FreeBSD `ports` repository switched from CVS to Subversion on July 14th, " "2012. The first real SVN commit is __r300894__. The ports repository " @@ -4220,18 +4254,18 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2061 +#: documentation/content/en/articles/committers-guide/_index.adoc:2079 msgid "[[conventions]]" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2061 +#: documentation/content/en/articles/committers-guide/_index.adoc:2079 #, no-wrap msgid "Setup, Conventions, and Traditions" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2066 +#: documentation/content/en/articles/committers-guide/_index.adoc:2084 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 " @@ -4239,25 +4273,25 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2068 +#: documentation/content/en/articles/committers-guide/_index.adoc:2086 msgid "[[conventions-committers]]" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2068 +#: documentation/content/en/articles/committers-guide/_index.adoc:2086 #, no-wrap msgid "For New Committers" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2071 +#: documentation/content/en/articles/committers-guide/_index.adoc:2089 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:2074 +#: documentation/content/en/articles/committers-guide/_index.adoc:2092 #, no-wrap msgid "" "* Get mentor approval before committing each of these changes!\n" @@ -4265,7 +4299,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2079 +#: documentation/content/en/articles/committers-guide/_index.adoc:2097 #, no-wrap msgid "" "[[commit-steps]]\n" @@ -4275,7 +4309,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2126 +#: documentation/content/en/articles/committers-guide/_index.adoc:2144 #, no-wrap msgid "" ". Add an Author Entity\n" @@ -4327,19 +4361,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2128 +#: documentation/content/en/articles/committers-guide/_index.adoc:2146 #, no-wrap msgid "[[conventions-everyone]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2128 +#: documentation/content/en/articles/committers-guide/_index.adoc:2146 #, no-wrap msgid "For Everyone" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2148 +#: documentation/content/en/articles/committers-guide/_index.adoc:2166 msgid "" "[[conventions-everyone-steps]] [.procedure] ==== . Introduce yourself to the " "other developers, otherwise no one will have any idea who you are or what " @@ -4368,25 +4402,25 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2150 +#: documentation/content/en/articles/committers-guide/_index.adoc:2168 msgid "[[smtp-setup]]" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:2150 +#: documentation/content/en/articles/committers-guide/_index.adoc:2168 #, no-wrap msgid "SMTP Access Setup" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2153 +#: documentation/content/en/articles/committers-guide/_index.adoc:2171 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:2174 +#: documentation/content/en/articles/committers-guide/_index.adoc:2192 msgid "" "[.procedure] ==== . Point your mail client at `smtp.FreeBSD.org:587`. . " "Enable STARTTLS. . Ensure your `From:` address is set to " @@ -4403,30 +4437,30 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2176 +#: documentation/content/en/articles/committers-guide/_index.adoc:2194 msgid "[[smtp-setup-local-mta]]" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:2176 +#: documentation/content/en/articles/committers-guide/_index.adoc:2194 #, 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:2179 +#: documentation/content/en/articles/committers-guide/_index.adoc:2197 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:2184 +#: documentation/content/en/articles/committers-guide/_index.adoc:2202 msgid "[[smtp-setup-local-postfix]] .Using Postfix [example] ====" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2186 +#: documentation/content/en/articles/committers-guide/_index.adoc:2204 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 [." @@ -4434,12 +4468,12 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2188 +#: documentation/content/en/articles/committers-guide/_index.adoc:2206 msgid "[.programlisting]" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2194 +#: documentation/content/en/articles/committers-guide/_index.adoc:2212 msgid "" "sender_dependent_relayhost_maps = hash:/usr/local/etc/postfix/relayhost_maps " "smtp_sasl_auth_enable = yes smtp_sasl_security_options = noanonymous " @@ -4448,67 +4482,67 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2197 +#: documentation/content/en/articles/committers-guide/_index.adoc:2215 #, 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:2199 -#: documentation/content/en/articles/committers-guide/_index.adoc:2206 -#: documentation/content/en/articles/committers-guide/_index.adoc:2213 -#: documentation/content/en/articles/committers-guide/_index.adoc:2221 -#: documentation/content/en/articles/committers-guide/_index.adoc:2236 -#: documentation/content/en/articles/committers-guide/_index.adoc:2246 -#: documentation/content/en/articles/committers-guide/_index.adoc:2260 -#: documentation/content/en/articles/committers-guide/_index.adoc:2290 +#: 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 #, no-wrap msgid "[.programlisting]\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2201 +#: documentation/content/en/articles/committers-guide/_index.adoc:2219 msgid "yourusername@FreeBSD.org [smtp.freebsd.org]:587" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2204 +#: documentation/content/en/articles/committers-guide/_index.adoc:2222 #, 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:2208 +#: documentation/content/en/articles/committers-guide/_index.adoc:2226 #, no-wrap msgid "[smtp.freebsd.org]:587 yourusername:yourpassword\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2211 +#: documentation/content/en/articles/committers-guide/_index.adoc:2229 #, 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:2216 +#: documentation/content/en/articles/committers-guide/_index.adoc:2234 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:2219 +#: documentation/content/en/articles/committers-guide/_index.adoc:2237 #, 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:2223 +#: documentation/content/en/articles/committers-guide/_index.adoc:2241 msgid "yourusername@FreeBSD.org yourlocalusername" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2227 +#: documentation/content/en/articles/committers-guide/_index.adoc:2245 #, no-wrap msgid "" "Where _yourlocalusername_ is the SASL username used to connect to the local instance of Postfix.\n" @@ -4516,7 +4550,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2232 +#: documentation/content/en/articles/committers-guide/_index.adoc:2250 #, no-wrap msgid "" "[[smtp-setup-local-opensmtpd]]\n" @@ -4526,13 +4560,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2234 +#: documentation/content/en/articles/committers-guide/_index.adoc:2252 #, 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:2239 +#: documentation/content/en/articles/committers-guide/_index.adoc:2257 msgid "" "action \"freebsd\" relay host smtp+tls://freebsd@smtp.freebsd.org:587 auth " "<secrets> match from any auth yourlocalusername mail-from " @@ -4540,24 +4574,24 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2242 +#: documentation/content/en/articles/committers-guide/_index.adoc:2260 #, 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:2244 +#: documentation/content/en/articles/committers-guide/_index.adoc:2262 #, 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:2248 +#: documentation/content/en/articles/committers-guide/_index.adoc:2266 msgid "freebsd\tyourusername:yourpassword" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2255 +#: documentation/content/en/articles/committers-guide/_index.adoc:2273 #, no-wrap msgid "" "====\n" @@ -4568,7 +4602,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2258 +#: documentation/content/en/articles/committers-guide/_index.adoc:2276 #, no-wrap msgid "" "To direct a local Exim instance to forward all mail from `_example_@FreeBSD.org`\n" @@ -4576,7 +4610,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2267 +#: documentation/content/en/articles/committers-guide/_index.adoc:2285 #, no-wrap msgid "" "Routers section: (at the top of the list):\n" @@ -4588,7 +4622,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2279 +#: documentation/content/en/articles/committers-guide/_index.adoc:2297 #, no-wrap msgid "" "Transport Section:\n" @@ -4605,7 +4639,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2285 +#: documentation/content/en/articles/committers-guide/_index.adoc:2303 #, no-wrap msgid "" "Authenticators:\n" @@ -4616,36 +4650,36 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2288 +#: documentation/content/en/articles/committers-guide/_index.adoc:2306 #, 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:2292 +#: documentation/content/en/articles/committers-guide/_index.adoc:2310 msgid "example@freebsd.org:smtp.freebsd.org::587" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2295 +#: documentation/content/en/articles/committers-guide/_index.adoc:2313 #, no-wrap msgid "====\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2297 +#: documentation/content/en/articles/committers-guide/_index.adoc:2315 #, no-wrap msgid "[[mentors]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2297 +#: documentation/content/en/articles/committers-guide/_index.adoc:2315 #, no-wrap msgid "Mentors" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2302 +#: documentation/content/en/articles/committers-guide/_index.adoc:2320 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 " @@ -4655,7 +4689,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2305 +#: documentation/content/en/articles/committers-guide/_index.adoc:2323 msgid "" "For committers: do not commit anything without first getting mentor " "approval. Document that approval with an `Approved by:` line in the commit " @@ -4663,7 +4697,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2309 +#: documentation/content/en/articles/committers-guide/_index.adoc:2327 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 [." @@ -4673,18 +4707,18 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2311 +#: documentation/content/en/articles/committers-guide/_index.adoc:2329 msgid "[[pre-commit-review]]" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2311 +#: documentation/content/en/articles/committers-guide/_index.adoc:2329 #, no-wrap msgid "Pre-Commit Review" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2316 +#: documentation/content/en/articles/committers-guide/_index.adoc:2334 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` " @@ -4694,7 +4728,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2322 +#: documentation/content/en/articles/committers-guide/_index.adoc:2340 #, no-wrap msgid "" "* All non-trivial changes should be reviewed before they are committed to the repository.\n" @@ -4705,13 +4739,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2324 +#: documentation/content/en/articles/committers-guide/_index.adoc:2342 #, 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:2331 +#: documentation/content/en/articles/committers-guide/_index.adoc:2349 #, 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" @@ -4723,7 +4757,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2336 +#: documentation/content/en/articles/committers-guide/_index.adoc:2354 #, no-wrap msgid "" "Developers should participate in code reviews as both reviewers and reviewees.\n" @@ -4733,7 +4767,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2339 +#: documentation/content/en/articles/committers-guide/_index.adoc:2357 #, no-wrap msgid "" "In some cases, no subject-matter expert may be available.\n" @@ -4741,32 +4775,32 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2341 +#: documentation/content/en/articles/committers-guide/_index.adoc:2359 #, no-wrap msgid "[[commit-log-message]]\n" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2341 +#: documentation/content/en/articles/committers-guide/_index.adoc:2359 #, no-wrap msgid "Commit Log Messages" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2344 +#: documentation/content/en/articles/committers-guide/_index.adoc:2362 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:2345 +#: documentation/content/en/articles/committers-guide/_index.adoc:2363 #, no-wrap msgid "Why are commit messages important?" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2349 +#: documentation/content/en/articles/committers-guide/_index.adoc:2367 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 " @@ -4776,7 +4810,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2352 +#: documentation/content/en/articles/committers-guide/_index.adoc:2370 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 " @@ -4784,7 +4818,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2355 +#: documentation/content/en/articles/committers-guide/_index.adoc:2373 msgid "" "FreeBSD has hundreds of active developers and hundreds of thousands of " "commits spanning decades of history. Over that time the developer community " @@ -4793,12 +4827,12 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2357 +#: documentation/content/en/articles/committers-guide/_index.adoc:2375 msgid "Commit messages serve at least three purposes:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2364 +#: documentation/content/en/articles/committers-guide/_index.adoc:2382 #, no-wrap msgid "" "* Communicating with other developers\n" @@ -4810,7 +4844,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2370 +#: documentation/content/en/articles/committers-guide/_index.adoc:2388 #, no-wrap msgid "" "* Making Changes Discoverable\n" @@ -4821,7 +4855,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2376 +#: documentation/content/en/articles/committers-guide/_index.adoc:2394 #, no-wrap msgid "" "* Providing historical documentation\n" @@ -4832,25 +4866,25 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2378 +#: documentation/content/en/articles/committers-guide/_index.adoc:2396 #, 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:2380 +#: documentation/content/en/articles/committers-guide/_index.adoc:2398 #, 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:2381 +#: documentation/content/en/articles/committers-guide/_index.adoc:2399 #, no-wrap msgid "Start with a subject line" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2385 +#: documentation/content/en/articles/committers-guide/_index.adoc:2403 msgid "" "Commit messages should start with a single-line subject that briefly " "summarizes the change. The subject should, by itself, allow the reader to " @@ -4858,13 +4892,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2386 +#: documentation/content/en/articles/committers-guide/_index.adoc:2404 #, no-wrap msgid "Keep subject lines short" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2391 +#: documentation/content/en/articles/committers-guide/_index.adoc:2409 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 " @@ -4874,86 +4908,86 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2392 +#: documentation/content/en/articles/committers-guide/_index.adoc:2410 #, 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:2395 +#: documentation/content/en/articles/committers-guide/_index.adoc:2413 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:2397 +#: documentation/content/en/articles/committers-guide/_index.adoc:2415 msgid "✓ `foo: Add -k option to keep temporary data`" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2399 +#: documentation/content/en/articles/committers-guide/_index.adoc:2417 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:2400 +#: documentation/content/en/articles/committers-guide/_index.adoc:2418 #, no-wrap msgid "Capitalize the first letter of the subject" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2404 +#: documentation/content/en/articles/committers-guide/_index.adoc:2422 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:2405 +#: documentation/content/en/articles/committers-guide/_index.adoc:2423 #, no-wrap msgid "Do not end the subject line with punctuation" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2409 +#: documentation/content/en/articles/committers-guide/_index.adoc:2427 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:2410 +#: documentation/content/en/articles/committers-guide/_index.adoc:2428 #, 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:2413 +#: documentation/content/en/articles/committers-guide/_index.adoc:2431 msgid "Separate the body from the subject with a blank line." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2415 +#: documentation/content/en/articles/committers-guide/_index.adoc:2433 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:2417 +#: documentation/content/en/articles/committers-guide/_index.adoc:2435 msgid "✓ `ls: Fix typo in usage text`" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2418 +#: documentation/content/en/articles/committers-guide/_index.adoc:2436 #, no-wrap msgid "Limit messages to 72 columns" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2424 +#: documentation/content/en/articles/committers-guide/_index.adoc:2442 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. " @@ -4964,13 +4998,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2425 +#: documentation/content/en/articles/committers-guide/_index.adoc:2443 #, no-wrap msgid "Use the present tense, imperative mood" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2430 +#: documentation/content/en/articles/committers-guide/_index.adoc:2448 msgid "" "This facilitates short subject lines and provides consistency, including " "with automatically generated commit messages (e.g., as generated by git " @@ -4980,7 +5014,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2435 +#: documentation/content/en/articles/committers-guide/_index.adoc:2453 #, no-wrap msgid "" "✓ `foo: Implement the -k (keep) option`\n" @@ -4990,20 +5024,20 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2436 +#: documentation/content/en/articles/committers-guide/_index.adoc:2454 #, no-wrap msgid "Focus on what and why, not how" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2439 +#: documentation/content/en/articles/committers-guide/_index.adoc:2457 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:2443 +#: documentation/content/en/articles/committers-guide/_index.adoc:2461 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 " @@ -5011,20 +5045,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2445 +#: documentation/content/en/articles/committers-guide/_index.adoc:2463 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:2446 +#: documentation/content/en/articles/committers-guide/_index.adoc:2464 #, 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:2449 +#: documentation/content/en/articles/committers-guide/_index.adoc:2467 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. " @@ -5033,13 +5067,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2450 +#: documentation/content/en/articles/committers-guide/_index.adoc:2468 #, no-wrap msgid "Write commit messages for your future self" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2454 +#: documentation/content/en/articles/committers-guide/_index.adoc:2472 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 " @@ -5049,13 +5083,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2455 +#: documentation/content/en/articles/committers-guide/_index.adoc:2473 #, no-wrap msgid "Commit messages should stand alone" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2459 +#: documentation/content/en/articles/committers-guide/_index.adoc:2477 msgid "" "You may include references to mailing list postings, benchmark result web " "sites, or code review links. However, the commit message should contain all " @@ -5064,7 +5098,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2463 +#: documentation/content/en/articles/committers-guide/_index.adoc:2481 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 " @@ -5075,32 +5109,32 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2464 +#: documentation/content/en/articles/committers-guide/_index.adoc:2482 #, no-wrap msgid "Include appropriate metadata in a footer" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2467 +#: documentation/content/en/articles/committers-guide/_index.adoc:2485 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:2469 +#: documentation/content/en/articles/committers-guide/_index.adoc:2487 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:2471 +#: documentation/content/en/articles/committers-guide/_index.adoc:2489 msgid "The key words or phrases are:" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2476 +#: documentation/content/en/articles/committers-guide/_index.adoc:2494 #, no-wrap msgid "" "[.informaltable]\n" @@ -5108,25 +5142,25 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2477 +#: documentation/content/en/articles/committers-guide/_index.adoc:2495 #, no-wrap msgid "`PR:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2479 +#: documentation/content/en/articles/committers-guide/_index.adoc:2497 #, 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:2480 +#: documentation/content/en/articles/committers-guide/_index.adoc:2498 #, no-wrap msgid "`Reported by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2484 +#: documentation/content/en/articles/committers-guide/_index.adoc:2502 #, 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" @@ -5135,7 +5169,7 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2486 +#: documentation/content/en/articles/committers-guide/_index.adoc:2504 #, no-wrap msgid "" "`Submitted by:` +\n" @@ -5143,19 +5177,19 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2488 +#: documentation/content/en/articles/committers-guide/_index.adoc:2506 #, 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:2489 +#: documentation/content/en/articles/committers-guide/_index.adoc:2507 #, no-wrap msgid "`Reviewed by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2504 +#: documentation/content/en/articles/committers-guide/_index.adoc:2522 #, 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" @@ -5174,25 +5208,25 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2505 +#: documentation/content/en/articles/committers-guide/_index.adoc:2523 #, no-wrap msgid "`Tested by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2507 +#: documentation/content/en/articles/committers-guide/_index.adoc:2525 #, 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:2508 +#: documentation/content/en/articles/committers-guide/_index.adoc:2526 #, no-wrap msgid "`Approved by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2534 +#: documentation/content/en/articles/committers-guide/_index.adoc:2552 #, 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" @@ -5221,121 +5255,121 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2535 +#: documentation/content/en/articles/committers-guide/_index.adoc:2553 #, no-wrap msgid "`Obtained from:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2537 +#: documentation/content/en/articles/committers-guide/_index.adoc:2555 #, 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:2538 +#: documentation/content/en/articles/committers-guide/_index.adoc:2556 #, no-wrap msgid "`Fixes:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2540 +#: documentation/content/en/articles/committers-guide/_index.adoc:2558 #, 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:2541 +#: documentation/content/en/articles/committers-guide/_index.adoc:2559 #, no-wrap msgid "`MFC after:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2543 +#: documentation/content/en/articles/committers-guide/_index.adoc:2561 #, 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:2544 +#: documentation/content/en/articles/committers-guide/_index.adoc:2562 #, no-wrap msgid "`MFC to:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2546 +#: documentation/content/en/articles/committers-guide/_index.adoc:2564 #, 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:2547 +#: documentation/content/en/articles/committers-guide/_index.adoc:2565 #, no-wrap msgid "`MFH:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2549 +#: documentation/content/en/articles/committers-guide/_index.adoc:2567 #, 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:2550 +#: documentation/content/en/articles/committers-guide/_index.adoc:2568 #, no-wrap msgid "`Relnotes:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2552 +#: documentation/content/en/articles/committers-guide/_index.adoc:2570 #, 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:2553 +#: documentation/content/en/articles/committers-guide/_index.adoc:2571 #, no-wrap msgid "`Security:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2555 +#: documentation/content/en/articles/committers-guide/_index.adoc:2573 #, 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:2556 +#: documentation/content/en/articles/committers-guide/_index.adoc:2574 #, no-wrap msgid "`Event:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2558 +#: documentation/content/en/articles/committers-guide/_index.adoc:2576 #, 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:2559 +#: documentation/content/en/articles/committers-guide/_index.adoc:2577 #, no-wrap msgid "`Sponsored by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2561 +#: documentation/content/en/articles/committers-guide/_index.adoc:2579 #, 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:2562 +#: documentation/content/en/articles/committers-guide/_index.adoc:2580 #, no-wrap msgid "`Pull Request:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2566 +#: documentation/content/en/articles/committers-guide/_index.adoc:2584 #, 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" @@ -5344,73 +5378,87 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2567 +#: documentation/content/en/articles/committers-guide/_index.adoc:2585 +#, no-wrap +msgid "`Co-authored-by:`" +msgstr "" + +#. type: Table +#: documentation/content/en/articles/committers-guide/_index.adoc:2588 +#, no-wrap +msgid "" +"The name and email address of an additional author of the commit.\n" +"GitHub has a detailed description of the Co-authored-by trailer at https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors." +msgstr "" + +#. type: Table +#: documentation/content/en/articles/committers-guide/_index.adoc:2589 #, no-wrap msgid "`Signed-off-by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2569 +#: documentation/content/en/articles/committers-guide/_index.adoc:2591 #, no-wrap msgid "ID certifies compliance with https://developercertificate.org/" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2570 +#: documentation/content/en/articles/committers-guide/_index.adoc:2592 #, no-wrap msgid "`Differential Revision:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2572 +#: documentation/content/en/articles/committers-guide/_index.adoc:2594 #, 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:2574 +#: documentation/content/en/articles/committers-guide/_index.adoc:2596 #, 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:2580 +#: documentation/content/en/articles/committers-guide/_index.adoc:2602 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:2584 -#: documentation/content/en/articles/committers-guide/_index.adoc:2602 -#: documentation/content/en/articles/committers-guide/_index.adoc:2617 -#: documentation/content/en/articles/committers-guide/_index.adoc:2633 -#: documentation/content/en/articles/committers-guide/_index.adoc:2648 +#: 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 #, no-wrap msgid "...\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2586 +#: documentation/content/en/articles/committers-guide/_index.adoc:2608 #, no-wrap msgid "PR:\t\t12345\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2589 +#: documentation/content/en/articles/committers-guide/_index.adoc:2611 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:2592 +#: documentation/content/en/articles/committers-guide/_index.adoc:2614 #, no-wrap msgid "Commit Log for a Commit Needing Review" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2598 +#: documentation/content/en/articles/committers-guide/_index.adoc:2620 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 " @@ -5418,73 +5466,73 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2604 +#: documentation/content/en/articles/committers-guide/_index.adoc:2626 #, no-wrap msgid "Reviewed by:\t-arch\n" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2608 +#: documentation/content/en/articles/committers-guide/_index.adoc:2630 #, no-wrap msgid "Commit Log for a Commit Needing Approval" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2613 +#: documentation/content/en/articles/committers-guide/_index.adoc:2635 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:2619 +#: documentation/content/en/articles/committers-guide/_index.adoc:2641 #, no-wrap msgid "Approved by:\tabc (maintainer)\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2622 +#: documentation/content/en/articles/committers-guide/_index.adoc:2644 msgid "Where _abc_ is the account name of the person who approved." msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2624 +#: documentation/content/en/articles/committers-guide/_index.adoc:2646 #, 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:2629 +#: documentation/content/en/articles/committers-guide/_index.adoc:2651 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:2635 +#: documentation/content/en/articles/committers-guide/_index.adoc:2657 #, no-wrap msgid "Obtained from:\tOpenBSD\n" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2639 +#: documentation/content/en/articles/committers-guide/_index.adoc:2661 #, 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:2644 +#: documentation/content/en/articles/committers-guide/_index.adoc:2666 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:2650 +#: documentation/content/en/articles/committers-guide/_index.adoc:2672 #, no-wrap msgid "MFC after:\t2 weeks\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2653 +#: documentation/content/en/articles/committers-guide/_index.adoc:2675 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`, " @@ -5492,12 +5540,12 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2656 +#: documentation/content/en/articles/committers-guide/_index.adoc:2678 msgid "It is often necessary to combine these." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2660 +#: documentation/content/en/articles/committers-guide/_index.adoc:2682 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 " @@ -5507,19 +5555,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2662 +#: documentation/content/en/articles/committers-guide/_index.adoc:2684 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:2663 +#: documentation/content/en/articles/committers-guide/_index.adoc:2685 #, no-wrap msgid "Example Combined Commit Log" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2674 +#: documentation/content/en/articles/committers-guide/_index.adoc:2696 #, no-wrap msgid "" "PR:\t\t54321\n" @@ -5530,13 +5578,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2679 +#: documentation/content/en/articles/committers-guide/_index.adoc:2701 #, no-wrap msgid "Preferred License for New Files" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2685 +#: documentation/content/en/articles/committers-guide/_index.adoc:2707 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/" @@ -5546,14 +5594,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2687 +#: documentation/content/en/articles/committers-guide/_index.adoc:2709 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:2718 +#: documentation/content/en/articles/committers-guide/_index.adoc:2740 #, no-wrap msgid "" "/*-\n" @@ -5587,7 +5635,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2724 +#: documentation/content/en/articles/committers-guide/_index.adoc:2746 msgid "" "The FreeBSD project strongly discourages the so-called \"advertising " "clause\" in new code. Due to the large number of contributors to the " @@ -5598,7 +5646,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2728 +#: documentation/content/en/articles/committers-guide/_index.adoc:2750 msgid "" "The FreeBSD project discourages completely new licenses and variations on " "the standard licenses. New licenses require the approval of {core-email} to " @@ -5609,7 +5657,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2732 +#: documentation/content/en/articles/committers-guide/_index.adoc:2754 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 " @@ -5620,7 +5668,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2735 +#: documentation/content/en/articles/committers-guide/_index.adoc:2757 msgid "" "Developers are reminded that in open source, getting \"open\" right is just " "as important as getting \"source\" right, as improper handling of " @@ -5629,13 +5677,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2737 +#: documentation/content/en/articles/committers-guide/_index.adoc:2759 #, no-wrap msgid "Keeping Track of Licenses Granted to the FreeBSD Project" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2742 +#: documentation/content/en/articles/committers-guide/_index.adoc:2764 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 " @@ -5646,7 +5694,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2747 +#: documentation/content/en/articles/committers-guide/_index.adoc:2769 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 " @@ -5656,13 +5704,13 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2749 +#: documentation/content/en/articles/committers-guide/_index.adoc:2771 msgid "" "Contact details for people or organizations granting the special license." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2750 +#: documentation/content/en/articles/committers-guide/_index.adoc:2772 msgid "" "What files, directories etc. in the repositories are covered by the license " "grant including the revision numbers where any specially licensed material " @@ -5670,7 +5718,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2751 +#: documentation/content/en/articles/committers-guide/_index.adoc:2773 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 " @@ -5678,24 +5726,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2752 +#: documentation/content/en/articles/committers-guide/_index.adoc:2774 msgid "The license text." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2753 +#: documentation/content/en/articles/committers-guide/_index.adoc:2775 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:2754 +#: documentation/content/en/articles/committers-guide/_index.adoc:2776 msgid "Any other relevant information." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2757 +#: documentation/content/en/articles/committers-guide/_index.adoc:2779 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 " @@ -5705,7 +5753,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2760 +#: documentation/content/en/articles/committers-guide/_index.adoc:2782 msgid "" "The license archive should contain only details of license grants; this is " "not the place for any discussions around licensing or other subjects. " @@ -5714,13 +5762,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2762 +#: documentation/content/en/articles/committers-guide/_index.adoc:2784 #, no-wrap msgid "SPDX Tags in the tree" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2773 +#: documentation/content/en/articles/committers-guide/_index.adoc:2795 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 " @@ -5739,20 +5787,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2775 +#: documentation/content/en/articles/committers-guide/_index.adoc:2797 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:2776 +#: documentation/content/en/articles/committers-guide/_index.adoc:2798 #, no-wrap msgid "Developer Relations" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2782 +#: documentation/content/en/articles/committers-guide/_index.adoc:2804 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 " @@ -5765,7 +5813,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2786 +#: documentation/content/en/articles/committers-guide/_index.adoc:2808 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 " @@ -5776,27 +5824,27 @@ msgid "" msgstr "" #. type: delimited block - 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2790 +#: documentation/content/en/articles/committers-guide/_index.adoc:2812 #, 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:2793 +#: documentation/content/en/articles/committers-guide/_index.adoc:2815 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:2798 +#: documentation/content/en/articles/committers-guide/_index.adoc:2820 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:2804 +#: documentation/content/en/articles/committers-guide/_index.adoc:2826 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 " @@ -5807,7 +5855,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2808 +#: documentation/content/en/articles/committers-guide/_index.adoc:2830 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 " @@ -5817,7 +5865,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2811 +#: documentation/content/en/articles/committers-guide/_index.adoc:2833 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 " @@ -5825,7 +5873,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2817 +#: documentation/content/en/articles/committers-guide/_index.adoc:2839 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 " @@ -5834,7 +5882,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2821 +#: documentation/content/en/articles/committers-guide/_index.adoc:2843 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 " @@ -5842,20 +5890,20 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2823 +#: documentation/content/en/articles/committers-guide/_index.adoc:2845 #, no-wrap msgid "If in Doubt..." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2827 +#: documentation/content/en/articles/committers-guide/_index.adoc:2849 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:2831 +#: documentation/content/en/articles/committers-guide/_index.adoc:2853 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 " @@ -5863,32 +5911,32 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2833 +#: documentation/content/en/articles/committers-guide/_index.adoc:2855 msgid "For project specific or administrative questions ask, in order:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2835 +#: documentation/content/en/articles/committers-guide/_index.adoc:2857 msgid "Your mentor or former mentor." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2836 +#: documentation/content/en/articles/committers-guide/_index.adoc:2858 msgid "An experienced committer on IRC, email, etc." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2837 +#: documentation/content/en/articles/committers-guide/_index.adoc:2859 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:2838 +#: documentation/content/en/articles/committers-guide/_index.adoc:2860 msgid "If still not sure, ask on {developers-name}." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2840 +#: documentation/content/en/articles/committers-guide/_index.adoc:2862 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 " @@ -5896,41 +5944,41 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2842 +#: documentation/content/en/articles/committers-guide/_index.adoc:2864 #, no-wrap msgid "Bugzilla" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2847 +#: documentation/content/en/articles/committers-guide/_index.adoc:2869 msgid "" "The FreeBSD Project utilizes Bugzilla for tracking bugs and change " -"requests. Be sure that if you commit a fix or suggestion found in the PR " -"database to close it. It is also considered nice if you take time to close " -"any PRs associated with your commits, if appropriate." +"requests. If you commit a fix or suggestion found in the PR database, be " +"sure to close the PR. It is also considered nice if you take time to close " +"any other PRs associated with your commits." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2849 +#: documentation/content/en/articles/committers-guide/_index.adoc:2871 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:2853 +#: documentation/content/en/articles/committers-guide/_index.adoc:2875 msgid "Log in using your old account." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2854 +#: documentation/content/en/articles/committers-guide/_index.adoc:2876 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:2855 +#: documentation/content/en/articles/committers-guide/_index.adoc:2877 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 " @@ -5938,35 +5986,35 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2856 +#: documentation/content/en/articles/committers-guide/_index.adoc:2878 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:2859 +#: documentation/content/en/articles/committers-guide/_index.adoc:2881 msgid "You can find out more about Bugzilla at:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2861 +#: documentation/content/en/articles/committers-guide/_index.adoc:2883 msgid "extref:{pr-guidelines}[FreeBSD Problem Report Handling Guidelines]" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2862 +#: documentation/content/en/articles/committers-guide/_index.adoc:2884 msgid "link:https://www.FreeBSD.org/support/[https://www.FreeBSD.org/support]" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2864 +#: documentation/content/en/articles/committers-guide/_index.adoc:2886 #, no-wrap msgid "Phabricator" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2868 +#: documentation/content/en/articles/committers-guide/_index.adoc:2890 msgid "" "The FreeBSD Project utilizes https://reviews.freebsd.org[Phabricator] for " "code review requests. See the https://wiki.freebsd.org/" @@ -5974,19 +6022,19 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2870 +#: documentation/content/en/articles/committers-guide/_index.adoc:2892 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:2874 +#: documentation/content/en/articles/committers-guide/_index.adoc:2896 msgid "Change your Phabricator account email to your `FreeBSD.org` email." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2875 +#: documentation/content/en/articles/committers-guide/_index.adoc:2897 msgid "" "Open new bug on our bug tracker using your `FreeBSD.org` account, see " "<<bugzilla>> for more information. Choose `Services` as the Product, and " @@ -5996,19 +6044,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2880 +#: documentation/content/en/articles/committers-guide/_index.adoc:2902 msgid "" "Phabricator accounts cannot be merged, please do not open a new account." msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2883 +#: documentation/content/en/articles/committers-guide/_index.adoc:2905 #, no-wrap msgid "Who's Who" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2886 +#: documentation/content/en/articles/committers-guide/_index.adoc:2908 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. " @@ -6016,13 +6064,13 @@ msgid "" msgstr "" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2887 +#: documentation/content/en/articles/committers-guide/_index.adoc:2909 #, no-wrap msgid "`{doceng}`" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2893 +#: documentation/content/en/articles/committers-guide/_index.adoc:2915 msgid "" "doceng is the group responsible for the documentation build infrastructure, " "approving new documentation committers, and ensuring that the FreeBSD " @@ -6036,13 +6084,13 @@ msgid "" msgstr "" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2894 +#: documentation/content/en/articles/committers-guide/_index.adoc:2916 #, no-wrap msgid "`{re-members}`" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2899 +#: documentation/content/en/articles/committers-guide/_index.adoc:2921 msgid "" "These are the members of the `{re}`. This team is responsible for setting " "release deadlines and controlling the release process. During code freezes, " @@ -6053,20 +6101,20 @@ msgid "" msgstr "" #. type: Labeled list -#: documentation/content/en/articles/committers-guide/_index.adoc:2900 +#: documentation/content/en/articles/committers-guide/_index.adoc:2922 #, no-wrap msgid "`{so}`" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2902 +#: documentation/content/en/articles/committers-guide/_index.adoc:2924 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:2907 +#: documentation/content/en/articles/committers-guide/_index.adoc:2929 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 " @@ -6075,7 +6123,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2912 +#: documentation/content/en/articles/committers-guide/_index.adoc:2934 msgid "" "{developers-name}:: All committers are subscribed to -developers. This list " "was created to be a forum for the committers \"community\" issues. Examples " @@ -6083,7 +6131,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2916 +#: documentation/content/en/articles/committers-guide/_index.adoc:2938 msgid "" "The {developers-name} is for the exclusive use of FreeBSD committers. To " "develop FreeBSD, committers must have the ability to openly discuss matters " @@ -6093,7 +6141,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2920 +#: documentation/content/en/articles/committers-guide/_index.adoc:2942 msgid "" "All FreeBSD committers are expected not to not publish or forward messages " "from the {developers-name} outside the list membership without permission of " @@ -6103,7 +6151,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2926 +#: documentation/content/en/articles/committers-guide/_index.adoc:2948 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 " @@ -6116,13 +6164,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2927 +#: documentation/content/en/articles/committers-guide/_index.adoc:2949 #, no-wrap msgid "SSH Quick-Start Guide" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2932 +#: documentation/content/en/articles/committers-guide/_index.adoc:2954 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 " @@ -6133,19 +6181,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2933 +#: documentation/content/en/articles/committers-guide/_index.adoc:2955 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:2937 +#: documentation/content/en/articles/committers-guide/_index.adoc:2959 msgid "Only ECDSA, Ed25519 or RSA keys are supported." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2939 +#: documentation/content/en/articles/committers-guide/_index.adoc:2961 msgid "" "Send your public key ([.filename]#$HOME/.ssh/id_ecdsa.pub#, [." "filename]#$HOME/.ssh/id_ed25519.pub#, or [.filename]#$HOME/.ssh/id_rsa.pub#) " @@ -6154,7 +6202,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2944 +#: documentation/content/en/articles/committers-guide/_index.adoc:2966 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 " @@ -6163,32 +6211,32 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2946 +#: documentation/content/en/articles/committers-guide/_index.adoc:2968 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:2948 +#: documentation/content/en/articles/committers-guide/_index.adoc:2970 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:2950 +#: documentation/content/en/articles/committers-guide/_index.adoc:2972 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:2952 +#: documentation/content/en/articles/committers-guide/_index.adoc:2974 #, no-wrap msgid "Coverity(R) Availability for FreeBSD Committers" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2956 +#: documentation/content/en/articles/committers-guide/_index.adoc:2978 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 " @@ -6197,7 +6245,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2959 +#: documentation/content/en/articles/committers-guide/_index.adoc:2981 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/" @@ -6208,7 +6256,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2961 +#: documentation/content/en/articles/committers-guide/_index.adoc:2983 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 " @@ -6216,13 +6264,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2963 +#: documentation/content/en/articles/committers-guide/_index.adoc:2985 #, no-wrap msgid "The FreeBSD Committers' Big List of Rules" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2968 +#: documentation/content/en/articles/committers-guide/_index.adoc:2990 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-" @@ -6233,25 +6281,25 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2970 -#: documentation/content/en/articles/committers-guide/_index.adoc:3000 +#: documentation/content/en/articles/committers-guide/_index.adoc:2992 +#: documentation/content/en/articles/committers-guide/_index.adoc:3022 msgid "Respect other committers." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2971 -#: documentation/content/en/articles/committers-guide/_index.adoc:3016 +#: documentation/content/en/articles/committers-guide/_index.adoc:2993 +#: documentation/content/en/articles/committers-guide/_index.adoc:3038 msgid "Respect other contributors." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2972 -#: documentation/content/en/articles/committers-guide/_index.adoc:3031 +#: documentation/content/en/articles/committers-guide/_index.adoc:2994 +#: documentation/content/en/articles/committers-guide/_index.adoc:3053 msgid "Discuss any significant change _before_ committing." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2973 +#: documentation/content/en/articles/committers-guide/_index.adoc:2995 msgid "" "Respect existing maintainers (if listed in the `MAINTAINER` field in [." "filename]#Makefile# or in [.filename]#MAINTAINER# in the top-level " @@ -6259,8 +6307,8 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2974 -#: documentation/content/en/articles/committers-guide/_index.adoc:3046 +#: documentation/content/en/articles/committers-guide/_index.adoc:2996 +#: documentation/content/en/articles/committers-guide/_index.adoc:3068 msgid "" "Any disputed change must be backed out pending resolution of the dispute if " "requested by a maintainer. Security related changes may override a " @@ -6268,7 +6316,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2975 +#: documentation/content/en/articles/committers-guide/_index.adoc:2997 msgid "" "Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically " "permitted by the release engineer or unless they are not applicable to " @@ -6280,40 +6328,40 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2976 -#: documentation/content/en/articles/committers-guide/_index.adoc:3061 +#: documentation/content/en/articles/committers-guide/_index.adoc:2998 +#: documentation/content/en/articles/committers-guide/_index.adoc:3083 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:2977 +#: documentation/content/en/articles/committers-guide/_index.adoc:2999 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:2978 -#: documentation/content/en/articles/committers-guide/_index.adoc:3076 +#: documentation/content/en/articles/committers-guide/_index.adoc:3000 +#: documentation/content/en/articles/committers-guide/_index.adoc:3098 msgid "When in doubt on any procedure, ask first!" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2979 -#: documentation/content/en/articles/committers-guide/_index.adoc:3081 +#: documentation/content/en/articles/committers-guide/_index.adoc:3001 +#: documentation/content/en/articles/committers-guide/_index.adoc:3103 msgid "Test your changes before committing them." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2980 -#: documentation/content/en/articles/committers-guide/_index.adoc:3090 +#: documentation/content/en/articles/committers-guide/_index.adoc:3002 +#: documentation/content/en/articles/committers-guide/_index.adoc:3112 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:2991 +#: documentation/content/en/articles/committers-guide/_index.adoc:3013 msgid "" "As noted, breaking some of these rules can be grounds for suspension or, " "upon repeated offense, permanent removal of commit privileges. Individual " @@ -6339,7 +6387,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2995 +#: documentation/content/en/articles/committers-guide/_index.adoc:3017 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 " @@ -6350,13 +6398,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2996 +#: documentation/content/en/articles/committers-guide/_index.adoc:3018 #, no-wrap msgid "Details" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3004 +#: documentation/content/en/articles/committers-guide/_index.adoc:3026 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 " @@ -6368,7 +6416,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3006 +#: documentation/content/en/articles/committers-guide/_index.adoc:3028 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 " @@ -6378,7 +6426,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3012 +#: documentation/content/en/articles/committers-guide/_index.adoc:3034 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 " @@ -6397,7 +6445,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3015 +#: documentation/content/en/articles/committers-guide/_index.adoc:3037 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 " @@ -6405,7 +6453,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3028 +#: documentation/content/en/articles/committers-guide/_index.adoc:3050 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 " @@ -6419,14 +6467,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3030 +#: documentation/content/en/articles/committers-guide/_index.adoc:3052 msgid "" "Consider the points raised under <<respect,Respect other committers>> and " "apply them also to contributors." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3037 +#: documentation/content/en/articles/committers-guide/_index.adoc:3059 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 " @@ -6442,17 +6490,17 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3039 +#: documentation/content/en/articles/committers-guide/_index.adoc:3061 msgid "When in doubt, ask for review!" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3040 +#: documentation/content/en/articles/committers-guide/_index.adoc:3062 msgid "Respect existing maintainers if listed." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3045 +#: documentation/content/en/articles/committers-guide/_index.adoc:3067 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, " @@ -6468,7 +6516,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3051 +#: documentation/content/en/articles/committers-guide/_index.adoc:3073 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 " @@ -6486,7 +6534,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3052 +#: documentation/content/en/articles/committers-guide/_index.adoc:3074 msgid "" "Changes go to FreeBSD-CURRENT before FreeBSD-STABLE unless specifically " "permitted by the release engineer or unless they are not applicable to " @@ -6497,7 +6545,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3058 +#: documentation/content/en/articles/committers-guide/_index.adoc:3080 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 " @@ -6516,7 +6564,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3060 +#: documentation/content/en/articles/committers-guide/_index.adoc:3082 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 " @@ -6524,7 +6572,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3071 +#: documentation/content/en/articles/committers-guide/_index.adoc:3093 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. " @@ -6549,14 +6597,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3072 +#: documentation/content/en/articles/committers-guide/_index.adoc:3094 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:3075 +#: documentation/content/en/articles/committers-guide/_index.adoc:3097 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 " @@ -6567,7 +6615,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3080 +#: documentation/content/en/articles/committers-guide/_index.adoc:3102 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, " @@ -6579,7 +6627,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3089 +#: documentation/content/en/articles/committers-guide/_index.adoc:3111 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 " @@ -6594,14 +6642,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3092 +#: documentation/content/en/articles/committers-guide/_index.adoc:3114 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:3097 +#: documentation/content/en/articles/committers-guide/_index.adoc:3119 msgid "" "The trees mentioned above are for contributed software usually imported onto " "a vendor branch. Committing something there may cause unnecessary headaches " @@ -6611,7 +6659,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3101 +#: documentation/content/en/articles/committers-guide/_index.adoc:3123 msgid "" "Reasons for modifying upstream software range from wanting strict control " "over a tightly coupled dependency to lack of portability in the canonical " @@ -6623,7 +6671,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3104 +#: documentation/content/en/articles/committers-guide/_index.adoc:3126 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 " @@ -6631,13 +6679,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3105 +#: documentation/content/en/articles/committers-guide/_index.adoc:3127 #, no-wrap msgid "Policy on Multiple Architectures" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3109 +#: documentation/content/en/articles/committers-guide/_index.adoc:3131 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 " @@ -6646,7 +6694,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3113 +#: documentation/content/en/articles/committers-guide/_index.adoc:3135 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 " @@ -6656,7 +6704,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3117 +#: documentation/content/en/articles/committers-guide/_index.adoc:3139 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 " @@ -6667,13 +6715,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3119 +#: documentation/content/en/articles/committers-guide/_index.adoc:3141 #, no-wrap msgid "Policy on Multiple Compilers" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3133 +#: documentation/content/en/articles/committers-guide/_index.adoc:3155 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 " @@ -6699,7 +6747,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3138 +#: documentation/content/en/articles/committers-guide/_index.adoc:3160 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 " @@ -6708,7 +6756,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3146 +#: documentation/content/en/articles/committers-guide/_index.adoc:3168 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 " @@ -6723,7 +6771,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3150 +#: documentation/content/en/articles/committers-guide/_index.adoc:3172 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 " @@ -6732,7 +6780,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3156 +#: documentation/content/en/articles/committers-guide/_index.adoc:3178 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 " @@ -6745,7 +6793,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3160 +#: documentation/content/en/articles/committers-guide/_index.adoc:3182 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 " @@ -6755,7 +6803,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3166 +#: documentation/content/en/articles/committers-guide/_index.adoc:3188 msgid "" "The FreeBSD project provides headers and libraries that allow other " "compilers to be used to build software not in the base system. These " @@ -6770,7 +6818,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3171 +#: documentation/content/en/articles/committers-guide/_index.adoc:3193 msgid "" "The FreeBSD build system currently accommodates these different " "environments. As new warnings are added to compilers, the project tries to " @@ -6782,13 +6830,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3172 +#: documentation/content/en/articles/committers-guide/_index.adoc:3194 #, no-wrap msgid "Current Compiler Versions" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3177 +#: documentation/content/en/articles/committers-guide/_index.adoc:3199 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. " @@ -6798,13 +6846,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3178 +#: documentation/content/en/articles/committers-guide/_index.adoc:3200 #, no-wrap msgid "Other Suggestions" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3182 +#: documentation/content/en/articles/committers-guide/_index.adoc:3204 msgid "" "When committing documentation changes, use a spell checker before " "committing. For all XML docs, verify that the formatting directives are " @@ -6812,7 +6860,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3184 +#: documentation/content/en/articles/committers-guide/_index.adoc:3206 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 " @@ -6821,7 +6869,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3191 +#: documentation/content/en/articles/committers-guide/_index.adoc:3213 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 " @@ -6834,20 +6882,20 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3192 +#: documentation/content/en/articles/committers-guide/_index.adoc:3214 #, no-wrap msgid "Deprecating Features" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3195 +#: documentation/content/en/articles/committers-guide/_index.adoc:3217 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:3197 +#: documentation/content/en/articles/committers-guide/_index.adoc:3219 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 " @@ -6855,14 +6903,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3198 +#: documentation/content/en/articles/committers-guide/_index.adoc:3220 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:3199 +#: documentation/content/en/articles/committers-guide/_index.adoc:3221 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 " @@ -6870,18 +6918,18 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3200 +#: documentation/content/en/articles/committers-guide/_index.adoc:3222 #, no-wrap msgid "Privacy and Confidentiality" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3203 +#: documentation/content/en/articles/committers-guide/_index.adoc:3225 msgid "Most FreeBSD business is done in public." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3206 +#: documentation/content/en/articles/committers-guide/_index.adoc:3228 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 " @@ -6889,12 +6937,12 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3207 +#: documentation/content/en/articles/committers-guide/_index.adoc:3229 msgid "Certain sensitive matters must remain private or held under embargo." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3213 +#: documentation/content/en/articles/committers-guide/_index.adoc:3235 msgid "" "There unfortunately cannot be complete transparency. As a FreeBSD developer " "you will have a certain degree of privileged access to information. " @@ -6905,14 +6953,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3214 +#: documentation/content/en/articles/committers-guide/_index.adoc:3236 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:3219 +#: documentation/content/en/articles/committers-guide/_index.adoc:3241 msgid "" "Where there are security problems that affect many different operating " "systems, FreeBSD frequently depends on early access to be able to prepare " @@ -6925,13 +6973,13 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3220 +#: documentation/content/en/articles/committers-guide/_index.adoc:3242 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:3225 +#: documentation/content/en/articles/committers-guide/_index.adoc:3247 msgid "" "Communications to core will initially be treated as confidential. " "Eventually however, most of Core's business will be summarized into the " @@ -6942,14 +6990,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3226 +#: documentation/content/en/articles/committers-guide/_index.adoc:3248 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:3229 +#: documentation/content/en/articles/committers-guide/_index.adoc:3251 msgid "" "Access to certain commercially sensitive data may only be available under a " "Non-Disclosure Agreement. The FreeBSD Foundation legal staff must be " @@ -6957,12 +7005,12 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3230 +#: documentation/content/en/articles/committers-guide/_index.adoc:3252 msgid "Private communications must not be made public without permission." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3233 +#: documentation/content/en/articles/committers-guide/_index.adoc:3255 msgid "" "Beyond the specific requirements above there is a general expectation not to " "publish private communications between developers without the consent of all " @@ -6972,14 +7020,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3234 +#: documentation/content/en/articles/committers-guide/_index.adoc:3256 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:3237 +#: documentation/content/en/articles/committers-guide/_index.adoc:3259 msgid "" "Similarly to personal communications, certain internal communications " "channels, including FreeBSD Committer only mailing lists and restricted " @@ -6988,12 +7036,12 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3238 +#: documentation/content/en/articles/committers-guide/_index.adoc:3260 msgid "Core may approve publication." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3240 +#: documentation/content/en/articles/committers-guide/_index.adoc:3262 msgid "" "Where it is impractical to obtain permission due to the number of " "correspondents or where permission to publish is unreasonably withheld, Core " @@ -7002,13 +7050,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3242 +#: documentation/content/en/articles/committers-guide/_index.adoc:3264 #, no-wrap msgid "Support for Multiple Architectures" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3249 +#: documentation/content/en/articles/committers-guide/_index.adoc:3271 msgid "" "FreeBSD is a highly portable operating system intended to function on many " "different types of hardware architectures. Maintaining clean separation of " @@ -7024,13 +7072,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3250 +#: documentation/content/en/articles/committers-guide/_index.adoc:3272 #, no-wrap msgid "Statement of General Intent" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3255 +#: documentation/content/en/articles/committers-guide/_index.adoc:3277 msgid "" "The FreeBSD Project targets \"production quality commercial off-the-shelf " "(COTS) workstation, server, and high-end embedded systems\". By retaining a " @@ -7046,7 +7094,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3262 +#: documentation/content/en/articles/committers-guide/_index.adoc:3284 msgid "" "The FreeBSD Project differentiates platform targets into four tiers. Each " "tier includes a list of guarantees consumers may rely on as well as " @@ -7060,13 +7108,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3263 +#: documentation/content/en/articles/committers-guide/_index.adoc:3285 #, no-wrap msgid "Platform Targets" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3270 +#: documentation/content/en/articles/committers-guide/_index.adoc:3292 msgid "" "Support for a hardware platform consists of two components: kernel support " "and userland Application Binary Interfaces (ABIs). Kernel platform support " @@ -7081,7 +7129,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3272 +#: documentation/content/en/articles/committers-guide/_index.adoc:3294 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 " @@ -7090,7 +7138,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3277 +#: documentation/content/en/articles/committers-guide/_index.adoc:3299 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 " @@ -7101,20 +7149,20 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3279 +#: documentation/content/en/articles/committers-guide/_index.adoc:3301 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:3280 +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:3302 #, no-wrap msgid "Tier 1: Fully-Supported Architectures" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3285 +#: documentation/content/en/articles/committers-guide/_index.adoc:3307 msgid "" "Tier 1 platforms are the most mature FreeBSD platforms. They are supported " "by the security officer, release engineering, and Ports Management Team. " @@ -7124,42 +7172,42 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3287 +#: documentation/content/en/articles/committers-guide/_index.adoc:3309 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:3289 +#: documentation/content/en/articles/committers-guide/_index.adoc:3311 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:3290 +#: documentation/content/en/articles/committers-guide/_index.adoc:3312 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:3291 +#: documentation/content/en/articles/committers-guide/_index.adoc:3313 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:3292 +#: documentation/content/en/articles/committers-guide/_index.adoc:3314 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:3293 +#: documentation/content/en/articles/committers-guide/_index.adoc:3315 msgid "" "Changes to userland ABIs will generally include compatibility shims to " "ensure correct operation of binaries compiled against any stable branch " @@ -7169,7 +7217,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3294 +#: documentation/content/en/articles/committers-guide/_index.adoc:3316 msgid "" "Changes to certain portions of the kernel ABI will include compatibility " "shims to ensure correct operation of kernel modules compiled against the " @@ -7178,7 +7226,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3295 +#: documentation/content/en/articles/committers-guide/_index.adoc:3317 msgid "" "Official binary packages for third party software will be provided by the " "ports team. For embedded architectures, these packages may be cross-built " @@ -7186,21 +7234,21 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3296 +#: documentation/content/en/articles/committers-guide/_index.adoc:3318 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:3297 +#: documentation/content/en/articles/committers-guide/_index.adoc:3319 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:3298 +#: documentation/content/en/articles/committers-guide/_index.adoc:3320 msgid "" "Features and compatibility shims used by binaries compiled against older " "stable branches may be removed in newer major versions. Such removals will " @@ -7208,19 +7256,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3299 +#: documentation/content/en/articles/committers-guide/_index.adoc:3321 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:3300 +#: documentation/content/en/articles/committers-guide/_index.adoc:3322 msgid "Tier 1 platforms will be included in the source tree." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3301 +#: documentation/content/en/articles/committers-guide/_index.adoc:3323 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 " @@ -7228,14 +7276,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3303 +#: documentation/content/en/articles/committers-guide/_index.adoc:3325 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:3305 +#: documentation/content/en/articles/committers-guide/_index.adoc:3327 msgid "" "Build and test automation support either in the FreeBSD.org cluster or some " "other location easily available for all developers. Embedded platforms may " @@ -7244,41 +7292,41 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3306 -#: documentation/content/en/articles/committers-guide/_index.adoc:3336 +#: documentation/content/en/articles/committers-guide/_index.adoc:3328 +#: documentation/content/en/articles/committers-guide/_index.adoc:3358 msgid "Inclusion in the `make universe` and `make tinderbox` targets." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3307 +#: documentation/content/en/articles/committers-guide/_index.adoc:3329 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:3309 +#: documentation/content/en/articles/committers-guide/_index.adoc:3331 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:3311 +#: documentation/content/en/articles/committers-guide/_index.adoc:3333 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:3312 +#: documentation/content/en/articles/committers-guide/_index.adoc:3334 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:3313 +#: documentation/content/en/articles/committers-guide/_index.adoc:3335 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 " @@ -7287,7 +7335,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3314 +#: documentation/content/en/articles/committers-guide/_index.adoc:3336 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 " @@ -7295,21 +7343,21 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3315 +#: documentation/content/en/articles/committers-guide/_index.adoc:3337 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 " "modified to preserve functionality of existing kernel modules." msgstr "" -#. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3316 +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:3338 #, no-wrap msgid "Tier 2: Developmental and Niche Architectures" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3320 +#: documentation/content/en/articles/committers-guide/_index.adoc:3342 msgid "" "Tier 2 platforms are functional, but less mature FreeBSD platforms. They " "are not supported by the security officer, release engineering, and Ports " @@ -7317,7 +7365,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3324 +#: documentation/content/en/articles/committers-guide/_index.adoc:3346 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 " @@ -7327,14 +7375,14 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3326 +#: documentation/content/en/articles/committers-guide/_index.adoc:3348 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:3328 +#: documentation/content/en/articles/committers-guide/_index.adoc:3350 msgid "" "The ports infrastructure should include basic support for Tier 2 " "architectures sufficient to support building ports and packages. This " @@ -7343,19 +7391,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3329 +#: documentation/content/en/articles/committers-guide/_index.adoc:3351 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:3330 +#: documentation/content/en/articles/committers-guide/_index.adoc:3352 msgid "Tier 2 platforms will be included in the source tree." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3331 +#: documentation/content/en/articles/committers-guide/_index.adoc:3353 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 " @@ -7363,41 +7411,41 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3332 +#: documentation/content/en/articles/committers-guide/_index.adoc:3354 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:3334 +#: documentation/content/en/articles/committers-guide/_index.adoc:3356 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:3338 +#: documentation/content/en/articles/committers-guide/_index.adoc:3360 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:3340 +#: documentation/content/en/articles/committers-guide/_index.adoc:3362 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:3341 +#: documentation/content/en/articles/committers-guide/_index.adoc:3363 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:3342 +#: documentation/content/en/articles/committers-guide/_index.adoc:3364 msgid "" "While changes are permitted to break the userland ABI, the ABI should not be " "broken gratuitously. Significant userland ABI changes should be restricted " @@ -7405,20 +7453,20 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3343 +#: documentation/content/en/articles/committers-guide/_index.adoc:3365 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:3344 +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:3366 #, no-wrap msgid "Tier 3: Experimental Architectures" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3348 +#: documentation/content/en/articles/committers-guide/_index.adoc:3370 msgid "" "Tier 3 platforms have at least partial FreeBSD support. They are _not_ " "supported by the security officer, release engineering, and Ports Management " @@ -7426,7 +7474,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3351 +#: documentation/content/en/articles/committers-guide/_index.adoc:3373 msgid "" "Tier 3 platforms are architectures in the early stages of development, for " "non-mainstream hardware platforms, or which are considered legacy systems " @@ -7435,7 +7483,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3354 +#: documentation/content/en/articles/committers-guide/_index.adoc:3376 msgid "" "The FreeBSD Project provides no guarantees to consumers of Tier 3 platforms " "and is not committed to maintaining resources to support development. Tier " @@ -7443,21 +7491,21 @@ msgid "" "considered stable." msgstr "" -#. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3355 +#. type: Title ==== +#: documentation/content/en/articles/committers-guide/_index.adoc:3377 #, no-wrap msgid "Unsupported Architectures" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3359 +#: documentation/content/en/articles/committers-guide/_index.adoc:3381 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:3362 +#: documentation/content/en/articles/committers-guide/_index.adoc:3384 msgid "" "After a platform transitions to unsupported, all support for the platform is " "removed from the source, ports and documentation trees. Note that ports " @@ -7466,13 +7514,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3363 +#: documentation/content/en/articles/committers-guide/_index.adoc:3385 #, no-wrap msgid "Policy on Changing the Tier of an Architecture" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3367 +#: documentation/content/en/articles/committers-guide/_index.adoc:3389 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 " @@ -7482,25 +7530,25 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3369 +#: documentation/content/en/articles/committers-guide/_index.adoc:3391 #, no-wrap msgid "Ports Specific FAQ" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3372 +#: documentation/content/en/articles/committers-guide/_index.adoc:3394 #, no-wrap msgid "Adding a New Port" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3375 +#: documentation/content/en/articles/committers-guide/_index.adoc:3397 #, no-wrap msgid "How do I add a new port?" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3379 +#: documentation/content/en/articles/committers-guide/_index.adoc:3401 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 " @@ -7510,20 +7558,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3383 +#: documentation/content/en/articles/committers-guide/_index.adoc:3405 #, no-wrap msgid "\tSUBDIR += newport\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3386 +#: documentation/content/en/articles/committers-guide/_index.adoc:3408 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:3391 +#: documentation/content/en/articles/committers-guide/_index.adoc:3413 #, no-wrap msgid "" "% git add category/Makefile category/newport\n" @@ -7532,7 +7580,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3395 +#: documentation/content/en/articles/committers-guide/_index.adoc:3417 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 " @@ -7540,35 +7588,35 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3398 +#: documentation/content/en/articles/committers-guide/_index.adoc:3420 #, 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:3401 +#: documentation/content/en/articles/committers-guide/_index.adoc:3423 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:3404 +#: documentation/content/en/articles/committers-guide/_index.adoc:3426 msgid "" "The extref:{porters-handbook}testing[Porters Handbook's Testing Chapter] " "contains more detailed instructions. See the extref:{porters-handbook}" "testing[Portclippy / Portfmt, testing-portclippy] and the extref:{porters-" -"handbook}testing[Poudriere, testing-poudriere] sections." +"handbook}testing[poudriere, testing-poudriere] sections." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3406 +#: documentation/content/en/articles/committers-guide/_index.adoc:3428 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:3408 +#: documentation/content/en/articles/committers-guide/_index.adoc:3430 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 " @@ -7576,22 +7624,22 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3411 +#: documentation/content/en/articles/committers-guide/_index.adoc:3433 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:3415 +#: documentation/content/en/articles/committers-guide/_index.adoc:3437 msgid "" -"If for some reason using extref:{porters-handbook}testing[Poudriere, testing-" +"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 " "includes this sequence:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3425 +#: documentation/content/en/articles/committers-guide/_index.adoc:3447 #, no-wrap msgid "" "# make install\n" @@ -7604,85 +7652,85 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3428 +#: documentation/content/en/articles/committers-guide/_index.adoc:3450 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:3431 +#: documentation/content/en/articles/committers-guide/_index.adoc:3453 #, no-wrap msgid "Removing an Existing Port" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3434 +#: documentation/content/en/articles/committers-guide/_index.adoc:3456 #, no-wrap msgid "How do I remove an existing port?" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3437 +#: documentation/content/en/articles/committers-guide/_index.adoc:3459 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:3439 +#: documentation/content/en/articles/committers-guide/_index.adoc:3461 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:3440 +#: documentation/content/en/articles/committers-guide/_index.adoc:3462 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:3441 +#: documentation/content/en/articles/committers-guide/_index.adoc:3463 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:3445 +#: documentation/content/en/articles/committers-guide/_index.adoc:3467 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:3448 +#: documentation/content/en/articles/committers-guide/_index.adoc:3470 msgid "Then, remove the port:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3452 +#: documentation/content/en/articles/committers-guide/_index.adoc:3474 msgid "Remove the port's files and directory with `git rm`." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3453 +#: documentation/content/en/articles/committers-guide/_index.adoc:3475 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:3454 -#: documentation/content/en/articles/committers-guide/_index.adoc:3469 +#: documentation/content/en/articles/committers-guide/_index.adoc:3476 +#: documentation/content/en/articles/committers-guide/_index.adoc:3491 msgid "Add an entry to [.filename]#ports/MOVED#." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3455 +#: documentation/content/en/articles/committers-guide/_index.adoc:3477 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:3460 +#: documentation/content/en/articles/committers-guide/_index.adoc:3482 msgid "" "Alternatively, you can use the rmport script, from [.filename]#ports/Tools/" "scripts#. This script was written by {vd}. When sending questions about " @@ -7691,13 +7739,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3462 +#: documentation/content/en/articles/committers-guide/_index.adoc:3484 #, 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:3467 +#: documentation/content/en/articles/committers-guide/_index.adoc:3489 msgid "" "Perform a thorough check of the ports collection for any dependencies on the " "old port location/name, and update them. Running `grep` on [." @@ -7707,14 +7755,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3468 +#: documentation/content/en/articles/committers-guide/_index.adoc:3490 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:3470 +#: documentation/content/en/articles/committers-guide/_index.adoc:3492 msgid "" "Search for entries in xml files inside [.filename]#ports/security/vuxml# and " "adjust them accordingly. In particular, check for previous packages with the " @@ -7722,51 +7770,51 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3471 +#: documentation/content/en/articles/committers-guide/_index.adoc:3493 msgid "Move the port with `git mv`." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3472 -#: documentation/content/en/articles/committers-guide/_index.adoc:3483 +#: documentation/content/en/articles/committers-guide/_index.adoc:3494 +#: documentation/content/en/articles/committers-guide/_index.adoc:3505 msgid "Commit the changes." msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3475 +#: documentation/content/en/articles/committers-guide/_index.adoc:3497 #, 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:3480 +#: documentation/content/en/articles/committers-guide/_index.adoc:3502 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:3481 +#: documentation/content/en/articles/committers-guide/_index.adoc:3503 msgid "Add the new port to the [.filename]#new-cat/Makefile#." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3482 +#: documentation/content/en/articles/committers-guide/_index.adoc:3504 msgid "Change stuff in [.filename]#new-cat/new-port#." msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3486 +#: documentation/content/en/articles/committers-guide/_index.adoc:3508 #, no-wrap msgid "Ports Freeze" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3489 +#: documentation/content/en/articles/committers-guide/_index.adoc:3511 #, no-wrap msgid "What is a “ports freeze”?" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3496 +#: documentation/content/en/articles/committers-guide/_index.adoc:3518 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 " @@ -7777,39 +7825,39 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3498 +#: documentation/content/en/articles/committers-guide/_index.adoc:3520 msgid "" "For more information on how to merge commits to the quarterly branch, see " "<<ports-qa-misc-request-mfh>>." msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3500 +#: documentation/content/en/articles/committers-guide/_index.adoc:3522 #, no-wrap msgid "Quarterly Branches" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3503 +#: documentation/content/en/articles/committers-guide/_index.adoc:3525 #, 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:3506 +#: documentation/content/en/articles/committers-guide/_index.adoc:3528 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:3508 +#: documentation/content/en/articles/committers-guide/_index.adoc:3530 #, 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:3511 +#: documentation/content/en/articles/committers-guide/_index.adoc:3533 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 " @@ -7817,7 +7865,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3517 +#: documentation/content/en/articles/committers-guide/_index.adoc:3539 #, no-wrap msgid "" "% git checkout 2021Q2\n" @@ -7827,7 +7875,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3521 +#: documentation/content/en/articles/committers-guide/_index.adoc:3543 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` " @@ -7835,19 +7883,19 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3523 +#: documentation/content/en/articles/committers-guide/_index.adoc:3545 #, no-wrap msgid "Creating a New Category" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3526 +#: documentation/content/en/articles/committers-guide/_index.adoc:3548 #, no-wrap msgid "What is the procedure for creating a new category?" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3531 +#: documentation/content/en/articles/committers-guide/_index.adoc:3553 msgid "" "Please see extref:{porters-handbook}[Proposing a New Category, proposing-" "categories] in the Porter's Handbook. Once that procedure has been followed " @@ -7856,42 +7904,42 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3535 +#: documentation/content/en/articles/committers-guide/_index.adoc:3557 msgid "Perform any needed moves. (This only applies to physical categories.)" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3536 +#: documentation/content/en/articles/committers-guide/_index.adoc:3558 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:3537 +#: documentation/content/en/articles/committers-guide/_index.adoc:3559 msgid "Assign the PR back to you." msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3540 +#: documentation/content/en/articles/committers-guide/_index.adoc:3562 #, 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:3545 +#: documentation/content/en/articles/committers-guide/_index.adoc:3567 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:3547 +#: documentation/content/en/articles/committers-guide/_index.adoc:3569 msgid "To do this, you will need to:" msgstr "" #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3551 +#: documentation/content/en/articles/committers-guide/_index.adoc:3573 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 " @@ -7899,7 +7947,7 @@ msgid "" msgstr "" #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3552 +#: documentation/content/en/articles/committers-guide/_index.adoc:3574 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 " @@ -7908,14 +7956,14 @@ msgid "" msgstr "" #. type: delimited block = 6 -#: documentation/content/en/articles/committers-guide/_index.adoc:3553 +#: documentation/content/en/articles/committers-guide/_index.adoc:3575 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:3556 +#: documentation/content/en/articles/committers-guide/_index.adoc:3578 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 " @@ -7925,7 +7973,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3558 +#: documentation/content/en/articles/committers-guide/_index.adoc:3580 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 " @@ -7935,7 +7983,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3559 +#: documentation/content/en/articles/committers-guide/_index.adoc:3581 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 " @@ -7947,7 +7995,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3560 +#: documentation/content/en/articles/committers-guide/_index.adoc:3582 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 [." @@ -7955,25 +8003,25 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3561 +#: documentation/content/en/articles/committers-guide/_index.adoc:3583 msgid "Add appropriate entries to [.filename]#ports/MOVED#." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3562 +#: documentation/content/en/articles/committers-guide/_index.adoc:3584 msgid "Update the documentation by modifying:" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3563 -#: documentation/content/en/articles/committers-guide/_index.adoc:3572 +#: documentation/content/en/articles/committers-guide/_index.adoc:3585 +#: documentation/content/en/articles/committers-guide/_index.adoc:3594 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:3565 +#: documentation/content/en/articles/committers-guide/_index.adoc:3587 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 " @@ -7981,38 +8029,38 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3567 +#: documentation/content/en/articles/committers-guide/_index.adoc:3589 #, 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:3570 +#: documentation/content/en/articles/committers-guide/_index.adoc:3592 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:3574 -#: documentation/content/en/articles/committers-guide/_index.adoc:3668 +#: documentation/content/en/articles/committers-guide/_index.adoc:3596 +#: documentation/content/en/articles/committers-guide/_index.adoc:3690 #, no-wrap msgid "Miscellaneous Questions" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3577 +#: documentation/content/en/articles/committers-guide/_index.adoc:3599 #, 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:3580 +#: documentation/content/en/articles/committers-guide/_index.adoc:3602 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:3582 +#: documentation/content/en/articles/committers-guide/_index.adoc:3604 msgid "" "Most infrastructure changes to a port (that is, modernizing, but not " "changing the functionality). For example, the blanket covers converting to " @@ -8021,19 +8069,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3583 +#: documentation/content/en/articles/committers-guide/_index.adoc:3605 msgid "Trivial and _tested_ build and runtime fixes." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3584 +#: documentation/content/en/articles/committers-guide/_index.adoc:3606 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:3589 +#: documentation/content/en/articles/committers-guide/_index.adoc:3611 msgid "" "Exceptions to this are anything maintained by the {portmgr}, or the " "{security-officer}. No unauthorized commits may ever be made to ports " @@ -8041,20 +8089,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3592 +#: documentation/content/en/articles/committers-guide/_index.adoc:3614 #, 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:3596 +#: documentation/content/en/articles/committers-guide/_index.adoc:3618 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:3598 +#: documentation/content/en/articles/committers-guide/_index.adoc:3620 msgid "" "Reports for all the package builds (official, experimental, and non-" "regression) are aggregated at link:pkg-status.FreeBSD.org[pkg-status.FreeBSD." @@ -8062,26 +8110,26 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3600 +#: documentation/content/en/articles/committers-guide/_index.adoc:3622 #, 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:3603 +#: documentation/content/en/articles/committers-guide/_index.adoc:3625 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:3605 +#: documentation/content/en/articles/committers-guide/_index.adoc:3627 #, 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:3609 +#: documentation/content/en/articles/committers-guide/_index.adoc:3631 msgid "" "Any file directly under [.filename]#ports/#, or any file under a " "subdirectory that starts with an uppercase letter ([.filename]#Mk/#, [." @@ -8091,13 +8139,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3611 +#: documentation/content/en/articles/committers-guide/_index.adoc:3633 #, 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:3615 +#: documentation/content/en/articles/committers-guide/_index.adoc:3637 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 " @@ -8110,20 +8158,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:3617 +#: documentation/content/en/articles/committers-guide/_index.adoc:3639 #, 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:3621 +#: documentation/content/en/articles/committers-guide/_index.adoc:3643 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:3623 +#: documentation/content/en/articles/committers-guide/_index.adoc:3645 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 " @@ -8131,22 +8179,22 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3627 +#: documentation/content/en/articles/committers-guide/_index.adoc:3649 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:3628 +#: documentation/content/en/articles/committers-guide/_index.adoc:3650 msgid "Select the product your patch is about." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3629 +#: documentation/content/en/articles/committers-guide/_index.adoc:3651 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:3630 +#: documentation/content/en/articles/committers-guide/_index.adoc:3652 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 " @@ -8154,56 +8202,56 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3631 +#: documentation/content/en/articles/committers-guide/_index.adoc:3653 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:3632 +#: documentation/content/en/articles/committers-guide/_index.adoc:3654 msgid "Submit. Wait for the build to run." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3633 +#: documentation/content/en/articles/committers-guide/_index.adoc:3655 msgid "{portmgr} will reply with a possible fallout." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3634 +#: documentation/content/en/articles/committers-guide/_index.adoc:3656 msgid "Depending on the fallout:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3635 +#: documentation/content/en/articles/committers-guide/_index.adoc:3657 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:3636 +#: documentation/content/en/articles/committers-guide/_index.adoc:3658 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:3637 +#: documentation/content/en/articles/committers-guide/_index.adoc:3659 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:3640 +#: documentation/content/en/articles/committers-guide/_index.adoc:3662 #, no-wrap msgid "Issues Specific to Developers Who Are Not Committers" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3645 +#: documentation/content/en/articles/committers-guide/_index.adoc:3667 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 " @@ -8212,17 +8260,17 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3647 +#: documentation/content/en/articles/committers-guide/_index.adoc:3669 msgid "<<admin>>" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3648 +#: documentation/content/en/articles/committers-guide/_index.adoc:3670 msgid "<<conventions-everyone>>" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3652 +#: documentation/content/en/articles/committers-guide/_index.adoc:3674 msgid "" "Get your mentor to add you to the \"Additional Contributors\" ([." "filename]#doc/shared/contrib-additional.adoc#), if you are not already " @@ -8230,47 +8278,47 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3654 +#: documentation/content/en/articles/committers-guide/_index.adoc:3676 msgid "<<developer.relations>>" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3655 +#: documentation/content/en/articles/committers-guide/_index.adoc:3677 msgid "<<ssh.guide>>" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3656 +#: documentation/content/en/articles/committers-guide/_index.adoc:3678 msgid "<<rules>>" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:3658 +#: documentation/content/en/articles/committers-guide/_index.adoc:3680 #, no-wrap msgid "Information About Google Analytics" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3661 +#: documentation/content/en/articles/committers-guide/_index.adoc:3683 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:3665 +#: documentation/content/en/articles/committers-guide/_index.adoc:3687 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:3670 +#: documentation/content/en/articles/committers-guide/_index.adoc:3692 #, 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:3674 +#: documentation/content/en/articles/committers-guide/_index.adoc:3696 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 " @@ -8279,45 +8327,45 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3675 +#: documentation/content/en/articles/committers-guide/_index.adoc:3697 #, no-wrap msgid "Where are the mailing list archives stored?" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3678 +#: documentation/content/en/articles/committers-guide/_index.adoc:3700 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:3679 +#: documentation/content/en/articles/committers-guide/_index.adoc:3701 #, 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:3682 +#: documentation/content/en/articles/committers-guide/_index.adoc:3704 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:3684 +#: documentation/content/en/articles/committers-guide/_index.adoc:3706 #, no-wrap msgid "Benefits and Perks for FreeBSD Committers" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3687 +#: documentation/content/en/articles/committers-guide/_index.adoc:3709 #, no-wrap msgid "Recognition" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3691 +#: documentation/content/en/articles/committers-guide/_index.adoc:3713 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 " @@ -8325,33 +8373,33 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3693 +#: documentation/content/en/articles/committers-guide/_index.adoc:3715 #, no-wrap msgid "FreeBSD Mall" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3696 +#: documentation/content/en/articles/committers-guide/_index.adoc:3718 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:3698 +#: documentation/content/en/articles/committers-guide/_index.adoc:3720 #, no-wrap msgid "`Gandi.net`" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3701 +#: documentation/content/en/articles/committers-guide/_index.adoc:3723 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:3705 +#: documentation/content/en/articles/committers-guide/_index.adoc:3727 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 " @@ -8361,20 +8409,20 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3707 +#: documentation/content/en/articles/committers-guide/_index.adoc:3729 #, no-wrap msgid "`rsync.net`" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3710 +#: documentation/content/en/articles/committers-guide/_index.adoc:3732 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:3712 +#: documentation/content/en/articles/committers-guide/_index.adoc:3734 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." @@ -8382,13 +8430,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:3714 +#: 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:3717 +#: 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 " @@ -8397,7 +8445,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:3719 +#: 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." @@ -8408,7 +8456,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:3723 +#: 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 " |