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

apps/pkcs12.c: Improve user guidance, re-ordering no-export vs. export options #13588

Merged
merged 1 commit into from
Dec 3, 2020

Conversation

DDvO
Copy link
Contributor

@DDvO DDvO commented Dec 1, 2020

Make the option order consistent in the help output and in the POD file.
Give warnings when an option is ignored because -export is given or missing.

  • documentation is added or updated

@DDvO DDvO added the approval: otc review pending This pull request needs review by an OTC member label Dec 1, 2020
doc/man1/openssl-pkcs12.pod.in Outdated Show resolved Hide resolved
doc/man1/openssl-pkcs12.pod.in Outdated Show resolved Hide resolved
doc/man1/openssl-pkcs12.pod.in Outdated Show resolved Hide resolved
@DDvO
Copy link
Contributor Author

DDvO commented Dec 1, 2020

Thanks @t8m for you comments. I've followed all your suggestions.

Copy link
Member

@t8m t8m left a comment

Choose a reason for hiding this comment

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

LGTM. The test failure does not look relevant.

@t8m t8m added approval: done This pull request has the required number of approvals branch: master Merge to master branch and removed approval: otc review pending This pull request needs review by an OTC member labels Dec 2, 2020
@openssl-machine openssl-machine removed the approval: done This pull request has the required number of approvals label Dec 3, 2020
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@openssl-machine openssl-machine added the approval: ready to merge The 24 hour grace period has passed, ready to merge label Dec 3, 2020
…t options

Make the option order consistent in the help output and in the POD file.
Give warnings when an option is ignored because -export is given or missing.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from openssl#13588)
@openssl-machine openssl-machine merged commit 902161e into openssl:master Dec 3, 2020
@DDvO
Copy link
Contributor Author

DDvO commented Dec 3, 2020

Rebased, fixed merge conflict, and merged - thanks @t8m

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants