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

1.6 ecma -- docs carry over #512

Merged
merged 19 commits into from
Aug 31, 2024
Merged

1.6 ecma -- docs carry over #512

merged 19 commits into from
Aug 31, 2024

Conversation

jkowalleck
Copy link
Member

@jkowalleck jkowalleck commented Aug 31, 2024 •
edited
Loading

properly merge #501 and #478

@jkowalleck jkowalleck added this to the 1.6-ECMA milestone Aug 31, 2024
@jkowalleck
xml: MUST -> must
533b7c2 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
pb: MUST -> must
71605b6 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: RECOMMENDED -> recommended
78c1c6e 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: OPTIONAL -> optional
6b85815 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
pb: OPTIONAL -> optional
07a8027 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
streamline attachedTextType docs
d81e0fa 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: licenseType description
842a17d 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
pb: licenseType description
990f2ad 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: license ID description
a2c157d 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
pd: license ID description
c2d693b 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: license name description
974411b 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
pb: license name description
1182ff9 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: POAM -> POA&M
6376890 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
pb: fix indent for POA&M
e0b42b7 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
xml: MAY -> may
6b541d8 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
streamline cppyright description
42c4bfe 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
trigger condition docs
814e876 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fix PB
f0934f1 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
fix PB
9b77727 
Signed-off-by: Jan Kowalleck <[email protected]>
@jkowalleck
Copy link
Member Author

this is a restored 1.6-ecma branch (#478), with the things from #502 properly merged.
as both were intended to be merged into master, while something got stuck or lost, i will provide the intended changes here.

@jkowalleck jkowalleck marked this pull request as ready for review August 31, 2024 07:01
@jkowalleck jkowalleck requested a review from a team as a code owner August 31, 2024 07:01
@jkowalleck jkowalleck changed the title 1.6 ecma 1.6 ecma -- docs takeover Aug 31, 2024
@jkowalleck
Copy link
Member Author

looks like #501 was merged to 1.6-ecma AFTER this one was already merged to master.
so the intended changes were never taken to master as expected.

this PR fixes this as intended in the approved PR #501

@jkowalleck jkowalleck changed the title 1.6 ecma -- docs takeover 1.6 ecma -- docs carry over Aug 31, 2024
@jkowalleck jkowalleck merged commit bfb6f8b into master Aug 31, 2024
11 checks passed
@jkowalleck jkowalleck deleted the 1.6-ecma branch August 31, 2024 07:04
@jkowalleck jkowalleck added the CDX 1.6 related to release v1.6 label Sep 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CDX 1.6 related to release v1.6 documentation
Projects
None yet
Milestone
1.6-ECMA
Development

Successfully merging this pull request may close these issues.
1 participant
@jkowalleck