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.

Sign up for GitHub

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

Jump to bottom

Be more precise: give the number of the annex. #756

Merged
merged 2 commits into from
May 15, 2024
Merged

Be more precise: give the number of the annex. #756

merged 2 commits into from
May 15, 2024

Conversation

vargenau
Copy link
Contributor

No description provided.

@vargenau
Be more precise: give the number of the annex.
c79c029 
Signed-off-by: Marc-Etienne Vargenau <marc-etienne.vargenau@nokia.com>
zvr
zvr approved these changes Apr 30, 2024
View reviewed changes
Copy link
Member

@zvr zvr left a comment

Choose a reason for hiding this comment

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

Thanks.
When this was written, the order of the annexes had not been specified.

@kestewart kestewart added this to the 3.0.1 milestone Apr 30, 2024
kestewart
kestewart reviewed Apr 30, 2024
View reviewed changes
Copy link
Contributor

@kestewart kestewart left a comment

Choose a reason for hiding this comment

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

Have we locked down the revised Annex ordering now? If so, we should change some other places as well.

@goneall
Copy link
Member

goneall commented Apr 30, 2024

Have we locked down the revised Annex ordering now? If so, we should change some other places as well.

Both issue Move Appendix G (CC License) and J (Differences From Earlier Versions) to be Appendix A and B and issue Reverse order of Annex J relate to ordering and are currently targeted for 3.1 - so we can probably merge this in and update it on the 3.1 release.

@kestewart - if you agree, please go ahead and merge

@goneall
Copy link
Member

goneall commented Apr 30, 2024

@vargenau - Can you resolve the merge conflicts?

@kestewart
Copy link
Contributor

Ok, I'll merge as soon as conflicts resolved.

@vargenau
Copy link
Contributor Author

@goneall @kestewart
Conflict resolved.

@goneall goneall merged commit 61a0597 into spdx:main May 15, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kestewart kestewart kestewart left review comments

@zvr zvr zvr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.0.1
Development

Successfully merging this pull request may close these issues.
4 participants
@vargenau @goneall @kestewart @zvr