git: 0ffaa4d6d4 - main - doc: Update source files (en .po), for translations
Edson Brandi <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by ebrandi: URL: https://cgit.FreeBSD.org/doc/commit/?id=0ffaa4d6d4aef80f4ee43798c05e0d04fac54862 commit 0ffaa4d6d4aef80f4ee43798c05e0d04fac54862 Author: Edson Brandi <[email protected]> AuthorDate: 2025-08-17 19:57:09 +0000 Commit: Edson Brandi <[email protected]> CommitDate: 2025-08-17 19:57:09 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 4746 ++++---- .../content/en/articles/pgpkeys/_index.po | 86 +- .../en/books/fdp-primer/manual-pages/_index.po | 11 +- .../en/books/fdp-primer/structure/_index.po | 332 +- .../en/books/fdp-primer/translations/_index.po | 6 +- .../content/en/books/handbook/basics/_index.po | 4 +- .../content/en/books/handbook/bsdinstall/_index.po | 633 +- .../content/en/books/handbook/desktop/_index.po | 102 +- .../content/en/books/handbook/dtrace/_index.po | 119 +- .../content/en/books/handbook/glossary.po | 937 +- .../content/en/books/handbook/jails/_index.po | 6 +- .../content/en/books/handbook/mirrors/_index.po | 415 +- .../content/en/books/handbook/multimedia/_index.po | 4 +- .../content/en/books/handbook/network/_index.po | 306 +- .../content/en/books/handbook/ports/_index.po | 663 +- .../en/books/handbook/virtualization/_index.po | 8 +- .../content/en/books/handbook/wayland/_index.po | 282 +- .../content/en/books/handbook/x11/_index.po | 1297 ++- .../en/books/porters-handbook/makefiles/_index.po | 26 +- .../porters-handbook/porting-samplem/_index.po | 239 +- .../en/books/porters-handbook/security/_index.po | 62 +- .../en/books/porters-handbook/testing/_index.po | 320 +- .../en/books/porters-handbook/versions/_index.po | 11598 ++++++++++--------- 23 files changed, 11737 insertions(+), 10465 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index 9585f882ca..c1f608dfab 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: 2025-06-29 21:20+0100\n" +"POT-Creation-Date: 2025-08-17 20:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -421,43 +421,38 @@ msgid "https://bugs.freebsd.org/bugzilla[Bugzilla]" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:203 -msgid "https://ci.freebsd.org[Jenkins]" -msgstr "" - -#. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:205 +#: documentation/content/en/articles/committers-guide/_index.adoc:204 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:209 +#: documentation/content/en/articles/committers-guide/_index.adoc:208 #, no-wrap msgid "% ssh kpasswd.freebsd.org\n" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:214 +#: documentation/content/en/articles/committers-guide/_index.adoc:213 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:217 +#: documentation/content/en/articles/committers-guide/_index.adoc:216 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:221 +#: documentation/content/en/articles/committers-guide/_index.adoc:220 #, no-wrap msgid "% kpasswd\n" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:227 +#: documentation/content/en/articles/committers-guide/_index.adoc:226 msgid "" "Unless the Kerberos-authenticated services of the FreeBSD.org cluster have " "been used previously, `Client unknown` will be shown. This error means that " @@ -466,13 +461,13 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:230 +#: documentation/content/en/articles/committers-guide/_index.adoc:229 #, no-wrap msgid "Commit Bit Types" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:236 +#: documentation/content/en/articles/committers-guide/_index.adoc:235 msgid "" "The FreeBSD repository has a number of components which, when combined, " "support the basic operating system source, documentation, third party " @@ -487,79 +482,79 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:242 +#: documentation/content/en/articles/committers-guide/_index.adoc:241 #, no-wrap msgid "__Committer Type__" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:243 +#: documentation/content/en/articles/committers-guide/_index.adoc:242 #, no-wrap msgid "__Responsible__" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:245 +#: documentation/content/en/articles/committers-guide/_index.adoc:244 #, no-wrap msgid "__Tree Components__" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:246 +#: documentation/content/en/articles/committers-guide/_index.adoc:245 #, no-wrap msgid "src" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:247 +#: documentation/content/en/articles/committers-guide/_index.adoc:246 #, no-wrap msgid "srcmgr@" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:249 +#: documentation/content/en/articles/committers-guide/_index.adoc:248 #, no-wrap msgid "src/" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:250 +#: documentation/content/en/articles/committers-guide/_index.adoc:249 #, no-wrap msgid "doc" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:251 +#: documentation/content/en/articles/committers-guide/_index.adoc:250 #, no-wrap msgid "doceng@" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:253 +#: documentation/content/en/articles/committers-guide/_index.adoc:252 #, no-wrap msgid "doc/, ports/, src/ documentation" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:254 +#: documentation/content/en/articles/committers-guide/_index.adoc:253 #, no-wrap msgid "ports" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:255 +#: documentation/content/en/articles/committers-guide/_index.adoc:254 #, no-wrap msgid "portmgr@" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:256 +#: documentation/content/en/articles/committers-guide/_index.adoc:255 #, no-wrap msgid "ports/" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:261 +#: documentation/content/en/articles/committers-guide/_index.adoc:260 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, " @@ -572,7 +567,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:263 +#: documentation/content/en/articles/committers-guide/_index.adoc:262 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 " @@ -580,13 +575,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:264 +#: documentation/content/en/articles/committers-guide/_index.adoc:263 #, no-wrap msgid "Policy for Committer Activity in Other Trees" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:267 +#: documentation/content/en/articles/committers-guide/_index.adoc:266 msgid "" "All committers may modify [.filename]#src/share/misc/committers-*.dot#, " "[.filename]#src/usr.bin/calendar/calendars/calendar.freebsd#, and " @@ -594,7 +589,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:268 +#: documentation/content/en/articles/committers-guide/_index.adoc:267 msgid "" "doc committers may commit documentation changes to [.filename]#src# files, " "such as manual pages, READMEs, fortune databases, calendar files, and " @@ -603,7 +598,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:270 +#: documentation/content/en/articles/committers-guide/_index.adoc:269 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 " @@ -611,7 +606,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:271 +#: documentation/content/en/articles/committers-guide/_index.adoc:270 msgid "" "Committers can acquire an additional bit by the usual process of finding a " "mentor who will propose them to srcmgr, doceng, or portmgr, as appropriate. " @@ -621,13 +616,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:273 +#: documentation/content/en/articles/committers-guide/_index.adoc:272 #, no-wrap msgid "Documentation Implicit (Blanket) Approval" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:277 +#: documentation/content/en/articles/committers-guide/_index.adoc:276 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 " @@ -636,87 +631,87 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:279 +#: documentation/content/en/articles/committers-guide/_index.adoc:278 msgid "Blanket approval applies to these types of fixes:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:281 +#: documentation/content/en/articles/committers-guide/_index.adoc:280 msgid "Typos" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:282 +#: documentation/content/en/articles/committers-guide/_index.adoc:281 msgid "Trivial fixes" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:284 +#: documentation/content/en/articles/committers-guide/_index.adoc:283 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:287 +#: documentation/content/en/articles/committers-guide/_index.adoc:286 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:289 +#: documentation/content/en/articles/committers-guide/_index.adoc:288 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:291 +#: documentation/content/en/articles/committers-guide/_index.adoc:290 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:292 +#: documentation/content/en/articles/committers-guide/_index.adoc:291 msgid "Changes in [.filename]#doc/shared/contrib-additional.adoc#" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:294 +#: documentation/content/en/articles/committers-guide/_index.adoc:293 msgid "" "extref:{contributors}[Additional FreeBSD Contributors, contrib-additional] " "maintenance." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:295 +#: documentation/content/en/articles/committers-guide/_index.adoc:294 msgid "All link:#commit-steps[Steps for New Committers], doc related" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:296 +#: documentation/content/en/articles/committers-guide/_index.adoc:295 msgid "Security advisories; Errata Notices; Releases;" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:298 +#: documentation/content/en/articles/committers-guide/_index.adoc:297 msgid "Used by {security-officer} and {re}." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:299 +#: documentation/content/en/articles/committers-guide/_index.adoc:298 msgid "Changes in [.filename]#website/content/en/donations/donors.adoc#" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:301 +#: documentation/content/en/articles/committers-guide/_index.adoc:300 msgid "Used by {donations}." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:303 +#: documentation/content/en/articles/committers-guide/_index.adoc:302 msgid "" "Before any commit, a build test is necessary; see the 'Overview' and 'The " "FreeBSD Documentation Build Process' sections of the extref:{fdp-primer}" @@ -724,19 +719,19 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:305 +#: documentation/content/en/articles/committers-guide/_index.adoc:304 #, no-wrap msgid "Git Primer" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:308 +#: documentation/content/en/articles/committers-guide/_index.adoc:307 #, no-wrap msgid "Git basics" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:315 +#: documentation/content/en/articles/committers-guide/_index.adoc:314 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 " @@ -751,33 +746,33 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:317 +#: documentation/content/en/articles/committers-guide/_index.adoc:316 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:319 +#: documentation/content/en/articles/committers-guide/_index.adoc:318 #, no-wrap msgid "Git Mini Primer" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:322 +#: documentation/content/en/articles/committers-guide/_index.adoc:321 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:323 +#: documentation/content/en/articles/committers-guide/_index.adoc:322 #, no-wrap msgid "Scope" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:329 +#: documentation/content/en/articles/committers-guide/_index.adoc:328 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, " @@ -789,7 +784,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:333 +#: documentation/content/en/articles/committers-guide/_index.adoc:332 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 " @@ -798,49 +793,49 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:335 +#: documentation/content/en/articles/committers-guide/_index.adoc:334 #, no-wrap msgid "Getting Started For Developers" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:338 +#: documentation/content/en/articles/committers-guide/_index.adoc:337 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:340 +#: documentation/content/en/articles/committers-guide/_index.adoc:339 #, no-wrap msgid "Daily use" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:345 +#: documentation/content/en/articles/committers-guide/_index.adoc:344 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:348 +#: documentation/content/en/articles/committers-guide/_index.adoc:347 msgid "Clone the repository:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:352 +#: documentation/content/en/articles/committers-guide/_index.adoc:351 #, 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:355 +#: documentation/content/en/articles/committers-guide/_index.adoc:354 msgid "Then you should have the official mirrors as your remote:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:361 +#: documentation/content/en/articles/committers-guide/_index.adoc:360 #, no-wrap msgid "" "% git remote -v\n" @@ -849,12 +844,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:364 +#: documentation/content/en/articles/committers-guide/_index.adoc:363 msgid "Configure the FreeBSD committer data:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:367 +#: documentation/content/en/articles/committers-guide/_index.adoc:366 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 " @@ -863,7 +858,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:374 +#: documentation/content/en/articles/committers-guide/_index.adoc:373 #, no-wrap msgid "" "% gen-gitconfig.sh\n" @@ -873,25 +868,25 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:377 +#: documentation/content/en/articles/committers-guide/_index.adoc:376 msgid "Set the push URL:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:381 +#: documentation/content/en/articles/committers-guide/_index.adoc:380 #, no-wrap msgid "% git remote set-url --push freebsd [email protected]:${repo}.git\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:384 +#: documentation/content/en/articles/committers-guide/_index.adoc:383 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:390 +#: documentation/content/en/articles/committers-guide/_index.adoc:389 #, no-wrap msgid "" "% git remote -v\n" @@ -900,24 +895,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:393 +#: documentation/content/en/articles/committers-guide/_index.adoc:392 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:395 +#: documentation/content/en/articles/committers-guide/_index.adoc:394 msgid "Install commit message template hook:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:397 +#: documentation/content/en/articles/committers-guide/_index.adoc:396 msgid "For doc repository:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:402 +#: documentation/content/en/articles/committers-guide/_index.adoc:401 #, no-wrap msgid "" "% cd .git/hooks\n" @@ -925,23 +920,23 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:405 +#: documentation/content/en/articles/committers-guide/_index.adoc:404 msgid "For ports repository:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:409 +#: documentation/content/en/articles/committers-guide/_index.adoc:408 #, no-wrap msgid "% git config --add core.hooksPath .hooks\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:412 +#: documentation/content/en/articles/committers-guide/_index.adoc:411 msgid "For src repository:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:417 +#: documentation/content/en/articles/committers-guide/_index.adoc:416 #, no-wrap msgid "" "% cd .git/hooks\n" @@ -949,27 +944,27 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:420 +#: documentation/content/en/articles/committers-guide/_index.adoc:419 #, no-wrap msgid "\"admin\" branch" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:423 +#: documentation/content/en/articles/committers-guide/_index.adoc:422 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:425 +#: documentation/content/en/articles/committers-guide/_index.adoc:424 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:431 +#: documentation/content/en/articles/committers-guide/_index.adoc:430 #, no-wrap msgid "" "% git config --add remote.freebsd.fetch '+refs/internal/*:refs/internal/*'\n" @@ -978,42 +973,42 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:433 +#: documentation/content/en/articles/committers-guide/_index.adoc:432 msgid "Alternatively, you can add a worktree for the `admin` branch:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:437 +#: documentation/content/en/articles/committers-guide/_index.adoc:436 #, 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:441 +#: documentation/content/en/articles/committers-guide/_index.adoc:440 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:443 +#: documentation/content/en/articles/committers-guide/_index.adoc:442 msgid "For pushing, specify the full refspec:" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:447 +#: documentation/content/en/articles/committers-guide/_index.adoc:446 #, no-wrap msgid "git push freebsd HEAD:refs/internal/admin\n" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:449 +#: documentation/content/en/articles/committers-guide/_index.adoc:448 #, no-wrap msgid "Keeping Current With The FreeBSD src Tree" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:456 +#: documentation/content/en/articles/committers-guide/_index.adoc:455 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 " @@ -1022,75 +1017,75 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:457 +#: documentation/content/en/articles/committers-guide/_index.adoc:456 #, no-wrap msgid "Branch Names" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:459 +#: documentation/content/en/articles/committers-guide/_index.adoc:458 msgid "FreeBSD-CURRENT uses the `main` branch." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:461 +#: documentation/content/en/articles/committers-guide/_index.adoc:460 msgid "`main` is the default branch." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:463 +#: documentation/content/en/articles/committers-guide/_index.adoc:462 msgid "For FreeBSD-STABLE, branch names include `stable/12` and `stable/13`." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:465 +#: documentation/content/en/articles/committers-guide/_index.adoc:464 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:467 +#: documentation/content/en/articles/committers-guide/_index.adoc:466 msgid "https://www.freebsd.org/releng/[] shows:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:469 +#: documentation/content/en/articles/committers-guide/_index.adoc:468 msgid "`main` and `stable/⋯` branches open" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:470 +#: documentation/content/en/articles/committers-guide/_index.adoc:469 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:472 +#: documentation/content/en/articles/committers-guide/_index.adoc:471 msgid "Examples:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:474 +#: documentation/content/en/articles/committers-guide/_index.adoc:473 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:475 +#: documentation/content/en/articles/committers-guide/_index.adoc:474 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:476 +#: documentation/content/en/articles/committers-guide/_index.adoc:475 #, no-wrap msgid "Repositories" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:479 +#: documentation/content/en/articles/committers-guide/_index.adoc:478 msgid "" "Please see the crossref:committers-guide[admin,Administrative Details] for " "the latest information on where to get FreeBSD sources. $URL below can be " @@ -1098,7 +1093,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:482 +#: documentation/content/en/articles/committers-guide/_index.adoc:481 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 " @@ -1107,13 +1102,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:483 +#: documentation/content/en/articles/committers-guide/_index.adoc:482 #, no-wrap msgid "Deep Clone" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:487 +#: documentation/content/en/articles/committers-guide/_index.adoc:486 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 " @@ -1122,13 +1117,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:490 +#: documentation/content/en/articles/committers-guide/_index.adoc:489 #, no-wrap msgid "% git clone -o freebsd $URL -b branch [<directory>]\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:495 +#: documentation/content/en/articles/committers-guide/_index.adoc:494 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 " @@ -1138,7 +1133,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:500 +#: documentation/content/en/articles/committers-guide/_index.adoc:499 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 " @@ -1150,13 +1145,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:501 +#: documentation/content/en/articles/committers-guide/_index.adoc:500 #, no-wrap msgid "Shallow Clone" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:507 +#: documentation/content/en/articles/committers-guide/_index.adoc:506 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 " @@ -1166,13 +1161,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:511 +#: documentation/content/en/articles/committers-guide/_index.adoc:510 #, 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:516 +#: documentation/content/en/articles/committers-guide/_index.adoc:515 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 " @@ -1180,7 +1175,7 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:521 +#: documentation/content/en/articles/committers-guide/_index.adoc:520 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 " @@ -1188,19 +1183,19 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:523 +#: documentation/content/en/articles/committers-guide/_index.adoc:522 #, no-wrap msgid "Building" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:527 +#: documentation/content/en/articles/committers-guide/_index.adoc:526 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:534 +#: documentation/content/en/articles/committers-guide/_index.adoc:533 #, no-wrap msgid "" "% cd src\n" @@ -1211,12 +1206,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:536 +#: documentation/content/en/articles/committers-guide/_index.adoc:535 msgid "so that won't be covered in depth here." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:539 +#: documentation/content/en/articles/committers-guide/_index.adoc:538 msgid "" "If you want to build a custom kernel, extref:{handbook}[the kernel config " "section, kernelconfig] of the FreeBSD Handbook recommends creating a file " @@ -1225,26 +1220,26 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:540 +#: documentation/content/en/articles/committers-guide/_index.adoc:539 #, no-wrap msgid "Updating" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:544 +#: documentation/content/en/articles/committers-guide/_index.adoc:543 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:547 +#: documentation/content/en/articles/committers-guide/_index.adoc:546 #, no-wrap msgid "% git pull --ff-only\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:552 +#: documentation/content/en/articles/committers-guide/_index.adoc:551 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 " @@ -1254,7 +1249,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:555 +#: documentation/content/en/articles/committers-guide/_index.adoc:554 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 " @@ -1262,20 +1257,20 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:556 +#: documentation/content/en/articles/committers-guide/_index.adoc:555 #, no-wrap msgid "Selecting a Specific Version" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:560 +#: documentation/content/en/articles/committers-guide/_index.adoc:559 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:562 +#: documentation/content/en/articles/committers-guide/_index.adoc:561 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 " @@ -1283,26 +1278,26 @@ msgid "" msgstr "" *** 64414 LINES SKIPPED ***