Skip to content

Licensing: Move up note on declared vs concluded license disagreement - #787

Merged
goneall merged 7 commits into
spdx:mainfrom
bact:heading-licensing-comment
Jul 23, 2024
Merged

Licensing: Move up note on declared vs concluded license disagreement#787
goneall merged 7 commits into
spdx:mainfrom
bact:heading-licensing-comment

Conversation

@bact

@bact bact commented Jun 14, 2024

Copy link
Copy Markdown
Collaborator
  • Currently the note about what to do when there is a disagreement between hasDeclaredLicense and hasConcludedLicense is buried down the bottom of the page
  • It is also not very noticeable due to the fact that it has no proper heading, make it looks like it is under the "hasConcludedLicense" section. Which in fact, it is not. The last two paragraphs are meant to be at the "root" level of the description.
  • This PR move up the note to the position next to the paragraph that introduces hasDeclaredLicense and hasConcludedLicense concepts.

bact added 4 commits April 30, 2024 19:09
@bact
Give a heading to two paras on licensing comment
47dd0f0 
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact
Remove whitespaces in blank lines
b70a543 
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact
Merge branch 'heading-licensing-comment' of https://github.com/bact/s…
ff4960b 
…pdx-3-model into heading-licensing-comment
@bact
Minimize changeset
753f66f 
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@goneall
goneall requested a review from swinslow June 15, 2024 00:01
@goneall goneall added the Profile:Licensing Licensing profiles, including SimpleLicensing and ExpandedLicensing, and related matters label Jun 15, 2024
@goneall

goneall commented Jul 22, 2024

Copy link
Copy Markdown
Member

@swinslow @zvr - Can you do a quick review - if OK, we'd like to merge

@goneall goneall added this to the 3.0.1 milestone Jul 22, 2024
@goneall

goneall commented Jul 22, 2024

Copy link
Copy Markdown
Member

@bact - could you update to resolve the merge conflicts?

@swinslow - Please take a look - if you agree, we can merge.

@bact
Merge branch 'main' into heading-licensing-comment
f6e6ec0 
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
@bact

bact commented Jul 22, 2024

Copy link
Copy Markdown
Collaborator Author

@goneall Conflict resolved.

swinslow
swinslow reviewed Jul 23, 2024
View reviewed changes
Comment thread model/Licensing/Licensing.md Outdated
swinslow
swinslow approved these changes Jul 23, 2024
View reviewed changes

@swinslow swinslow left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM -- I did notice one typo (not from your PR) -- if you want to fix that now as well, great! Otherwise looks good to go as-is.

@bact
Fix typo: sring -> string
c55e353 
Signed-off-by: Arthit Suriyawongkul <arthit@gmail.com>
goneall
goneall approved these changes Jul 23, 2024
View reviewed changes

@goneall goneall left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo fixed - LGTM

@goneall
goneall merged commit fcb3829 into spdx:main Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@goneall goneall goneall approved these changes
@swinslow swinslow swinslow approved these changes

Assignees

No one assigned

Labels

Profile:Licensing Licensing profiles, including SimpleLicensing and ExpandedLicensing, and related matters

Projects

None yet

Milestone

3.0.1

Development

Successfully merging this pull request may close these issues.

3 participants

@bact @goneall @swinslow