struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r619268 - in /struts/site/src/site: site.xml xdoc/dev/bylaws.xml xdoc/dev/minutes.xml xdoc/dev/site.xml xdoc/dev/volunteers.xml
Date Thu, 07 Feb 2008 05:22:00 GMT
Author: husted
Date: Wed Feb  6 21:22:00 2008
New Revision: 619268

URL: http://svn.apache.org/viewvc?rev=619268&view=rev
Log:
SITE-23 From charter, remove sections that overlap "How it works" and incorporate "How it
works" by reference. Mention that release plans can also be posted in documentation. Add Sandbox
section. 

Modified:
    struts/site/src/site/site.xml
    struts/site/src/site/xdoc/dev/bylaws.xml
    struts/site/src/site/xdoc/dev/minutes.xml
    struts/site/src/site/xdoc/dev/site.xml
    struts/site/src/site/xdoc/dev/volunteers.xml

Modified: struts/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=619268&r1=619267&r2=619268&view=diff
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Wed Feb  6 21:22:00 2008
@@ -106,23 +106,28 @@
                     />
             <item
                     name="Development Lists"
-                    href="dev\dev-mail.html"
+                    href="dev/dev-mail.html"
                     />
             <item
                     name="Source Code"
-                    href="dev\builds.html"
+                    href="dev/builds.html"
                     />
             <item
                     name="Release Guidelines"
-                    href="dev\releases.html"
+                    href="dev/releases.html"
                     />
             <item
                     name="PMC Charter"
-                    href="dev\bylaws.html"
+                    href="dev/bylaws.html"
                     />
             <item
+                    name="Minutes"
+                    href="dev/minutes.html"
+                    />
+
+            <item
                     name="Volunteers"
-                    href="dev\volunteers.html"
+                    href="dev/volunteers.html"
                     />
             <item
                     name="Sandbox"

Modified: struts/site/src/site/xdoc/dev/bylaws.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/bylaws.xml?rev=619268&r1=619267&r2=619268&view=diff
==============================================================================
--- struts/site/src/site/xdoc/dev/bylaws.xml (original)
+++ struts/site/src/site/xdoc/dev/bylaws.xml Wed Feb  6 21:22:00 2008
@@ -38,76 +38,14 @@
                     Bylaws</a>
                 and the direction of the ASF Board.
             </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 &quot;
-                    <em>Committer</em>
-                    &quot; 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
-                    &quot;
-                    <em>Project Management Committee Member</em>
-                    &quot;. The PMC
-                    is responsible for the day-to-day management of the
-                    Project.
-                </p>
-
-            </subsection>
+            
+            <p>
+                The Project Charter incorporates by reference 
+                the current version of 
+                <a href="http://apache.org/foundation/how-it-works.html">
+                How the ASF works</a>, with the additional guidelines 
+                and clarifications found herein.
+            </p>
 
             <subsection name="Management">
 
@@ -184,17 +122,18 @@
                 </p>
 
             </subsection>
+            
 
             <subsection name="Decision Making">
 
                 <p>
-                    All Volunteers are encouraged to participate in decisions,
-                    but the
-                    decision itself is made by the Project Management
+                    All <a href="http://apache.org/foundation/how-it-works.html#roles">
+                        Volunteers</a> 
+                    (Users, Developers, Committers, PMC Members) are encouraged to 
+                    participate in the 
+                    decision-making process, but binding
+                    decisions are made only by the Project Management
                     Committee.
-                    The Project is a &quot;
-                    <em>Minimum Threshold Meritocracy</em>
-                    &quot;.
                 </p>
 
             </subsection>
@@ -202,118 +141,15 @@
             <subsection name="Voting">
 
                 <p>
-                    Any subscriber to the list may vote on any issue or action
-                    item.
-                    Votes from Contributors and Committers are especially
+                    Any subscriber to the list may <a href="http://apache.org/foundation/voting.html">
+                        vote</a>
+                    on any issue or action item.
+                    Votes from Developers and Committers are especially
                     welcome.
                     However, the only binding votes are those cast by a PMC
                     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>
-                    <tr>
-                        <td>
-                            <strong>+1</strong>
-                        </td>
-                        <td>
-                            &quot;Yes,&quot; &quot;Agree,&quot; or &quot;the
-                            action should be
-                            performed.&quot; On some issues this is only
-                            binding if the voter
-                            has tested the action on their own system(s).
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td>
-                            <strong>+/-0</strong>
-                        </td>
-                        <td>
-                            &quot;Abstain,&quot; &quot;no opinion&quot;.
An
-                            abstention may
-                            have detrimental effects if too many people
-                            abstain.
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td>
-                            <strong>-1</strong>
-                        </td>
-                        <td>
-                            <p>
-                                &quot;No.&quot; 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">
@@ -329,7 +165,7 @@
                     <li>Long Term Plans</li>
                     <li>Short Term Plans</li>
                     <li>Product Changes</li>
