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

Minor updates #5889

Closed
wants to merge 6 commits into from
Closed

Minor updates #5889

wants to merge 6 commits into from

Conversation

richsalz
Copy link
Contributor

@richsalz richsalz commented Apr 5, 2018

Not planning to backport (doc-nits is only in master) unless there's pressure.

@richsalz richsalz added branch: master Merge to master branch approval: review pending This pull request needs review by a committer labels Apr 5, 2018
@richsalz richsalz self-assigned this Apr 5, 2018
CONTRIBUTING Outdated
------------------------------------

(Please visit https://www.openssl.org/community/getting-started.html for
other ideas about how to contribute.)

Development is coordinated on the openssl-dev mailing list (see the
Development is coordinated on the openssl-project mailing list (see the
Copy link
Member

Choose a reason for hiding this comment

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

No. openssl-project is not intended to be a new openssl-dev. We should say that we're coordinating development on github.

CONTRIBUTING Outdated
above link or https://mta.openssl.org for information on subscribing).
If you are unsure as to whether a feature will be useful for the general
OpenSSL community you might want to discuss it on the openssl-dev mailing
OpenSSL community you might want to discuss it on the openssl-project mailing
Copy link
Member

Choose a reason for hiding this comment

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

No. You raise an issue on github.

CONTRIBUTING Outdated
list first. Someone may be already working on the same thing or there
may be a good reason as to why that feature isn't implemented.

To submit a patch, make a pull request on GitHub. If you think the patch
could use feedback from the community, please start a thread on openssl-dev
could use feedback from the community, please start a thread on openssl-project
Copy link
Member

Choose a reason for hiding this comment

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

No, just submit a PR on github, discussion will happen there.

@levitte
Copy link
Member

levitte commented Apr 5, 2018

I would also very much like to see whatever changes we end up with backported to 1.1.0, as much as is appropriate (yes, I know, doc-nits is master only, but the rest is the same for all branches)

@t-j-h
Copy link
Member

t-j-h commented Apr 5, 2018

As I noted in the other PR - we need to be clear to point what used to go to openssl-dev off to github as per OMC decisions. openssl-project is not a replacement for openssl-dev - it has an entirely different purpose.

And the elimination of RT references should be backported for active release (1.0.2, 1.1.0) ...

CONTRIBUTING Outdated
@@ -1,26 +1,26 @@
HOW TO CONTRIBUTE PATCHES TO OpenSSL
HOW TO CONTRIBUTE TO PATCHES OpenSSL
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you change this line intentionally? This does not sound like correct english to me.

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe you intended to write "HOW TO CONTRIBUTE TO OpenSSL"?

CONTRIBUTING Outdated

1. Anything other than trivial contributions will require a contributor
To make it easier to review and accept our pull request, please follow these
Copy link
Contributor

Choose a reason for hiding this comment

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

'our pull request' -> 'your pull request'

CONTRIBUTING Outdated
To make it easier to review and accept our pull request, please follow these
guidelines:

1. Anything other than a trivial contribution requires a contributor
licensing agreement, giving us permission to use your code. See
Copy link
Contributor

Choose a reason for hiding this comment

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

It's better to use the formulation of cla.html, which calls it a "Contributor License Agreement (CLA)".

CONTRIBUTING Outdated
@@ -1,26 +1,26 @@
HOW TO CONTRIBUTE PATCHES TO OpenSSL
HOW TO CONTRIBUTE TO PATCHES OpenSSL
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe you intended to write "HOW TO CONTRIBUTE TO OpenSSL"?

CONTRIBUTING Outdated
documentation. Please look at the "pod" files in doc/man[1357]
for examples of our style.
documentation. Please look at the "pod" files in doc/man[1357] for
examples of our style. Do "make doc-nits" to make sure that your
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe replace "Do" -> "Run" ?

Copy link
Member

@levitte levitte left a comment

Choose a reason for hiding this comment

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

This looks good to me.

I hope you will do a backport for 1.1.0 as well

@levitte levitte added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Apr 6, 2018
CONTRIBUTING Outdated
guidelines:

1. Anything other than a trivial contribution requires a Contributor
Licensing Agreement (CLA), giving us permission to use your code. See
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: the official wording is „License“, not „Licensing“, see the cla pdf.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed.

@richsalz
Copy link
Contributor Author

richsalz commented Apr 6, 2018

I'll wait until @t-j-h has a chance to look before pushing. I will cherry-pick, by just copying the file over to each release (and deleting the doc-nits sentence for the non-master branches).

Copy link
Contributor

@mspncp mspncp left a comment

Choose a reason for hiding this comment

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

LGTM now. But I‘ll abstain and leave it for an OMC member to approve.

@richsalz
Copy link
Contributor Author

richsalz commented Apr 6, 2018

Thanks for your feedback. You don't have to abstain :) Tim had made excellent points, too, and I want to make sure this addresses them before I merge.

CONTRIBUTING Outdated
To submit a patch, make a pull request on GitHub. If you think the patch
could use feedback from the community, please start a thread on openssl-dev
to discuss it.
To request new features or report bugs, please open an issue.
Copy link
Contributor

Choose a reason for hiding this comment

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

... an issue on GitHub.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok

CONTRIBUTING Outdated

Having addressed the following items before the PR will help make the
acceptance and review process faster:
To submit a patch, make a pull request on GitHub. If you are thinking of
Copy link
Contributor

Choose a reason for hiding this comment

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

"To submit a patch, please open a pull request on GitHub..."

Copy link
Contributor

Choose a reason for hiding this comment

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

There is some steps before opening a PR that can be mentionned, like cloning the OpenSSL repository, create our work branch, push the change onto it, and them create a PR with this edited branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I took the wording change, but this is not the place for a GitHub tutorial, so not going to do that. Having that kind of doc, probably on our website, makes sense.

platforms: try to ensure you only use portable features.
Clean builds via Travis and AppVeyor are expected, and done whenever
a PR is created or updated.
platforms: try to ensure you only use portable features. Clean builds
Copy link
Contributor

Choose a reason for hiding this comment

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

"Clean builds..." deserve a paragraph of its own, with some word on creating/opening a personal Travis/AppVeyor account ( very quick stepo using own GitHub login account) , sot anyone can push and test there changes without opening a PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Again, I think this should be a separate doc on the website.

@mspncp
Copy link
Contributor

mspncp commented Apr 6, 2018

@FdaSilvaYY, you propose a lot of good ideas here, but some of them go beyond the scope of a simple CONTRIBUTING text file. For example, it can't be purpose of it to provide a complete GitHub tutorial. There are are a lot of good tutorials out there, not only on GitHub.

I agree that it would be a good thing to have a place were OpenSSL specific GitHub matters like the basic workflow and the build servers are explained. But a plain text format is not the ideal medium for doing that. The Wiki would be a more suitable location.

An even better and more visible solution (than a link to the wiki) is the possibility to create a welcome page for the project. I happened to see a nice one just recently on the google/tink project page. If you scroll down a little, you see it. The source file, README.md is part of the repository and written in github flavoured markdown. From the welcome page, one could link into further useful documentation related to OpenSSL on GitHub, which could be located in docs/github as markdown files. There you would have a lot of possibilities to follow your ideas...

@richsalz
Copy link
Contributor Author

richsalz commented Apr 7, 2018

I know @t-j-h is busy this week with RSA, so I'll merge in a couple of days anyway.

Copy link
Member

@t-j-h t-j-h left a comment

Choose a reason for hiding this comment

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

Looks good!

levitte pushed a commit that referenced this pull request Apr 7, 2018
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #5889)
levitte pushed a commit that referenced this pull request Apr 7, 2018
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #5889)
(cherry picked from commit 2876872)
levitte pushed a commit that referenced this pull request Apr 7, 2018
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #5889)

(cherry picked from commit 2876872)
@richsalz
Copy link
Contributor Author

richsalz commented Apr 7, 2018

Merged to all three branches (sans the doc-nits sentence for non-master); thanks everyone for the feedback.

@richsalz richsalz closed this Apr 7, 2018
@richsalz richsalz deleted the update-contributing branch April 24, 2018 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants