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

Editing contributing #65

Merged
merged 1 commit into from
Jan 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ helping us improve our community.
* [Contribution Guidelines](#contribution-guidelines)
* [Community Guidelines](#community-guidelines)
* [Community Improvement](#community-improvement)
* [Helping in other ways](#helping-in-other-ways)

### Security Issues

Expand All @@ -48,7 +49,6 @@ uname -a >>/tmp/ipfs-bug-report

It may also be relevant to look at the eventlog of your ipfs node, but we will request it if so.


### Protocol Design

When considering protocol design proposals, we are looking for:
Expand All @@ -69,7 +69,6 @@ When considering design proposals for implementations, we are looking for:
- Discussion of the tradeoffs involved
- Discussion of the proposed solution


### Contribution Guidelines

Please see [contribution-guidelines.md](contribution-guidelines.md).
Expand All @@ -91,3 +90,7 @@ There is also a more extensive [code-of-conduct](code-of-conduct.md).
### Community Improvement

The IPFS community requires maintenance of various "public infrastructure" resources. These include documentation, github repositories, CI build bots, and more. There is also helping new users with questions, spreading theword about IPFS, and so on. Soon, we will be planning and running conferences. Please get in touch if you would like to help out.

### Helping in other ways

Protocol Labs occasionally is able to hire developers for part time or full time positions, to work on IPFS. If you are interested, check out [the job listings](http://ipn.io/join/#pm). If you'd like to help in other ways, [email @jbenet directly](mailto:juan@ipfs.io?subject=Contributing to IPFS).
4 changes: 2 additions & 2 deletions contribution-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ Write clean code. Universally formatted code promotes ease of writing, reading,

### Tests

Submit tests with your changes. Take a look at existing tests for inspiration. Run the full test suite on your branch before submitting a pull request.
If the repository you are working on has a testing suite, submit tests with your changes. Take a look at existing tests for inspiration. Run the full test suite on your branch before submitting a pull request.

For commandline tool changes, please write appropriate sharness tests.
For command line tool changes, please write appropriate sharness tests.

### Documentation

Expand Down