summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleh Herasym <oolleehh@gmail.com>2016-02-05 15:33:56 +0200
committerHerasym Oleh <oolleehh@gmail.com>2016-02-05 16:44:18 +0200
commitb4d3b098a1e502f26697e5624b2ed73ba3846228 (patch)
treec06717f9e969c7e61fb915b1b2bb6f3ae247145b
parent74d06bf04ee7cf7786d860ca147c404ee241cc20 (diff)
downloadsdl_core-b4d3b098a1e502f26697e5624b2ed73ba3846228.tar.gz
Update CONTRIBUTING.md & COMMITTERS.md
-rw-r--r--COMMITTERS.md2
-rw-r--r--CONTRIBUTING.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/COMMITTERS.md b/COMMITTERS.md
index f4debf6098..df5fee94df 100644
--- a/COMMITTERS.md
+++ b/COMMITTERS.md
@@ -31,7 +31,7 @@ set in the form of a pull request.
Windows paths vs. POSIX paths).
* Thread safe code.
* No deadlocks.
-* Doxygen API documentation available?
+* Is Doxygen API documentation available?
* Do you have thread specific comment provided? (if another thread uses added method/classes,
there must be comment which explains: When method will be called by thread? Which thread calls the method? e.g.)
* Do you have specific realization code comments?
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 754ea407fb..a07423d5bb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,11 +12,11 @@ We use <a href="http://nvie.com/posts/a-successful-git-branching-model/">Gitflow
### Pull Requests
* Please follow the repository's for all code and documentation.
-* All pull requests should be sent to `smartdevicelink/sdl_core/`, in `develop` or `master` branches.
+* All pull requests should be sent to `smartdevicelink/sdl_core/`, to `develop` or `master` branch.
* All feature branches should be based on `develop` and have the format `feature/branch_name`.
-* All hotfix branches should be based on `develop` and have the format `fix/branch_name`.
+* All fix branches should be based on `develop` and have the format `fix/branch_name`.
* All new functionality requests should be provided only for `develop` branch.
-* In case defect should be fixed in short time (after release), send pull request on `master` and have the format `hotfix/branch_name`.
+* In case defect should be fixed in short time (after release), send pull request to `master` and have the format `hotfix/branch_name`.
* In case defect exists in `develop` and `master` branches, send pull request to `develop` only. Do not send the same pull request to the `master` branch.
* All pull requests should implement a single feature or fix a single bug. Pull Requests that involve multiple changes (it is our discretion what precisely this means) will be rejected with a reason.
* All commits should be separated into logical units, i.e. unrelated changes should be in different commits within a pull request.