Index: en_US.ISO8859-1/htdocs/internal/Makefile =================================================================== --- en_US.ISO8859-1/htdocs/internal/Makefile +++ en_US.ISO8859-1/htdocs/internal/Makefile @@ -21,6 +21,7 @@ DOCS+= i18n.xml DOCS+= internal.xml DOCS+= machines.xml +DOCS+= members.xml DOCS+= mirror.xml DOCS+= new-account.xml DOCS+= policies.xml Index: en_US.ISO8859-1/htdocs/internal/members.xml =================================================================== --- en_US.ISO8859-1/htdocs/internal/members.xml +++ en_US.ISO8859-1/htdocs/internal/members.xml @@ -13,20 +13,46 @@
-An Associate is an individual who has made a notable contribution - to the FreeBSD project. That may be in the form of new code, - documentation, or patches to existing code and documentation - committed through a currently valid Committer, or in other ways - that the Core Team designates, including community management and - advocacy. Associates do not have any voting rights or +
Membership of the FreeBSD project has been extended to include + ordinary members as well as committers. Committers are now + distinguished as being those project members who have (or used to + have) commit access (a "commit bit") into one or more of the + project's repositories.
+ +A FreeBSD Project Member is an individual who has made a + notable contribution to the FreeBSD project. That may be in the + form of new code, documentation, or patches to existing code and + documentation, or in other ways that the Core Team designates, + including community management and advocacy.
+ +Committers are those members who have made sufficient + contributions that they have been granted commit rights into one + or more project code repositories. Committers are expected to + ensure that the work they commit is correctly attributed to its + authors, that it has appropriate licensing, and that it follows + the project's standards and practices. Committers are + required to adhere to the FreeBSD project Code of Conduct, + particularly when representing the project in external fora.
+ +Active committers (those who have made a commit within the + previous year) are able to vote in Core elections.
+ +Ordinary members do not have any voting rights or responsibilities to the project other than to ensure their contributed material adheres to the project's standards and - practices, that the work is original to the author and is made - available under the standard, FreeBSD license.
+ practices, that their contributed work is of their own original + authorship and is made available under an acceptable license, + preferably the standard FreeBSD license. + +All members receive:
Associates MUST create SSH and PGP keys in exactly the same way - that a committer would to gain access to project resources.
- -Associates are bound by the Code of Conduct of the FreeBSD Project.
- -Associate status is conferred by a ballot of Core members, or - by other groups that Core may designate such as Portmgr or Doceng. - Any FreeBSD committer or associate may propose candidates for - associate status.
+Members MUST create SSH and PGP keys in exactly the same way as + committers have done previously in order to gain access to project + resources.
+ +Members are bound by the Code of Conduct of the FreeBSD project.
+ +Member status is conferred by a ballot of Core members, or by a + ballot of other groups that Core may designate such as Portmgr or + Doceng. Any FreeBSD committer or member may propose candidates + for member status.
-Core, or groups that core may designate, that award associate +
Core, or groups that Core may designate, that award member status, should review that status at least once annually and retire inactive accounts. There is no minimum level of contribution required, Core and the designated teams may use their @@ -59,19 +86,33 @@