From nobody Sat Sep 09 21:17:14 2023 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjm5R6VN9z4sfDc for ; Sat, 9 Sep 2023 21:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjm5R6GlDz4DyQ; Sat, 9 Sep 2023 21:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694294235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=na2buBLs8gbf8yImP5UTj3T+ZGwxe5xKQV7KbMcYCOk=; b=RxG+/SL+U7MBs/FcPacKXYwiNAijdM9+f0rDplQfvse5wXkk3o0cWAeBHae2RTNvkeb6XV adTT/Mr4fw6EnCO0HQxDg9UxhhdRuRr4YDZRKMar4LEf4b5j28jooxlbPo1jlOS+e/q5Nn u8ArOifyc8ldufKhiwki1nczT2Ro0L6BSSnU7FaXr1zQoAWxEzO02I/ouX+C9IVcaG+F7c 2Yw6K0Yf6hB9yjm7XZDnXzrRpc7Z5koBHqO4ifiu2wjiCx11oBF+hSmcrjOiiFz0YssgAt nyj9WKSacDMRPUDhPM8R7CSw0kT/+AOBBH+qe1z1T80D7FnsdUXyHKxg+3vx4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694294235; a=rsa-sha256; cv=none; b=QmEg8st6lQrPEKSlEsqapp5iBj27b1fBknVSWE/TVGkDvjCx5ZepqhZZ2/agT7QUUYxk8b FnISXmdBZzLJVhIUPPPtiTa8easzFfVAG+sSmZiFQyO6QQy6xh0ojkdwrNe7WD3WGec5a2 sh0legG4K/46fSsz/lkT5d/vYvWbTCAXAL0nidr/iIN95gOQb/WMPsOh4iW9eZKYx+9nOe eyGLQ3zr89sQaFzV+s8Hw0UcvQef+0kURjPiAeNjXyByMFcXTZImNw5IjAxb8vGZt/e1PZ /glZ/qG4tT9SaNKs/QMhCt3OgN/QUQKFpZVoZB+KrYolMTOUJCF8egkkHuA57g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694294235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=na2buBLs8gbf8yImP5UTj3T+ZGwxe5xKQV7KbMcYCOk=; b=AKJehp61F4mFwpVRQB4ufRdmUkmzgjFcK3h/CMgABJl3tToGAdtmIheOOuRN5f6uQ9gQRq uC5NerdUPl4t8x6CSXJho+Xswe91RDDZL7YEAPxNCRuH242KpYxa4FTmC+vG9iom81w3S/ GS8WpGm9HFGSienHBF1dGqeY5VCD/LAbZDv9NKuf3dCfsyqmST37S/yExlevpSEhSmIKZs AOmhe4YYiK9hY1A7xjkQZ9/sR53QYL73XBbIzVsWLMAn1niryrDnfXnWRXFky7lF3AfD2G NP6NyaweNhT4oP5jFQ+OoqSqeHcceDMvi5+vzb7bR47oJUJc0NjwH7BHFaMDKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rjm5R4ksszgFY; Sat, 9 Sep 2023 21:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389LHFWc032967; Sat, 9 Sep 2023 21:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389LHE70032964; Sat, 9 Sep 2023 21:17:14 GMT (envelope-from git) Date: Sat, 9 Sep 2023 21:17:14 GMT Message-Id: <202309092117.389LHE70032964@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: c54e400920 - main - doc: Update source files (en .po), for translations List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c54e4009208857f850f93f0ab3a6f3575c5edb7e Auto-Submitted: auto-generated The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=c54e4009208857f850f93f0ab3a6f3575c5edb7e commit c54e4009208857f850f93f0ab3a6f3575c5edb7e Author: Danilo G. Baio AuthorDate: 2023-09-09 21:15:57 +0000 Commit: Danilo G. Baio CommitDate: 2023-09-09 21:15:57 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 2336 ++-- .../content/en/articles/explaining-bsd/_index.po | 12 +- .../en/articles/freebsd-questions/_index.po | 9 +- .../content/en/articles/freebsd-releng/_index.po | 1090 +- documentation/content/en/articles/hubs/_index.po | 8 +- .../content/en/articles/ldap-auth/_index.po | 41 +- .../content/en/articles/license-guide/_index.po | 182 +- .../content/en/articles/pgpkeys/_index.po | 868 +- .../content/en/articles/problem-reports/_index.po | 26 +- documentation/content/en/articles/releng/_index.po | 18 +- .../content/en/articles/vm-design/_index.po | 187 +- .../en/books/developers-handbook/tools/_index.po | 475 +- documentation/content/en/books/faq/_index.po | 1284 +-- .../books/fdp-primer/asciidoctor-primer/_index.po | 24 +- .../en/books/fdp-primer/doc-build/_index.po | 6 +- .../en/books/fdp-primer/manual-pages/_index.po | 72 +- .../content/en/books/fdp-primer/weblate/_index.po | 117 +- .../content/en/books/handbook/bsdinstall/_index.po | 15 +- .../content/en/books/handbook/config/_index.po | 4054 ++++--- .../en/books/handbook/cutting-edge/_index.po | 108 +- .../content/en/books/handbook/desktop/_index.po | 665 +- .../content/en/books/handbook/eresources/_index.po | 115 +- .../en/books/handbook/introduction/_index.po | 149 +- .../content/en/books/handbook/mirrors/_index.po | 576 +- .../en/books/handbook/network-servers/_index.po | 1375 ++- .../content/en/books/handbook/network/_index.po | 215 +- .../content/en/books/handbook/ports/_index.po | 429 +- .../content/en/books/handbook/wine/_index.po | 55 +- .../content/en/books/handbook/zfs/_index.po | 16 +- .../en/books/porters-handbook/flavors/_index.po | 33 +- .../en/books/porters-handbook/makefiles/_index.po | 2657 ++--- .../books/porters-handbook/quick-porting/_index.po | 106 +- .../en/books/porters-handbook/special/_index.po | 4966 ++++---- .../en/books/porters-handbook/testing/_index.po | 432 +- .../en/books/porters-handbook/upgrading/_index.po | 8 +- .../en/books/porters-handbook/uses/_index.po | 2065 ++-- .../en/books/porters-handbook/versions/_index.po | 11550 ++++++++++--------- 37 files changed, 18749 insertions(+), 17595 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 \n" "Language-Team: LANGUAGE \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 <>." 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:400 +#, no-wrap +msgid "" +"% 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:397 +#: 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 "" -"% 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 ../../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 <> 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 []\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 "" *** 110228 LINES SKIPPED ***