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

Spelling doc #3580

Closed
wants to merge 17 commits into from
Closed

Spelling doc #3580

wants to merge 17 commits into from

Conversation

jsoref
Copy link
Contributor

@jsoref jsoref commented May 30, 2017

Split from #3459

@jsoref jsoref mentioned this pull request May 30, 2017
Closed
@richsalz richsalz self-assigned this May 30, 2017
@richsalz richsalz added branch: 1.0.2 Merge to OpenSSL_1_0_2-stable branch 1.1.0 branch: master Merge to master branch labels May 30, 2017
@richsalz
Copy link
Contributor

best-effort cherry-pick to the existing releases.

@dot-asm
Copy link
Contributor

dot-asm commented May 30, 2017

I can approve this only if we agree that all commits are squashed to one or two. How many should depend on cherry-pick-ability, but I suppose one would do, and if it doesn't cherry-pick, just let it be...

@jsoref
Copy link
Contributor Author

jsoref commented May 30, 2017

Do you want me to do the squash?
Can you tell me what releases you care about?
I could probably make two commits:
Cherry picks well + doesn't cherry pick.

@dot-asm
Copy link
Contributor

dot-asm commented May 30, 2017 •
edited

Can you tell me what releases you care about?

See labels.

Do you want me to do the squash?

If we agree that one is sufficient (and if it doesn't cherry-pick it's all right), then you don't have to squash. Only recognize that it's going to happen.

@richsalz
Copy link
Contributor

Once the manpage typo's goes in, then rebase and squash this. I only care about the doc fixes getting picked back to 1.0.2 and 1.1.0

@richsalz
Copy link
Contributor

@dot-asm please take a look at #3459

@dot-asm
Copy link
Contributor

dot-asm commented May 30, 2017

please take a look at #3459

I don't follow. I've seen it (as should be obvious from me commenting there)...

@richsalz
Copy link
Contributor

I had the two PR's backwards.
A separate version of this to do the fixes for 1.0.2 would be great. Ignore 1.1.0, it's not going to live very long once 1.1.1 comes out :)

@dot-asm
Copy link
Contributor

dot-asm commented Jun 1, 2017

This needs re-base :-(

@jsoref
Copy link
Contributor Author

jsoref commented Jun 2, 2017

@dot-asm: thankfully, resolving conflicts isn't hard until the commits are squashed

@kroeckx
Copy link
Member

kroeckx commented Jun 10, 2017

@richsalz: I assume you can deal with the conflicts yourself? I suggest you squash them all into 1 commit.

@kroeckx kroeckx added the approval: done This pull request has the required number of approvals label Jun 10, 2017
levitte pushed a commit that referenced this pull request Jun 11, 2017
@jsoref
Fix spelling errors in manpages
27b138e 
spelling: algorithm
spelling: anyway
spelling: assigned
spelling: authenticated
spelling: callback
spelling: certificate
spelling: compatibility
spelling: configuration
spelling: digest
spelling: encrypted
spelling: function
spelling: output
spelling: receive
spelling: renegotiation
spelling: signing
spelling: similar
spelling: string

(Merged from #3580: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(Merged from #3580)
levitte pushed a commit that referenced this pull request Jun 11, 2017
@bbolli
doc/man3: use the documented coding style in the example code
7aefa75 
Adjust brace placement, whitespace after keywords, indentation and empty
lines after variable declarations according to
https://www.openssl.org/policies/codingstyle.html.

Indent literal sections by exactly one space.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #3580)
@richsalz
Copy link
Contributor

too much work to backport to 1.0.2 and 1.1.0 master only.

@richsalz richsalz closed this Jun 11, 2017
@jsoref jsoref deleted the spelling-doc branch June 12, 2017 03:49
@FdaSilvaYY FdaSilvaYY mentioned this pull request Nov 2, 2017
Closed
FdaSilvaYY added a commit to FdaSilvaYY/openssl that referenced this pull request Nov 3, 2017
@FdaSilvaYY
Spelling doc openssl#3580
512568c 
Backport of openssl#3580 to 1.1.0
plus a few other typo fixes found at fligth.
levitte pushed a commit that referenced this pull request Nov 3, 2017
@FdaSilvaYY @bernd-edlinger
Spelling doc #3580
38c23e6 
Duplicated tests descriptions

Backport of #3580 to 1.1.0
plus a few other typo fixes found at fligth.

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from #4645)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kroeckx kroeckx kroeckx approved these changes

@richsalz richsalz richsalz approved these changes

Assignees

@richsalz richsalz

Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch branch: 1.0.2 Merge to OpenSSL_1_0_2-stable branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jsoref @richsalz @dot-asm @kroeckx