Author: ihabunek
Date: Thu Apr  5 13:44:43 2012
New Revision: 1309858

URL: http://svn.apache.org/viewvc?rev=1309858&view=rev
Log:
Fixed paragraphs for the guidelines page.

Modified:
    
logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.twig

Modified: 
logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.twig
URL: 
http://svn.apache.org/viewvc/logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.twig?rev=1309858&r1=1309857&r2=1309858&view=diff
==============================================================================
--- 
logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.twig 
(original)
+++ 
logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.twig 
Thu Apr  5 13:44:43 2012
@@ -84,53 +84,21 @@ Within the Logging Services project, dif
 
 h3. Voting
 
-Decisions regarding the project are made by votes on the primary project 
mailing list ([email protected]). 
-Where necessary, PMC voting may take place on the private Logging Services PMC 
mailing list. Votes are clearly 
-indicated by subject line starting with [VOTE] or [PMC-VOTE]. Votes may 
contain multiple items for approval and these 
-should be clearly separated. Voting is carried out by replying to the vote 
mail. Voting may take four flavours
+Decisions regarding the project are made by votes on the primary project 
mailing list ([email protected]). Where necessary, PMC voting may take 
place on the private Logging Services PMC mailing list. Votes are clearly 
indicated by subject line starting with [VOTE] or [PMC-VOTE]. Votes may contain 
multiple items for approval and these should be clearly separated. Voting is 
carried out by replying to the vote mail. Voting may take four flavours.
 
 table(table table-bordered).
-| +1 | "Yes," "Agree," or "the action should be performed." In general, this 
vote also indicates a willingness on the behalf of the voter in "making it 
happen" |
-| +0 | This vote indicates a willingness for the action under consideration to 
go ahead. The voter, however will not be able to help. |
-| -0 | This vote indicates that the voter does not, in general, agree with the 
proposed action but is not concerned enough to prevent the action going ahead. |
-| -1 | This is a negative vote. On issues where consensus is required, this 
vote counts as a *veto*. All vetoes must contain an explanation of why the veto 
is appropriate. Vetoes with no explanation are void. It may also be appropriate 
for a -1 vote to include an alternative course of action. |
+| *+1* | "Yes," "Agree," or "the action should be performed." In general, this 
vote also indicates a willingness on the behalf of the voter in "making it 
happen" |
+| *+0* | This vote indicates a willingness for the action under consideration 
to go ahead. The voter, however will not be able to help. |
+| *-0* | This vote indicates that the voter does not, in general, agree with 
the proposed action but is not concerned enough to prevent the action going 
ahead. |
+| *-1* | This is a negative vote. On issues where consensus is required, this 
vote counts as a *veto*. All vetoes must contain an explanation of why the veto 
is appropriate. Vetoes with no explanation are void. It may also be appropriate 
for a -1 vote to include an alternative course of action. |
 
-<table class="table table-bordered">
-       <tr>
-               <td><strong>+1</strong></td>
-               <td>"Yes," "Agree," or "the action should be performed." In 
general, this vote also indicates a willingness on
-                       the behalf of the voter in "making it happen"</td>
-       </tr>
-       <tr>
-               <td><strong>+0</strong></td>
-               <td>This vote indicates a willingness for the action under 
consideration to go ahead. The voter, however will not
-                       be able to help.</td>
-       </tr>
-       <tr>
-               <td><strong>-0</strong></td>
-               <td>This vote indicates that the voter does not, in general, 
agree with the proposed action but is not concerned
-                       enough to prevent the action going ahead.</td>
-       </tr>
-       <tr>
-               <td><strong>-1</strong></td>
-               <td>This is a negative vote. On issues where consensus is 
required, this vote counts as a <strong>veto</strong>.
-                       All vetoes must contain an explanation of why the veto 
is appropriate. Vetoes with no explanation are void. It may
-                       also be appropriate for a -1 vote to include an 
alternative course of action.
-               </td>
-       </tr>
-</table>
-
-All participants in the Logging Services project are encouraged to show their 
agreement with or against a
-particular action by voting. For technical decisions, only the votes of active 
committers are binding. Non binding
-votes are still useful for those with binding votes to understand the 
perception of an action in the wider Logging
-Services community. For PMC decisions, only the votes of PMC members are 
binding.
+All participants in the Logging Services project are encouraged to show their 
agreement with or against a particular action by voting. For technical 
decisions, only the votes of active committers are binding. Non binding votes 
are still useful for those with binding votes to understand the perception of 
an action in the wider Logging Services community. For PMC decisions, only the 
votes of PMC members are binding.
 
