svn commit: r804305 - in /websites/production/openofficeorg: ./ content/openofficeorg/community-faqs.html content/openofficeorg/get-involved.html

[ro...@apache.org]

Author: robweir
Date: Thu Feb  9 01:43:40 2012
New Revision: 804305

Log:
Publishing merge to openofficeorg site by robweir

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/community-faqs.html
    websites/production/openofficeorg/content/openofficeorg/get-involved.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 01:43:40 2012
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-804141
+/websites/staging/openofficeorg/trunk:791146-804304

Modified: websites/production/openofficeorg/content/openofficeorg/community-faqs.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/community-faqs.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/community-faqs.html Thu Feb  9 01:43:40 2012
@@ -78,7 +78,31 @@
   <div id="contenta">
   
     <h1 class="title">Community FAQs</h1>
-    
+    <h2 id="how_are_decisions_made_in_the_project">How are decisions made in the project?</h2>
+<p>The most important thing about engaging with any Apache project is that everyone
+is equal. All people with an opinion are entitled to express that opinion and, where 
+appropriate, have it considered by the community.</p>
+<p>To some the idea of having to establish consensus in a large and distributed team 
+sounds inefficient and frustrating. Don't despair though, The Apache Way has a
+set of simple processes to ensure things proceed at a good pace.</p>
+<p>In ASF projects we don't like to vote. We reserve that for the few things that need 
+official approval for legal or process reasons (e.g. a release or a new committer). 
+Most of the time we work with the consensus building techniques documented below.</p>
+<h2 id="what_is_lazy_consensus">What is "Lazy Consensus"?</h2>
+<p><a href="/openofficeorg/docs/governance/lazyConsensus.html">Lazy consensus</a> is the first, and possibly the most important, consensus building 
+tool we have. Essentially lazy consensus means that you don't need to get explicit
+approval to proceed, but you need to be prepared to listen if someone objects.</p>
+<h2 id="consensus_building">Consensus Building</h2>
+<p>Sometimes lazy consensus is not appropriate. In such cases it is necessary to
+make a proposal to the mailing list and discuss options. There are mechanisms
+for quickly showing your support or otherwise for a proposal and 
+<a href="/openofficeorg/docs/governance/consensusBuilding.html">building consensus</a> amongst the community.</p>
+<p>Once there is a consensus people can proceed with the work under the <a href="/openofficeorg/docs/governance/lazyConsensus.html">lazy 
+consensus</a> model.</p>
+<h2 id="what_about_voting">What about voting?</h2>
+<p>Occasionally a "feel" for consensus is not enough. Sometimes we need to 
+have a measurable consensus. For example, when <a href="/openofficeorg/docs/governance/voting.html">voting</a> in new committers or 
+to approve a release. </p>
   </div>
 
   <div id="footera">

Modified: websites/production/openofficeorg/content/openofficeorg/get-involved.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/get-involved.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/get-involved.html Thu Feb  9 01:43:40 2012
@@ -105,31 +105,6 @@ as easy as possible for people to get in
 <h2 id="mailing_lists">Mailing lists</h2>
 <p>Your first engagement with the project should be to subscribe to our
 <a href="/openofficeorg/mailing-lists.html">mailing lists</a>.</p>
-<h2 id="decision_making">Decision Making</h2>
-<p>The most important thing about engaging with any Apache project is that everyone
-is equal. All people with an opinion are entitled to express that opinion and, where 
-appropriate, have it considered by the community.</p>
-<p>To some the idea of having to establish consensus in a large and distributed team 
-sounds inefficient and frustrating. Don't despair though, The Apache Way has a
-set of simple processes to ensure things proceed at a good pace.</p>
-<p>In ASF projects we don't like to vote. We reserve that for the few things that need 
-official approval for legal or process reasons (e.g. a release or a new committer). 
-Most of the time we work with the consensus building techniques documented below.</p>
-<h3 id="lazy_consensus">Lazy Consensus</h3>
-<p><a href="/openofficeorg/docs/governance/lazyConsensus.html">Lazy consensus</a> is the first, and possibly the most important, consensus building 
-tool we have. Essentially lazy consensus means that you don't need to get explicit
-approval to proceed, but you need to be prepared to listen if someone objects.</p>
-<h3 id="consensus_building">Consensus Building</h3>
-<p>Sometimes lazy consensus is not appropriate. In such cases it is necessary to
-make a proposal to the mailing list and discuss options. There are mechanisms
-for quickly showing your support or otherwise for a proposal and 
-<a href="/openofficeorg/docs/governance/consensusBuilding.html">building consensus</a> amongst the community.</p>
-<p>Once there is a consensus people can proceed with the work under the <a href="/openofficeorg/docs/governance/lazyConsensus.html">lazy 
-consensus</a> model.</p>
-<h3 id="voting">Voting</h3>
-<p>Occasionally a "feel" for consensus is not enough. Sometimes we need to 
-have a measurable consensus. For example, when <a href="/openofficeorg/docs/governance/voting.html">voting</a> in new committers or 
-to approve a release. </p>
   </div>
 
   <div id="footera">