summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Murawski <steven.murawski@gmail.com>2015-09-29 12:29:03 -0500
committerSteven Murawski <steven.murawski@gmail.com>2015-09-29 12:29:03 -0500
commite26158cd40f7e29e837275585d5a597e8872d5eb (patch)
tree38bf9decb6a0e7adb9dc4c91776c7e7df69e297d
parent2e75d4f6551fa7307931a78123712205738454b2 (diff)
parent650df1b431de34804e3e8fa00a29ecef5ca079ca (diff)
downloadchef-e26158cd40f7e29e837275585d5a597e8872d5eb.tar.gz
Merge pull request #3975 from tas50/contrib
Fix awkward wording in the contributing doc
-rw-r--r--CONTRIBUTING.md10
1 files changed, 3 insertions, 7 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc416537ab..e7f2e05f06 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -70,7 +70,7 @@ Chef uses [the Apache 2.0 license](https://github.com/opscode/chef/blob/master/L
The license tells you what rights you have that are provided by the copyright holder.
It is important that the contributor fully understands what rights they are
licensing and agrees to them. Sometimes the copyright holder isn't the contributor,
- most often when the contributor is doing work for a company.
+ such as when the contributor is doing work for a company.
To make a good faith effort to ensure these criteria are met, Chef requires an Individual CLA
or a Corporate CLA for contributions. This agreement helps ensure you are aware of the
@@ -134,8 +134,8 @@ There is also a listing of the various Chef products and where to file issues th
Otherwise you can file your issue in the [Chef project](https://github.com/opscode/chef/issues)
and we will make sure it gets filed against the appropriate project.
-In order to decrease the back and forth an issues and help us get to the bottom of them quickly
- we use below issue template. You can copy paste this code into the issue you are opening and
+In order to decrease the back and forth in issues, and to help us get to the bottom of them quickly
+ we use the below issue template. You can copy/paste this template into the issue you are opening and
edit it accordingly.
<a name="issuetemplate"></a>
@@ -148,16 +148,12 @@ In order to decrease the back and forth an issues and help us get to the bottom
### Scenario:
[What you are trying to achieve and you can't?]
-
-
### Steps to Reproduce:
[If you are filing an issue what are the things we need to do in order to repro your problem?]
-
### Expected Result:
[What are you expecting to happen as the consequence of above reproduction steps?]
-
### Actual Result:
[What actually happens after the reproduction steps?]
```