diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2da732e..4c11c14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,9 +8,8 @@ work for us, and a faster and better response. Issues are not a way to ask general questions about Flot. If you see unexpected behavior but are not 100% certain that it is a bug, please try posting to the [forum](http://groups.google.com/group/flot-graphs) first, and confirm that -what you see is really a Flot problem before creating a new issue for it. - -When reporting a bug, please include a working demonstration of the problem, if +what you see is really a Flot problem before creating a new issue for it. When +reporting a bug, please include a working demonstration of the problem, if possible, or at least a clear description of the options you're using and the environment (browser and version, jQuery version, other libraries) that you're running under. @@ -27,17 +26,17 @@ duplicated effort. To make merging as easy as possible, please keep these rules in mind: - 1. Divide larger changes into a series of small, logical commits with - descriptive messages. - - 2. Format your code according to the style guidelines below. - - 3. Submit new features or architectural changes to the *<version>-work* + 1. Submit new features or architectural changes to the *<version>-work* branch for the next major release. Submit bug fixes to the master branch. - 4. Rebase, if necessary, before submitting your pull request, to reduce the + 2. Divide larger changes into a series of small, logical commits with + descriptive messages. + + 3. Rebase, if necessary, before submitting your pull request, to reduce the work we need to do to merge it. + 4. Format your code according to the style guidelines below. + ### Flot Style Guidelines ### Flot follows the [jQuery Core Style Guidelines](http://docs.jquery.com/JQuery_Core_Style_Guidelines),