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

Fix botched merge to main for "Other Deliverables" section. #91

Merged
merged 4 commits into from
Mar 2, 2022

Conversation

msporny
Copy link
Member

@msporny msporny commented Mar 2, 2022

This PR fixes a botched merge that never made it to main in #86 (comment). What went wrong is explained in #77 (comment). This PR ensures that the botched merge makes it down to main. It already has all of the approvals to go to main, this PR just records what happened.


Preview | Diff

@msporny msporny changed the title Msporny fix other deliverables Fix botched merge to main for "Other Deliverables" section. Mar 2, 2022
@@ -292,7 +292,7 @@ <h3>
</td>
</tr>
<tr>
<td><a href="https://json-web-proofs.github.io/json-web-proofs/">JSON Web Proof (JWP)</a></td>
<td><a href="https://json-web-proofs.github.io/json-web-proofs/">VC-JSON Web Proof (JWP)</a></td>
Copy link
Member Author

@msporny msporny Mar 2, 2022

Choose a reason for hiding this comment

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

@brentzundel @Sakurann @iherman -- just making sure each of you see this. We are standardizing VC-JWP in this group, NOT JWP. JWP will be standardized in IETF. We probably need to make this much more clear in the charter.

index.html Outdated Show resolved Hide resolved
index.html Outdated Show resolved Hide resolved
index.html Outdated Show resolved Hide resolved
originally added in acronym PR
@brentzundel brentzundel merged commit bb419e2 into main Mar 2, 2022
@msporny msporny deleted the msporny-fix-other-deliverables branch March 2, 2022 16:53
@@ -292,7 +292,7 @@ <h3>
</td>
</tr>
<tr>
<td><a href="https://json-web-proofs.github.io/json-web-proofs/">JSON Web Proof (JWP)</a></td>
<td><a href="https://json-web-proofs.github.io/json-web-proofs/">VC-JSON Web Proof (JWP)</a></td>
Copy link
Member

Choose a reason for hiding this comment

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

@msporny @brentzundel -- Should VC-JSON Web Proof (JWP) not have become VC-JSON Web Proof (VC-JWP) (changing the parenthetical), or maybe Verifiable Credential JSON Web Proof (VC-JWP) (changing the parenthetical and expanding VC in the full name)?

@brentzundel
Copy link
Member

The acronym JWP was originally expanded in https://github.com/w3c/vc-wg-charter/pull/79/files, this PR added the VC, which is already expanded in the scope section.
I think the combo is self-explanatory at this point, but would not be opposed to seeing a PR that adds the additional expansion.

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.

None yet

3 participants