-
Notifications
You must be signed in to change notification settings - Fork 65
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
Archive old YubiHSM2 documentation #565
Conversation
…al/old-books. Cross repro coverage will be handled differently.
The commits from two years ago are no longer relevant. Can we remove them from the PR? Or reject the changes from those two commits? |
Hi @joostd , can I ask you to please merge this PR? Saqib asked us to move the HSM docs from developers.yubico.com, so we've done that, and these are the redirects. I am making sure that the recent updates to this old content are transferred to the new content on docs.yubico.com, updates such as PR#568 |
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.
There are some merge conflicts that still need to be resolved. See individual comments on affected files (not sure if I commented them all, please check).
Otherwise this PR lgtm!
content/Software_Projects/Yubico_OTP/Yubico_OTP_Integration_Plug-ins/index.adoc
Outdated
Show resolved
Hide resolved
content/Software_Projects/Yubico_OTP/YubiCloud_Validation_Servers/index.adoc
Outdated
Show resolved
Hide resolved
content/Software_Projects/Yubico_OTP/YubiCloud_Connector_Libraries/index.adoc
Outdated
Show resolved
Hide resolved
content/Developer_Program/Guides/Securing_Web_Services_with_OTP.adoc
Outdated
Show resolved
Hide resolved
Hello @joostd |
For some reason I don't seem to be authorized to merge. Assigning to @elukewalker |
There still seem to be some merge conflicts left to fix:
|
commit b218db6, merge intending to resolve conflicts. message '-a' was a typo. |
resolving conflict, round 3
@joostd Could you please check if there are more conflicts? I went through all the files listed as changed and updated then committed, see commit b218db6. But when I view 'all files' it still shows brown/+ for conflict. When I check my master branch git responds with branch is up to date with origin/master. I did a test and updated plugins.adoc from pr to git. Still shows conflict. Any suggestions for how to resolve these? Should I close this PR, update local master, create a new branch, apply changes (I saved off a copy), pull commit and push, make a new PR? |
With your latest commits, I no longer see any conflicts. Fine to merge as far as I am concerned! |
I know, @elukewalker - I see that too - I just don't understand how those conflicts could be resolved to Joost's satisfaction, and then REAPPEAR ! |
Two pieces:
-- Copy of latest version of the developers.yubico.com/content/YubiHSM documentation copied to an archive folder /Archive_Old_Dev_Docs.
= Added a Readme to explain this process.
-- Updated all the documentation files in developers.yubico.com/content/YubiHSM
= Removed content from each file
= Added statement: This content is deprecated. See
= Added link to replacement YubiHSM 2 User Guide and link to specific topic within that guide.