-                    <li>Showstoppers</li>
+                    <li>Showstoppers (or "blockers")</li>
                     <li>Release Plan</li>
                     <li>Release Grade</li>
                 </ul>
@@ -342,7 +178,7 @@
                     Long term plans are simply announcements that group
                     members are
                     working on particular issues related to the Project. These
-                    are not
+                    items are not
                     voted on, but Committers and PMC Members who do not agree
                     with a
                     particular plan, or think that an alternative plan would
@@ -380,12 +216,12 @@
                 <p>
                     Showstoppers are issues that require a fix be in place
                     before the
-                    next public release. They are listed in the status file in
-                    order to
+                    next public release. They are designated as "blockers" in 
+                    the issue tracker in order to
                     focus special attention on these problems. An issue
                     becomes a
-                    showstopper when it is listed as such in the status file
-                    and remains
+                    showstopper when it is designated as such in the issue tracker 
+                    by a PMC member and remains
                     so by lazy consensus.
                 </p>
 
@@ -403,8 +239,9 @@
                     other assorted
                     information to keep volunteers from tripping over each
                     other. A release
-                    plan must be announced to the DEV list. Lazy majority
-                    decides each issue
+                    plan must be incorporated into the product documentation, 
+                    or otherwise announced to the DEV list.
+                    Lazy majority decides each issue
                     in a release plan.
                 </p>
 
@@ -429,10 +266,39 @@
                 </p>
 
             </subsection>
+            
+            <subsection name="Sandbox"> 
+            
+                <p>
+                    Pursuant to the <a href="http://incubator.apache.org/learn/rules-for-revolutionaries.html">
+                        "Rules for Revolutionaries"</a>, 
+                    any committer may submit experimental material to the Sandbox area 
+                    of the repository at his or her own discretion. 
+                </p>
+                
+                <p>
+                    Material must be moved from the sandbox to the main repository before

+                    it can be released.
+                </p>
+                
+                <p>
+                    If a sandbox whiteboard becomes dormant for six or more months, 
+                    it may be moved to the archive section of the repository. 
+                </p>
+                
+                <p>
+                    Experimental material that is outside the scope of the Struts project

+                    may also be  submitted to the <a href="http://labs.apache.org/">
+                        Apache Labs</a>.
+                </p>
+                    
+
+            </subsection>
+            
         </section>
         <section>
             <p class="right">Next:
-                <a href="volunteers.html">Volunteers</a>
+                <a href="minutes.html">Project Minutes</a>
             </p>
         </section>
 

Modified: struts/site/src/site/xdoc/dev/minutes.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/minutes.xml?rev=619268&r1=619267&r2=619268&view=diff
==============================================================================
--- struts/site/src/site/xdoc/dev/minutes.xml (original)
+++ struts/site/src/site/xdoc/dev/minutes.xml Wed Feb  6 21:22:00 2008
@@ -835,14 +835,9 @@
 
         </section>
         <section>
-            <p>
-              For more about volunteers at the ASF, visit
-              <a href="http://people.apache.org/">
-                people.apache.org</a>.
-            </p>
             <p class="right">
                 Next:
-                <a href="http://people.apache.org/~rubys/planet/struts/">Our Blogs</a>
+                <a href="volunteers.html">Volunteers</a>
             </p>
         </section>
     </body>

Modified: struts/site/src/site/xdoc/dev/site.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/site.xml?rev=619268&r1=619267&r2=619268&view=diff
==============================================================================
--- struts/site/src/site/xdoc/dev/site.xml (original)
+++ struts/site/src/site/xdoc/dev/site.xml Wed Feb  6 21:22:00 2008
@@ -47,6 +47,11 @@
                     href="bylaws.html"
                     />
             <item
+                    name="Minutes"
+                    href="minutes.html"
+                    />
+
+            <item
                     name="Volunteers"
                     href="volunteers.html"
                     />

Modified: struts/site/src/site/xdoc/dev/volunteers.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/dev/volunteers.xml?rev=619268&r1=619267&r2=619268&view=diff
==============================================================================
--- struts/site/src/site/xdoc/dev/volunteers.xml (original)
+++ struts/site/src/site/xdoc/dev/volunteers.xml Wed Feb  6 21:22:00 2008
@@ -1471,7 +1471,7 @@
             </p>
             <p class="right">
                 Next:
-                <a href="minutes.html">Project Minutes</a>
+                <a href="http://people.apache.org/~rubys/planet/struts/">Our Blogs</a>
             </p>
         </section>
     </body>



Mime
View raw message