From 929d3b5b40d2274cf490f7b4602193c4aaccc387 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Jul 28 2022 16:20:38 +0000 Subject: [PATCH 1/3] Update LicensingGuidelines.adoc typos fixes a few typos and odd/awkward wording Signed-off-by: Jilayne Lovejoy --- diff --git a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc index 81c84a4..0d623a2 100644 --- a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc +++ b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc @@ -8,16 +8,19 @@ The goal of the Fedora Project is to work with the Linux community to create a complete, general purpose operating system exclusively from free and open source software. -All software in Fedora must be under licenses that has been determined to be https://docs.fedoraproject.org/en-US/legal/license-approval/[allowed for Fedora]. +All software in Fedora must be under licenses that have been determined to +be https://docs.fedoraproject.org/en-US/legal/license-approval/[allowed for Fedora]. This criteria is based on the licenses approved by the https://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses[Free Software Foundation], https://opensource.org/licenses/[OSI] and consultation with Red Hat Legal. -For more details on the criteria for allowed and not-allowed licenses, questions related to process, -or other helpful guidance related to Fedora licensing, see https://docs.fedoraproject.org/en-US/legal/[Licensing in Fedora]. +For more details on the criteria for allowed and not-allowed licenses, processed related to licensing, +or other guidance related to Fedora licensing, +see https://docs.fedoraproject.org/en-US/legal/[Licensing in Fedora]. -The information here provides guidance on how to add license text in `+%license+` and how to populate the `+License:+` field of +The information here provides guidance on how to add license text in `+%license+` +and how to populate the `+License:+` field of spec files for Fedora packages. == License Text @@ -69,28 +72,31 @@ However, this is not always possible to achieve. == License: field Every Fedora package must contain a `+License:+` entry. -Maintainers should be aware that the contents of the `+License:+` field are understood to not be legally binding (only the source code itself is), +Maintainers should be aware that the contents of the `+License:+` field are understood to not be legally +binding (only the source code itself is), but maintainers must make every possible effort to be accurate when filling the `+License:+` field. -The License: field refers to the licenses of the contents of the *_binary_* rpm. +The `License:` field refers to the licenses of the contents of the *_binary_* rpm. -This policy and examples can be found at https://docs.fedoraproject.org/en-US/legal/license-field/[License: field in Spec file]. +This policy and examples can be found at https://docs.fedoraproject.org/en-US/legal/license-field/[License: field in spec file]. === Valid License Short Names The `+License:+` field for new packages as of July 2022 must be filled with the appropriate SPDX license identifier or -expression from the list of https://docs.fedoraproject.org/en-US/legal/allowed-licenses/[allowed licenses for Fedora. +expression from the list of https://docs.fedoraproject.org/en-US/legal/allowed-licenses/[allowed licenses] for Fedora. Note that some licenses may be allowed for only certain types of material, e.g., fonts, content, or documentation. -The SPDX License List provides identifiers for each individual license or exception based on a set of matching guidelines. -For example, licenses that have different versions or options related to later versions have specific identifiers. +The https://spdx.org/licenses/[SPDX License List] provides identifiers for each individual license +or exception based on a set of matching guidelines. SPDX license expressions cover situations where multiple licenses apply to a package, where there is a choice of a license, and where licenses are coupled with exceptions or additional permissions. -https://docs.fedoraproject.org/en-US/legal/license-field/[License: field in Spec file] contains examples and further explanations for using SPDX expressions in the `License:` field. +https://docs.fedoraproject.org/en-US/legal/license-field/[License: field in Spec file] contains examples +and further explanations for using SPDX expressions in the `License:` field. For more information on what to do if you find a license that is not on the Fedora list, -does not have a corresponding SPDX license identifier or expression, or other process questions, see https://docs.fedoraproject.org/en-US/legal/license-review-process/[License Review Process]. +does not have a corresponding SPDX license identifier or expression, or other process questions, +see https://docs.fedoraproject.org/en-US/legal/license-review-process/[License Review Process]. From cd710df3c336a1e1099680c6754c54e9297d9864 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Jul 28 2022 16:20:38 +0000 Subject: [PATCH 2/3] another typo --- diff --git a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc index 0d623a2..7277eb6 100644 --- a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc +++ b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc @@ -15,7 +15,7 @@ https://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses[Free Soft https://opensource.org/licenses/[OSI] and consultation with Red Hat Legal. -For more details on the criteria for allowed and not-allowed licenses, processed related to licensing, +For more details on the criteria for allowed and not-allowed licenses, processes related to licensing, or other guidance related to Fedora licensing, see https://docs.fedoraproject.org/en-US/legal/[Licensing in Fedora]. From 4d9eb68a7a6c4ac4f284207edc745900bcf822ad Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Jul 28 2022 16:20:38 +0000 Subject: [PATCH 3/3] update docs link to xref update all internal docs link to xref:legal::(page) format remove shortcut links at top --- diff --git a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc index 7277eb6..536eb96 100644 --- a/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc +++ b/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc @@ -1,7 +1,4 @@ = Licensing Guidelines -:url-fedora-licensing: https://fedoraproject.org/wiki/Licensing -:fedora-licensing-list: {url-fedora-licensing}#SoftwareLicenses[Fedora licensing list] -:fedora-licensing: {url-fedora-licensing}[Fedora Licensing] == Fedora Licensing @@ -17,7 +14,7 @@ and consultation with Red Hat Legal. For more details on the criteria for allowed and not-allowed licenses, processes related to licensing, or other guidance related to Fedora licensing, -see https://docs.fedoraproject.org/en-US/legal/[Licensing in Fedora]. +see xref:legal::index.adoc[Licensing in Fedora]. The information here provides guidance on how to add license text in `+%license+` and how to populate the `+License:+` field of @@ -78,12 +75,12 @@ but maintainers must make every possible effort to be accurate when filling the The `License:` field refers to the licenses of the contents of the *_binary_* rpm. -This policy and examples can be found at https://docs.fedoraproject.org/en-US/legal/license-field/[License: field in spec file]. +This policy and examples can be found at xref:legal::license-field.adoc/[License: field in spec file]. === Valid License Short Names The `+License:+` field for new packages as of July 2022 must be filled with the appropriate SPDX license identifier or -expression from the list of https://docs.fedoraproject.org/en-US/legal/allowed-licenses/[allowed licenses] for Fedora. +expression from the list of xref:legal::allowed-licenses.adoc/[allowed licenses] for Fedora. Note that some licenses may be allowed for only certain types of material, e.g., fonts, content, or documentation. The https://spdx.org/licenses/[SPDX License List] provides identifiers for each individual license @@ -91,12 +88,12 @@ or exception based on a set of matching guidelines. SPDX license expressions cover situations where multiple licenses apply to a package, where there is a choice of a license, and where licenses are coupled with exceptions or additional permissions. -https://docs.fedoraproject.org/en-US/legal/license-field/[License: field in Spec file] contains examples +xref:legal::license-field.adoc/[License: field in Spec file] contains examples and further explanations for using SPDX expressions in the `License:` field. For more information on what to do if you find a license that is not on the Fedora list, does not have a corresponding SPDX license identifier or expression, or other process questions, -see https://docs.fedoraproject.org/en-US/legal/license-review-process/[License Review Process]. +see xref:legal::license-review-process.adoc/[License Review Process].