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

Add "and" and "&" to the equivalent words list #1700

Merged
merged 1 commit into from
Nov 15, 2022
Merged

Add "and" and "&" to the equivalent words list #1700

merged 1 commit into from
Nov 15, 2022

Conversation

swinslow
Copy link
Member

@swinslow swinslow commented Nov 9, 2022

Fixes #1663

Signed-off-by: Steve Winslow steve@swinslow.net

@swinslow
Add "and" and "&" to the equivalent words list
975a11f 
Fixes #1663

Signed-off-by: Steve Winslow <steve@swinslow.net>
@swinslow swinslow added this to the 3.19 (documentation) milestone Nov 9, 2022
@swinslow
Copy link
Member Author

swinslow commented Nov 9, 2022

@jlovejoy and @goneall If/when the tests pass, grateful to get your +1 for "and" and "&" :)

goneall
goneall approved these changes Nov 9, 2022
View reviewed changes
Copy link
Member

@goneall goneall left a comment

Choose a reason for hiding this comment

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

Seems like a reasonable update to me - I will need to update the tools - it doesn't pull from this file automatically.

goneall added a commit to spdx/Spdx-Java-Library that referenced this pull request Nov 9, 2022
@goneall
Add new license equivalent words
c4ff298 
Adds `&` and `and`.

This should be merged after spdx/license-list-XML#1700 is approved and merged
@goneall goneall mentioned this pull request Nov 9, 2022
Merged
@jlovejoy jlovejoy mentioned this pull request Nov 10, 2022
Closed
@jlovejoy jlovejoy added the XML markup change potential change or addition to XML markup in license label Nov 15, 2022
@jlovejoy jlovejoy merged commit a7b0491 into main Nov 15, 2022
@swinslow swinslow deleted the and-and-& branch May 22, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlovejoy jlovejoy jlovejoy approved these changes

@goneall goneall goneall approved these changes

Assignees
No one assigned
Labels
XML markup change potential change or addition to XML markup in license
Projects
None yet
Milestone
3.19 (documentation)
Development

Successfully merging this pull request may close these issues.

MS-LPL XML should accommodate 'and' instead of '&' in last section
3 participants
@swinslow @goneall @jlovejoy