Commit 2bdb49acc2f9faa5e88a94b256c9359b2366a165
1 parent
2ee317d9
Exists in
master
and in
29 other branches
DEVELOPMENT.md: apply Daniela Feitosa's suggestions
Mostly editorial changes
Showing
1 changed file
with
9 additions
and
6 deletions
Show diff stats
DEVELOPMENT.md
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | |
3 | 3 | ## Developer Roles |
4 | 4 | |
5 | -* *Developers* are everyone that are contributing code to Noosfero. | |
5 | +* *Developers* are everyone that is contributing code to Noosfero. | |
6 | 6 | * *Committers* are the people with direct commit access to the Noosfero source |
7 | 7 | code. They are responsible for reviewing contributions from other developers |
8 | 8 | and integrating them in the Noosfero code base. They are the members of the |
... | ... | @@ -23,6 +23,8 @@ |
23 | 23 | There are no strict rule on what makes a change trivial or urgent; committers |
24 | 24 | are expected to exercise good judgement on a case by case basis. |
25 | 25 | |
26 | + * Usually changes to the database are not trivial. | |
27 | + | |
26 | 28 | * In the case of unsolvable conflict between commiters regarding any change to |
27 | 29 | the code, the current release manager(s) will have the final say in the |
28 | 30 | matter. |
... | ... | @@ -35,8 +37,9 @@ |
35 | 37 | |
36 | 38 | * The release schedule may include a period of feature freeze, during which |
37 | 39 | no new features or any other changes that are not pre-approved by the |
38 | - release manager must be committed to the repository. Committers must | |
39 | - respect the feature freezes. | |
40 | + release manager must be committed to the repository. | |
41 | + | |
42 | + * Committers must respect the release schedule and feature freezes. | |
40 | 43 | |
41 | 44 | ## Maintainance process |
42 | 45 | |
... | ... | @@ -77,8 +80,8 @@ matters related to that branch. |
77 | 80 | |
78 | 81 | Every developer that wants to be a committer should create [an issue on |
79 | 82 | Gitlab](https://gitlab.com/noosfero/noosfero/issues) requesting to be added as |
80 | -a committer. This request must include information the requestor's previous | |
81 | -contributions to the project. | |
83 | +a committer. This request must include information about the requestor's | |
84 | +previous contributions to the project. | |
82 | 85 | |
83 | 86 | If 2 or more commiters consider second the request, the requestor is accepted |
84 | 87 | as new commiter and added to the Noosfero group. |
... | ... | @@ -96,6 +99,6 @@ that includes new features, a.k.a. the master branch) is apointed by the |
96 | 99 | current release manager, and must be a committer first. |
97 | 100 | |
98 | 101 | Release managers for stable branches are self-appointed, i.e. whoever takes the |
99 | -work takes the role. In case of a conflict (e.g. 2+ different people want to | |
102 | +work takes the role. In case of a conflict (e.g. 2+ different people want to do | |
100 | 103 | the work but can't agree on working together), the development release manager |
101 | 104 | decides. | ... | ... |