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

Update openssl-smime.pod.in #24052

Closed
wants to merge 2 commits into from
Closed

Update openssl-smime.pod.in #24052

wants to merge 2 commits into from

Conversation

DominikNeubauer
Copy link
Contributor

remove duplicate entries for -nocerts and -noattr

The manpage for openssl-smime shows two entries for -nocerts and -noattr, respectively. One set of them (l. 198 ff) is quite exhaustive, the second one merely mentions the existence, and thus is redundant.

Checklist
  • documentation is added or updated
  • tests are added or updated

CLA: trivial

@DominikNeubauer
Update openssl-smime.pod.in
6002592 
remove duplicate entries for -nocerts and -noattr
@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Apr 5, 2024
slontis
slontis reviewed Apr 8, 2024
View reviewed changes
doc/man1/openssl-smime.pod.in

=item B<-noattr>

Don't include any signed attributes when signing.
Copy link
Member

Choose a reason for hiding this comment

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

Well spotted,
Maybe fix up the other ones so they are just as clear as these ones are.. There needs to at least be a comma in the -nocerts one above.

t8m
t8m reviewed Apr 8, 2024
View reviewed changes
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.

Could you please also amend the commit message to include the CLA: trivial annotation?

@t8m t8m added cla: trivial One of the commits is marked as 'CLA: trivial' branch: master Merge to master branch triaged: documentation The issue/pr deals with documentation (errors) branch: 3.0 Merge to openssl-3.0 branch branch: 3.1 Merge to openssl-3.1 branch: 3.2 Merge to openssl-3.2 branch: 3.3 Merge to openssl-3.3 labels Apr 8, 2024
@DominikNeubauer
Copy link
Contributor Author

Could you please also amend the commit message to include the CLA: trivial annotation?

Have I put it in on the wrong place?

@t8m
Copy link
Member

t8m commented Apr 8, 2024

Could you please also amend the commit message to include the CLA: trivial annotation?

Have I put it in on the wrong place?

Yes, it needs to be in the commit message, not just in the pull request description. You can use git commit --amend ; git push --force.

@t8m t8m added the approval: review pending This pull request needs review by a committer label Apr 8, 2024
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Apr 13, 2024
@openssl-machine
Copy link
Collaborator

This PR is in a state where it requires action by @openssl/committers but the last update was 30 days ago

t8m
t8m approved these changes May 14, 2024
View reviewed changes
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.

OK with CLA trivial

@paulidale Can you please confirm, you're OK with CLA trivial?

@t8m t8m added approval: done This pull request has the required number of approvals tests: exempted The PR is exempt from requirements for testing and removed approval: review pending This pull request needs review by a committer labels May 14, 2024
paulidale
paulidale approved these changes May 15, 2024
View reviewed changes
Copy link
Contributor

@paulidale paulidale left a comment

Choose a reason for hiding this comment

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

okay with trivial

@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels May 15, 2024
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@t8m
Copy link
Member

t8m commented May 15, 2024

Merged to all the active branches. Thank you for your contribution.

@t8m t8m closed this May 15, 2024
openssl-machine pushed a commit that referenced this pull request May 15, 2024
@DominikNeubauer @t8m
Update openssl-smime.pod.in
d4b119c 
Remove duplicate entries for -nocerts and -noattr

CLA:trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24052)

(cherry picked from commit 5a0c92c)
openssl-machine pushed a commit that referenced this pull request May 15, 2024
@DominikNeubauer @t8m
Update openssl-smime.pod.in
bb7edb6 
Remove duplicate entries for -nocerts and -noattr

CLA:trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24052)

(cherry picked from commit 5a0c92c)
openssl-machine pushed a commit that referenced this pull request May 15, 2024
@DominikNeubauer @t8m
Update openssl-smime.pod.in
5a0c92c 
Remove duplicate entries for -nocerts and -noattr

CLA:trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24052)
openssl-machine pushed a commit that referenced this pull request May 15, 2024
@DominikNeubauer @t8m
Update openssl-smime.pod.in
2613ccc 
Remove duplicate entries for -nocerts and -noattr

CLA:trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24052)

(cherry picked from commit 5a0c92c)
openssl-machine pushed a commit that referenced this pull request May 15, 2024
@DominikNeubauer @t8m
Update openssl-smime.pod.in
0b49dde 
Remove duplicate entries for -nocerts and -noattr

CLA:trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24052)

(cherry picked from commit 5a0c92c)
@DominikNeubauer DominikNeubauer deleted the patch-1 branch May 16, 2024 12:42
jvdsn pushed a commit to jvdsn/openssl that referenced this pull request Jun 3, 2024
@DominikNeubauer @jvdsn
Update openssl-smime.pod.in
f2c8e95 
Remove duplicate entries for -nocerts and -noattr

CLA:trivial

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#24052)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slontis slontis slontis left review comments

@t8m t8m t8m approved these changes

@paulidale paulidale paulidale approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch branch: 3.0 Merge to openssl-3.0 branch branch: 3.1 Merge to openssl-3.1 branch: 3.2 Merge to openssl-3.2 branch: 3.3 Merge to openssl-3.3 cla: trivial One of the commits is marked as 'CLA: trivial' tests: exempted The PR is exempt from requirements for testing triaged: documentation The issue/pr deals with documentation (errors)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@DominikNeubauer @t8m @openssl-machine @paulidale @slontis