Tuan Duong Quang · 01d4e0f4
--- a/CONTRIBUTING.md

+ 21

− 23
+++ b/CONTRIBUTING.md

+ 21

− 23
 @@ -3,29 +3,21 @@
 This guide provides all necessary information to enable [contributors and committers](https://www.eclipse.org/projects/dev_process/#2_3_1_Contributors_and_Committers) to contribute to Eclipse sim@openPASS. 

 ## Eclipse sim@openPASS  
-Eclipse sim@openPASS provides a software platform that enables the simulation of traffic scenarios to predict the real-world effectiveness of advanced driver assistance systems or automated driving functions.  
+Eclipse sim@openPASS provides a software platform that enables the simulation of traffic scenarios to predict the real-world effectiveness of advanced driver assistance systems or automated driving functions. 

 ## Developer resources

-  * [sim@openpass Website](https://openpass.eclipse.org/)
+  * [Working Group Website](https://openpass.eclipse.org/)
+  * [Developer Website](https://projects.eclipse.org/projects/automotive.simopenpass)
  * Mailing list: Join our [developer list](https://accounts.eclipse.org/mailing-list/simopenpass-dev)
-  * Bugs? [GitLab](https://gitlab.eclipse.org/eclipse/simopenpass/simopenpass/-/issues)
+  * Bugs can be reported in [GitLab](https://gitlab.eclipse.org/eclipse/simopenpass/simopenpass/-/issues) by anybody who owns an Eclipse account. Please use type “Incident”
+  * [Documentation](https://openpass.eclipse.org/resources/#documentation)

-## Eclipse Contributor Agreement
+## Eclipse Contributor/ Committer Agreement

-Before your contribution can be accepted by the project team, contributors must
-electronically sign the Eclipse Contributor Agreement (ECA).
+Before your contribution can be accepted by the project team, contributors and committers must sign the correct agreement depending on their status. Please read on how to proceed on: https://www.eclipse.org/legal/committer_process/re-sign/.

-* http://www.eclipse.org/legal/ECA.php
-
-Commits that are provided by non-committers must have a Signed-off-by field in
-the footer indicating that the author is aware of the terms by which the
-contribution has been provided to the project. The non-committer must
-additionally have an Eclipse Foundation account and must have a signed Eclipse
-Contributor Agreement (ECA) on file.
-
-For more information, please see the Eclipse Committer Handbook:
-https://www.eclipse.org/projects/handbook/#resources-commit
+For more information, please see the Eclipse Committer Handbook: https://www.eclipse.org/projects/handbook/#resources-commit.

 ## Contact

 @@ -39,13 +31,19 @@ The sim@openpass source code can be found [here](https://gitlab.eclipse.org/ecli

 To build the project, follow the guide in "pathToRepo\sim\doc\OSI World Setup Guide.pdf".

-The branch 'servant' contains the contributions that will be included in the next release. 
+The branch 'servant' contains the contributions that will be included in the next release. The branch ‘master’ contains the latest stable release.

 ### Committer contribution process

-1. (you) If needed, create the Issue on GitLab and assign it to yourself.
-2. (you) In GitLab, create a merge request. The related branch will be created from the branch 'servant'. 
-3. (you) Work on it.
-4. (you) Assign the issue to another committer.
-5. (other committer) Review the code. 
-6. (other committer) To merge new branch into 'servant' you can close the merge request via GitLab.
+1.	(you) Discuss your planned contribution with the project lead first.
+2.	(you) If needed, create the Issue on GitLab and assign it to yourself.
+3.	(you) In GitLab, create a merge request. The related branch will be created from the branch 'servant'.
+4.	(you) Work on it and respect the following points:
+  4.1. Stick to the [coding guideline](https://wiki.eclipse.org/images/3/3f/OpenPASS_Conventions.pdf)
+  4.2. Amend the documentation if necessary
+  4.3. Provide unit-tests in googletest format
+  4.4. Make sure, the servant compiles and runs in combination with your contribution
+5.	(you) Assign the issue to another committer.
+6.	(other committer) Review the code.
+7.	(other committer) To merge new branch into 'servant' you can close the merge request via GitLab.
+8.	(you) Present your contribution to the openPASS WG