-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Add missing docs that should be on 1.10 release branch #14996
Conversation
Tagging @kalafut @ldilalla-HC @peaceofthepai @mladlow here at Meggie's request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looked through the changes to all relevant docs for the crypto-sec team, (SSH, PKI, managed keys, hsm, seal). All these changes look good to me and should appear on 1.10 branch.
I also agree with the technique used to generate the diff, for at least the crypto-sec related stuff nothing will be backported that is targeting 1.11 that I can see.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A quick diff against stable-website
looked reasonable. I'm good with merging. We can still fix things up if we discover missed items.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm too late, this is cool updates and correct, but submitting review so typo-references exist.
I'm late to this party but thanks for following up on this @raskchanky ! |
I'm not confident that I've done this correctly, but let me detail what I've actually done and maybe someone can correct me if I'm wrong. The goal here is to add docs to the 1.10 release branch that should be there, but aren't.
For context, see the discussion starting here #14927 (comment)
I originally attempted to calculate the diff between the
release/1.10.x
andstable-website
branches, constrained to thewebsite
directory, but that proved an exercise in futility. The resulting diff I got wouldn't apply cleanly torelease/1.10.x
, which made me feel like I was going about this wrong.In the end, instead of diffing
release/1.10.x
andstable-website
, I diffedrelease/1.10.x
andmain
, figuring that all docs changes would've been merged tomain
anyway. Here are the exact commands I used, starting from a freshly updated main branch:I think this should have the effect of bringing over all the changes that have been made to the
website
directory on themain
branch into therelease/1.10.x
branch. I'm not certain I got this correct however, and would appreciate some extra eyes. The litmus test I was using was checking to see if the MFA docs I wrote were added, since those should be on therelease/1.10.x
branch.