diff --git a/documentation/content/en/articles/license-guide/_index.adoc b/documentation/content/en/articles/license-guide/_index.adoc --- a/documentation/content/en/articles/license-guide/_index.adoc +++ b/documentation/content/en/articles/license-guide/_index.adoc @@ -55,9 +55,9 @@ [.programlisting] .... /*- - * Copyright (c) [year] [your name] - * * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) [year] [your name] */ .... @@ -151,9 +151,9 @@ [.programlisting] .... /*- - * Copyright (c) [year] [your name] - * * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) [year] [your name] */ .... * The 3 clause version of the BSD license @@ -161,9 +161,9 @@ [.programlisting] .... /*- - * Copyright (c) [year] [your name] - * * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) [year] [your name] */ .... * The ISC License @@ -171,9 +171,9 @@ [.programlisting] .... /*- - * Copyright (c) [year] [copyright holder] - * * SPDX-License-Identifier: ISC + * + * Copyright (c) [year] [copyright holder] */ .... * The MIT License @@ -181,9 +181,9 @@ [.programlisting] .... /*- - * Copyright (c) [year] [copyright holders] - * * SPDX-License-Identifier: MIT + * + * Copyright (c) [year] [copyright holders] */ .... == Software Collection License @@ -212,7 +212,7 @@ [[individual-files]] == Individual Files License -Each individual file in the FreeBSD software collection has its own copyright and license. +Each individual file in the FreeBSD software collection has its own license and copyright. How they are marked varies and is described in this section. A copyright notice identifies who claims the legal copyright to a file. @@ -234,7 +234,7 @@ There are four types of files in the FreeBSD software collection: . Files that have only an explicit copyright notice and license. -. 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 an SPDX-License-Identifier tag. . Files that have only a copyright notice and an SPDX-License-Identifier tag, but no explicit license. . Files that lack any copyright or license at all. @@ -250,23 +250,20 @@ 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. -=== Only Copyright and SPDX-License-Identifier expression. +=== Only Copyright and SPDX-License-Identifier expression Some files in the tree contain detached licenses. These files contain only a copyright notice and an SPDX-License-Identifier expression, but no explicit license. See <> for how to interpret the expression. -Note: the expressions allowed for detached licenses by the project are a subset of the expressions used informationally or that are defined by the standard. - -The license for files containing only the SPDX-License-Identifier should be construed to be +Note: The Project only allows a subset of standard license expressions for detached licenses. -. Start the license with the copyright notice from the file. -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 expressions should be construed as described in the SPDX standard. +These source files must contain: -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. +. An SPDX-License-Identifier as described in the SPDX standard. + If there is no file in LICENSE/, then that license or exception cannot be specified as a detached license under this section. + When exceptions are present, append them from src/share/license/exceptions/id.txt. + For each sub-expression, copy the license text from LICENSE/text/id.txt, where id is the SPDX short identifier from the Identifier column of SPDX Identifiers or license exceptions. +. A copyright notice that contains all the copyright holders. 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. @@ -280,7 +277,7 @@ 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 license explicitly. +Contributors wishing to license under a variant of an SPDX license not contained verbatim in [.filename]#LICENSE/# cannot use the detached option and must specify the license explicitly. === Files without Copyright or any License Marking