From nobody Tue May 30 20:47:21 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 4QW4G13Y6vz4Y7wd for ; Tue, 30 May 2023 20:47:21 +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 4QW4G136WJz4NN7; Tue, 30 May 2023 20:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685479641; 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=PLohHzgCuIvwCfSKkMNhsZ8Qcj4z0l86FKDoO+wU4bU=; b=AGzRyte84zdCu3MXOMF6adSpb2ZqEKk36C/zz+Lsm6gW7yPvgjzDnQVfwwg2tqDr0mLQdc 6t4j5Nmea23j6O3BejLA8/iTlJNh9ahAK6ZhaqPEGSJMYJ5qNwcnhQ6ofg4eZiIwx9z9Cy Y8YLOgM8E9ycPMo+xg40B4RzAAQg98iJy91bao874bit1sS3iiJunrmdE6VLkoF5iNFNSZ 57inyyl5fC0i27f/cbzSOuu46lv5OMw8UU3/Agrkw51Yssfe/TyK1YWSEU7vHRjZwdZJWA bkxL0FH9W5KS5OzlGxLZQ6+N7y0O2x5uxhqCrMGePDc6CUAFfJUitOqg593x9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685479641; 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=PLohHzgCuIvwCfSKkMNhsZ8Qcj4z0l86FKDoO+wU4bU=; b=qYpvRYoOccfP1a0RGPG9sHLRnESB0FH75yAjK8acPnP6q1+w4STn6gDEk84O8EX3/K1w63 /lo1/QZdMn4O5cZXVbA4lpQUWGNTxV8/2yxD2N6ISrzGpTan+s2sI3yUK2imsakKDEYaKc oNPaej/pX/VRi2/g1Mp34xbQIn0OMCbL7vm6BuBfUl/x3kDpkuB55pS/hf1s4kAQS5K8Gx VyMke9tmMOVvgNORFaKl0K5qfg7lF2XKsT/hf+FpZYfx1C2UE18ZtvV/UmWFKU4A2rVWDi tJ6MGrl5drF58Ht9rvM6I13yaje9JVXbHDHtEcpyDx5d8q4eEXlW9PogIPNVUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685479641; a=rsa-sha256; cv=none; b=ECrapl67R1qRSk1tADm+iZ0Mo4aMaIwM9RaSrealL7zSsizzSPCeTGWVPPAAfZwHZP5uDs t6NqLWup0AOIjxu0Mpp+eL4SXzoqcmhEWnces49Km+sT8VaW1Doie7o/zSJ7TuV2OvhH/j cGsOguRfH42u7ZRNt5l0/giCbPkdF5Q3oIsW4CkEvTypT7q9NYHdZCvwnFV1nzDfMaW/4Y QCCTW4jlpIr7IbzWl8JmuN0vu4IqLn5iVcEd3uAckSQWnVXm9EK2hM1drhrQ6KbAyNpQCF nUP/mmjAfnTffTb3w01oQS67MSmIYzO+j8r/ZecBVe6Tf+i3Kr93su+MJPRkSg== 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 4QW4G124KDz17PP; Tue, 30 May 2023 20:47:21 +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 34UKlL3L076225; Tue, 30 May 2023 20:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UKlLtU076224; Tue, 30 May 2023 20:47:21 GMT (envelope-from git) Date: Tue, 30 May 2023 20:47:21 GMT Message-Id: <202305302047.34UKlLtU076224@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Edson Brandi Subject: git: cc162c98e6 - main - Article license-guide in pt_BR synced with en_US doc tree version f7e514ee7f5b6ccaefb3ff14bca73d3ba7d98a33 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: ebrandi X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc162c98e6508c4e49ab26c74e67c3ddefc7436a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ebrandi: URL: https://cgit.FreeBSD.org/doc/commit/?id=cc162c98e6508c4e49ab26c74e67c3ddefc7436a commit cc162c98e6508c4e49ab26c74e67c3ddefc7436a Author: Edson Brandi AuthorDate: 2023-05-30 20:46:45 +0000 Commit: Edson Brandi CommitDate: 2023-05-30 20:46:45 +0000 Article license-guide in pt_BR synced with en_US doc tree version f7e514ee7f5b6ccaefb3ff14bca73d3ba7d98a33 --- .../pt-br/articles/license-guide/_index.adoc | 7 +- .../content/pt-br/articles/license-guide/_index.po | 255 ++++++++++----------- 2 files changed, 129 insertions(+), 133 deletions(-) diff --git a/documentation/content/pt-br/articles/license-guide/_index.adoc b/documentation/content/pt-br/articles/license-guide/_index.adoc index 8ac998e8f8..e9f4d96af8 100644 --- a/documentation/content/pt-br/articles/license-guide/_index.adoc +++ b/documentation/content/pt-br/articles/license-guide/_index.adoc @@ -150,11 +150,12 @@ Uma licença é um documento legal entre o colaborador e os usuários do softwar Entidades que contribuem com correções e melhorias para a coleção de software sem uma licença explícita concordam em licenciar essas mudanças sob os termos que se aplicam aos arquivo(s) modificados. A política do projeto, em linha com a prática da indústria, inclui apenas um aviso de direitos autorais dos contribuintes significativos para os arquivos na coleção. -Existem quatro tipos de arquivos na coleção de software do FreeBSD +Existem quatro tipos de arquivos na coleção de software do FreeBSD: + . Arquivos que possuem apenas um aviso explícito de direitos autorais e de licença. . Arquivos que possuem tanto um aviso explícito de direitos autorais e de licença, quanto uma tag SPDX-License-Identifier. -. Arquivos que possuem apenas um aviso de direitos autorais e uma tag SPDX-License-Identifier, mas sem uma licença explícita -. Arquivos que não possuem nenhum aviso de direitos autorais ou de licença +. Arquivos que possuem apenas um aviso de direitos autorais e uma tag SPDX-License-Identifier, mas sem uma licença explícita. +. Arquivos que não possuem nenhum aviso de direitos autorais ou de licença. === Apenas Direitos Autorais e Licença diff --git a/documentation/content/pt-br/articles/license-guide/_index.po b/documentation/content/pt-br/articles/license-guide/_index.po index d1673bc184..5dab8f16bc 100644 --- a/documentation/content/pt-br/articles/license-guide/_index.po +++ b/documentation/content/pt-br/articles/license-guide/_index.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2023-04-20 21:10-0300\n" -"PO-Revision-Date: 2023-04-22 16:17+0000\n" +"POT-Creation-Date: 2023-05-21 14:43-0300\n" +"PO-Revision-Date: 2023-05-30 20:22+0000\n" "Last-Translator: Edson Brandi \n" "Language-Team: Portuguese (Brazil) \n" @@ -162,8 +162,8 @@ msgstr "Política de Licença de Software" msgid "" "The following sections outline the project's Software License Policies in " "detail. For the most part we expect developers to read, understand and " -"utilize the sections above this one in order to apply appropriate licenses " -"to their contributions. The rest of this document details the philosophical " +"utilize the sections above this one to apply appropriate licenses to their " +"contributions. The rest of this document details the philosophical " "background to the policies as well as the policies in great detail. As " "always, if the text below is confusing or you need help with applying these " "policies, please reach out to {core-email}." @@ -188,11 +188,11 @@ msgid "" "The FreeBSD Project aims to produce a complete, BSD-licensed operating " "system allowing consumers of the system to produce derivative products " "without constraint or further license obligations. We invite and greatly " -"appreciate the contribution of both changes and additions under the " -"two-clause BSD license, and encourage the adoption of this license by other " -"open source projects. Use of the BSD license is key to encouraging the " -"adoption of advanced operating system technology, and on many notable " -"occasions has been pivotal to widespread use of new technology." +"appreciate the contribution of both changes and additions under the two-" +"clause BSD license, and encourage the adoption of this license by other open " +"source projects. Use of the BSD license is key to encouraging the adoption " +"of advanced operating system technology, and on many notable occasions has " +"been pivotal to widespread use of new technology." msgstr "" "O Projeto FreeBSD tem como objetivo produzir um sistema operacional completo " "licenciado sob a licença BSD, permitindo que os usuários do sistema criem " @@ -207,8 +207,8 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/license-guide/_index.adoc:80 msgid "" -"We accept however that compelling reasons exist to allow " -"differently-licensed software to be included in the FreeBSD source tree." +"We accept however that compelling reasons exist to allow differently-" +"licensed software to be included in the FreeBSD source tree." msgstr "" "No entanto, reconhecemos que existem razões importantes para permitir que " "softwares com licenças diferentes sejam incluídos no FreeBSD." @@ -327,9 +327,9 @@ msgid "" "change of license of existing components to the BSD+Patent License." msgstr "" "A Licença BSD+Patent é aceitável para uso em alguns casos. O Core Team deve " -"aprovar a importação de novos componentes licenciados sob a Licença BSD+" -"Patent ou a mudança da licença de componentes existentes para a Licença " -"BSD+Patent." +"aprovar a importação de novos componentes licenciados sob a Licença BSD" +"+Patent ou a mudança da licença de componentes existentes para a Licença BSD" +"+Patent." #. type: Plain text #: documentation/content/en/articles/license-guide/_index.adoc:108 @@ -364,14 +364,14 @@ msgstr "" #: documentation/content/en/articles/license-guide/_index.adoc:120 msgid "" "Historically, the phrase 'All Rights Reserved.' was included in all " -"copyright notices. All the BSD releases had it, in order to comply with the " -"https://en.wikipedia.org/wiki/Buenos_Aires_Convention[Buenos Aires " -"Convention of 1910] in the Americas. With the ratification of the " -"https://en.wikipedia.org/wiki/Berne_Convention[Berne Convention] in 2000 by " -"Nicaragua, the Buenos Aires Convention -- and the phrase -- became " -"obsolete. As such, the FreeBSD project recommends that new code omit the " -"phrase and encourages existing copyright holders to remove it. In 2018, the " -"project updated its templates to remove it." +"copyright notices. All the BSD releases had it, to comply with the https://" +"en.wikipedia.org/wiki/Buenos_Aires_Convention[Buenos Aires Convention of " +"1910] in the Americas. With the ratification of the https://en.wikipedia." +"org/wiki/Berne_Convention[Berne Convention] in 2000 by Nicaragua, the Buenos " +"Aires Convention -- and the phrase -- became obsolete. As such, the FreeBSD " +"project recommends that new code omit the phrase and encourages existing " +"copyright holders to remove it. In 2018, the project updated its templates " +"to remove it." msgstr "" "Historicamente, a expressão \"Todos os direitos reservados\" era incluída em " "todos os avisos de direitos autorais. Todos os releases do BSD tinham essa " @@ -387,11 +387,10 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/license-guide/_index.adoc:123 msgid "" -"Initially, many items in the FreeBSD tree were marked with " -"BSD-2-Clause-FreeBSD. However, SPDX has obsoleted the license as a variant; " -"and the SPDX text of the obsolete tag differs enough from the standard " -"FreeBSD license that it shouldn't be used. A review of its current use is " -"ongoing." +"Initially, many items in the FreeBSD tree were marked with BSD-2-Clause-" +"FreeBSD. However, SPDX has obsoleted the license as a variant; and the SPDX " +"text of the obsolete tag differs enough from the standard FreeBSD license " +"that it shouldn't be used. A review of its current use is ongoing." msgstr "" "Inicialmente, muitos itens no repositório do FreeBSD eram marcados com a " "licença BSD-2-Clause-FreeBSD. No entanto, o SPDX obsoletou a licença como " @@ -493,11 +492,11 @@ msgstr "A Licença de Coleção de Software" #. type: Plain text #: documentation/content/en/articles/license-guide/_index.adoc:174 msgid "" -"The FreeBSD Project licenses its compilation of software as described in " -"[.filename]#COPYRIGHT# under the BSD-2-Clause license. This license does " -"not supersede the license of individual files, which is described below. " -"Files that do not have an explicit license are licensed under the " -"BSD-2-Clause license." +"The FreeBSD Project licenses its compilation of software as described in [." +"filename]#COPYRIGHT# under the BSD-2-Clause license. This license does not " +"supersede the license of individual files, which is described below. Files " +"that do not have an explicit license are licensed under the BSD-2-Clause " +"license." msgstr "" "O Projeto FreeBSD licencia sua compilação de software conforme descrito em [." "filename]#COPYRIGHT# sob a licença BSD-2-Clause. Essa licença não substitui " @@ -518,20 +517,19 @@ msgid "" "directory of the repository. There are three subdirectories under this top " "level directory. The [.filename]#LICENSES/text/# subdirectory contains, in " "detached form, the text of all the licenses that are allowed in the FreeBSD " -"software collection. These files are stored using the " -"SPDX-License-Identifier name followed by .txt. The " -"[.filename]#LICENSES/exceptions/# subdirectory has the text of all " -"exceptions that are allowed in detached form in the FreeBSD software " -"collection. These files are stored using the exception identifier name " -"followed by .txt. The [.filename]#LICENSES/other/# contains, in detached " -"form, the license files references in SPDX-License-Identifier expressions, " -"but aren't otherwise allowed as detached licenses. All such files must " -"appear at least once in the FreeBSD software collection, and should be " -"removed when the last file that references them is removed. Licenses that " -"have no adequate SPDX matching license must be in " -"[.filename]#LICENSES/other/# and have a filename that starts with " -"LicenseRef- followed by a unique idstring. No such files have currently " -"been identified, but if they are, a full list will appear here." +"software collection. These files are stored using the SPDX-License-" +"Identifier name followed by .txt. The [.filename]#LICENSES/exceptions/# " +"subdirectory has the text of all exceptions that are allowed in detached " +"form in the FreeBSD software collection. These files are stored using the " +"exception identifier name followed by .txt. The [.filename]#LICENSES/other/" +"# contains, in detached form, the license files references in SPDX-License-" +"Identifier expressions, but aren't otherwise allowed as detached licenses. " +"All such files must appear at least once in the FreeBSD software collection, " +"and should be removed when the last file that references them is removed. " +"Licenses that have no adequate SPDX matching license must be in [." +"filename]#LICENSES/other/# and have a filename that starts with LicenseRef- " +"followed by a unique idstring. No such files have currently been " +"identified, but if they are, a full list will appear here." msgstr "" "Para cumprir com o padrão https://reuse.software/[REUSE Software] tanto " "quanto possível, todos os arquivos de licença serão armazenados no diretório " @@ -548,11 +546,11 @@ msgstr "" "permitidos como licenças destacadas. Todos esses arquivos devem aparecer " "pelo menos uma vez na coleção de software do FreeBSD e devem ser removidos " "quando o último arquivo que os referenciar for removido. As licenças que não " -"possuem uma correspondência adequada no SPDX devem estar em [.filename]#" -"LICENSES/other/# e ter um nome de arquivo que comece com LicenseRef-, " -"seguido por uma sequência de identificação exclusiva. Nenhum desses arquivos " -"foi identificado atualmente, mas se forem, uma lista completa será " -"apresentada aqui." +"possuem uma correspondência adequada no SPDX devem estar em [." +"filename]#LICENSES/other/# e ter um nome de arquivo que comece com " +"LicenseRef-, seguido por uma sequência de identificação exclusiva. Nenhum " +"desses arquivos foi identificado atualmente, mas se forem, uma lista " +"completa será apresentada aqui." #. type: Plain text #: documentation/content/en/articles/license-guide/_index.adoc:191 @@ -651,48 +649,48 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/license-guide/_index.adoc:215 -msgid "There are four types of files in the FreeBSD software collection" -msgstr "Existem quatro tipos de arquivos na coleção de software do FreeBSD" +msgid "There are four types of files in the FreeBSD software collection:" +msgstr "Existem quatro tipos de arquivos na coleção de software do FreeBSD:" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:216 +#: documentation/content/en/articles/license-guide/_index.adoc:217 msgid "Files that have only an explicit copyright notice and license." msgstr "" "Arquivos que possuem apenas um aviso explícito de direitos autorais e de " "licença." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:217 +#: documentation/content/en/articles/license-guide/_index.adoc:218 msgid "" -"Files that have both an explicit copyright notice and license, and a " -"SPDX-License-Identifier tag." +"Files that have both an explicit copyright notice and license, and a SPDX-" +"License-Identifier tag." msgstr "" "Arquivos que possuem tanto um aviso explícito de direitos autorais e de " "licença, quanto uma tag SPDX-License-Identifier." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:218 +#: documentation/content/en/articles/license-guide/_index.adoc:219 msgid "" "Files that have only a copyright notice and an SPDX-License-Identifier tag, " -"but no explicit license" +"but no explicit license." msgstr "" "Arquivos que possuem apenas um aviso de direitos autorais e uma tag SPDX-" -"License-Identifier, mas sem uma licença explícita" +"License-Identifier, mas sem uma licença explícita." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:219 -msgid "Files that lack any copyright or license at all" +#: documentation/content/en/articles/license-guide/_index.adoc:220 +msgid "Files that lack any copyright or license at all." msgstr "" -"Arquivos que não possuem nenhum aviso de direitos autorais ou de licença" +"Arquivos que não possuem nenhum aviso de direitos autorais ou de licença." #. type: Title === -#: documentation/content/en/articles/license-guide/_index.adoc:220 +#: documentation/content/en/articles/license-guide/_index.adoc:221 #, no-wrap msgid "Only Copyright and License" msgstr "Apenas Direitos Autorais e Licença" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:224 +#: documentation/content/en/articles/license-guide/_index.adoc:225 msgid "" "Many files in the FreeBSD software collection have both a copyright notice " "and an explicit license contained in the file. In these cases, the license " @@ -703,21 +701,20 @@ msgstr "" "casos, a licença contida no arquivo é a que governa." #. type: Title === -#: documentation/content/en/articles/license-guide/_index.adoc:225 +#: documentation/content/en/articles/license-guide/_index.adoc:226 #, no-wrap msgid "Copyright and License with SPDX-License-Identifier expression" msgstr "Direitos autorais e licença com a expressão SPDX-License-Identifier" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:231 +#: documentation/content/en/articles/license-guide/_index.adoc:232 msgid "" "Some files in the FreeBSD software collection contain a copyright statement, " "an SPDX-License-Identifier tag and an explicit license. The explicit " -"license takes precedence over the SPDX-License-Identifier tag. The " -"SPDX-License-Identifier tag is the project's best effort attempt to " -"characterize the license, but is only informative for automated tools. See " -"<> for how to interpret the " -"expression." +"license takes precedence over the SPDX-License-Identifier tag. The SPDX-" +"License-Identifier tag is the project's best effort attempt to characterize " +"the license, but is only informative for automated tools. See <> for how to interpret the expression." msgstr "" "Alguns arquivos na coleção de software do FreeBSD contêm uma declaração de " "direitos autorais, uma tag SPDX-License-Identifier e uma licença explícita. " @@ -728,13 +725,13 @@ msgstr "" "para saber como interpretar a expressão." #. type: Title === -#: documentation/content/en/articles/license-guide/_index.adoc:232 +#: documentation/content/en/articles/license-guide/_index.adoc:233 #, no-wrap msgid "Only Copyright and SPDX-License-Identifier expression." msgstr "Apenas direitos autorais e a expressão SPDX-License-Identifier." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:238 +#: documentation/content/en/articles/license-guide/_index.adoc:239 msgid "" "Some files in the tree contain detached licenses. These files contain only " "a copyright notice and an SPDX-License-Identifier expression, but no " @@ -752,7 +749,7 @@ msgstr "" "definidas pelo padrão." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:240 +#: documentation/content/en/articles/license-guide/_index.adoc:241 msgid "" "The license for files containing only the SPDX-License-Identifier should be " "construed to be" @@ -761,7 +758,7 @@ msgstr "" "construida da seguinte forma" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:243 +#: documentation/content/en/articles/license-guide/_index.adoc:244 msgid "" "Start the license with the copyright notice from the file. Include all the " "copyright holders." @@ -770,27 +767,26 @@ msgstr "" "todos os detentores dos direitos autorais." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:246 +#: documentation/content/en/articles/license-guide/_index.adoc:247 msgid "" -"For each sub-expression, copy the license text from " -"[.filename]#LICENSE/text/`id`.txt#. When exceptions are present, append " -"them from [.filename]#src/share/license/exceptions/`id`.txt#. " -"SPDX-License-Identifier expressions should be construed as described in the " -"SPDX standard." +"For each sub-expression, copy the license text from [.filename]#LICENSE/text/" +"`id`.txt#. When exceptions are present, append them from [.filename]#src/" +"share/license/exceptions/`id`.txt#. SPDX-License-Identifier expressions " +"should be construed as described in the SPDX standard." msgstr "" "Para cada sub-expressão, copie o texto da licença de [.filename]#LICENSE/" -"text/`id`.txt#. Quando exceções estiverem presentes, anexe-as de [.filename]#" -"src/share/license/exceptions/`id`.txt#. As expressões SPDX-License-" +"text/`id`.txt#. Quando exceções estiverem presentes, anexe-as de [." +"filename]#src/share/license/exceptions/`id`.txt#. As expressões SPDX-License-" "Identifier devem ser interpretadas conforme descrito no padrão SPDX." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:249 +#: documentation/content/en/articles/license-guide/_index.adoc:250 msgid "" "Where `id` is the SPDX short license identifier from the `Identifier` column " -"of https://spdx.org/licenses/[SPDX Identifiers] or " -"https://spdx.org/licenses/exceptions-index.html[license exception]. If " -"there is no file in [.filename]#LICENSE/#, then that license or exception " -"cannot be specified as a detached license under this section." +"of https://spdx.org/licenses/[SPDX Identifiers] or https://spdx.org/licenses/" +"exceptions-index.html[license exception]. If there is no file in [." +"filename]#LICENSE/#, then that license or exception cannot be specified as a " +"detached license under this section." msgstr "" "Onde o`id` é o identificador curto de licença SPDX da coluna `Identifier` de " "https://spdx.org/licenses/[SPDX Identifiers] ou da lista de https://spdx.org/" @@ -799,7 +795,7 @@ msgstr "" "especificada como uma licença desanexada nesta seção." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:251 +#: documentation/content/en/articles/license-guide/_index.adoc:252 msgid "" "When reading the license text that is detached from a file, a number of " "considerations must be taken to make the detached license make sense." @@ -808,7 +804,7 @@ msgstr "" "considerações devem ser tomadas para que a licença desanexada faça sentido." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:254 +#: documentation/content/en/articles/license-guide/_index.adoc:255 msgid "" "Any reference to a copyright notice shall refer to the copyright notice " "constructed from the licensed file, not from any copyright notice in the " @@ -822,13 +818,13 @@ msgstr "" "que são entendidos apenas como exemplos." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:256 +#: documentation/content/en/articles/license-guide/_index.adoc:258 msgid "" "When names of entities are referred to in the license text, they shall be " "construed to apply to the list of all copyright holders listed in the " "copyright notices of the licensed file. For example, the BSD-4-clause " "license contains the phrase \"This product includes software developed by " -"the organization\". The phrase 'the organization' should be replaced by the " +"the organization\". The phrase 'the organization' should be replaced by the " "copyright holders." msgstr "" "Quando os nomes das entidades são mencionados no texto da licença, eles " @@ -839,7 +835,7 @@ msgstr "" "organização' deve ser substituída pelos detentores de direitos autorais." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:258 +#: documentation/content/en/articles/license-guide/_index.adoc:260 msgid "" "When the SPDX offers variations of the license, it is understood the license " "in the [.filename]#LICENSE/# file represents the exact version of the " @@ -854,12 +850,12 @@ msgstr "" "organização SPDX acredita serem legalmente idênticas." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:262 +#: documentation/content/en/articles/license-guide/_index.adoc:264 msgid "" "For licenses that have slight variations in text, the SPDX has guidelines to " "match them. These guidelines are not relevant here. Contributors wishing " -"to license under a variant of a SPDX license not contained verbatim in " -"[.filename]#LICENSE/# cannot use the detached option and must specify the " +"to license under a variant of a SPDX license not contained verbatim in [." +"filename]#LICENSE/# cannot use the detached option and must specify the " "license explicitly." msgstr "" "Para licenças que possuem pequenas variações no texto, o SPDX possui " @@ -869,18 +865,18 @@ msgstr "" "opção desanexada e devem especificar explicitamente a licença." #. type: Title === -#: documentation/content/en/articles/license-guide/_index.adoc:263 +#: documentation/content/en/articles/license-guide/_index.adoc:265 #, no-wrap msgid "Files without Copyright or any License Marking" msgstr "Arquivos sem marcação de direitos autorais ou de licença" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:268 +#: documentation/content/en/articles/license-guide/_index.adoc:270 msgid "" "Some files cannot have suitable comments added to them. In such cases, a " "license may be found in [.filename]#file.ext.license#. For example, a file " -"named [.filename]#foo.jpg# may have a license in " -"[.filename]#foo.jpg.license#, following the REUSE Software conventions." +"named [.filename]#foo.jpg# may have a license in [.filename]#foo.jpg." +"license#, following the REUSE Software conventions." msgstr "" "Alguns arquivos não podem ter comentários adequados adicionados a eles. " "Nesses casos, uma licença pode ser encontrada em [.filename]#file.ext." @@ -889,7 +885,7 @@ msgstr "" "REUSE." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:271 +#: documentation/content/en/articles/license-guide/_index.adoc:273 msgid "" "Files created by the project that lack a copyright notice are understood to " "fall under the blanket copyright and licensing in [.filename]#COPYRIGHT#. " @@ -904,7 +900,7 @@ msgstr "" "não justifica a sobrecarga de uma licença explícita." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:274 +#: documentation/content/en/articles/license-guide/_index.adoc:276 msgid "" "Files that lack marking and have more than a trivial amount of copyrightable " "material, or whose author believes them to be improperly marked, should be " @@ -918,7 +914,7 @@ msgstr "" "licenças apropriadas." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:276 +#: documentation/content/en/articles/license-guide/_index.adoc:278 msgid "" "In the future, all such files will be marked explicitly, or follow the REUSE " "Software [.filename]#.license# convention." @@ -927,21 +923,21 @@ msgstr "" "convenção de software REUSE [.filename]#.license#." #. type: Title === -#: documentation/content/en/articles/license-guide/_index.adoc:278 +#: documentation/content/en/articles/license-guide/_index.adoc:280 #, no-wrap msgid "SPDX-License-Identifier Expressions" msgstr "Expressões SPDX-License-Identifier" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:285 +#: documentation/content/en/articles/license-guide/_index.adoc:287 msgid "" "An 'SPDX License expression' is used in two contexts in the FreeBSD software " "collection. First, its full form is used for files that have explicit " -"license statements contained within the file as well as a summarizing " -"SPDX-License-Identifier expression. In this context, the full power of " -"these expressions may be used. Second, in a restricted form described " -"above, it is used to denote the actual license for a given file. In the " -"second context, only a subset of this expression is allowed by the project." +"license statements contained within the file as well as a summarizing SPDX-" +"License-Identifier expression. In this context, the full power of these " +"expressions may be used. Second, in a restricted form described above, it " +"is used to denote the actual license for a given file. In the second " +"context, only a subset of this expression is allowed by the project." msgstr "" "A \"expressão de licença SPDX\" é usada em dois contextos na coleção de " "software do FreeBSD. Em primeiro lugar, sua forma completa é usada para " @@ -953,7 +949,7 @@ msgstr "" "expressão é permitido pelo projeto." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:289 +#: documentation/content/en/articles/license-guide/_index.adoc:291 msgid "" "An `SPDX License sub-expression` is either an SPDX short form license " "identifier from the https://spdx.org/licenses/[SPDX License List], or the " @@ -961,24 +957,23 @@ msgid "" "when a https://spdx.org/licenses/exceptions-index.html[license exception] " "applies. When multiple licenses apply, an expression consists of keywords " "\"AND\", \"OR\" separating sub-expressions and surrounded by \"(\", \")\" . " -"The " -"https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/[full " -"specification of expressions] spells out all the details and takes " +"The https://spdx.github.io/spdx-spec/appendix-IV-SPDX-license-expressions/" +"[full specification of expressions] spells out all the details and takes " "precedence when it conflicts with the simplified treatment of this section." msgstr "" "Uma \"sub-expressão de licença SPDX\" é um identificador de licença de forma " "curta SPDX da https://spdx.org/licenses/[Lista de Licenças SPDX], ou a " "combinação de dois identificadores de licença de forma curta SPDX separados " -"por \"WITH\" quando uma https://spdx.org/licenses/exceptions-index.html[" -"licença de exceção] se aplica. Quando várias licenças se aplicam, uma " +"por \"WITH\" quando uma https://spdx.org/licenses/exceptions-index." +"html[licença de exceção] se aplica. Quando várias licenças se aplicam, uma " "expressão consiste em palavras-chave \"AND\", \"OR\" que separam as sub-" -"expressões e são cercadas por \"(\", \")\". A https://spdx.github.io/" -"spdx-spec/appendix-IV-SPDX-license-expressions/[especificação completa de " +"expressões e são cercadas por \"(\", \")\". A https://spdx.github.io/spdx-" +"spec/appendix-IV-SPDX-license-expressions/[especificação completa de " "expressões] explica todos os detalhes e tem precedência em caso de conflito " "com o tratamento simplificado desta seção." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:297 +#: documentation/content/en/articles/license-guide/_index.adoc:299 msgid "" "Some license identifiers, like [L]GPL, have the option to use only that " "version, or any later version. SPDX defines the suffix `-or-later` to mean " @@ -995,13 +990,13 @@ msgstr "" "later\" para significar aquela versão da licença ou uma versão posterior. " "Define \"-only\" para significar apenas aquela versão específica do arquivo. " "Existe uma convenção antiga de não ter um sufixo (o que significa o que o " -"novo sufixo '-only' significa, mas que as pessoas confundem com '-or-later')" -". Além disso, adicionar um sufixo `+` significava `-or-later`. Novos " +"novo sufixo '-only' significa, mas que as pessoas confundem com '-or-" +"later'). Além disso, adicionar um sufixo `+` significava `-or-later`. Novos " "arquivos no FreeBSD não devem usar essas duas convenções. Arquivos antigos " "que usam essa convenção devem ser convertidos conforme apropriado." #. type: delimited block . 4 -#: documentation/content/en/articles/license-guide/_index.adoc:302 +#: documentation/content/en/articles/license-guide/_index.adoc:304 #, no-wrap msgid "" " // SPDX-License-Identifier: GPL-2.0-only\n" @@ -1011,7 +1006,7 @@ msgstr "" " // SPDX-License-Identifier: LGPL-2.1-or-later\n" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:306 +#: documentation/content/en/articles/license-guide/_index.adoc:308 msgid "" "`WITH` should be used when a license modifier is needed. In the FreeBSD " "project, a number of files from LLVM have an exception to the Apache 2.0 " @@ -1022,13 +1017,13 @@ msgstr "" "Apache 2.0:" #. type: delimited block . 4 -#: documentation/content/en/articles/license-guide/_index.adoc:310 +#: documentation/content/en/articles/license-guide/_index.adoc:312 #, no-wrap msgid " // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception\n" msgstr " // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception\n" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:314 +#: documentation/content/en/articles/license-guide/_index.adoc:316 msgid "" "https://spdx.org/licenses/exceptions-index.html[Exception tags] are managed " "by SPDX. License exceptions can only be applied to certain licenses, as " @@ -1039,7 +1034,7 @@ msgstr "" "determinadas licenças, conforme especificado na exceção." #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:317 +#: documentation/content/en/articles/license-guide/_index.adoc:319 msgid "" "`OR` should be used if the file has a choice of license and one license is " "selected. For example, some dtsi files are available under dual licenses:" @@ -1049,13 +1044,13 @@ msgstr "" "sob licenças duplas:" #. type: delimited block . 4 -#: documentation/content/en/articles/license-guide/_index.adoc:321 +#: documentation/content/en/articles/license-guide/_index.adoc:323 #, no-wrap msgid " // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause\n" msgstr " // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause\n" #. type: Plain text -#: documentation/content/en/articles/license-guide/_index.adoc:325 +#: documentation/content/en/articles/license-guide/_index.adoc:327 msgid "" "`AND` should be used if the file has multiple licenses whose terms all apply " "to use the file. For example, if code has been incorporated by several " @@ -1066,7 +1061,7 @@ msgstr "" "vários projetos, cada um com sua própria licença:" #. type: delimited block . 4 -#: documentation/content/en/articles/license-guide/_index.adoc:329 +#: documentation/content/en/articles/license-guide/_index.adoc:331 #, no-wrap msgid " // SPDX-License-Identifier: BSD-2-Clause AND MIT\n" msgstr " // SPDX-License-Identifier: BSD-2-Clause AND MIT\n" From nobody Mon Jun 5 05:50:35 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 4QZN4W3h2nz4Zq7L for ; Mon, 5 Jun 2023 05:50:35 +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 4QZN4W3F7gz3NB7; Mon, 5 Jun 2023 05:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685944235; 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=Wb76txIdziluH5gUdvvqhxsUkQxijdgxHu95GreXNG8=; b=gz9zN57hMqNcQE8hZriBmea1D3gut2nrp4c7iPg6s/+TOS+bYRQu5RqtSkDhIDeSwFPHqG wXJhgnP+gjzQmMQ+y2JLj/IoGUcr/2bPu+nE7Tfl5/+5CahhXyDfJKf94gJm/8VqazLE0k eEJjHaoEzY7oognebd1WQxYyzp+ufb7S+KSFThBvUQ+G28vHEXHIEEWy0iMX1LIVPHlHx3 yBWhjD37jhRwb56F4D+xVzokd8Urc0WYOxiXEdvQyxzGQI+m9T2k9fP6fX+G3kJFH0slct XrIQI2fiDBnXjEEdVazIsQ9ZMHD8Zfw1Z+QeftFj2dP8YL6VJfjIDHEvFFk/TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685944235; 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=Wb76txIdziluH5gUdvvqhxsUkQxijdgxHu95GreXNG8=; b=JxiFfPe4G+QCpZc5guxg+7yUWXD3U4V5IES+WPFlpf03sKLehKLJChf7oyu16BgdVpi8Ep vlruzaEnZg3yl+OnqYyuoyoNZveTXtwzddHh0Lvie02adlj74pt2XjcDq6M4w/p7+LCOQ6 qjWqjU2w6YfFRXb4OYZmEYRM7inUOqufZn4SM2TjRx0a7I8+wDkZZsm3fh8YEGy7ROa6PV Nvznjs+pcgll7ingubO7JmAB5PhAqaKNJiKaXSv6G1Q1rbYTUvMWswSv1pc3K9Hme5NdCT 7KQ4Aeew3j6AHna/zCUK8isXdwS4yycvhfAyJG3AjwbAQiP1fz9jDxubW06nMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685944235; a=rsa-sha256; cv=none; b=HcxfAmz9f1YwiR83+p1vWM6PkOV9VLPZMdDj5Lxt/PnQhh20BGcKSuSkG0QpQb+FDSoaaF 885+0bLGSmhPPf/UX32pvEQwOjlAPYk9PqRQ99JgYQcmn2FQhWv9+hcgWOCWESXBovL12g F3Vqh3c/ixcQLg/ngowLFUKDqLTYnd79a7UEeWrskpZVBQQIJGfLDekJdUUn/QzaYGUKoe 1W0/HUVxGd4ERiW8nk0B209bUa76qjRbzHQcIFVzyPjHtgchM/kW1Iioi5cL7rN8VA+Jmn K5M3KIDMuOy11NiBi438Gz9P1/oij0UL4Q2GLK/HGeMcnduF1w+1aoeWw60r5Q== 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 4QZN4W2J3MzbwR; Mon, 5 Jun 2023 05:50:35 +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 3555oZgj053168; Mon, 5 Jun 2023 05:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3555oZRp053167; Mon, 5 Jun 2023 05:50:35 GMT (envelope-from git) Date: Mon, 5 Jun 2023 05:50:35 GMT Message-Id: <202306050550.3555oZRp053167@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Colin Percival Subject: git: 8618b393d5 - main - 13.2R: Minor corrections to announce and relnotes 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: cperciva X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8618b393d5cdc71d55dfcb674cb0dc2b7237234d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/doc/commit/?id=8618b393d5cdc71d55dfcb674cb0dc2b7237234d commit 8618b393d5cdc71d55dfcb674cb0dc2b7237234d Author: Colin Percival AuthorDate: 2023-06-04 18:47:46 +0000 Commit: Colin Percival CommitDate: 2023-06-04 19:10:38 +0000 13.2R: Minor corrections to announce and relnotes * The release date is now known, and thus the EoL date for 13.1 is known. [1] * OpenSSH[2] and tzdata[3] got updated one last time before the release. The signed announce.asc file will not be updated for these corrections. Reported by: Graham Perrin [1] Reported by: Jakub Bystron [2] Reported by: Dan Allen [3] Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D40416 --- website/content/en/releases/13.2R/announce.adoc | 4 ++-- website/content/en/releases/13.2R/relnotes.adoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/content/en/releases/13.2R/announce.adoc b/website/content/en/releases/13.2R/announce.adoc index 28f63128da..4dddb81b61 100644 --- a/website/content/en/releases/13.2R/announce.adoc +++ b/website/content/en/releases/13.2R/announce.adoc @@ -21,7 +21,7 @@ The FreeBSD Release Engineering Team is pleased to announce the availability of Some of the highlights: -* OpenSSH has been updated to version 9.2p1. +* OpenSSH has been updated to version 9.3p1. * OpenSSL has been updated to version 1.1.1t. * The bhyve hypervisor now supports more than 16 vCPUs in a guest. * Address Space Layout Randomization (ASLR) is now enabled for 64-bit executables by default. @@ -271,7 +271,7 @@ Based on the new FreeBSD support model, the FreeBSD {thisBranch} release series * `https://www.FreeBSD.org/security/` -Please note that {lastRelease} will be supported until three months from the {thisRelease} release date, which is yet to be scheduled at the time of this writing. +Please note that {lastRelease} will be supported until three months from the {thisRelease} release date, i.e. July 31, 2023. == Acknowledgments diff --git a/website/content/en/releases/13.2R/relnotes.adoc b/website/content/en/releases/13.2R/relnotes.adoc index f0924ac169..966f0a7b5c 100644 --- a/website/content/en/releases/13.2R/relnotes.adoc +++ b/website/content/en/releases/13.2R/relnotes.adoc @@ -194,7 +194,7 @@ Supported `LLVM` sanitizers are now enabled on `powerpc64` and variants. `mandoc` has been upgraded to version 1.14.6. -`OpenSSH` has been upgraded to version 9.2p1. +`OpenSSH` has been upgraded to version 9.3p1. `OpenSSL` has been upgraded to version 1.1.1t. @@ -205,7 +205,7 @@ gitref:68e86d5265bc[repository=src] `tzcode` has been upgraded to version 2022g with improved timezone change detection and reliability fixes. -`tzdata` has been upgraded to version 2023b. +`tzdata` has been upgraded to version 2023c. `unbound` has been upgraded to version 1.17.1.