diff options
| -rw-r--r-- | CONTRIBUTING.md | 12 | ||||
| -rw-r--r-- | CONTRIBUTIONS.md | 2 | ||||
| -rw-r--r-- | DOC_CHANGES.md | 6 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | RELEASE_NOTES.md | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e460d64fe1..9d9839fd5c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,7 +24,7 @@ Chef uses the Apache 2.0 license to strike a balance between open contribution a 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. -To make a good faith effort to ensure these criteria are met, Opscode requires a Contributor License Agreement (CLA) or a Corporate Contributor License +To make a good faith effort to ensure these criteria are met, Chef requires a Contributor License Agreement (CLA) or a Corporate Contributor License Agreement (CCLA) for all contributions. This is without exception due to some matters not being related to copyright and to avoid having to continually check with our lawyers about small patches. @@ -74,7 +74,7 @@ helpful to be clear about your use case and change so they can understand it eve ### Github and Pull Requests -All of Opscode's open source projects are available on [Github](http://www.github.com/opscode). +All of Chef's open source projects are available on [Github](http://www.github.com/opscode). We don't require you to use Github, and we will even take patch diffs attached to tickets on the tracker. However Github has a lot of convenient features, such as being able to see a diff of changes between a @@ -115,7 +115,7 @@ and accounting for it. ## Code Review -Opscode regularly reviews code contributions and provides suggestions for improvement in the code itself or the implementation. +Chef regularly reviews code contributions and provides suggestions for improvement in the code itself or the implementation. We find contributions by searching the ticket tracker for _resolved_ tickets with a status of _fixed_. If we have feedback we will reopen the ticket and you should resolve it again when you've made the changes or have a response to our feedback. When we believe @@ -134,14 +134,14 @@ The versioning for the Chef project is X.Y.Z. * Y is a minor release, which adds both new features and bug fixes * Z is a patch release, which adds just bug fixes -Major releases and have historically been once a year. Minor releases for Chef average every three months and patch releases come as needed. +Major releases have historically been once a year. Minor releases for Chef average every three months and patch releases come as needed. There are usually beta releases and release candidates (RC) of major and minor releases announced on the [chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev). Once an RC is released, we wait at least three days to allow for testing for regressions before the final release. If a blocking regression is found then another RC is made containing the fix and the timer is reset. -Once the official release is made, the release notes are available on the [Opscode blog](http://www.opscode.com/blog). +Once the official release is made, the release notes are available on the [Chef blog](http://www.getchef.com/blog). ## Working with the community @@ -151,5 +151,5 @@ These resources will help you learn more about Chef and connect to other members * #chef and #chef-hacking IRC channels on irc.freenode.net * [Community Cookbook site](http://community.opscode.com) * [Chef wiki](http://wiki.opscode.com/display/chef) -* Opscode Chef [product page](http://www.opscode.com/chef) +* Chef [product page](http://www.getchef.com/chef) diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md index 920f574c32..3bf6a131d7 100644 --- a/CONTRIBUTIONS.md +++ b/CONTRIBUTIONS.md @@ -1,5 +1,5 @@ <!--- -This file is reset everytime when a new release is done. Contents of this file is for the currently unreleased version. +This file is reset every time a new release is done. The contents of this file are for the currently unreleased version. Example Contribution: * **kalistec**: Improved file resource greatly. diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md index ad7d2eccd8..3bad475ae1 100644 --- a/DOC_CHANGES.md +++ b/DOC_CHANGES.md @@ -1,12 +1,12 @@ <!--- -This file is reset everytime when a new release is done. Contents of this file is for the currently unreleased version. +This file is reset every time a new release is done. The contents of this file are for the currently unreleased version. Example Doc Change: ### Headline for the required change Description of the required change. --> -# Chef CLient Doc Changes: +# Chef Client Doc Changes: ### --validator option for `knife client create` Boolean value. If set to true, knife creates a validator client o.w. it creates a user client. Default is false. @@ -15,4 +15,4 @@ Boolean value. If set to true, knife creates a validator client o.w. it creates Option that is required to be specified if user is attempting to delete a validator client. No effect while deleting a user client. ### -r / --runlist option for chef-client -Option similar to `-o` which sets or changes the run_list of a node permanently.
\ No newline at end of file +Option similar to `-o` which sets or changes the run_list of a node permanently. @@ -61,7 +61,7 @@ Then get the source and install it: Before working on the code, if you plan to contribute your changes, you need to read the -[Opscode Contributing document](http://docs.opscode.com/community_contributions.html). +[Chef Contributions document](http://docs.opscode.com/community_contributions.html). You will also need to set up the repository with the appropriate branches. We document the process on the diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f9797ca72f..9afa0a73ec 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,5 +1,5 @@ <!--- -This file is reset everytime when a new release is done. Contents of this file is for the currently unreleased version. +This file is reset every time a new release is done. The contents of this file are for the currently unreleased version. Example Note: |