Download as
Browse Code »

Commit 2bdb49acc2f9faa5e88a94b256c9359b2366a165

Authored by Antonio Terceiro
1 parent 2ee317d9
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @2bdb49a
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 ## Developer Roles 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 * *Committers* are the people with direct commit access to the Noosfero source 6 * *Committers* are the people with direct commit access to the Noosfero source
7 code. They are responsible for reviewing contributions from other developers 7 code. They are responsible for reviewing contributions from other developers
8 and integrating them in the Noosfero code base. They are the members of the 8 and integrating them in the Noosfero code base. They are the members of the
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
23 There are no strict rule on what makes a change trivial or urgent; committers 23 There are no strict rule on what makes a change trivial or urgent; committers
24 are expected to exercise good judgement on a case by case basis. 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 * In the case of unsolvable conflict between commiters regarding any change to 28 * In the case of unsolvable conflict between commiters regarding any change to
27 the code, the current release manager(s) will have the final say in the 29 the code, the current release manager(s) will have the final say in the
28 matter. 30 matter.
@@ -35,8 +37,9 @@ @@ -35,8 +37,9 @@
35 37
36 * The release schedule may include a period of feature freeze, during which 38 * The release schedule may include a period of feature freeze, during which
37 no new features or any other changes that are not pre-approved by the 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 ## Maintainance process 44 ## Maintainance process
42 45
@@ -77,8 +80,8 @@ matters related to that branch. @@ -77,8 +80,8 @@ matters related to that branch.
77 80
78 Every developer that wants to be a committer should create [an issue on 81 Every developer that wants to be a committer should create [an issue on
79 Gitlab](https://gitlab.com/noosfero/noosfero/issues) requesting to be added as 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 If 2 or more commiters consider second the request, the requestor is accepted 86 If 2 or more commiters consider second the request, the requestor is accepted
84 as new commiter and added to the Noosfero group. 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,6 +99,6 @@ that includes new features, a.k.a. the master branch) is apointed by the
96 current release manager, and must be a committer first. 99 current release manager, and must be a committer first.
97 100
98 Release managers for stable branches are self-appointed, i.e. whoever takes the 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 the work but can't agree on working together), the development release manager 103 the work but can't agree on working together), the development release manager
101 decides. 104 decides.