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 @@ -1,7 +1,7 @@ + ]> @@ -13,20 +13,23 @@
-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 - 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.
+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 Project members who have been granted + commit access (a "commit bit") to one or more of the Project's + repositories.
+ +All members receive:
In addition to the Ordinary Member benefits, active + Committers (those who have made a commit within the previous + year) are able to vote in Core elections.
+ +All Members should ensure that all contributed material:
+ +Associates MUST create SSH and PGP keys in exactly the same way - that a committer would to gain access to project resources.
+Members MUST create SSH and PGP keys in order to gain access to + Project resources.
-Associates are bound by the Code of Conduct of the FreeBSD Project.
+Members are bound by the Project's Code of Conduct, + particularly when representing the Project in external fora.
-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.
- -Core, or groups that core may designate, that award associate - 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 - own discretion.
+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 designated by Core that award Member status, + should review that status at least once annually and retire + inactive accounts. There is no formal definition of inactive + accounts. Core and the designated teams may use their own + discretion.