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

Wording Changes for Calendar Baseline per Issue 135 #136

Merged
merged 5 commits into from
Jan 17, 2024
Merged

Conversation

jkaufman-mitre
Copy link
Collaborator

@jkaufman-mitre jkaufman-mitre commented Jan 5, 2024

Changed wording to the Calendar baseline in 4.1, 3.1, and 1.1. This PR addresses the comments in issue 135.

Fixes #135

Copy link
Collaborator

@tmcomeau tmcomeau left a comment

Choose a reason for hiding this comment

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

Minor suggested edits. Please resend when ready and will review and then tag in @mitchelbaker-cisa

jkaufman-mitre and others added 3 commits January 5, 2024 12:30
@jkaufman-mitre jkaufman-mitre changed the title Addresses issues in 135 Wording Changes for Calendar Baseline per Issue 135 Jan 8, 2024
@adhilto
Copy link
Collaborator

adhilto commented Jan 9, 2024

@jkaufman-mitre The changes here are highly related to and might even conflict with #134. Would you be open to closing this PR and making these changes all within #134 instead? Should be simple enough to repeat the changes over there. Otherwise I'll recommend marking this PR as blocked until #134 is complete. I can help deal with any merge conflict that arise if we take that route.

@adhilto adhilto removed the request for review from buidav January 9, 2024 00:25
@jkaufman-mitre jkaufman-mitre added the blocked This issue or pull request is awaiting the outcome of another issue or pull request label Jan 9, 2024
@LaurenBassett
Copy link
Contributor

@adhilto is this one no longer blocked based on your changes?

@adhilto
Copy link
Collaborator

adhilto commented Jan 16, 2024 via email

@adhilto adhilto removed the blocked This issue or pull request is awaiting the outcome of another issue or pull request label Jan 17, 2024
@adhilto adhilto merged commit a3a7b06 into main Jan 17, 2024
4 checks passed
@adhilto adhilto deleted the calendar-changes-1 branch January 17, 2024 23:12
@adhilto adhilto added this to the TBD 0.2 Milestone milestone Feb 21, 2024
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.

Changes to Calendar Baseline Wording
4 participants