git: f85add5b55 - main - doc: Update source files (en .po), for translations
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 01 May 2025 23:17:03 UTC
The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=f85add5b55c5a68df11aa282656a88e8d3a1fd8e commit f85add5b55c5a68df11aa282656a88e8d3a1fd8e Author: Danilo G. Baio <dbaio@FreeBSD.org> AuthorDate: 2025-05-01 23:11:25 +0000 Commit: Danilo G. Baio <dbaio@FreeBSD.org> CommitDate: 2025-05-01 23:11:25 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 1117 +- .../freebsd-status-report-process/_index.po | 72 +- .../content/en/articles/license-guide/_index.po | 60 +- .../content/en/articles/mailing-list-faq/_index.po | 154 +- .../content/en/articles/pgpkeys/_index.po | 222 +- .../content/en/books/arch-handbook/_index.po | 16 +- .../en/books/arch-handbook/bibliography/_index.po | 6 +- .../content/en/books/arch-handbook/boot/_index.po | 806 +- .../en/books/arch-handbook/driverbasics/_index.po | 140 +- .../content/en/books/arch-handbook/isa/_index.po | 766 +- .../content/en/books/arch-handbook/jail/_index.po | 214 +- .../content/en/books/arch-handbook/kobj/_index.po | 136 +- .../en/books/arch-handbook/locking/_index.po | 128 +- .../content/en/books/arch-handbook/mac/_index.po | 3574 +++--- .../en/books/arch-handbook/newbus/_index.po | 166 +- .../content/en/books/arch-handbook/parti.po | 4 +- .../content/en/books/arch-handbook/partii.po | 4 +- .../content/en/books/arch-handbook/partiii.po | 4 +- .../en/books/arch-handbook/pccard/_index.po | 94 +- .../content/en/books/arch-handbook/pci/_index.po | 172 +- .../content/en/books/arch-handbook/scsi/_index.po | 748 +- .../content/en/books/arch-handbook/smp/_index.po | 324 +- .../content/en/books/arch-handbook/sound/_index.po | 245 +- .../en/books/arch-handbook/sysinit/_index.po | 70 +- .../content/en/books/arch-handbook/usb/_index.po | 168 +- .../content/en/books/arch-handbook/vm/_index.po | 72 +- documentation/content/en/books/dev-model/_index.po | 6 +- .../content/en/books/developers-handbook/_index.po | 22 +- .../developers-handbook/bibliography/_index.po | 16 +- .../developers-handbook/introduction/_index.po | 46 +- .../en/books/developers-handbook/ipv6/_index.po | 702 +- .../developers-handbook/kernelbuild/_index.po | 30 +- .../developers-handbook/kerneldebug/_index.po | 487 +- .../en/books/developers-handbook/l10n/_index.po | 130 +- .../content/en/books/developers-handbook/parti.po | 4 +- .../content/en/books/developers-handbook/partii.po | 4 +- .../en/books/developers-handbook/partiii.po | 4 +- .../content/en/books/developers-handbook/partiv.po | 4 +- .../content/en/books/developers-handbook/partv.po | 4 +- .../books/developers-handbook/policies/_index.po | 122 +- .../en/books/developers-handbook/secure/_index.po | 174 +- .../en/books/developers-handbook/sockets/_index.po | 572 +- .../en/books/developers-handbook/testing/_index.po | 206 +- .../en/books/developers-handbook/tools/_index.po | 926 +- .../en/books/developers-handbook/x86/_index.po | 2100 ++-- .../content/en/books/fdp-primer/_index.po | 14 +- .../books/fdp-primer/asciidoctor-primer/_index.po | 230 +- .../en/books/fdp-primer/doc-build/_index.po | 308 +- .../en/books/fdp-primer/editor-config/_index.po | 142 +- .../content/en/books/fdp-primer/examples/_index.po | 78 +- .../en/books/fdp-primer/manual-pages/_index.po | 343 +- .../content/en/books/fdp-primer/overview/_index.po | 235 +- .../en/books/fdp-primer/po-translations/_index.po | 302 +- .../content/en/books/fdp-primer/preface/_index.po | 84 +- .../content/en/books/fdp-primer/rosetta/_index.po | 124 +- .../content/en/books/fdp-primer/see-also/_index.po | 34 +- .../en/books/fdp-primer/structure/_index.po | 594 +- .../content/en/books/fdp-primer/tools/_index.po | 37 +- .../en/books/fdp-primer/trademarks/_index.po | 36 +- .../en/books/fdp-primer/translations/_index.po | 175 +- .../content/en/books/fdp-primer/weblate/_index.po | 326 +- .../en/books/fdp-primer/working-copy/_index.po | 80 +- .../en/books/fdp-primer/writing-style/_index.po | 298 +- documentation/content/en/books/handbook/_index.po | 6 +- .../books/handbook/advanced-networking/_index.po | 1368 +-- .../content/en/books/handbook/audit/_index.po | 394 +- .../content/en/books/handbook/basics/_index.po | 1398 +-- .../en/books/handbook/bibliography/_index.po | 64 +- .../content/en/books/handbook/boot/_index.po | 306 +- .../content/en/books/handbook/bsdinstall/_index.po | 1181 +- .../content/en/books/handbook/colophon.po | 6 +- .../content/en/books/handbook/config/_index.po | 1090 +- .../en/books/handbook/cutting-edge/_index.po | 733 +- .../content/en/books/handbook/desktop/_index.po | 874 +- .../content/en/books/handbook/disks/_index.po | 1308 +- .../content/en/books/handbook/dtrace/_index.po | 118 +- .../content/en/books/handbook/eresources/_index.po | 189 +- .../en/books/handbook/filesystems/_index.po | 124 +- .../content/en/books/handbook/firewalls/_index.po | 1568 +-- .../content/en/books/handbook/geom/_index.po | 719 +- .../content/en/books/handbook/glossary.po | 1101 +- .../content/en/books/handbook/introduction.po | 19 +- .../en/books/handbook/introduction/_index.po | 208 +- .../content/en/books/handbook/jails/_index.po | 949 +- .../en/books/handbook/kernelconfig/_index.po | 204 +- .../content/en/books/handbook/l10n/_index.po | 530 +- .../content/en/books/handbook/linuxemu/_index.po | 260 +- .../content/en/books/handbook/mac/_index.po | 737 +- .../content/en/books/handbook/mail/_index.po | 546 +- .../content/en/books/handbook/mirrors/_index.po | 8 +- .../content/en/books/handbook/multimedia/_index.po | 556 +- .../en/books/handbook/network-servers/_index.po | 1932 +-- .../content/en/books/handbook/network/_index.po | 698 +- documentation/content/en/books/handbook/parti.po | 20 +- documentation/content/en/books/handbook/partii.po | 18 +- documentation/content/en/books/handbook/partiii.po | 8 +- documentation/content/en/books/handbook/partiv.po | 20 +- documentation/content/en/books/handbook/partv.po | 4 +- .../content/en/books/handbook/pgpkeys/_index.po | 20 +- .../content/en/books/handbook/ports/_index.po | 666 +- .../en/books/handbook/ppp-and-slip/_index.po | 620 +- .../content/en/books/handbook/preface/_index.po | 328 +- .../content/en/books/handbook/printing/_index.po | 488 +- .../content/en/books/handbook/security/_index.po | 1375 +-- .../en/books/handbook/serialcomms/_index.po | 999 +- .../en/books/handbook/usb-device-mode/_index.po | 178 +- .../en/books/handbook/virtualization/_index.po | 1448 +-- .../content/en/books/handbook/wayland/_index.po | 294 +- .../content/en/books/handbook/wine/_index.po | 677 +- .../content/en/books/handbook/x11/_index.po | 439 +- .../content/en/books/handbook/zfs/_index.po | 1369 +-- .../content/en/books/porters-handbook/_index.po | 6 +- .../en/books/porters-handbook/flavors/_index.po | 223 +- .../en/books/porters-handbook/keeping-up/_index.po | 56 +- .../en/books/porters-handbook/makefiles/_index.po | 4331 +++---- .../en/books/porters-handbook/new-port/_index.po | 28 +- .../en/books/porters-handbook/order/_index.po | 253 +- .../en/books/porters-handbook/pkg-files/_index.po | 212 +- .../en/books/porters-handbook/plist/_index.po | 469 +- .../books/porters-handbook/porting-dads/_index.po | 368 +- .../porters-handbook/porting-samplem/_index.po | 40 +- .../books/porters-handbook/porting-why/_index.po | 8 +- .../books/porters-handbook/quick-porting/_index.po | 212 +- .../en/books/porters-handbook/security/_index.po | 132 +- .../books/porters-handbook/slow-porting/_index.po | 248 +- .../en/books/porters-handbook/special/_index.po | 4659 ++++---- .../en/books/porters-handbook/testing/_index.po | 352 +- .../en/books/porters-handbook/upgrading/_index.po | 154 +- .../en/books/porters-handbook/uses/_index.po | 5064 +++++--- .../en/books/porters-handbook/versions/_index.po | 11915 ++++++++++--------- 130 files changed, 38801 insertions(+), 36575 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index 3409cfaa88..1dee22ffb3 100644 --- a/documentation/content/en/articles/committers-guide/_index.po +++ b/documentation/content/en/articles/committers-guide/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2024-12-29 08:30-0500\n" +"POT-Creation-Date: 2025-05-01 19:56-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" @@ -260,8 +260,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:122 msgid "" -"Existing keys can be used, but should be checked with [." -"filename]#documentation/tools/checkkey.sh# first. In this case, make sure " +"Existing keys can be used, but should be checked with " +"[.filename]#documentation/tools/checkkey.sh# first. In this case, make sure " "the key has a FreeBSD user ID." msgstr "" @@ -275,10 +275,11 @@ msgstr "" #. type: delimited block = 4 #: documentation/content/en/articles/committers-guide/_index.adoc:129 msgid "" -"Install [.filename]#security/gnupg#. Enter these lines in [.filename]#~/." -"gnupg/gpg.conf# to set minimum acceptable defaults for signing and new key " -"preferences (see the link:https://www.gnupg.org/documentation/manuals/gnupg/" -"GPG-Options.html[GnuPG options documentation] for more details):" +"Install [.filename]#security/gnupg#. Enter these lines in " +"[.filename]#~/.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 @@ -388,8 +389,8 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:190 msgid "" "Protect the private key and passphrase. If either the private key or " -"passphrase may have been compromised or disclosed, immediately notify mailto:" -"accounts@FreeBSD.org[accounts@FreeBSD.org] and revoke the key." +"passphrase may have been compromised or disclosed, immediately notify " +"mailto:accounts@FreeBSD.org[accounts@FreeBSD.org] and revoke the key." msgstr "" #. type: delimited block = 4 @@ -445,8 +446,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:217 msgid "" -"A Kerberos password can also be set manually by logging into `freefall." -"FreeBSD.org` and running:" +"A Kerberos password can also be set manually by logging into " +"`freefall.FreeBSD.org` and running:" msgstr "" #. type: delimited block . 4 @@ -587,9 +588,9 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:267 msgid "" -"All committers may modify [.filename]#src/share/misc/committers-*.dot#, [." -"filename]#src/usr.bin/calendar/calendars/calendar.freebsd#, and [." -"filename]#ports/astro/xearth/files#." +"All committers may modify [.filename]#src/share/misc/committers-*.dot#, " +"[.filename]#src/usr.bin/calendar/calendars/calendar.freebsd#, and " +"[.filename]#ports/astro/xearth/files#." msgstr "" #. type: Plain text @@ -739,9 +740,9 @@ msgstr "" 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 " -"Willie Willus' link:https://gist.github.com/" -"williewillus/068e9a8543de3a7ef80adb2938657b6b[Git - Quick Primer] are both " -"good overviews. The Git book is also complete, but much longer https://git-" +"Willie Willus' link:https://gist.github.com/williewillus/" +"068e9a8543de3a7ef80adb2938657b6b[Git - Quick Primer] are both good " +"overviews. The Git book is also complete, but much longer https://git-" "scm.com/book/en/v2. There is also this website https://dangitgit.com/ for " "common traps and pitfalls of Git, in case you need guidance to fix things " "up. Finally, an introduction link:https://eagain.net/articles/git-for-" @@ -901,8 +902,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:393 msgid "" -"Again, note that `gitrepo.freebsd.org` has been canonicalized to `repo." -"freebsd.org`." +"Again, note that `gitrepo.freebsd.org` has been canonicalized to " +"`repo.freebsd.org`." msgstr "" #. type: Plain text @@ -990,8 +991,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:441 msgid "" -"For browsing `internal/admin` branch on web: `https://cgit.freebsd.org/" -"${repo}/log/?h=internal/admin`" +"For browsing `internal/admin` branch on web: `https://cgit.freebsd.org/$" +"{repo}/log/?h=internal/admin`" msgstr "" #. type: Plain text @@ -1132,8 +1133,8 @@ 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 " "used. If no `<directory>` is given: the name of the new directory will " -"match the name of the repo ([.filename]#doc#, [.filename]#ports# or [." -"filename]#src#)." +"match the name of the repo ([.filename]#doc#, [.filename]#ports# or " +"[.filename]#src#)." msgstr "" #. type: Plain text @@ -1543,8 +1544,8 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:693 msgid "" "The cgit repository web interface for use with web browsers is at https://" -"cgit.FreeBSD.org/ports/ . The production Git repository is at https://git." -"FreeBSD.org/ports.git and at ssh://anongit@git.FreeBSD.org/ports.git (or " +"cgit.FreeBSD.org/ports/ . The production Git repository is at https://" +"git.FreeBSD.org/ports.git and at ssh://anongit@git.FreeBSD.org/ports.git (or " "anongit@git.FreeBSD.org:ports.git)." msgstr "" @@ -1566,9 +1567,9 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:703 msgid "" "A hook is available in the ports repository to help you write up your commit " -"messages in https://cgit.freebsd.org/ports/tree/.hooks/prepare-commit-msg[." -"hooks/prepare-commit-message]. It can be enabled by running ``git config --" -"add core.hooksPath .hooks``." +"messages in https://cgit.freebsd.org/ports/tree/.hooks/prepare-commit-" +"msg[.hooks/prepare-commit-message]. It can be enabled by running ``git " +"config --add core.hooksPath .hooks``." msgstr "" #. type: Plain text @@ -1972,8 +1973,8 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:907 msgid "" "MFC workflow can be summarized as `git cherry-pick -x` plus `git commit --" -"amend` to adjust the commit message. For multiple commits, use `git rebase -" -"i` to squash them together and edit the commit message." +"amend` to adjust the commit message. For multiple commits, use `git rebase " +"-i` to squash them together and edit the commit message." msgstr "" #. type: Title ==== @@ -2835,8 +2836,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:1315 msgid "" -"% cd /some/where % mkdir glorbnitz % cd glorbnitz % git init % git checkout -" -"b vendor/glorbnitz" +"% cd /some/where % mkdir glorbnitz % cd glorbnitz % git init % git checkout " +"-b vendor/glorbnitz" msgstr "" #. type: delimited block . 4 @@ -3218,9 +3219,9 @@ msgstr "" #. type: delimited block . 4 #: documentation/content/en/articles/committers-guide/_index.adoc:1523 msgid "" -"You'll need to make sure that you've fetched the notes (see the crossref:" -"committers-guide[git-mini-daily-use, Daily use]for details). Once you have " -"these, notes will show up in the git log command like so:" +"You'll need to make sure that you've fetched the notes (see the " +"crossref:committers-guide[git-mini-daily-use, Daily use]for details). Once " +"you have these, notes will show up in the git log command like so:" msgstr "" #. type: Plain text @@ -3916,8 +3917,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:1905 msgid "" -"% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd ports." -"git % git worktree add ../ports main % git worktree add ../quarterly " +"% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd " +"ports.git % git worktree add ../ports main % git worktree add ../quarterly " "branches/2020Q4 % cd ../ports" msgstr "" @@ -4052,17 +4053,18 @@ msgstr "" #. type: delimited block . 4 #: documentation/content/en/articles/committers-guide/_index.adoc:1967 msgid "" -"Now add a remote on your local system that points to your fork: [source," -"shell]" +"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:1974 msgid "" "% git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v " -"github\tgit@github.com:gvnn3/freebsd-src.git (fetch) github\tgit@github.com:" -"gvnn3/freebsd-src.git (push) freebsd\thttps://git.freebsd.org/src.git " -"(fetch) freebsd\tssh://git@gitrepo.freebsd.org/src.git (push)" +"github\tgit@github.com:gvnn3/freebsd-src.git (fetch) " +"github\tgit@github.com:gvnn3/freebsd-src.git (push) freebsd\thttps://" +"git.freebsd.org/src.git (fetch) freebsd\tssh://git@gitrepo.freebsd.org/" +"src.git (push)" msgstr "" #. type: delimited block . 4 @@ -4460,25 +4462,26 @@ msgid "" "you are working on. The introduction need not be a comprehensive biography, " "just write a paragraph or two about who you are, what you plan to be working " "on as a developer in FreeBSD, and who will be your mentor. Email this to the " -"{developers-name} and you will be on your way! . Log into `freefall.FreeBSD." -"org` and create a [.filename]#/var/forward/user# (where _user_ is your " -"username) file containing the e-mail address where you want mail addressed " -"to _yourusername_@FreeBSD.org to be forwarded. This includes all of the " -"commit messages as well as any other mail addressed to the {committers-name} " -"and the {developers-name}. Really large mailboxes which have taken up " -"permanent residence on `freefall` may get truncated without warning if space " -"needs to be freed, so forward it or save it elsewhere. + [NOTE] ====== If " -"your e-mail system uses SPF with strict rules, you should exclude `mx2." -"FreeBSD.org` from SPF checks. ====== + Due to the severe load dealing with " -"SPAM places on the central mail servers that do the mailing list processing, " -"the front-end server does do some basic checks and will drop some messages " -"based on these checks. At the moment proper DNS information for the " -"connecting host is the only check in place but that may change. Some people " -"blame these checks for bouncing valid email. To have these checks turned off " -"for your email, create a file named [.filename]#~/.spam_lover# on `freefall." -"FreeBSD.org`. + [NOTE] ====== Those who are developers but not committers " -"will not be subscribed to the committers or developers mailing lists. The " -"subscriptions are derived from the access rights. ====== ====" +"{developers-name} and you will be on your way! . Log into " +"`freefall.FreeBSD.org` and create a [.filename]#/var/forward/user# (where " +"_user_ is your username) file containing the e-mail address where you want " +"mail addressed to _yourusername_@FreeBSD.org to be forwarded. This includes " +"all of the commit messages as well as any other mail addressed to the " +"{committers-name} and the {developers-name}. Really large mailboxes which " +"have taken up permanent residence on `freefall` may get truncated without " +"warning if space needs to be freed, so forward it or save it elsewhere. + " +"[NOTE] ====== If your e-mail system uses SPF with strict rules, you should " +"exclude `mx2.FreeBSD.org` from SPF checks. ====== + Due to the severe load " +"dealing with SPAM places on the central mail servers that do the mailing " +"list processing, the front-end server does do some basic checks and will " +"drop some messages based on these checks. At the moment proper DNS " +"information for the connecting host is the only check in place but that may " +"change. Some people blame these checks for bouncing valid email. To have " +"these checks turned off for your email, create a file named " +"[.filename]#~/.spam_lover# on `freefall.FreeBSD.org`. + [NOTE] ====== Those " +"who are developers but not committers will not be subscribed to the " +"committers or developers mailing lists. The subscriptions are derived from " +"the access rights. ====== ====" msgstr "" #. type: delimited block . 4 @@ -4553,9 +4556,9 @@ msgstr "" #. type: delimited block . 4 #: documentation/content/en/articles/committers-guide/_index.adoc:2259 msgid "" -"To tell a local Postfix instance that anything from `_yourusername_@FreeBSD." -"org` should be forwarded to the FreeBSD.org servers, add this to your [." -"filename]#main.cf#:" +"To tell a local Postfix instance that anything from " +"`_yourusername_@FreeBSD.org` should be forwarded to the FreeBSD.org servers, " +"add this to your [.filename]#main.cf#:" msgstr "" #. type: delimited block . 4 @@ -4792,10 +4795,10 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:2384 msgid "" "When the mentor decides that a mentee has learned the ropes and is ready to " -"commit on their own, the mentor announces it with a commit to [." -"filename]#mentors#. This file is in the [.filename]#admin# orphan branch of " -"each repository. Detailed information on how to access these branches can " -"be found in crossref:committers-guide[admin-branch, \"admin\" branch]." +"commit on their own, the mentor announces it with a commit to " +"[.filename]#mentors#. This file is in the [.filename]#admin# orphan branch " +"of each repository. Detailed information on how to access these branches " +"can be found in crossref:committers-guide[admin-branch, \"admin\" branch]." msgstr "" #. type: delimited block . 4 @@ -5222,11 +5225,19 @@ msgstr "" #. type: delimited block . 4 #: documentation/content/en/articles/committers-guide/_index.adoc:2546 +msgid "" +"For key words where multiple values make sense (e.g., `PR:` with a comma-" +"separated list of PRs), it is permitted to use the same keyword multiple " +"times to avoid ambiguity or improve readability." +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:2548 msgid "The key words or phrases are:" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2551 +#: documentation/content/en/articles/committers-guide/_index.adoc:2553 #, no-wrap msgid "" "[.informaltable]\n" @@ -5234,25 +5245,25 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2552 +#: documentation/content/en/articles/committers-guide/_index.adoc:2554 #, no-wrap msgid "`PR:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2554 +#: documentation/content/en/articles/committers-guide/_index.adoc:2556 #, 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:2555 +#: documentation/content/en/articles/committers-guide/_index.adoc:2557 #, no-wrap msgid "`Reported by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2559 +#: documentation/content/en/articles/committers-guide/_index.adoc:2561 #, 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" @@ -5261,7 +5272,7 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2561 +#: documentation/content/en/articles/committers-guide/_index.adoc:2563 #, no-wrap msgid "" "`Submitted by:` +\n" @@ -5269,19 +5280,19 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2563 +#: documentation/content/en/articles/committers-guide/_index.adoc:2565 #, 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:2564 +#: documentation/content/en/articles/committers-guide/_index.adoc:2566 #, no-wrap msgid "`Reviewed by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2579 +#: documentation/content/en/articles/committers-guide/_index.adoc:2581 #, 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" @@ -5300,25 +5311,25 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2580 +#: documentation/content/en/articles/committers-guide/_index.adoc:2582 #, no-wrap msgid "`Tested by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2582 +#: documentation/content/en/articles/committers-guide/_index.adoc:2584 #, 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:2583 +#: documentation/content/en/articles/committers-guide/_index.adoc:2585 #, no-wrap msgid "`Discussed with:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2586 +#: documentation/content/en/articles/committers-guide/_index.adoc:2588 #, no-wrap msgid "" "The name and e-mail address of the person or people that contributed to the patch by providing meaningful feedback; for developers, just the username on the FreeBSD cluster.\n" @@ -5326,13 +5337,13 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2587 +#: documentation/content/en/articles/committers-guide/_index.adoc:2589 #, no-wrap msgid "`Approved by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2613 +#: documentation/content/en/articles/committers-guide/_index.adoc:2615 #, 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" @@ -5361,121 +5372,121 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2614 +#: documentation/content/en/articles/committers-guide/_index.adoc:2616 #, no-wrap msgid "`Obtained from:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2616 +#: documentation/content/en/articles/committers-guide/_index.adoc:2618 #, 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:2617 +#: documentation/content/en/articles/committers-guide/_index.adoc:2619 #, no-wrap msgid "`Fixes:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2619 +#: documentation/content/en/articles/committers-guide/_index.adoc:2621 #, 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 --pretty=format:'%h (\"%s\")' GIT-COMMIT-HASH`." msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2620 +#: documentation/content/en/articles/committers-guide/_index.adoc:2622 #, no-wrap msgid "`MFC after:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2622 +#: documentation/content/en/articles/committers-guide/_index.adoc:2624 #, 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:2623 +#: documentation/content/en/articles/committers-guide/_index.adoc:2625 #, no-wrap msgid "`MFC to:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2625 +#: documentation/content/en/articles/committers-guide/_index.adoc:2627 #, 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:2626 +#: documentation/content/en/articles/committers-guide/_index.adoc:2628 #, no-wrap msgid "`MFH:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2628 +#: documentation/content/en/articles/committers-guide/_index.adoc:2630 #, 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:2629 +#: documentation/content/en/articles/committers-guide/_index.adoc:2631 #, no-wrap msgid "`Relnotes:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2631 +#: documentation/content/en/articles/committers-guide/_index.adoc:2633 #, 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:2632 +#: documentation/content/en/articles/committers-guide/_index.adoc:2634 #, no-wrap msgid "`Security:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2634 +#: documentation/content/en/articles/committers-guide/_index.adoc:2636 #, 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:2635 +#: documentation/content/en/articles/committers-guide/_index.adoc:2637 #, no-wrap msgid "`Event:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2637 +#: documentation/content/en/articles/committers-guide/_index.adoc:2639 #, 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:2638 +#: documentation/content/en/articles/committers-guide/_index.adoc:2640 #, no-wrap msgid "`Sponsored by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2640 +#: documentation/content/en/articles/committers-guide/_index.adoc:2642 #, 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:2641 +#: documentation/content/en/articles/committers-guide/_index.adoc:2643 #, no-wrap msgid "`Pull Request:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2645 +#: documentation/content/en/articles/committers-guide/_index.adoc:2647 #, 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" @@ -5484,13 +5495,13 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2646 +#: documentation/content/en/articles/committers-guide/_index.adoc:2648 #, no-wrap msgid "`Co-authored-by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2649 +#: documentation/content/en/articles/committers-guide/_index.adoc:2651 #, no-wrap msgid "" "The name and email address of an additional author of the commit.\n" @@ -5498,73 +5509,73 @@ msgid "" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2650 +#: documentation/content/en/articles/committers-guide/_index.adoc:2652 #, no-wrap msgid "`Signed-off-by:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2652 +#: documentation/content/en/articles/committers-guide/_index.adoc:2654 #, no-wrap msgid "ID certifies compliance with https://developercertificate.org/" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2653 +#: documentation/content/en/articles/committers-guide/_index.adoc:2655 #, no-wrap msgid "`Differential Revision:`" msgstr "" #. type: Table -#: documentation/content/en/articles/committers-guide/_index.adoc:2655 +#: documentation/content/en/articles/committers-guide/_index.adoc:2657 #, 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:2657 +#: documentation/content/en/articles/committers-guide/_index.adoc:2659 #, 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:2663 +#: documentation/content/en/articles/committers-guide/_index.adoc:2665 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:2667 -#: documentation/content/en/articles/committers-guide/_index.adoc:2685 -#: documentation/content/en/articles/committers-guide/_index.adoc:2700 -#: documentation/content/en/articles/committers-guide/_index.adoc:2716 -#: documentation/content/en/articles/committers-guide/_index.adoc:2731 +#: documentation/content/en/articles/committers-guide/_index.adoc:2669 +#: documentation/content/en/articles/committers-guide/_index.adoc:2687 +#: documentation/content/en/articles/committers-guide/_index.adoc:2702 +#: documentation/content/en/articles/committers-guide/_index.adoc:2718 +#: documentation/content/en/articles/committers-guide/_index.adoc:2733 #, no-wrap msgid "...\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2669 +#: documentation/content/en/articles/committers-guide/_index.adoc:2671 #, no-wrap msgid "PR:\t\t12345\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2672 +#: documentation/content/en/articles/committers-guide/_index.adoc:2674 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:2675 +#: documentation/content/en/articles/committers-guide/_index.adoc:2677 #, no-wrap msgid "Commit Log for a Commit Needing Review" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2681 +#: documentation/content/en/articles/committers-guide/_index.adoc:2683 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 " @@ -5572,73 +5583,73 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2687 +#: documentation/content/en/articles/committers-guide/_index.adoc:2689 #, no-wrap msgid "Reviewed by:\t-arch\n" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2691 +#: documentation/content/en/articles/committers-guide/_index.adoc:2693 #, no-wrap msgid "Commit Log for a Commit Needing Approval" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2696 +#: documentation/content/en/articles/committers-guide/_index.adoc:2698 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:2702 +#: documentation/content/en/articles/committers-guide/_index.adoc:2704 #, no-wrap msgid "Approved by:\tabc (maintainer)\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2705 +#: documentation/content/en/articles/committers-guide/_index.adoc:2707 msgid "Where _abc_ is the account name of the person who approved." msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2707 +#: documentation/content/en/articles/committers-guide/_index.adoc:2709 #, 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:2712 +#: documentation/content/en/articles/committers-guide/_index.adoc:2714 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:2718 +#: documentation/content/en/articles/committers-guide/_index.adoc:2720 #, no-wrap msgid "Obtained from:\tOpenBSD\n" msgstr "" #. type: Block title -#: documentation/content/en/articles/committers-guide/_index.adoc:2722 +#: documentation/content/en/articles/committers-guide/_index.adoc:2724 #, 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:2727 +#: documentation/content/en/articles/committers-guide/_index.adoc:2729 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:2733 +#: documentation/content/en/articles/committers-guide/_index.adoc:2735 #, no-wrap msgid "MFC after:\t2 weeks\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2736 +#: documentation/content/en/articles/committers-guide/_index.adoc:2738 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`, " @@ -5646,12 +5657,12 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2739 +#: documentation/content/en/articles/committers-guide/_index.adoc:2741 msgid "It is often necessary to combine these." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2743 +#: documentation/content/en/articles/committers-guide/_index.adoc:2745 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 " @@ -5661,19 +5672,19 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2745 +#: documentation/content/en/articles/committers-guide/_index.adoc:2747 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:2746 +#: documentation/content/en/articles/committers-guide/_index.adoc:2748 #, no-wrap msgid "Example Combined Commit Log" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2757 +#: documentation/content/en/articles/committers-guide/_index.adoc:2759 #, no-wrap msgid "" "PR:\t\t54321\n" @@ -5684,33 +5695,33 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/articles/committers-guide/_index.adoc:2762 +#: documentation/content/en/articles/committers-guide/_index.adoc:2764 #, no-wrap msgid "Preferred License for New Files" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2768 +#: documentation/content/en/articles/committers-guide/_index.adoc:2770 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/" +"The FreeBSD Project's full license policy can be found at link:https://" +"www.FreeBSD.org/internal/software-license/[https://www.FreeBSD.org/internal/" "software-license]. The rest of this section is intended to help you get " "started. As a rule, when in doubt, ask. It is much easier to give advice " "than to fix the source tree." msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2770 +#: documentation/content/en/articles/committers-guide/_index.adoc:2772 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:2801 +#: documentation/content/en/articles/committers-guide/_index.adoc:2803 #, no-wrap msgid "" -"/*-\n" +"/*\n" " * SPDX-License-Identifier: BSD-2-Clause\n" " *\n" " * Copyright (c) [year] [your name]\n" @@ -5741,7 +5752,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2807 +#: documentation/content/en/articles/committers-guide/_index.adoc:2809 msgid "" "The FreeBSD project strongly discourages the so-called \"advertising " "clause\" in new code. Due to the large number of contributors to the " @@ -5752,7 +5763,7 @@ msgid "" msgstr "" *** 245706 LINES SKIPPED ***