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

Capitalization of WCAG 2.0 Parsing explainer text #3958

Closed
wants to merge 83 commits into from
Closed

Conversation

fstrr
Copy link
Contributor

@fstrr fstrr commented Jul 10, 2024

Michael Cooper and others added 30 commits August 12, 2020 16:12
commit fa8bc5a41f0380d67f094d4cb625af05e1155e3f
Author: Michael Cooper <[email protected]>
Date:   Tue Jul 27 11:36:35 2021 -0400

    fix delete to allow CVS removes

commit e19681de4f14aa736ddae70ae802b7276039467e
Author: Michael Cooper <[email protected]>
Date:   Mon Jul 26 15:16:32 2021 -0400

    Clear old versions on W3C site before updating

    Fixes #1833
Correct 2.5.5 understanding with correct SC number
* Updating the contrast value

* Rain's suggested wording

* removing the SRGB reference

@michaelc does this work for removing a bib entry?

* Meeting updates.

* Aligned understandings docs

From AWK comment.
Corrections to understanding for 1.4.8 Visual Presentation
alastc and others added 12 commits September 19, 2023 12:24
Updates for 2.1 publication
Removing the HTML one, as covered in SpecRef.
<!--
    This comment and the below content is programmatically generated.
    You may add a comma-separated list of anchors you'd like a
    direct link to below (e.g. #idl-serializers, #idl-sequence):

    Don't remove this comment or modify anything below this line.
    If you don't want a preview generated for this pull request,
    just replace the whole of this comment's content by "no preview"
    and remove what's below.
-->
***
<a
href="https://pr-preview.s3.amazonaws.com/remibetin/wcag/pull/3679.html"
title="Last updated on Feb 6, 2024, 12:41 PM UTC (c0cb528)">Preview</a>
| <a
href="https://pr-preview.s3.amazonaws.com/w3c/wcag/3679/2eca9e5...remibetin:c0cb528.html"
title="Last updated on Feb 6, 2024, 12:41 PM UTC (c0cb528)">Diff</a>
@fstrr
Copy link
Contributor Author

fstrr commented Jul 10, 2024

Those are some chunky-looking merge conflicts.

I was going to delete this branch and re-do it, but I cannot find the Parsing content that's on the live WCAG 2.0 in the repo. The 2.0 Understanding Parsing page in this repo has different content in it.

@patrickhlauke
Copy link
Member

I was going to delete this branch and re-do it, but I cannot find the Parsing content that's on the live WCAG 2.0 in the repo. The 2.0 Understanding Parsing page in this repo has different content in it.

maybe @kfranqueiro or @iadawn may know what's going on here...

@kfranqueiro
Copy link
Contributor

The 2nd-to-last commit in this branch exists on the WCAG-2.1 branch, not on main, so that's why there's a ton of commits here when there should only be 1. Even then, though, this branch is many commits out of date from that branch, so I'm a little confused as to how this PR has only been created now for a commit from April 19, 2023?

It may be more advisable to manually re-apply the changes seen in 3b11b13 to a new branch based on main, since the content of parsing.html has changed considerably due to its removal in WCAG 2.2.

@fstrr
Copy link
Contributor Author

fstrr commented Jul 10, 2024

A while ago, @patrickhlauke pointed out that there were over 250 branches on this repo, so I decided to look and see what they were, what could be deleted, and what looked useful but had gone stale for some reason. This is a branch that, for whatever reason, didn't get merged in at the time, so I created a PR for it last night.

I'll try to take a look at this tonight. I'll create a new branch, copy the current live content into it and then apply the edits. I think that's what you're saying to do.

@kfranqueiro
Copy link
Contributor

kfranqueiro commented Jul 10, 2024

FYI, upon searching for an earlier PR for this branch, there is indeed an open PR against the WCAG-2.1 branch at #3154.

Meanwhile, looking at the relevant file on main, the changes in the original commit are no longer applicable as the content has been completely changed to indicate the SC's removal.

@fstrr
Copy link
Contributor Author

fstrr commented Jul 10, 2024

So, we should take off and nuke the entire branch and PRs from orbit?

@kfranqueiro
Copy link
Contributor

I don't think this branch/PR warrants any action against main.

At most, we could potentially address the original PR #3154 as it pertains to the WCAG-2.1 branch, although I'll note that it also has conflicts there in one paragraph.

The WCAG-2.1 branch hasn't been touched in a long time though, and I'm not sure if it is expected to receive any unique updates? (Just yesterday I began investigating as to whether it's realistic to update 2.1 informative materials directly from main using the Eleventy build system.)

Copy link

netlify bot commented Aug 29, 2024

Deploy Preview for wcag2 failed.

Name Link
🔨 Latest commit dc219d3
🔍 Latest deploy log https://app.netlify.com/sites/wcag2/deploys/66d062c6e640a9000828dcae

@kfranqueiro
Copy link
Contributor

kfranqueiro commented Aug 29, 2024

@patrickhlauke I'm not sure why a further merge commit was attempted on this PR, but its commit history is very problematic at this point.

As I pointed out previously, #3154 is the version opened against the WCAG-2.1 branch. The original PR changes one file - which does not make sense to change on the main branch, because it's the file for Parsing, which was hollowed out as obsolete on the main branch.

This PR should be closed. If we are interested in merging this into the WCAG-2.1 branch, we should merge the original PR #3154 instead - it is based on the same source branch, but targeting the correct destination. This additional PR was opened against main by mistake without realizing that #3154 exists.

@patrickhlauke
Copy link
Member

@patrickhlauke I'm not sure why a further merge commit was attempted on this PR, but its commit history is very problematic at this point.

ah, my bad, I was having a trawl through hanging PRs and didn't scroll far enough down its history of comments to see we already talked about it.

I'd say let's close it then for now. If there's still outstanding problems, we can tackle them in a fresh PR.

@patrickhlauke patrickhlauke deleted the capitalization branch September 8, 2024 10:13
@patrickhlauke patrickhlauke restored the capitalization branch September 16, 2024 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants