logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ihabu...@apache.org
Subject svn commit: r1349807 - in /logging/site/branches/cms/trunk/content: css/site.css guidelines.twig
Date Wed, 13 Jun 2012 12:44:35 GMT
Author: ihabunek
Date: Wed Jun 13 12:44:35 2012
New Revision: 1349807

URL: http://svn.apache.org/viewvc?rev=1349807&view=rev
Log:
Minor style improvements.

Modified:
    logging/site/branches/cms/trunk/content/css/site.css
    logging/site/branches/cms/trunk/content/guidelines.twig

Modified: logging/site/branches/cms/trunk/content/css/site.css
URL: http://svn.apache.org/viewvc/logging/site/branches/cms/trunk/content/css/site.css?rev=1349807&r1=1349806&r2=1349807&view=diff
==============================================================================
--- logging/site/branches/cms/trunk/content/css/site.css (original)
+++ logging/site/branches/cms/trunk/content/css/site.css Wed Jun 13 12:44:35 2012
@@ -28,6 +28,8 @@ limitations under the License.
 .content h3,
 .content h4 { margin-bottom: 10px; }
 
+.content h3 { margin-top: 20px; }
+
 blockquote { margin-top: 20px; font-weight: normal; }
 blockquote p { margin-bottom: 12px; font-size: 14px; text-align: justify; }
 blockquote ul { margin-left: 50px; font-size: 14px; }

Modified: logging/site/branches/cms/trunk/content/guidelines.twig
URL: http://svn.apache.org/viewvc/logging/site/branches/cms/trunk/content/guidelines.twig?rev=1349807&r1=1349806&r2=1349807&view=diff
==============================================================================
--- logging/site/branches/cms/trunk/content/guidelines.twig (original)
+++ logging/site/branches/cms/trunk/content/guidelines.twig Wed Jun 13 12:44:35 2012
@@ -8,21 +8,13 @@ h1. Guidelines
 
 This document defines the guidelines under which the Apache Logging Services project operates.
It defines the roles and responsibilities of the project, who may vote, how voting works,
how conflicts are resolved, etc.
 
-The Logging Services is a project of the "Apache Software Foundation":http://www.apache.org/foundation/.
The foundation holds the copyright on Apache code including the code in the Logging Services
codebase. The "foundation FAQ": http://www.apache.org/foundation/faq.html explains the operation
and background of the foundation.
+The Logging Services is a project of the "(external)Apache Software Foundation":http://www.apache.org/foundation/.
The foundation holds the copyright on Apache code including the code in the Logging Services
codebase. The "(external)foundation FAQ":http://www.apache.org/foundation/faq.html explains
the operation and background of the foundation.
 
-Logging Services is typical of Apache projects in that it operates under a set of principles,
known collectively as the "Apache Way". If you are new to Apache development, please refer
to the "Incubator project":http://incubator.apache.org for more information on how Apache
projects operate.
-
-* <a href="#Roles and Responsibilities">Roles and Responsibilities</a>
-* <a href="#Decision Making">How decisions are made</a>
+Logging Services is typical of Apache projects in that it operates under a set of principles,
known collectively as the "Apache Way". If you are new to Apache development, please refer
to the "(external)Incubator project":http://incubator.apache.org for more information on how
Apache projects operate.
 
 h2. Roles and Responsibilities
 
-Apache projects define a set of roles with associated rights and responsibilities. These
roles govern what tasks an individual may perform within the project. The roles are defined
in the following sections
-
-* <a href="#Users">Users</a>
-* <a href="#Developers">Developers</a>
-* <a href="#Committers">Committers</a>
-* <a href="#Project Management Committee"> Project Management Committee (PMC)</a>
+Apache projects define a set of roles with associated rights and responsibilities. These
roles govern what tasks an individual may perform within the project.
 
 h3. Users
 
@@ -42,13 +34,13 @@ Committer access is by invitation only a
 
 Commit access can be revoked by a unanimous vote of all the active PMC members (except the
committer in question if they are also a PMC member).
 
-All Apache committers are required to have a signed Contributor License Agreement (CLA) on
file with the Apache Software Foundation. There is a <a href="http://www.apache.org/dev/committers.html">Committer
FAQ</a> which provides more details on the requirements for Committers.
+All Apache committers are required to have a signed Contributor License Agreement (CLA) on
file with the Apache Software Foundation. There is a "(external)Committer FAQ":http://www.apache.org/dev/committers.html
which provides more details on the requirements for Committers.
 
 A committer who makes a sustained contribution to the project may be invited to become a
member of the PMC. The form of contribution is not limited to code. It can also include code
review, helping out users on the mailing lists, documentation, etc.
 
 h3. Project Management Committee
 
-The Project Management Committee (PMC) for Apache Logging Services was created by a <a
href="charter.html">resolution</a> of the board of the Apache Software Foundation
on 18<sup>th</sup> November 2002. The PMC is responsible to the board and the
ASF for the management and oversight of the Apache Logging Services codebase. The responsibilities
of the PMC include
+The Project Management Committee (PMC) for Apache Logging Services was created by a "resolution":charter.html
of the board of the Apache Software Foundation on 18<sup>th</sup> November 2002.
The PMC is responsible to the board and the ASF for the management and oversight of the Apache
Logging Services codebase. The responsibilities of the PMC include
 
 * Deciding what is distributed as products of the Apache Logging Services project. In particular
