From nobody Sun Oct 16 20:10:05 2022 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 4MrB7K69dmz4fyyl for ; Sun, 16 Oct 2022 20:10:05 +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 4MrB7K5lvTz3CnD; Sun, 16 Oct 2022 20:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665951005; 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=hRqR890rThWDFuzHy/Idi5ssyvx0fcpd7rHGH6fgCF4=; b=bNjG3z6wMrXS7vqcbZWlRPQvjwsWgo4TfVJJbLkDBJuepMVoFQ+YcNAKcrqagpnsEMOJv1 qKbpPalYz24Z57Bice+kJg96fuEhv/DZaCE8bIRls/u0t4LjeGB1zhzxns+kqFKi0v5V5N tiFPgnVaGeeQcG0ElFkcw+SmPDSX0DfkVilSaZLEFTAlvWGdE3GpaO+cpPsJcqeQyc7hJP Rt1q3Bsd9v2gJ9Zes67l61v9v49tGiR8ijjV+uGFrCwJLYZtXi4RDH2TYjIPfFKk2ZWmng FCtx/RG6HYiUrHwxZ1HZNi8bD+ECNmyxiHIyUDfU896domP/pRPEB/BF+xujKQ== 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 4MrB7K4lJ4zZYN; Sun, 16 Oct 2022 20:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29GKA5qo047670; Sun, 16 Oct 2022 20:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29GKA5UL047644; Sun, 16 Oct 2022 20:10:05 GMT (envelope-from git) Date: Sun, 16 Oct 2022 20:10:05 GMT Message-Id: <202210162010.29GKA5UL047644@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: 0836b1908d - 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: 0836b1908d20f6f6cdbf37890af83c4fdd829ce8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665951005; 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=hRqR890rThWDFuzHy/Idi5ssyvx0fcpd7rHGH6fgCF4=; b=ZUAHQQEIxOOllsSE3tvk/n9/YKdlOHPDz+W4D0m/aEdm/2fAMNAq5xaSuxnGqsfeX1o5Li hlvIt9G7IvNtPxRU8hs/Y/0t+BJ7fTz39mJyAy5qlxDgvvsnRm0fXZVaa/oO/B4aEA8nfL 5d/cxAwnKfKhvNcu6PY/CkJw6ztXRrfG7ZgOBjQZc9mC4pJeZeMqY+96AyrNMqgGauXZsX UKTpcn/zry7P0eHhAJVlsQ8GsMCvi2v6fauBAcr9Yr0ruyblcXcT/JnAM3YzwmFhxarURK 2uqABQaRV05rHjz9oXDqGIeqcx7wJJ5QYxvoEZEjLdXXoP8iMs+t61nCghRQmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665951005; a=rsa-sha256; cv=none; b=URVECIQV4PYe1cPv2vkBfLYuMn82vCK2zVOrNVGRKL6Zbz+vV98srV/BH1N9VXDaxLKYv8 dZ+wxE7IEv1w7dzcl4p9WC4T8avrvFvgbhty0wiD12ShV5e7DVyzwc264Q8PhKBprgC2MY Pwzpf5chcZ4pkQ6CDfVXo5v8a+QQd7q90CuBMMaz6Z++9EGpgz3VyP/yhZySusgpKIfQvT Zqii1xzZ/GErl15d+SUBPaF1UHyxh8J+826T2noaTeQku3okQYXEYo2vnblgd21Lr/7P5v H7Nc9dYIuWKfTmWYkfBBylWyTBR+hA8C9hEpNmJa78uMStmOCVH8DWkpFizCOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=0836b1908d20f6f6cdbf37890af83c4fdd829ce8 commit 0836b1908d20f6f6cdbf37890af83c4fdd829ce8 Author: Danilo G. Baio AuthorDate: 2022-10-16 20:07:55 +0000 Commit: Danilo G. Baio CommitDate: 2022-10-16 20:07:55 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 38 +- .../content/en/articles/linux-users/_index.po | 9 +- .../content/en/articles/pgpkeys/_index.po | 4 +- documentation/content/en/books/dev-model/_index.po | 1174 +++++++------------- .../content/en/books/handbook/bsdinstall/_index.po | 892 +++++++-------- .../content/en/books/handbook/jails/_index.po | 8 +- .../content/en/books/handbook/mirrors/_index.po | 8 +- .../content/en/books/handbook/ports/_index.po | 429 +++---- .../en/books/porters-handbook/makefiles/_index.po | 12 +- .../en/books/porters-handbook/pkg-files/_index.po | 4 +- .../en/books/porters-handbook/testing/_index.po | 303 +++-- .../en/books/porters-handbook/uses/_index.po | 268 ++--- 12 files changed, 1355 insertions(+), 1794 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index 81fb326abb..9938c1f80a 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: 2022-10-01 10:13-0300\n" +"POT-Creation-Date: 2022-10-16 17:07-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -9304,9 +9304,43 @@ msgid "" msgstr "" #. type: delimited block = 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:4049 +#: documentation/content/en/articles/committers-guide/_index.adoc:4050 msgid "" "rsync.net offers a free-forever 500 GB account to FreeBSD developers. Simply " "sign up at https://www.rsync.net/freebsd.html[https://www.rsync.net/freebsd." "html] using your `@freebsd.org` address to receive this free account." msgstr "" + +#. type: Title === +#: documentation/content/en/articles/committers-guide/_index.adoc:4052 +#, no-wrap +msgid "`JetBrains`" +msgstr "" + +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:4055 +msgid "" +"https://www.jetbrains.com[JetBrains] is a software development company which " +"makes tools for software developers and project managers. The company offers " +"many integrated development environments (IDEs) for different programming " +"languages." +msgstr "" + +#. type: delimited block = 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:4057 +msgid "" +"JetBrains offers 100 free yearly licenses for all https://www.jetbrains.com/" +"products[JetBrains IDE products]. Simply sign up at https://account." +"jetbrains.com/a/322tl3z7[https://account.jetbrains.com/a/322tl3z7] using " +"your `@freebsd.org` address and the account will have a license attached to " +"it automatically. Once the account is active, use it in any of the products " +"to activate them and you're done." +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:4061 +msgid "" +"Please, only use these licences personally and do not share them with anyone " +"outside of the FreeBSD project, as that would be a violation of the terms of " +"the donation." +msgstr "" diff --git a/documentation/content/en/articles/linux-users/_index.po b/documentation/content/en/articles/linux-users/_index.po index 7db8fd8115..9f8d341a4b 100644 --- a/documentation/content/en/articles/linux-users/_index.po +++ b/documentation/content/en/articles/linux-users/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2022-02-01 10:28-0300\n" +"POT-Creation-Date: 2022-10-16 17:07-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -220,9 +220,10 @@ msgstr "" #: documentation/content/en/articles/linux-users/_index.adoc:118 msgid "" "The Ports Collection, sometimes referred to as the ports tree, can be " -"installed to [.filename]#/usr/ports# using man:portsnap[8]. Detailed " -"instructions for installing the Ports Collection can be found in extref:" -"{handbook}[section 5.5, ports-using] of the FreeBSD Handbook." +"installed to [.filename]#/usr/ports# using link:{handbook}mirrors/" +"#git[Git]. Detailed instructions for installing the Ports Collection can be " +"found in extref:{handbook}[section 4.5.1, ports-using-installation-methods] " +"of the FreeBSD Handbook." msgstr "" #. type: Plain text diff --git a/documentation/content/en/articles/pgpkeys/_index.po b/documentation/content/en/articles/pgpkeys/_index.po index 27e1c73979..ebb13ddbd0 100644 --- a/documentation/content/en/articles/pgpkeys/_index.po +++ b/documentation/content/en/articles/pgpkeys/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2022-08-07 10:35-0300\n" +"POT-Creation-Date: 2022-10-16 17:07-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -82,7 +82,7 @@ msgstr "" #. type: Title === #: documentation/content/en/articles/pgpkeys/_index.adoc:75 #, no-wrap -msgid "`{doceng-secretary-email}`" +msgid "{doceng-secretary-name} `<{doceng-secretary-email}>`" msgstr "" #. type: Title == diff --git a/documentation/content/en/books/dev-model/_index.po b/documentation/content/en/books/dev-model/_index.po index 44c34d7c87..1bfab9a87f 100644 --- a/documentation/content/en/books/dev-model/_index.po +++ b/documentation/content/en/books/dev-model/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2022-02-01 10:28-0300\n" +"POT-Creation-Date: 2022-10-16 17:06-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -346,7 +346,6 @@ msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:179 #: documentation/content/en/books/dev-model/_index.adoc:216 -#: documentation/content/en/books/dev-model/_index.adoc:228 #, no-wrap msgid "9" msgstr "" @@ -360,21 +359,20 @@ msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:182 -#: documentation/content/en/books/dev-model/_index.adoc:236 #, no-wrap -msgid "269" +msgid "318" msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:183 -#: documentation/content/en/books/dev-model/_index.adoc:237 +#: documentation/content/en/books/dev-model/_index.adoc:233 #, no-wrap msgid "Contributors" msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:184 -#: documentation/content/en/books/dev-model/_index.adoc:239 +#: documentation/content/en/books/dev-model/_index.adoc:235 #, no-wrap msgid "~3000" msgstr "" @@ -436,62 +434,63 @@ msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:218 #, no-wrap -msgid "Kernel" +msgid "Base" msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:220 #, no-wrap -msgid "56" +msgid "164" msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:222 #, no-wrap -msgid "Userland" +msgid "Docs" msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:224 #, no-wrap -msgid "50" +msgid "45" msgstr "" #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:226 #, no-wrap -msgid "Docs" +msgid "Ports" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:230 +#: documentation/content/en/books/dev-model/_index.adoc:228 #, no-wrap -msgid "Ports" +msgid "166" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:232 +#: documentation/content/en/books/dev-model/_index.adoc:230 #, no-wrap -msgid "120" +msgid "Total" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:234 +#: documentation/content/en/books/dev-model/_index.adoc:232 #, no-wrap -msgid "Total" +msgid "374" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:244 +#: documentation/content/en/books/dev-model/_index.adoc:240 msgid "" "Number of committers per area has been determined by going through CVS logs " "from January 1st, 2004 to December 31st, 2004. Note that many committers " "work in multiple areas, making the total number higher than the real number " -"of committers. The total number of committers at that time was 269." +"of committers. The total number of active unique committers on June 2022 " +"was 317." msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:247 +#: documentation/content/en/books/dev-model/_index.adoc:243 msgid "" "Committers fall into three groups: committers who are only concerned with " "one area of the project (for instance file systems), committers who are " @@ -502,7 +501,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:252 +#: documentation/content/en/books/dev-model/_index.adoc:248 msgid "" "The kernel is the main building block of FreeBSD. While the userland " "applications are protected against faults in other userland applications, " @@ -514,7 +513,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:256 +#: documentation/content/en/books/dev-model/_index.adoc:252 msgid "" "The core utilities, known as userland, provide the interface that identifies " "FreeBSD, both user interface, shared libraries and external interfaces to " @@ -525,7 +524,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:259 +#: documentation/content/en/books/dev-model/_index.adoc:255 msgid "" "Documentation is handled by <> and includes all " "documents surrounding the FreeBSD project, including the web pages. There " @@ -534,7 +533,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:267 +#: documentation/content/en/books/dev-model/_index.adoc:263 msgid "" "Ports is the collection of meta-data that is needed to make software " "packages build correctly on FreeBSD. An example of a port is the port for " @@ -551,19 +550,19 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/books/dev-model/_index.adoc:269 +#: documentation/content/en/books/dev-model/_index.adoc:265 #, no-wrap msgid "Methodology model" msgstr "" #. type: Title === -#: documentation/content/en/books/dev-model/_index.adoc:272 +#: documentation/content/en/books/dev-model/_index.adoc:268 #, no-wrap msgid "Development model" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:276 +#: documentation/content/en/books/dev-model/_index.adoc:272 msgid "" "There is no defined model for how people write code in FreeBSD. However, " "Niels Jørgenssen has suggested a model of how written code is integrated " @@ -571,56 +570,65 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:278 -#: documentation/content/en/books/dev-model/_index.adoc:852 +#: documentation/content/en/books/dev-model/_index.adoc:274 +#: documentation/content/en/books/dev-model/_index.adoc:848 msgid "Jørgenssen's model for change integration" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:283 -#: documentation/content/en/books/dev-model/_index.adoc:857 +#: documentation/content/en/books/dev-model/_index.adoc:279 +#: documentation/content/en/books/dev-model/_index.adoc:853 #, no-wrap msgid "Stage" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:284 -#: documentation/content/en/books/dev-model/_index.adoc:858 +#: documentation/content/en/books/dev-model/_index.adoc:280 +#: documentation/content/en/books/dev-model/_index.adoc:854 #, no-wrap msgid "Next if successful" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:286 -#: documentation/content/en/books/dev-model/_index.adoc:860 +#: documentation/content/en/books/dev-model/_index.adoc:282 +#: documentation/content/en/books/dev-model/_index.adoc:856 #, no-wrap msgid "Next if unsuccessful" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:287 +#: documentation/content/en/books/dev-model/_index.adoc:283 +#: documentation/content/en/books/dev-model/_index.adoc:290 #: documentation/content/en/books/dev-model/_index.adoc:294 #: documentation/content/en/books/dev-model/_index.adoc:298 #: documentation/content/en/books/dev-model/_index.adoc:302 -#: documentation/content/en/books/dev-model/_index.adoc:306 -#: documentation/content/en/books/dev-model/_index.adoc:309 -#: documentation/content/en/books/dev-model/_index.adoc:861 +#: documentation/content/en/books/dev-model/_index.adoc:305 +#: documentation/content/en/books/dev-model/_index.adoc:857 +#: documentation/content/en/books/dev-model/_index.adoc:864 #: documentation/content/en/books/dev-model/_index.adoc:868 #: documentation/content/en/books/dev-model/_index.adoc:872 #: documentation/content/en/books/dev-model/_index.adoc:876 -#: documentation/content/en/books/dev-model/_index.adoc:880 -#: documentation/content/en/books/dev-model/_index.adoc:883 +#: documentation/content/en/books/dev-model/_index.adoc:879 #, no-wrap msgid "code" msgstr "" +#. type: Table +#: documentation/content/en/books/dev-model/_index.adoc:284 +#: documentation/content/en/books/dev-model/_index.adoc:287 +#: documentation/content/en/books/dev-model/_index.adoc:858 +#: documentation/content/en/books/dev-model/_index.adoc:861 +#, no-wrap +msgid "review" +msgstr "" + #. type: Table #: documentation/content/en/books/dev-model/_index.adoc:288 #: documentation/content/en/books/dev-model/_index.adoc:291 #: documentation/content/en/books/dev-model/_index.adoc:862 #: documentation/content/en/books/dev-model/_index.adoc:865 #, no-wrap -msgid "review" +msgid "pre-commit test" msgstr "" #. type: Table @@ -629,7 +637,7 @@ msgstr "" #: documentation/content/en/books/dev-model/_index.adoc:866 #: documentation/content/en/books/dev-model/_index.adoc:869 #, no-wrap -msgid "pre-commit test" +msgid "development release" msgstr "" #. type: Table @@ -638,7 +646,7 @@ msgstr "" #: documentation/content/en/books/dev-model/_index.adoc:870 #: documentation/content/en/books/dev-model/_index.adoc:873 #, no-wrap -msgid "development release" +msgid "parallel debugging" msgstr "" #. type: Table @@ -647,20 +655,11 @@ msgstr "" #: documentation/content/en/books/dev-model/_index.adoc:874 #: documentation/content/en/books/dev-model/_index.adoc:877 #, no-wrap -msgid "parallel debugging" -msgstr "" - -#. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:304 -#: documentation/content/en/books/dev-model/_index.adoc:307 -#: documentation/content/en/books/dev-model/_index.adoc:878 -#: documentation/content/en/books/dev-model/_index.adoc:881 -#, no-wrap msgid "production release" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:312 +#: documentation/content/en/books/dev-model/_index.adoc:308 msgid "" "The \"development release\" is the FreeBSD-CURRENT (\"-CURRENT\") branch and " "the \"production release\" is the FreeBSD-STABLE branch (\"-STABLE\") " @@ -668,7 +667,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:318 +#: documentation/content/en/books/dev-model/_index.adoc:314 msgid "" "This is a model for one change, and shows that after coding, developers seek " "community review and try integrating it with their own systems. After " @@ -682,7 +681,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:321 +#: documentation/content/en/books/dev-model/_index.adoc:317 msgid "" "Jørgensen found that most FreeBSD developers work individually, meaning that " "this model is used in parallel by many developers on the different ongoing " @@ -692,7 +691,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:324 +#: documentation/content/en/books/dev-model/_index.adoc:320 msgid "" "As each commit represents an increment, this is a massively incremental " "model. The commits are in fact so frequent that during one year footnote:" @@ -702,7 +701,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:328 +#: documentation/content/en/books/dev-model/_index.adoc:324 msgid "" "Within the \"code\" bracket in Jørgensen's model, each programmer has their " "own working style and follows their own development models. The bracket " @@ -713,7 +712,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:334 +#: documentation/content/en/books/dev-model/_index.adoc:330 msgid "" "From a stepwise model's perspective (such as the waterfall model), the other " "brackets can be seen as further verification and system integration. This " @@ -727,14 +726,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:337 +#: documentation/content/en/books/dev-model/_index.adoc:333 msgid "" "It is important to notice the word \"change\". Most commits do not contain " "radical new features, but are maintenance updates." msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:340 +#: documentation/content/en/books/dev-model/_index.adoc:336 msgid "" "The only exceptions from this model are security fixes and changes to " "features that are deprecated in the -CURRENT branch. In these cases, " @@ -742,7 +741,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:345 +#: documentation/content/en/books/dev-model/_index.adoc:341 msgid "" "In addition to many people working on the project, there are many related " "projects to the FreeBSD Project. These are either projects developing brand " @@ -757,7 +756,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:352 +#: documentation/content/en/books/dev-model/_index.adoc:348 msgid "" "There is no standards to how design should be done, nor is design collected " "in a centralised repository. The main design is that of 4.4BSD. footnote:" @@ -778,13 +777,13 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/books/dev-model/_index.adoc:354 +#: documentation/content/en/books/dev-model/_index.adoc:350 #, no-wrap msgid "Release branches" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:358 +#: documentation/content/en/books/dev-model/_index.adoc:354 msgid "" "The releases of FreeBSD are best illustrated by a tree with many branches " "where each major branch represents a major version. Minor versions are " @@ -792,7 +791,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:365 +#: documentation/content/en/books/dev-model/_index.adoc:361 msgid "" "In the following release tree, arrows that follow one-another in a " "particular direction represent a branch. Boxes with full lines and diamonds " @@ -806,110 +805,110 @@ msgid "" msgstr "" #. type: Block title -#: documentation/content/en/books/dev-model/_index.adoc:366 +#: documentation/content/en/books/dev-model/_index.adoc:362 #, no-wrap msgid "The FreeBSD release tree" msgstr "" #. type: Positional ($1) AttributeList argument for macro 'image' -#: documentation/content/en/books/dev-model/_index.adoc:367 +#: documentation/content/en/books/dev-model/_index.adoc:363 #, no-wrap msgid "Refer to table below for a screen-reader friendly version." msgstr "" #. type: Target for macro image -#: documentation/content/en/books/dev-model/_index.adoc:367 +#: documentation/content/en/books/dev-model/_index.adoc:363 #, no-wrap msgid "branches.png" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:373 +#: documentation/content/en/books/dev-model/_index.adoc:369 #, no-wrap msgid "Major release" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:374 +#: documentation/content/en/books/dev-model/_index.adoc:370 #, no-wrap msgid "Forked from" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:376 +#: documentation/content/en/books/dev-model/_index.adoc:372 #, no-wrap msgid "Following minor releases" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:377 -#: documentation/content/en/books/dev-model/_index.adoc:397 +#: documentation/content/en/books/dev-model/_index.adoc:373 +#: documentation/content/en/books/dev-model/_index.adoc:393 #, no-wrap msgid "..." msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:381 +#: documentation/content/en/books/dev-model/_index.adoc:377 #, no-wrap msgid "3.0 Current (development branch)" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:384 +#: documentation/content/en/books/dev-model/_index.adoc:380 #, no-wrap msgid "Releng 3 branches: 3.0 Release to 3.5 Release, leading to 3.5.1 Release and the subsequent 3 Stable branch" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:385 +#: documentation/content/en/books/dev-model/_index.adoc:381 #, no-wrap msgid "4.0 Current (development branch)" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:386 +#: documentation/content/en/books/dev-model/_index.adoc:382 #, no-wrap msgid "3.1 Release" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:388 +#: documentation/content/en/books/dev-model/_index.adoc:384 #, no-wrap msgid "Releng 4 branches: 4.1 Release to 4.6 Release (and 4.6.2 Release), then 4.7 Release to 4.11 Release (all starting at 4.3 Release also leading to a Releng_4_n branch), and the subsequent 4 Release branch" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:389 +#: documentation/content/en/books/dev-model/_index.adoc:385 #, no-wrap msgid "5.0 Current (development branch)" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:390 +#: documentation/content/en/books/dev-model/_index.adoc:386 #, no-wrap msgid "4.0 Release" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:392 +#: documentation/content/en/books/dev-model/_index.adoc:388 #, no-wrap msgid "Releng 5 branches: 5.0 Release to 5.4 Release (all except 5.0 and 5.3 also leading to a Releng_5_n branch), and the subsequent 5 Release branch" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:393 +#: documentation/content/en/books/dev-model/_index.adoc:389 #, no-wrap msgid "6.0 Current (development branch)" msgstr "" #. type: Table -#: documentation/content/en/books/dev-model/_index.adoc:394 +#: documentation/content/en/books/dev-model/_index.adoc:390 #, no-wrap msgid "5.3 Release" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:404 +#: documentation/content/en/books/dev-model/_index.adoc:400 msgid "" "The latest -CURRENT version is always referred to as -CURRENT, while the " "latest -STABLE release is always referred to as -STABLE. In this figure, -" @@ -918,7 +917,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:411 +#: documentation/content/en/books/dev-model/_index.adoc:407 msgid "" "A \"major release\" is always made from the -CURRENT branch. However, the -" "CURRENT branch does not need to fork at that point in time, but can focus on " @@ -932,14 +931,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:413 +#: documentation/content/en/books/dev-model/_index.adoc:409 msgid "" "A \"minor release\" is made from the -CURRENT branch following a major " "release, or from the -STABLE branch." msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:416 +#: documentation/content/en/books/dev-model/_index.adoc:412 msgid "" "Following and including, 4.3-RELEASEfootnote:[The first release this " "actually happened for was 4.5-RELEASE, but security branches were at the " @@ -956,7 +955,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:421 +#: documentation/content/en/books/dev-model/_index.adoc:417 msgid "" "Each update to a security branch is called a \"patchlevel\". For every " "security enhancement that is done, the patchlevel number is increased, " @@ -967,45 +966,45 @@ msgid "" msgstr "" #. type: Title === -#: documentation/content/en/books/dev-model/_index.adoc:423 +#: documentation/content/en/books/dev-model/_index.adoc:419 #, no-wrap msgid "Model summary" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:426 +#: documentation/content/en/books/dev-model/_index.adoc:422 msgid "" "To summarise, the development model of FreeBSD can be seen as the following " "tree:" msgstr "" #. type: Block title -#: documentation/content/en/books/dev-model/_index.adoc:427 +#: documentation/content/en/books/dev-model/_index.adoc:423 #, no-wrap msgid "The overall development model" msgstr "" #. type: Positional ($1) AttributeList argument for macro 'image' -#: documentation/content/en/books/dev-model/_index.adoc:428 +#: documentation/content/en/books/dev-model/_index.adoc:424 #, no-wrap msgid "Refer to paragraphs below for a screen-reader friendly version." msgstr "" #. type: Target for macro image -#: documentation/content/en/books/dev-model/_index.adoc:428 +#: documentation/content/en/books/dev-model/_index.adoc:424 #, no-wrap msgid "freebsd-code-model.png" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:431 +#: documentation/content/en/books/dev-model/_index.adoc:427 msgid "" "The tree of the FreeBSD development with ongoing development efforts and " "continuous integration." msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:435 +#: documentation/content/en/books/dev-model/_index.adoc:431 msgid "" "The tree symbolises the release versions with major versions spawning new " "main branches and minor versions being versions of the main branch. The top " @@ -1015,7 +1014,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:439 +#: documentation/content/en/books/dev-model/_index.adoc:435 msgid "" "Clouds of development efforts hang over the project where developers use the " "development models they see fit. The product of their work is then " @@ -1025,7 +1024,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:446 +#: documentation/content/en/books/dev-model/_index.adoc:442 msgid "" "Many committers have a special area of responsibility. These roles are " "called hats. These hats can be either project roles, such as public " @@ -1037,7 +1036,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:451 +#: documentation/content/en/books/dev-model/_index.adoc:447 msgid "" "Many of these hats are not formalised. Formalised hats have a charter " "stating the exact purpose of the hat along with its privileges and " @@ -1048,25 +1047,25 @@ msgid "" msgstr "" #. type: Title == -#: documentation/content/en/books/dev-model/_index.adoc:453 +#: documentation/content/en/books/dev-model/_index.adoc:449 #, no-wrap msgid "Hats" msgstr "" #. type: Title === -#: documentation/content/en/books/dev-model/_index.adoc:456 +#: documentation/content/en/books/dev-model/_index.adoc:452 #, no-wrap msgid "General Hats" msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:459 +#: documentation/content/en/books/dev-model/_index.adoc:455 #, no-wrap msgid "Contributor" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:462 +#: documentation/content/en/books/dev-model/_index.adoc:458 msgid "" "A Contributor contributes to the FreeBSD project either as a developer, as " "an author, by sending problem reports, or in other ways contributing to the " @@ -1075,13 +1074,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:464 +#: documentation/content/en/books/dev-model/_index.adoc:460 #, no-wrap msgid "Committer" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:469 +#: documentation/content/en/books/dev-model/_index.adoc:465 msgid "" "A person who has the required privileges to add their code or documentation " "to the repository. A committer has made a commit within the past 12 " @@ -1091,7 +1090,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:472 +#: documentation/content/en/books/dev-model/_index.adoc:468 msgid "" "It is worth noting that there are no technical barriers to prevent someone, " "once having gained commit privileges to the main- or a sub-project, to make " @@ -1104,13 +1103,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:474 +#: documentation/content/en/books/dev-model/_index.adoc:470 #, no-wrap msgid "Core Team" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:480 +#: documentation/content/en/books/dev-model/_index.adoc:476 msgid "" "The core team is elected by the committers from the pool of committers and " "serves as the board of directors of the FreeBSD project. It promotes active " @@ -1121,13 +1120,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:482 +#: documentation/content/en/books/dev-model/_index.adoc:478 #, no-wrap msgid "Maintainership" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:486 +#: documentation/content/en/books/dev-model/_index.adoc:482 msgid "" "Maintainership means that the person is responsible for what is allowed to " "go into that area of the code and has the final say should disagreements " @@ -1136,7 +1135,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:489 +#: documentation/content/en/books/dev-model/_index.adoc:485 msgid "" "With the FreeBSD source comes the MAINTAINERS file that contains a one-line " "summary of how each maintainer would like contributions to be made. Having " @@ -1146,7 +1145,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:492 +#: documentation/content/en/books/dev-model/_index.adoc:488 msgid "" "If the maintainer is unavailable for an unreasonably long period of time, " "and other people do a significant amount of work, maintainership may be " @@ -1155,20 +1154,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:494 +#: documentation/content/en/books/dev-model/_index.adoc:490 msgid "" "Maintainership of a particular piece of code is a hat that is not held as a " "group." msgstr "" #. type: Title === -#: documentation/content/en/books/dev-model/_index.adoc:496 +#: documentation/content/en/books/dev-model/_index.adoc:492 #, no-wrap msgid "Official Hats" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:501 +#: documentation/content/en/books/dev-model/_index.adoc:497 msgid "" "The official hats in the FreeBSD Project are hats that are more or less " "formalised and mainly administrative roles. They have the authority and " @@ -1177,13 +1176,13 @@ msgid "" msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:503 +#: documentation/content/en/books/dev-model/_index.adoc:499 #, no-wrap msgid "Documentation project manager" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:506 +#: documentation/content/en/books/dev-model/_index.adoc:502 msgid "" "<> architect is responsible for defining and " "following up documentation goals for the committers in the Documentation " @@ -1191,20 +1190,20 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:509 +#: documentation/content/en/books/dev-model/_index.adoc:505 msgid "" "Hat held by: The DocEng team mailto:doceng@FreeBSD.org[doceng@FreeBSD.org]. " "The https://www.freebsd.org/internal/doceng/[ DocEng Charter]." msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:511 +#: documentation/content/en/books/dev-model/_index.adoc:507 #, no-wrap msgid "Postmaster" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:515 +#: documentation/content/en/books/dev-model/_index.adoc:511 msgid "" "The Postmaster is responsible for mail being correctly delivered to the " "committers' email address. They are also responsible for ensuring that the " @@ -1213,62 +1212,62 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:517 +#: documentation/content/en/books/dev-model/_index.adoc:513 msgid "" "Hat currently held by: the Postmaster Team mailto:postmaster@FreeBSD." "org[postmaster@FreeBSD.org]." msgstr "" #. type: Title ==== -#: documentation/content/en/books/dev-model/_index.adoc:519 +#: documentation/content/en/books/dev-model/_index.adoc:515 #, no-wrap msgid "Release Coordination" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:522 +#: documentation/content/en/books/dev-model/_index.adoc:518 msgid "The responsibilities of the Release Engineering Team are" msgstr "" #. type: Plain text -#: documentation/content/en/books/dev-model/_index.adoc:524 +#: documentation/content/en/books/dev-model/_index.adoc:520 msgid "" "Setting, publishing and following a release schedule for official releases" msgstr "" *** 8579 LINES SKIPPED ***