-Voting can also be applied to changes made to the Logging Services codebase. 
These typically take the form of a
-veto (-1) in reply to the commit message sent when the commit is made.
+Voting can also be applied to changes made to the Logging Services codebase. 
These typically take the form of a veto (-1) in reply to the commit message 
sent when the commit is made.
 
 h3. Approvals
 
-These are the types of approvals that can be sought. Different actions require 
different types of approvals
+These are the types of approvals that can be sought. Different actions require 
different types of approvals.
 
 <table class="table table-bordered">
        <tr>
@@ -139,20 +107,20 @@ These are the types of approvals that ca
                votes are rarely required due to the impracticality of getting 
all eligible voters to cast a vote.</td>
        </tr>
        <tr>
-               <td><strong>Lazy Consensus</strong></td>
+               <td><strong>Lazy&nbsp;Consensus</strong></td>
                <td>Lazy consensus requires 3 binding +1 votes and no binding 
vetoes.</td>
        </tr>
        <tr>
-               <td><strong>Lazy Majority</strong></td>
+               <td><strong>Lazy&nbsp;Majority</strong></td>
                <td>A lazy majority vote requires 3 binding +1 votes and more 
binding +1 votes that -1 votes.</td>
        </tr>
        <tr>
-               <td><strong>Lazy Approval</strong></td>
+               <td><strong>Lazy&nbsp;Approval</strong></td>
                <td>An action with lazy approval is implicitly allowed unless a 
-1 vote is received, at which time, depending on
                        the type of action, either lazy majority or lazy 
consensus approval must be obtained.</td>
        </tr>
        <tr>
-               <td><strong>2/3 Majority</strong></td>
+               <td><strong>2/3&nbsp;Majority</strong></td>
                <td>Some actions require a 2/3 majority of active committers or 
PMC members to pass. Such actions typically
                        affect the foundation of the project (e.g. adopting a 
new codebase to replace an existing product). The higher
                        threshold is designed to ensure such changes are 
strongly supported. To pass this vote requires at least 2/3 of
@@ -162,17 +130,13 @@ These are the types of approvals that ca
 
 h3. Vetoes
 
-A valid, binding veto cannot be overruled. If a veto is cast, it must be 
accompanied by a valid reason explaining
-the reasons for the veto. The validity of a veto, if challenged, can be 
confirmed by anyone who has a binding vote.
-This does not necessarily signify agreement with the veto - merely that the 
veto is valid.
+A valid, binding veto cannot be overruled. If a veto is cast, it must be 
accompanied by a valid reason explaining the reasons for the veto. The validity 
of a veto, if challenged, can be confirmed by anyone who has a binding vote. 
This does not necessarily signify agreement with the veto - merely that the 
veto is valid.
 
-If you disagree with a valid veto, you must lobby the person casting the veto 
to withdraw their veto. If a veto
-is not withdrawn, the action that has been vetoed must be reversed in a timely 
manner.
+If you disagree with a valid veto, you must lobby the person casting the veto 
to withdraw their veto. If a veto is not withdrawn, the action that has been 
vetoed must be reversed in a timely manner.
 
 h3. Actions
 
-This section describes the various actions which are undertaken within the 
project, the corresponding approval
-required for that action and those who have binding votes over the action.
+This section describes the various actions which are undertaken within the 
project, the corresponding approval required for that action and those who have 
binding votes over the action.
 
 <table class="table table-bordered">
        <tr>


Reply via email to