Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(license): update to LICENSE v3 #12

Merged
merged 3 commits into from
Aug 21, 2023
Merged

chore(license): update to LICENSE v3 #12

merged 3 commits into from
Aug 21, 2023

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Aug 16, 2023

@srl295 srl295 self-assigned this Aug 16, 2023
@annebright
Copy link

The Copyright & Licenses language is fine, but the LICENSE link appears to be broken. Also, there is still language earlier in the ReadMe referencing the SIL license - this is the correct license, but this language should either be removed or added to the Copyright & Licenses language at the bottom of the ReadMe. You can just remove it so long as the broken LICENSE link is fixed and resolves to the SIL license.

@srl295
Copy link
Member Author

srl295 commented Aug 18, 2023

The Copyright & Licenses language is fine, but the LICENSE link appears to be broken.

I had neglected a commit that renamed LICENSE.md to LICENSE, it's now included.

Also, there is still language earlier in the ReadMe referencing the SIL license - this is the correct license, but this language should either be removed or added to the Copyright & Licenses language at the bottom of the ReadMe. You can just remove it so long as the broken LICENSE link is fixed and resolves to the SIL license.

I moved it into the Copyright & Licenses section. It seems like it might be worth pointing out since it's a different license?

@kenlunde
Copy link
Member

This is all fine and dandy, but I had major update to the README.md file staged for Version 15.1 on my local machine, which was being held until 2023-09-12. I wish that I was first consulted before this PR was initiated, because now I will need to manually resolve the differences. Although less critical, because I have nothing staged locally, I wish that I were also first consulted on the other two repos: CJK Symbols and UK-Source Ideographs.

@srl295
Copy link
Member Author

srl295 commented Aug 18, 2023

This is all fine and dandy, but I had major update to the README.md file staged for Version 15.1 on my local machine, which was being held until 2023-09-12. I wish that I was first consulted before this PR was initiated, because now I will need to manually resolve the differences. Although less critical, because I have nothing staged locally, I wish that I were also first consulted on the other two repos: CJK Symbols and UK-Source Ideographs.

Hi Ken,

This is being rolled out across Unicode, it's been discussed some in EMG.

I don't think the other repos PRs have been merged either, let me know if you'd like something different.

If you pull down my PR, does it conflict with your changes? Is there something I can do to conflict less?

Comment on lines -10 to -13
## License

The use of the *Last Resort* font is covered by the terms of the [SIL Open Font License, Version 1.1](https://scripts.sil.org/OFL) license.

Copy link
Member Author

Choose a reason for hiding this comment

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

@kenlunde @annebright if we leave these lines in, then my change is only adding lines and so shouldn't conflict.

@srl295
Copy link
Member Author

srl295 commented Aug 21, 2023

@kenlunde any concern on this one?

@kenlunde
Copy link
Member

Fire away. I will resolve the staged update manually.

@srl295 srl295 merged commit 5c50ce3 into main Aug 21, 2023
@srl295 srl295 deleted the srl295/licensev3 branch August 21, 2023 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants