#1195 Update LicensingGuidelines.adoc typos
Merged 2 years ago by tibbs. Opened 2 years ago by jlovejoy.
jlovejoy/packaging-committee jl-packaging-licensing-typos  into  master

@@ -1,23 +1,23 @@ 

  = 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

  

  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, processes related to licensing, 

+ or other guidance related to Fedora licensing, 

+ 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 

+ 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 +69,31 @@ 

  == 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 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 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.

+ 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].

+ does not have a corresponding SPDX license identifier or expression, or other process questions, 

+ see xref:legal::license-review-process.adoc/[License Review Process].

  

  

  

fixes a few typos and odd/awkward wording

Signed-off-by: Jilayne Lovejoy

1 new commit added

  • another typo
2 years ago

This file has some hidden links at the top. I'm not sure what purpose they serve, but they are not up-to-date??

They are:

: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]

@mattdm or @bcotton - do you know?

I'm assuming they're there to avoid retyping a URL that appears frequently in the doc. Looking at the git history, it looks like Igor Raits added that 3 years ago: https://pagure.io/packaging-committee/c/5a5fd718fa7dda9b92c0c939173446518292ce60

Relatedly, I suggest replacing some of the URL references to legal docs with Antora cross references. For example, the reference at
https://pagure.io/fork/jlovejoy/packaging-committee/blob/7277eb669d23bb150e0fe69c71f8a72a535291d6/f/guidelines/modules/ROOT/pages/LicensingGuidelines.adoc#_12
Should be
xref:legal::license-approval.adoc

xref:legal::(exact page) - thanks, that was what I wasn't sure about!

As to the shortcut URLs defined at top - I guess they can be removed then?

1 new commit added

  • update docs link to xref
2 years ago

rebased onto 929d3b5

2 years ago

Pull-Request has been merged by tibbs

2 years ago
Metadata