Update CONTRIBUTING.md.

Author: mekras

CONTRIBUTING.md

@@ -5,8 +5,8 @@ If you're here, you would like to contribute to this repository and you're reall
 
 ## Bug reports
 
-If you find a bug or a documentation issue, please report it or even better: fix it :). If you
-report it, please be as precise as possible. Here is a little list of required information:
+If you find a bug or a documentation issue, please report it or even better: fix it :). If you report it,
+please be as precise as possible. Here is a little list of required information:
 
  - Precise description of the bug
  - Details of your environment (for example: OS, PHP version, installed extensions)
@@ -15,24 +15,23 @@ report it, please be as precise as possible. Here is a little list of required i
 
 ## Security issues
 
-If you discover any security related issues, please contact us at
-[[email protected]](mailto:[email protected]) instead of submitting an issue on Github.
-This allows us to fix the issue and release a security hotfix without publicly disclosing the
-vulnerability.
+If you discover any security related issues,
+please contact us at the [security email address](../../#security) instead of submitting an issue on Github.
+This allows us to fix the issue and release a security hotfix without publicly disclosing the vulnerability.
 
 
 ## Feature requests
 
-If you think a feature is missing, please report it or even better: implement it :). If you report
-it, describe the more precisely what you would like to see implemented and we will discuss what is
-the best approach for it. If you can do some research before submitting it and link the resources
-to your description, you're awesome! It will allow us to more easily understood/implement it.
+If you think a feature is missing, please report it or even better: implement it :). If you report it, describe the more
+precisely what you would like to see implemented and we will discuss what is the best approach for it. If you can do
+some research before submitting it and link the resources to your description, you're awesome! It will allow us to more
+easily understood/implement it.
 
 
 ## Sending a Pull Request
 
-If you're here, you are going to fix a bug or implement a feature and you're the best! To do it,
-first fork the repository, clone it and create a new branch with the following commands:
+If you're here, you are going to fix a bug or implement a feature and you're the best!
+To do it, first fork the repository, clone it and create a new branch with the following commands:
 
 ``` bash
 $ git clone [email protected]:your-name/repo-name.git
@@ -52,30 +51,28 @@ Write code and tests. When you are ready, run the tests.
 $ composer test
 ```
 
-When you are ready with the code, tested it and documented it, you can commit and push it with the
-following commands:
+When you are ready with the code, tested it and documented it, you can commit and push it with the following commands:
 
 ``` bash
 $ git commit -m "Feature or bug fix description"
 $ git push origin feature-or-bug-fix-description
 ```
 
 **Note:** Please write your commit messages in the imperative and follow the
-[guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and
-concise messages.
+[guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) for clear and concise messages.
 
 Then [create a pull request](https://help.github.com/articles/creating-a-pull-request/) on GitHub.
 
-Please make sure that each individual commit in your pull request is meaningful. If you had to make
-multiple intermediate commits while developing, please squash them before submitting with the
-following commands (here, we assume you would like to squash 3 commits in a single one):
+Please make sure that each individual commit in your pull request is meaningful.
+If you had to make multiple intermediate commits while developing,
+please squash them before submitting with the following commands
+(here, we assume you would like to squash 3 commits in a single one):
 
 ``` bash
 $ git rebase -i HEAD~3
 ```
 
-If your branch conflicts with the master branch, you will need to rebase and repush it with the
-following commands:
+If your branch conflicts with the master branch, you will need to rebase and repush it with the following commands:
 
 ``` bash
 $ git remote add upstream [email protected]:php-http/repo-name.git
@@ -86,12 +83,18 @@ $ git push -f origin feature-or-bug-fix-description
 
 ## Coding standard
 
-This repository follows the [PSR-2 standard](http://www.php-fig.org/psr/psr-2/) and so, if you want
-to contribute, you must follow these rules.
+This repository follows the [PSR-2 standard](http://www.php-fig.org/psr/psr-2/) and so, if you want to contribute,
+you must follow these rules.
 
 
 ## Semver
 
 We are trying to follow [semver](http://semver.org/). When you are making BC breaking changes,
-please let us know why you think it is important. In this case, your patch can only be included in
-the next major version.
+please let us know why you think it is important.
+In this case, your patch can only be included in the next major version.
+
+
+## Code of Conduct
+
+This project is released with a [Contributor Code of Conduct](CONDUCT.md).
+By participating in this project you agree to abide by its terms.