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

cleanup of index.html #111

Merged
merged 9 commits into from Sep 10, 2019
Merged

cleanup of index.html #111

merged 9 commits into from Sep 10, 2019

Conversation

TallTed
Copy link
Member

@TallTed TallTed commented Aug 23, 2019

  • normalized whitespace
  • fixed various typos
  • fixed nested lists
  • fixed incorrect h2/h3/h4 levels

Preview | Diff

* normalized whitespace
* fixed various typos
* fixed nested lists
* fixed incorrect h2/h3/h4 levels
* fixed broken `img` markup
@TallTed
Copy link
Member Author

TallTed commented Aug 23, 2019

There are also a number of <ol> that should probably be changed to <ul>.

@TallTed
Copy link
Member Author

TallTed commented Aug 27, 2019

Conflicts resolved; should be mergeable.

@ken-ebert
Copy link
Contributor

ken-ebert commented Aug 28, 2019

This looks like it makes only changes to the internal organization of the html, but no substantive changes to the text. Is that correct?

@TallTed
Copy link
Member Author

TallTed commented Aug 28, 2019

@ken-ebert - Yes, "changes to the internal organization of the html, but no substantive changes to the text" is the intent.

@ken-ebert
Copy link
Contributor

ken-ebert commented Aug 28, 2019

@TallTed You did a huge amount of work to make this all consistent. Do I need to review the changes in my recently merged PR#105 regarding device use cases to perform a similar cleanup?

same cleanup applied to text from #105
@TallTed
Copy link
Member Author

TallTed commented Aug 28, 2019

@ken-ebert -- Thanks for noticing I'd overlooked that! Handled.

index.html Outdated Show resolved Hide resolved
index.html Outdated Show resolved Hide resolved
fixed Carol/Certifications Testing Lab and Vince/VAR Resellers details
@TallTed
Copy link
Member Author

TallTed commented Aug 28, 2019

Also changed details about update application, removing reference there to Vince.

Copy link
Contributor

@ken-ebert ken-ebert left a comment

Choose a reason for hiding this comment

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

It looks good to me.

@stonematt
Copy link
Contributor

You Gus are awesome! Reviewing now

@TallTed
Copy link
Member Author

TallTed commented Aug 30, 2019

Something huge got merged, with lots of whitespace changes, and lots of <a> insertions. I've started resolving the conflicts -- but there are many, and they are large, so it's going to take me some time ... and I will probably not be able to complete this task until Sunday, as I'm actively moving house even-as-I-type.

@stonematt
Copy link
Contributor

that was me -- I added tags for glossary terms across the doc. I was planning (expecting) to be the one to fix it w/ your PR. how can I help?

@stonematt
Copy link
Contributor

@TallTed . I didn’t know the best way to resolve conflicts in this PR, so I started or #115. I would really appreciate a review if you can.

@stonematt stonematt mentioned this pull request Sep 1, 2019
@TallTed
Copy link
Member Author

TallTed commented Sep 3, 2019

@TallTed . I didn’t know the best way to resolve conflicts in this PR, so I started or #115. I would really appreciate a review if you can.

@stonematt - Regrettably, the best way to handle this would have been to merge #111 before the across-the-board glossary tagging -- or to take the same steps to apply the same tags to #111 before trying to merge it. I don't think reverting commits will be optimal at this point.

GitHub's tools don't offer a good way to address the current state of things.

External editors (with a bit more hoop-jumping) can allow for side-by-side comparisons of any two versions, and can do a better job of flagging differences at the character level (such as the <a> additions) with or without flagging whitespace changes.

I'll take a crack at this (putting #111 against #115 in BBEdit) today, and make my comments on #115. Please don't close #111 until #115 is finalized and merged.

@stonematt
Copy link
Contributor

thanks @TallTed I focused on whitespace and line length in the committs in pr #115

@TallTed
Copy link
Member Author

TallTed commented Sep 3, 2019

I can't win... I just did a huge cross-compare between #115 and #111, and made #111 almost completely fixed by pasting a unified set of changes here.

But there are still a LOT of conflicts with the upstream.

Also --

  • There remain some <ol> which should be <ul>, and possibly vice-versa.

  • "Claim" and "Credential" appear to be used inconsistently, sometimes apparently intended to mean the same thing, and sometimes appearing to mean what we've been talking about with the other term for some time.

  • There are doubled images in at least 3 places, because there's both an SVG and a PNG for each, and I'm not sure which was produced/corrected later (file and commit dates cannot be trusted for this). These do not display properly in the PREVIEW because something in that tool sets file permissions incorrectly, resulting in things like the following for https://pr-preview.s3.amazonaws.com/w3c/vc-use-cases/pull/user-roles.svg --

<Error>
<Code>AccessDenied</Code>
<Message>Access Denied</Message>
<RequestId>02F28DD5CCD62DE7</RequestId>
<HostId>
a/YR1yAT9Wz81jl2h1/iRxO7z94k4YQrVLt2/rk5FQyIMFo51Q5ZkqXj6SCCnOmF4QcbmJCnd+o=
</HostId>
<style id="stylebot-global-css">
pre, code, kbd, samp, tt {font-family: monospace,monospace !important;font-size: 1em !important;}textarea {font-family: monospace !important;}
</style>
</Error>

index.html Outdated
describes a quality or qualities, property or properties of an <a>entity</a>
which establish its existence and uniqueness. The use cases outlined here are
provided in order to make progress toward possible future standardization and
interoperability of both low and high-stakes <a>claims</a> with the goals of
Copy link
Contributor

Choose a reason for hiding this comment

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

"low" to "low-"

Copy link
Contributor

Choose a reason for hiding this comment

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

This is an editorial nit.

Copy link
Contributor

@ken-ebert ken-ebert left a comment

Choose a reason for hiding this comment

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

All of the new changes look good to me.

@TallTed TallTed merged commit a2ac4d3 into gh-pages Sep 10, 2019
@ken-ebert
Copy link
Contributor

After looking at the document after merge, I noticed that Figure 2 Verifiable Credentials, Example Domains for User Needs seems to be duplicative of Figure 3 Verifiable Credentials, Example Domains for User Needs. I think that Figure 2 should be deleted.

@ken-ebert
Copy link
Contributor

"EXAMPLE 3: Amanda's passport" -> EXAMPLE 3: Anand's passport"
"Example 4: Amanda's birth certificate" -> ""Example 4: Anand's birth certificate"

@TallTed TallTed deleted the TallTed-20190822-vcuc-cleanup branch September 11, 2019 18:39
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

4 participants