git: 47bf926f59 - main - license-guide: correct some typos/grammar
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Jan 2023 22:01:59 UTC
The branch main has been updated by ceri: URL: https://cgit.FreeBSD.org/doc/commit/?id=47bf926f59438c58d0e258cc0a3fb77434c33a16 commit 47bf926f59438c58d0e258cc0a3fb77434c33a16 Author: Ceri Davies <ceri@FreeBSD.org> AuthorDate: 2023-01-26 22:01:20 +0000 Commit: Ceri Davies <ceri@FreeBSD.org> CommitDate: 2023-01-26 22:01:20 +0000 license-guide: correct some typos/grammar --- .../content/en/articles/license-guide/_index.adoc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/documentation/content/en/articles/license-guide/_index.adoc b/documentation/content/en/articles/license-guide/_index.adoc index d60b6dd947..248e615ea6 100644 --- a/documentation/content/en/articles/license-guide/_index.adoc +++ b/documentation/content/en/articles/license-guide/_index.adoc @@ -113,7 +113,7 @@ The Core Team must approve the import of new CDDL licensed components or the cha *** ZFS filesystem, including kernel support and userland utilities * Historically, the phrase 'All Rights Reserved.' was included in all copyright notices. -All the BSD releases had it, in order comply with the https://en.wikipedia.org/wiki/Buenos_Aires_Convention[Buenos Aires Convention of 1910] in the Americas. +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. @@ -175,8 +175,8 @@ Files that do not have an explicit license are licensed under the BSD-2-Clause l == License File Location To comply with the https://reuse.software/[REUSE Software] standard as much as possible, all license files will be stored in the [.filename]#LICENSES/# directory of the repository. -There are three subdrectories under this top level directory. -The [.filename]#LICENSES/text/# subdrectory contains, in detached form, the text of all the licenses that are allowed in the FreeBSD software collection. +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. @@ -187,7 +187,7 @@ No such files have currently been identified, but if they are, a full list will The FreeBSD Project currently does not make use of the `DEP5` files described in the `REUSE Software` standard. The FreeBSD Project has not marked all the files in the tree yet in accordance with this standard, as described later in this document. -The FreeBSD Project has not yet included these files in its repsoitories since this is policy is still evolving. +The FreeBSD Project has not yet included these files in its repositories since this policy is still evolving. [[individual-files]] == Individual Files License @@ -200,7 +200,7 @@ These are provided on a best effort basis by the project. Because copyrights may be legally transferred, the current copyright holder may differ from what is listed in the file. A license is a legal document between the contributor and the users of the software granting permission to use the copyrighted portions of the software, subject to certain terms and conditions set forth in the license. -Licenses can be expresssed in one of two ways in the FreeBSD software collection. +Licenses can be expressed in one of two ways in the FreeBSD software collection. Licenses can be explicit in a file. When a license grant is explicit in the file, that file may be used, copied, and modified in accordance with that license. Licenses can also be expressed indirectly, where the text of the license is elsewhere. @@ -242,7 +242,7 @@ The license for files containing only the SPDX-License-Identifier should be cons Include all the copyright holders. . 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 expresions should be construed as described in the SPDX standard. +SPDX-License-Identifier expressions should be construed as described in the SPDX standard. 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. @@ -285,7 +285,7 @@ In the second context, only a subset of this expression is allowed by the projec An `SPDX License sub-expression` is either an SPDX short form license identifier from the https://spdx.org/licenses/[SPDX License List], or the combination of two SPDX short form license identifiers separated by "WITH" 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 precidence when it conflicts with the simplified treament of this section. +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. 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 that version of the license or a later version. @@ -310,7 +310,7 @@ In the FreeBSD project, a number of files from LLVM have an exception to the Apa .... https://spdx.org/licenses/exceptions-index.html[Exception tags] are managed by SPDX. -License exceptions can only be applied to certain license, as sepcified in the exception. +License exceptions can only be applied to certain licenses, as specified in the exception. `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: @@ -321,7 +321,7 @@ For example, some dtsi files are available under dual licenses: .... `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 project, each with their own license: +For example, if code has been incorporated by several projects, each with their own license: [.programlisting] ....