svn commit: r1401456 - in /incubator/ooo/site/trunk/content/openofficeorg/orientation: index.mdtext level-1.mdtext level-2.mdtext

[ro...@apache.org]

Author: robweir
Date: Tue Oct 23 20:44:33 2012
New Revision: 1401456

URL: http://svn.apache.org/viewvc?rev=1401456&view=rev
Log: (empty)

Modified:
    incubator/ooo/site/trunk/content/openofficeorg/orientation/index.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/orientation/level-2.mdtext

Modified: incubator/ooo/site/trunk/content/openofficeorg/orientation/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/orientation/index.mdtext?rev=1401456&r1=1401455&r2=1401456&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/orientation/index.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/orientation/index.mdtext Tue Oct 23 20:44:33 2012
@@ -46,7 +46,7 @@ The Orientation Modules for the various 
  
 1. [Introduction to Contributing to Apache OpenOffice](level-1.html)
 
-1. Intermediate Social and Technical Tools
+1. [Intermediate Social and Technical Tools](level-2.html)
 
 1. Introductory Specialized Areas
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext?rev=1401456&r1=1401455&r2=1401456&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext Tue Oct 23 20:44:33 2012
@@ -86,8 +86,7 @@ and [List Conduct Guidelines](http://ope
     1. Our [Community Forums](http://forum.openoffice.org/) These are available in several languages.  This is the primary way in which we engage with the user community.
     1. Join our [Social Networks](http://incubator.apache.org/openofficeorg/social.html)
 
-
 1. Finally, once you have done the above, Edit this wiki page *TBD* containing project volunteers. Add your name
 and indicate that you have completed Level 1.  Congratulations!  Please send a note to the ooo-dev list so we know
-you are ready for the next Level.
+you are ready for [Level 2](level-2.html).
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/orientation/level-2.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/orientation/level-2.mdtext?rev=1401456&r1=1401455&r2=1401456&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/orientation/level-2.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/orientation/level-2.mdtext Tue Oct 23 20:44:33 2012
@@ -19,10 +19,58 @@ Notice:    Licensed to the Apache Softwa
 In this 2nd Orientation Module you will learn about some additional tools, both social and technical, which are widely used in this project: Lazy Concensus, Apache-style voting, 
 Subversion and the Apache CMS.
 
-As with the previous Level 1 Module, if you have prior experience with an open source software project, especially one at
-Apache, then much of this material will already be familiar to you.
+As with the previous Level 1 Module, if you have prior experience with an open source software project, especially one at Apache, then much of this material will already 
+be familiar to you.
 
 ##Steps to Complete Level 2
 
-1. Step 1
+1. In the previous Module we read about collaboration on the mailings lists, how to do it efficiently and how to avoid the most common pitfalls.  We use the mailing lists for many things,
+for asking questions, for sharing information or the like.  But one of the most important uses of the mailing list is for decision making.  It is important to understand
+how decisions are made in an Apache community.  Here are a few general principles that you should keep in mind:
+
+    1. There are two primary ways of managing product changes, which go by the names Commit-Then-Review (CTR) and Review-Then-Commit (RTC).  For most cases we operate in a CTR mode,
+    meaning that our [Committers](http://www.apache.org/foundation/how-it-works.html#committers) are able to check in changes as they desire, with no advance approval or review.
+
+    1. We trust our Committers to do the right thing.  By default Committers don't ask permission before acting.  They avoid unnecessary discussion and email traffic.  This is not 
+    because they are anti-social.  This is because they realize that in a project of this size it is impossible to discuss every small change in advance.  Discussing too much is both 
+    unnecessary and unproductive.  We have a "time machine" called Subversion that allows us to undo any changes to the product or website.   So if a Committer believes that a 
+    change would be uncontroversial, and the change is reversible, then the default approach is to go ahead make the change.
+
+    1. Terms that you might related to the above are: [JFDI](http://www.urbandictionary.com/define.php?term=JFDI) and "assuming lazy consensus".
+
+    1. However, there are times where CTR is not appropriate and RTC is used.  This happens, for example, at the end of a release cycle, when we want to carefully review
+    changes made to the product, in order to control the final quality before the release.  When we're in RTC mode, no changes are made to the code unless first discussed and approved
+    on the mailing list.
+    
+    1. A Committer can also voluntarily invocate a RTC on their own changes.  For example the Committer might be considering a change that of greater significance.  Maybe he would 
+    value additional input, or technical review.  Maybe the change is controversial or require coordination.  If CTR is not appropriate then one can make a proposal and send it to 
+    the ooo-dev mailing list.  
+
+    1. The convention is to send all proposals in their own new thread.  (Don't hide a proposal 10 posts deep in an existing thread).  Put "[PROPOSAL]" in the subject line or 
+    make it obvious that you are making a proposal.
+
+    1. Because the Volunteers are spread out all across the globe, in various time zones, and many have day jobs or other committments, the convention is to wait *at least* 72 hours
+    for feedback on a proposal.
+
+    1. In cases where the proposer wants to act on their proposal, if there are no objections, they should state this in the proposal.  For example, "If there are no objections voiced
+    within 72 hours, I'll go ahead and make these changes".  This is called "stating lazy consensus". You can read more about lazy consensus 
+    [here](http://incubator.apache.org/openofficeorg/docs/governance/lazyConsensus.html).
+
+    1. In Apache projects it is common to use a shorthand way of responding to proposals, where +1 indicates approval, 0 indicates indifference and -1 indicates disapproval.
+    
+    1. In most cases proposals are decided by consensus, based on community discussions.  Only in rare cases, and in a small number of pre-defined administrative questions, do we resort
+    to a formal counting of votes.  The places where we require voting are: voting to release, voting in a new Committer or PMC Member, Voting in a new PMC Chair.  That's it.  Generally 
+    speaking, voting on any other topic is avoided in favor of consensus building.  With voting there are winners and losers.  With consensus everyone wins.
+
+    1. Another aspect of decision making in an Apache project is the "veto".  Every Committer has the ability to "veto" a change, for technical reasons, provided he explains 
+    the technical reasons for the veto, describes an alternative approach, and offers to help implement the alternative approach.  Vetos are quite rare.
+
+    1. There is one disorder of community decision making that is common enough to warrant a colorful name:  [bikeshedding](http://bikeshed.com/).  Follow the link and read more 
+    about this topic.
+
+1. To apply the above skills, be sure you are subscribed to the project's [main mailing list](http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list). 
+Keep your eye out for terms like "proposal", "lazy consensus", "vote" or "veto" and see how they are used in practice.  Compare actual practice to the above descriptions.  No, we're
+not perfect.  But we work best and have the most fun when we follow the above guidelines.  And so will you when you apply then in your own list communications!
+
+