--- /var/www/www.edgebsd.org/wiki/Project organization	2013/09/25 23:39:54	1.1
+++ /var/www/www.edgebsd.org/wiki/Project organization	2014/02/24 19:45:32	1.2
@@ -1,8 +1,7 @@
-<p><b><i>This document is a work in progress and hasn't been accepted by every registered developer yet.</i></b></p>
 <h2>Roles</h2>
 <p>There are a number of roles in the project management of EdgeBSD.</p>
 <h3>Leader</h3>
-<p>The EdgeBSD leader dictates the tentative vision and orientation of the project. He has the final word in case of conflicts. The leader is also in charge of reviewing and accepting applications for developer status.</p>
+<p>The EdgeBSD leader dictates the tentative vision and orientation of the project, and has the final word in case of conflicts. The leader is also in charge of reviewing and accepting applications for developer status.</p>
 <p>The leader is elected by the project developers, with the one collecting the most votes being appointed. Developers must have been part of the project for a year (365 days) before being allowed to vote. All votes are public. Votes can be cast during a voting period of one week (7 days).</p>
 <p>The project leader may choose to step out at any time, and is free to choose an interim leader before new elections can be organized. New elections must be organized within three months (90 days).</p>
 <p>The current leader is Pierre Pronchery &lt;khorben@edgebsd.org&gt;.</p>
@@ -20,10 +19,10 @@
 <p>Releasers should not import their own work into the stable branches (except for the lead releaser). Releasers must be developers of the project.</p>
 <h3>Developers</h3>
 <p>Developers are users with the care and ability to actively help the project in any way. Anyone can apply to become a developer. Applications have to be sent to the project's official address &lt;root@edgebsd.org&gt; or to the project leader (possibly by means of a mailing-list).</p>
-<p>Developers are listed publicly, and are identified by a full name, login and SSH public key. Only human beings are currently accepted as official developers, although other conscious living species may apply (if they are able to cater for their own, private SSH key).</p>
+<p>Developers are listed publicly, and are identified by a full name, login and SSH public key. Only human beings are currently accepted as official developers, although other conscious living species may apply (if they are able to create and keep a personal SSH private key).</p>
 <h3>Users</h3>
-<p>Users are the most important members of the project. Membership is informal and can be considered granted by subscribing to the website, or to any mailing-list hosted by the project. Each member has to act sincerely, respectfully and willingly, considering the needs and desires of fellow members just as much as their own. Membership can be revoked at any point by the project leader, without requiring any public justification.</p>
-<p>Aspiring developers have to be members to apply.</p>
+<p>Users are the most important members of the project. Membership is informal and can be considered granted by subscribing to the website, or to any mailing-list hosted by the project. Each member has to act sincerely, respectfully and willingly, considering the needs and desires of fellow members as much as their own. User accounts on the website or registrations on the mailing-lists can be revoked at any point by the project leader, without requiring any public justification.</p>
+<p>Developers are expected to be registered on the website, and to be following discussions on the mailing-lists regularly.</p>
 <h3>Security team</h3>
 <p>Last but not least, the project leader should nominate a security officer whenever resources allow it. The security officer is in charge of choosing up to three other developers to participate to the security team.</p>
 <p>The security team is in charge of collecting, researching and addressing security concerns, pressuring the other teams or developers to act on potential and confirmed issues. Subsequently fixed issues must be communicated publicly and formally in the format of an advisory. Communication to and within the team should however be confidential and encrypted whenever feasible. The official address to reach the team is &lt;security@edgebsd.org&gt;.</p>
\ No newline at end of file