Skip to content

Commit

Permalink
Small wording adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
andsnunes authored Apr 4, 2019
1 parent 73c2f3a commit 7b789b2
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

When contributing to the TAO project, please first discuss the change you wish to make via issue.

Contributions to the TAO codebase are done using the fork & pull model.
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
Contributions to the TAO codebase are made using the fork & pull model.
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests, please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).

The TAO development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.
The TAO development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review, we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.

## Contribution process

If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the TAO development team, fork the TAO project and send pull requests.
If you are a new GitHub user, we recommend that you create your own [free GitHub account](https://github.com/signup/free). This will allow you to collaborate with the TAO development team, fork the TAO project and send pull requests.

1. Check the open an closed issues for similar proposals of intended contribution before starting work on a new contribution.
2. Create and test your work.
3. Fork the repository of the TAO extension you wish to contribute to.
3. Fork the repository of the TAO extension you wish to contribute.

This comment has been minimized.

Copy link
@martijn-tao

martijn-tao Apr 4, 2019

Contributor

I think "you wish to contribute to" was actually the correct way of wording this

4. Create a branch that follows the [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) branching model.
5. Once development has been done, create a pull request that targets the development branch of the extension you are contributing to.
5. Once development has been done, create a pull request that targets the development branch of the extension you are contributing.

This comment has been minimized.

Copy link
@martijn-tao

martijn-tao Apr 4, 2019

Contributor

Same comment here. "you are contributing to" is the correct wording here

6. If your code depends on changes in another extension, create a draft pull request, until all required pull requests are created.
7. Once your contribution is received the TAO development team will review the contribution and collaborate with you as needed.

Expand All @@ -24,7 +24,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
### Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
contributors and maintainers pledge to make participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
Expand Down Expand Up @@ -68,18 +68,17 @@ threatening, offensive, or harmful.

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representing a project or community include using an official project e-mail address, posting via an official social media account or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
Instances of abusive, harassing or otherwise, unacceptable behavior may be

This comment has been minimized.

Copy link
@martijn-tao

martijn-tao Apr 4, 2019

Contributor

"abusive", "harassing" and "otherwise unacceptable behavior" are separate parts in this case, so the previous punctuation was correct here

reported by contacting the project team at [[email protected]](mailto:[email protected]). All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
obligated to maintain confidentiality concerning the reporter of an incident.

This comment has been minimized.

Copy link
@martijn-tao

martijn-tao Apr 4, 2019

Contributor

This works in this case, but is a matter of preference (see: https://english.stackexchange.com/a/317499)

Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
Expand Down

0 comments on commit 7b789b2

Please sign in to comment.