Author: mcucchiara
Date: Sat Jan 29 07:19:43 2011
New Revision: 1064973
URL: http://svn.apache.org/viewvc?rev=1064973&view=rev
Log:
Updated link to the right version of bylaws and merged the new version with the
old one
Modified:
struts/site/forms/invitation-committer.txt
struts/site/src/site/xdoc/dev/bylaws.xml
struts/site/src/site/xdoc/downloads.xml
Modified: struts/site/forms/invitation-committer.txt
URL:
http://svn.apache.org/viewvc/struts/site/forms/invitation-committer.txt?rev=1064973&r1=1064972&r2=1064973&view=diff
==============================================================================
--- struts/site/forms/invitation-committer.txt (original)
+++ struts/site/forms/invitation-committer.txt Sat Jan 29 07:19:43 2011
@@ -8,7 +8,7 @@ review the 'How the ASF Works' pages:
along with the Apache Struts PMC charter:
-* http://struts.apache.org/bylaws.html
+* http://struts.apache.org/dev/bylaws.html
If you decide to accept the invitation, the first step would be to file an
Individual Contributor License Agreement:
Modified: struts/site/src/site/xdoc/dev/bylaws.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/bylaws.xml?rev=1064973&r1=1064972&r2=1064973&view=diff
==============================================================================
--- struts/site/src/site/xdoc/dev/bylaws.xml (original)
+++ struts/site/src/site/xdoc/dev/bylaws.xml Sat Jan 29 07:19:43 2011
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<!--
+$Id $
Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -47,6 +48,79 @@ limitations under the License.
and clarifications found herein.
</p>
+ <subsection name="Roles and Responsibilities">
+
+ <p>
+ The roles and responsibilities that people can assume in
+ the project
+ are based on merit. Everybody can help no matter what
+ their role.
+ Those who have been longterm or valuable contributors to
+ the project
+ can earn the right to commit directly to the source
+ repository and to
+ cast binding votes during the decision-making process.
+ </p>
+
+ <p>
+ <strong>Users.</strong>
+
+ Users are the people who use the products of the Project.
+ People in
+ this role aren't contributing code, but they are using the
+ products,
+ reporting bugs, making feature requests, and such. This is
+ by far
+ the most important category of people as, without users,
+ there is no
+ reason for the Project. When a user starts to contribute
+ code or
+ documentation patches, they become a Contributor.
+ </p>
+
+ <p>
+ <strong>Contributors.</strong>
+ Contributors are the people who write code or
+ documentation patches or
+ contribute positively to the project in other ways. When a
+ volunteer's
+ patch is applied, the contribution is recognized in the
+ version control
+ log.
+ </p>
+
+ <p>
+ <strong>Committers.</strong>
+
+ Contributors who give frequent and valuable contributions
+ to a
+ subproject of the Project can have their status promoted
+ to that of
+ a "
+ <em>Committer</em>
+ " for that subproject. A Committer
+ has write access to the source code repository. Committer
+ status is
+ granted by the Project Management Committee by majority
+ vote.
+ </p>
+
+ <p>
+ <strong>Project Management Committee (PMC).</strong>
+ Committers and other volunteers who frequently participate
+ with
+ valuable contributions may have their status promoted to
+ that of a
+ "
+
+ <em>Project Management Committee Member</em>
+ ". The PMC
+ is responsible for the day-to-day management of the
+ Project.
+ </p>
+
+ </subsection>
+
<subsection name="Management">
<p>
@@ -150,6 +224,115 @@ limitations under the License.
Member.
</p>
+ <p>
+ The act of voting carries certain obligations. Voters are
+ not only
+ stating their opinion, they are also agreeing to help do
+ the work.
+ </p>
+
+ <p>Each vote can be made in one of three flavors:</p>
+
+ <table class="bodyTable">
+ <tr class="a">
+ <td>
+ <strong>+1</strong>
+ </td>
+ <td>
+ "Yes," "Agree," or "the
+ action should be
+ performed." On some issues this is only
+ binding if the voter
+ has tested the action on their own system(s).
+ </td>
+
+ </tr>
+
+ <tr class="b">
+ <td>
+ <strong>+/-0</strong>
+ </td>
+ <td>
+ "Abstain," "no opinion". An
+ abstention may
+ have detrimental effects if too many people
+ abstain.
+ </td>
+
+ </tr>
+
+ <tr class="a">
+ <td>
+ <strong>-1</strong>
+ </td>
+ <td>
+ <p>
+ "No." On issues where consensus is
+ required, this vote
+ counts as a
+ <strong>veto</strong>
+
+ . All vetos must contain an
+ explanation of why the veto is appropriate.
+ Vetos with no
+ explanation are void. A veto cannot be
+ overruled. If you disagree
+ with the veto, you should lobby the person who
+ cast the veto.
+ Voters intending to veto an action item should
+ make their opinions
+ known to the group immediately so that the
+ problem can be remedied
+ as early as possible.
+ </p>
+ <p>
+ If a Committer tries to "override" a
veto by
+ restoring a vetoed
+ change, the PMC may ask the infrastructure
+ group to revoke that
+ Committer's write privileges.
+ </p>
+ </td>
+ </tr>
+
+ </table>
+
+ <p>
+ An action requiring consensus approval must receive at
+ least
+ <strong>3 binding +1</strong>
+ votes and
+ <strong>no binding
+ vetos</strong>
+ . An action requiring majority approval must receive
+ at least
+ <strong>3 binding +1</strong>
+ votes and more
+ <strong>+1</strong>
+
+ votes than
+ <strong>-1</strong>
+ votes. All other
+ action items are considered to have lazy approval until
+ somebody
+ votes
+ <strong>-1</strong>
+ , after which point they are decided by
+ either consensus or majority vote, depending on the type
+ of action
+ item.
+ </p>
+ <p>
+ Voting represent consensus and votes are never final.
+ Circumstances
+ change, and so may votes. A veto may be converted to a +1
+ after
+ discussion, and likewise a +1 may be converted to a -1.
+ By convention, Committers should allow a vote to circulate
+ for 72
+ hours before taking action.
+ </p>
+
</subsection>
<subsection name="Action Items">
Modified: struts/site/src/site/xdoc/downloads.xml
URL:
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?rev=1064973&r1=1064972&r2=1064973&view=diff
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Sat Jan 29 07:19:43 2011
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
<!--
+$Id $
Copyright 1999-2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -85,7 +86,7 @@ limitations under the License.
<p>
Project releases are approved by vote of the
- Apache Struts <a href="bylaws.html">Project Management
Committee.</a>
+ Apache Struts <a href="dev/bylaws.html">Project Management
Committee.</a>
Support for a release is provided by
<a href="dev/volunteers.html">project volunteers</a>
on the <a href="mail.html">User mailing list.</a>