all releases must be approved by the PMC
 * Maintaining the project's shared resources, including the codebase repository, mailing
lists, websites.
@@ -83,33 +75,12 @@ h3. Approvals
 
 These are the types of approvals that can be sought. Different actions require different
types of approvals.
 
-<table class="table table-bordered">
-	<tr>
-		<td><strong>Consensus</strong></td>
-		<td>For this to pass, all voters with binding votes must vote and there can be no
binding vetoes (-1). Consensus
-		votes are rarely required due to the impracticality of getting all eligible voters to cast
a vote.</td>
-	</tr>
-	<tr>
-		<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&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&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&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
-			binding vote holders to vote +1</td>
-	</tr>
-</table>
+table(table table-bordered).
+|_. Consensus           | For this to pass, all voters with binding votes must vote and there
can be no binding vetoes (-1). Consensus votes are rarely required due to the impracticality
of getting all eligible voters to cast a vote. |
+|_. Lazy&nbsp;Consensus | Lazy consensus requires 3 binding +1 votes and no binding vetoes.
|
+|_. Lazy&nbsp;Majority  | A lazy majority vote requires 3 binding +1 votes and more binding
+1 votes that -1 votes. |
+|_. Lazy&nbsp;Approval  | 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. |
+|_. 2/3&nbsp;Majority   | 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 binding vote
holders to vote +1 |
 
 h3. Vetoes
 
@@ -130,8 +101,7 @@ This section describes the various actio
 	</tr>
 	<tr>
 		<td><strong>Code Change</strong></td>
-		<td>A change made to the codebase of a sub-project and committed by a committer.
This includes source code,
-			documentation, website content, etc.</td>
+		<td>A change made to the codebase of a sub-project and committed by a committer.
This includes source code, documentation, website content, etc.</td>
 		<td>Lazy approval and then lazy consensus.</td>
 		<td>Active committers of the relevant sub-project.</td>
 	</tr>
@@ -143,21 +113,13 @@ This section describes the various actio
 	</tr>
 	<tr>
 		<td><strong>Product Release</strong></td>
-		<td>
-			When a release of one of the sub-project's products is ready, a vote is required to accept
the release 
-			as an official release of the Logging Services project.
-			This step ensures the overall supervision by the Logging Services PMC over its sub-projects.
-		</td>
+		<td>When a release of one of the sub-project's products is ready, a vote is required
to accept the release as an official release of the Logging Services project. This step ensures
the overall supervision by the Logging Services PMC over its sub-projects.</td>
 		<td>Lazy Majority</td>
 		<td><b>Active PMC members</b></td>
 	</tr>
 	<tr>
 		<td><strong>Adoption of New Codebase</strong></td>
-		<td>
-			When the codebase for an existing, released product is to be replaced with an alternative
codebase. If such a
-				vote fails to gain approval, the existing code base will continue.
-			This also covers the creation of new sub-projects within the project
-		</td>
+		<td>When the codebase for an existing, released product is to be replaced with an
alternative codebase. If such a vote fails to gain approval, the existing code base will continue.
This also covers the creation of new sub-projects within the project.</td>
 		<td>2/3 majority</td>
 		<td>Active PMC members</td>
 	</tr>
@@ -169,10 +131,7 @@ This section describes the various actio
 	</tr>
 	<tr>
 		<td><strong>New Committer</strong></td>
-		<td>
-			When a new committer is proposed for a sub-project.
-			The PMC must be informed of the result of the sub-project's vote.
-		</td>
+		<td>When a new committer is proposed for a sub-project.The PMC must be informed of
the result of the sub-project's vote.</td>
 		<td>Lazy consensus</td>
 		<td>Active committers of the relevant sub-project</td>
 	</tr>
@@ -184,19 +143,15 @@ This section describes the various actio
 	</tr>
 	<tr>
 		<td><strong>Committer Removal</strong></td>
-		<td>
-			When removal of commit privileges is sought.
-			<b>Note: </b> Such actions will also be referred to the ASF board by the PMC
chair.
-		</td>
+		<td>When removal of commit privileges is sought.<br />
+			*Note:* Such actions will also be referred to the ASF board by the PMC chair.</td>
 		<td>Consensus</td>
 		<td>Active PMC members (excluding the committer in question if a member of the PMC).</td>
 	</tr>
 	<tr>
 		<td><strong>PMC Member Removal</strong></td>
-		<td>
-			When removal of a PMC member is sought.
-			<b>Note: </b> Such actions will also be referred to the ASF board by the PMC
chair
-		</td>
+		<td>When removal of a PMC member is sought.<br />
+			*Note:* Such actions will also be referred to the ASF board by the PMC chair.</td>
 		<td>Consensus</td>
 		<td>Active PMC members (excluding the member in question).</td>
 	</tr>



Mime
View raw message