Modified: logging/site/branches/experimental-twig-textile/src/site/pages/charter.html.twig URL: http://svn.apache.org/viewvc/logging/site/branches/experimental-twig-textile/src/site/pages/charter.html.twig?rev=1307362&r1=1307361&r2=1307362&view=diff ============================================================================== --- logging/site/branches/experimental-twig-textile/src/site/pages/charter.html.twig (original) +++ logging/site/branches/experimental-twig-textile/src/site/pages/charter.html.twig Fri Mar 30 11:26:02 2012 @@ -20,59 +20,44 @@ limitations under the License. {% block title %}Charter{% endblock %} {% block content %} -<h1>Charter</h1> +{% filter textile %} +h1. Charter -<p>On <a target="_blank" href="http://www.apache.org/foundation/records/minutes/2003/board_minutes_2003_12_17.txt";> -December 17<sup>th</sup> 2003</a>. the Apache Board voted to establish the Apache Logging Services Project.</p> +On December 17<sup>th</sup> 2003. the Apache Board voted to establish the Apache Logging Services Project. + +The following is an extract from the minutes of the meeting of the board of directors. You can read the full minutes "here":http://www.apache.org/foundation/records/minutes/2003/board_minutes_2003_12_17.txt. <blockquote> - <h3>A. Establishment of the Apache Logging Services Project</h3> - - <p>WHEREAS, the Board of Directors deems it to be in the best interests of the Foundation and consistent with the - Foundation's purpose to establish a Project Management Committee charged with the creation and maintenance of - open-source software related to the logging of application behavior, for distribution at no charge to the - public.</p> - - <p>NOW, THEREFORE, BE IT RESOLVED, that a Project Management Committee (PMC), to be known as the "Apache Logging - Services PMC", be and hereby is established pursuant to Bylaws of the Foundation; and be it further</p> - - <p>RESOLVED, that the Apache Logging Services PMC be and hereby is responsible for the creation and maintenance of - software for managing the logging of application behavior, and for related software components, based on software - licensed to the Foundation; and be it further</p> - - <p>RESOLVED, that the office of "Vice President, Apache Logging Services" be and hereby is created, the person - holding such office to serve at the direction of the Board of Directors as the chair of the Apache Logging - Services PMC, and to have primary responsibility for management of the projects within the scope of responsibility - of the Apache Logging Services PMC; and be it further</p> - - <p>RESOLVED, that the persons listed immediately below be and hereby are appointed to serve as the initial members - of the Apache Logging Services PMC:</p> - - <ul> - <li>Scott Deboy </li> - <li>Ceki Gülcü </li> - <li>Jacob Kjome </li> - <li>Yoav Shapira</li> - <li>Paul Smith </li> - <li>Mark Womack </li> - </ul> - - <p>NOW, THEREFORE, BE IT FURTHER RESOLVED, that Mr. Ceki Gülcü be and hereby is appointed to the office of Vice - President, Apache Logging Services, to serve in accordance with and subject to the direction of the Board of - Directors and the Bylaws of the Foundation until death, resignation, retirement, removal or disqualification, or - until a successor is appointed; and be it further</p> - - <p>RESOLVED, that the initial Apache Logging Services PMC be and hereby is tasked with the creation of a set of - bylaws intended to encourage open development and increased participation in the Apache Logging Services Project; - and be it further</p> - - <p>RESOLVED, that the initial Logging Services PMC be and hereby is tasked with the migration and rationalization - of the log4j Apache Jakarta subproject; and be it further</p> - - <p>RESOLVED, that the initial Logging Services PMC be and hereby is tasked with the migration and integration of - the sister projects, namely but not exclusively, Log4Perl, Log4Net, Log4Cxx (c++), Log4CPlus, Log4PHP and - Log4plsql, subject to the will and approval of the respective project owners and communities.</p> + +h3. A. Establishment of the Apache Logging Services Project + +WHEREAS, the Board of Directors deems it to be in the best interests of the Foundation and consistent with the Foundation's purpose to establish a Project Management Committee charged with the creation and maintenance of open-source software related to the logging of application behavior, for distribution at no charge to the public. + +NOW, THEREFORE, BE IT RESOLVED, that a Project Management Committee (PMC), to be known as the "Apache Logging Services PMC", be and hereby is established pursuant to Bylaws of the Foundation; and be it further + +RESOLVED, that the Apache Logging Services PMC be and hereby is responsible for the creation and maintenance of software for managing the logging of application behavior, and for related software components, based on software licensed to the Foundation; and be it further + +RESOLVED, that the office of "Vice President, Apache Logging Services" be and hereby is created, the person holding such office to serve at the direction of the Board of Directors as the chair of the Apache Logging Services PMC, and to have primary responsibility for management of the projects within the scope of responsibility of the Apache Logging Services PMC; and be it further + +RESOLVED, that the persons listed immediately below be and hereby are appointed to serve as the initial members of the Apache Logging Services PMC: + +* Scott Deboy +* Ceki Gülcü +* Jacob Kjome +* Yoav Shapira +* Paul Smith +* Mark Womack - <p>This was passed by Unanimous Vote.</p> +NOW, THEREFORE, BE IT FURTHER RESOLVED, that Mr. Ceki Gülcü be and hereby is appointed to the office of Vice President, Apache Logging Services, to serve in accordance with and subject to the direction of the Board of Directors and the Bylaws of the Foundation until death, resignation, retirement, removal or disqualification, or until a successor is appointed; and be it further + +RESOLVED, that the initial Apache Logging Services PMC be and hereby is tasked with the creation of a set of bylaws intended to encourage open development and increased participation in the Apache Logging Services Project; and be it further + +RESOLVED, that the initial Logging Services PMC be and hereby is tasked with the migration and rationalization of the log4j Apache Jakarta subproject; and be it further + +RESOLVED, that the initial Logging Services PMC be and hereby is tasked with the migration and integration of the sister projects, namely but not exclusively, Log4Perl, Log4Net, Log4Cxx (c++), Log4CPlus, Log4PHP and Log4plsql, subject to the will and approval of the respective project owners and communities. + +This was passed by Unanimous Vote. + </blockquote> +{% endfilter %} {% endblock %} \ No newline at end of file
Modified: logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.html.twig URL: http://svn.apache.org/viewvc/logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.html.twig?rev=1307362&r1=1307361&r2=1307362&view=diff ============================================================================== --- logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.html.twig (original) +++ logging/site/branches/experimental-twig-textile/src/site/pages/guidelines.html.twig Fri Mar 30 11:26:02 2012 @@ -20,116 +20,80 @@ limitations under the License. {% block title %}Guidelines{% endblock %} {% block content %} -<h1>Guidelines</h1> +{% filter textile %} +h1. Guidelines -<p>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.</p> +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. -<p>The Logging Services is a project of the <a href="http://www.apache.org/foundation/";>Apache Software Foundation</a>. -The foundation holds the copyright on Apache code including the code in the Logging Services codebase. The <a -href="http://www.apache.org/foundation/faq.html";>foundation FAQ</a> explains the operation and background of the -foundation.</p> +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. -<p>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 <a href="http://incubator.apache.org";>Incubator -project</a> for more information on how Apache projects operate.</p> +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. -<ul> - <li><a href="#Roles and Responsibilities">Roles and Responsibilities</a></li> - <li><a href="#Decision Making">How decisions are made</a></li> -</ul> +* <a href="#Roles and Responsibilities">Roles and Responsibilities</a> +* <a href="#Decision Making">How decisions are made</a> -<h2>Roles and Responsibilities<a name="Roles and Responsibilities"> </a></h2> +h2. Roles and Responsibilities -<p>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</p> +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 -<ul> - <li><a href="#Users">Users</a></li> - <li><a href="#Developers">Developers</a></li> - <li><a href="#Committers">Committers</a></li> - <li><a href="#Project Management Committee"> Project Management Committee (PMC)</a></li> -</ul> +* <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> -<h3 class="subsection">Users<a name="Users"> </a></h3> +h3. Users -<p>The most important participants in the project are people who use our software. The majority of our developers -start out as users and guide their development efforts from the user's perspective.</p> +The most important participants in the project are people who use our software. The majority of our developers start out as users and guide their development efforts from the user's perspective. -<p>Users contribute to the Apache projects by providing feedback to developers in the form of bug reports and -feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and -user support forums.</p> +Users contribute to the Apache projects by providing feedback to developers in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums. -<h3 class="subsection">Developers<a name="Developers"> </a></h3> +h3. Developers -<p>All of the volunteers who are contributing time, code, documentation, or resources to the Logging Services -Project. A developer that makes sustained, welcome contributions to the project may be invited to become a Committer, -though the exact timing of such invitations depends on many factors.</p> +All of the volunteers who are contributing time, code, documentation, or resources to the Logging Services Project. A developer that makes sustained, welcome contributions to the project may be invited to become a Committer, though the exact timing of such invitations depends on many factors. -<h3 class="subsection">Committers<a name="Committers"> </a></h3> +h3. Committers -<p>The project's Committers are responsible for the project's technical management. All committers have write access -to the project's source repositories. Committers may cast binding votes on any technical discussion regarding the -project.</p> +The project's Committers are responsible for the project's technical management. All committers have write access to the project's source repositories. Committers may cast binding votes on any technical discussion regarding the project. -<p>Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A -Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over -six months. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is -subject to lazy consensus of active PMC members.</p> +Committer access is by invitation only and must be approved by lazy consensus of the active PMC members. A Committer is considered emeritus by their own declaration or by not contributing in any form to the project for over six months. An emeritus committer may request reinstatement of commit access from the PMC. Such reinstatement is subject to lazy consensus of active PMC members. -<p>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).</p> +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). -<p>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.</p> +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. -<p>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.</p> +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 class="subsection">Project Management Committee <a name="Project Management Committee"> </a></h3> +h3. Project Management Committee -<p>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</p> +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 -<ul> - <li>Deciding what is distributed as products of the Apache Logging Services project. In particular all releases - must be approved by the PMC</li> - <li>Maintaining the project's shared resources, including the codebase repository, mailing lists, websites.</li> - <li>Speaking on behalf of the project.</li> - <li>Resolving license disputes regarding products of the project</li> - <li>Nominating new PMC members and committers</li> - <li>Maintaining these bylaws and other guidelines of the project</li> -</ul> +* 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. +* Speaking on behalf of the project. +* Resolving license disputes regarding products of the project +* Nominating new PMC members and committers +* Maintaining these bylaws and other guidelines of the project -<p>Membership of the PMC is by invitation only and must be approved by a lazy consensus of active PMC members. A PMC -member is considered "emeritus" by their own declaration or by not contributing in any form to the project for over six -months. An emeritus member may request reinstatement to the PMC. Such reinstatement is subject to lazy consensus of the -active PMC members. Membership of the PMC can be revoked by an unanimous vote of all the active PMC members other than -the member in question.</p> +Membership of the PMC is by invitation only and must be approved by a lazy consensus of active PMC members. A PMC member is considered "emeritus" by their own declaration or by not contributing in any form to the project for over six months. An emeritus member may request reinstatement to the PMC. Such reinstatement is subject to lazy consensus of the active PMC members. Membership of the PMC can be revoked by an unanimous vote of all the active PMC members other than the member in question. -<p>The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software -Foundation (Vice President, Apache Logging Services) and has primary responsibility to the board for the management of -the projects within the scope of the Logging Services PMC. The chair reports to the board quarterly on developments -within the Logging Services project. The PMC may consider the position of PMC chair annually and if supported by 2/3 -Majority may recommend a new chair to the board. Ultimately, however, it is the board's responsibility who it chooses -to appoint as the PMC chair.</p> +The chair of the PMC is appointed by the ASF board. The chair is an office holder of the Apache Software Foundation (Vice President, Apache Logging Services) and has primary responsibility to the board for the management of the projects within the scope of the Logging Services PMC. The chair reports to the board quarterly on developments within the Logging Services project. The PMC may consider the position of PMC chair annually and if supported by 2/3 Majority may recommend a new chair to the board. Ultimately, however, it is the board's responsibility who it chooses to appoint as the PMC chair. -<h3 class="section">Decision Making <a name="Decision Making"> </a></h3> +h3. Decision making -<p>Within the Logging Services project, different types of decisions require different forms of approval. For -example, the previous section describes several decisions which require "lazy consensus" approval. This section defines -how voting is performed, the types of approvals, and which types of decision require which type of approval.</p> +Within the Logging Services project, different types of decisions require different forms of approval. For example, the previous section describes several decisions which require "lazy consensus" approval. This section defines how voting is performed, the types of approvals, and which types of decision require which type of approval. -<h3 class="subsection">Voting<a name="Voting"> </a></h3> +h3. Voting -<p>Decisions regarding the project are made by votes on the primary project mailing list ([email protected]). +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</p> +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. | <table class="table table-bordered"> <tr> @@ -156,17 +120,17 @@ should be clearly separated. Voting is c </tr> </table> -<p>All participants in the Logging Services project are encouraged to show their agreement with or against a +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.</p> +Services community. For PMC decisions, only the votes of PMC members are binding. -<p>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.</p> +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<a name="Approvals"> </a></h3> +h3. Approvals -<p>These are the types of approvals that can be sought. Different actions require different types of approvals</p> +These are the types of approvals that can be sought. Different actions require different types of approvals <table class="table table-bordered"> <tr> @@ -196,19 +160,19 @@ veto (-1) in reply to the commit message </tr> </table> -<h3>Vetoes<a name="Vetoes"> </a></h3> +h3. Vetoes -<p>A valid, binding veto cannot be overruled. If a veto is cast, it must be accompanied by a valid reason explaining +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.</p> +This does not necessarily signify agreement with the veto - merely that the veto is valid. -<p>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.</p> +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<a name="Actions"> </a></h3> +h3. Actions -<p>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.</p> +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> @@ -233,9 +197,9 @@ required for that action and those who h <tr> <td><strong>Product Release</strong></td> <td> - <p>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.</p> - <p>This step ensures the overall supervision by the Logging Services PMC over its sub-projects.</p> + 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> @@ -243,9 +207,9 @@ required for that action and those who h <tr> <td><strong>Adoption of New Codebase</strong></td> <td> - <p>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.</p> - <p>This also covers the creation of new sub-projects within the project</p> + 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> @@ -259,8 +223,8 @@ required for that action and those who h <tr> <td><strong>New Committer</strong></td> <td> - <p>When a new committer is proposed for a sub-project.</p> - <p>The PMC must be informed of the result of the sub-project's vote.</p> + 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> @@ -274,8 +238,8 @@ required for that action and those who h <tr> <td><strong>Committer Removal</strong></td> <td> - <p>When removal of commit privileges is sought.</p> - <p><b>Note: </b> Such actions will also be referred to the ASF board by the PMC chair.</p> + 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>Consensus</td> <td>Active PMC members (excluding the committer in question if a member of the PMC).</td> @@ -283,16 +247,17 @@ required for that action and those who h <tr> <td><strong>PMC Member Removal</strong></td> <td> - <p>When removal of a PMC member is sought.</p> - <p><b>Note: </b> Such actions will also be referred to the ASF board by the PMC chair</p> + 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>Consensus</td> <td>Active PMC members (excluding the member in question).</td> </tr> </table> -<h3>Voting Timeframes<a name="Voting Timeframes"> </a></h3> +h3. Voting Timeframes + +Votes are open for a period of 72 hours to allow all active voters time to consider the vote. Votes relating to code changes are not subject to a strict timetable but should be made as timely as possible. -<p>Votes are open for a period of 72 hours to allow all active voters time to consider the vote. Votes relating to -code changes are not subject to a strict timetable but should be made as timely as possible.</p> +{% endfilter %} {% endblock %} \ No newline at end of file Modified: logging/site/branches/experimental-twig-textile/src/site/pages/mailing-lists.html.twig URL: http://svn.apache.org/viewvc/logging/site/branches/experimental-twig-textile/src/site/pages/mailing-lists.html.twig?rev=1307362&r1=1307361&r2=1307362&view=diff ============================================================================== --- logging/site/branches/experimental-twig-textile/src/site/pages/mailing-lists.html.twig (original) +++ logging/site/branches/experimental-twig-textile/src/site/pages/mailing-lists.html.twig Fri Mar 30 11:26:02 2012 @@ -20,11 +20,13 @@ limitations under the License. {% block title %}Mailing lists{% endblock %} {% block content %} -<h1>Mailing lists</h1> +{% filter textile %} -<p>These are the mailing lists that have been established for the Apache Logging Services project.</p> +h1. Mailing lists -<p>For questions regarding individual logging projects, please find use the mailing lists defined on the project site.</p> +These are the mailing lists that have been established for the Apache Logging Services project. + +For questions regarding individual logging projects, please find use the mailing lists defined on the project site. <table class="table table-bordered table-striped"> <thead> @@ -59,4 +61,5 @@ limitations under the License. </tr> </tbody> </table> +{% endfilter %} {% endblock %} \ No newline at end of file Modified: logging/site/branches/experimental-twig-textile/src/site/pages/privacy-policy.html.twig URL: http://svn.apache.org/viewvc/logging/site/branches/experimental-twig-textile/src/site/pages/privacy-policy.html.twig?rev=1307362&r1=1307361&r2=1307362&view=diff ============================================================================== --- logging/site/branches/experimental-twig-textile/src/site/pages/privacy-policy.html.twig (original) +++ logging/site/branches/experimental-twig-textile/src/site/pages/privacy-policy.html.twig Fri Mar 30 11:26:02 2012 @@ -20,29 +20,23 @@ limitations under the License. {% block title %}Privacy policy{% endblock %} {% block content %} -<h1>Privacy policy</h1> +{% filter textile %} -<p>Information about your use of this web site is collected using server access logs and a tracking cookie. -The collected information consists of the following:</p> +h1. Privacy policy -<ul> - <li>The IP address from which you access the web site;</li> - <li>The type of browser and operating system you use to access our site;</li> - <li>The date and time you access our site;</li> - <li>The pages you visit; and</li> - <li>The addresses of pages from where you followed a link to our site.</li> -</ul> - -<p>Part of this information is gathered using a tracking cookie set by the -<a href="http://www.google.com/analytics"; target="_blank">Google Analytics</a> service and handled by Google as -described in their <a href="http://www.google.com/privacy.html"; target="_blank">privacy policy</a>. -See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data -with Google.</p> - -<p>We use the gathered information to help us make our site more useful to visitors and to better understand how -and when our site is used. We do not track or collect personally identifiable information or associate gathered -data with any personally identifying information from other sources.</p> +Information about your use of this web site is collected using server access logs and a tracking cookie. The collected information consists of the following: -<p>By using this web site, you consent to the collection of this data in the manner and for the purpose described -above.</p> +* The IP address from which you access the web site; +* The type of browser and operating system you use to access our site; +* The date and time you access our site; +* The pages you visit; and +* The addresses of pages from where you followed a link to our site. + +Part of this information is gathered using a tracking cookie set by the "Google Analytics":http://www.google.com/analytics service and handled by Google as described in their "privacy policy":http://www.google.com/privacy.html. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google. + +We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources. + +By using this web site, you consent to the collection of this data in the manner and for the purpose described above. + +{% endfilter %} {% endblock %} \ No newline at end of file Modified: logging/site/branches/experimental-twig-textile/src/site/pages/team-list.html.twig URL: http://svn.apache.org/viewvc/logging/site/branches/experimental-twig-textile/src/site/pages/team-list.html.twig?rev=1307362&r1=1307361&r2=1307362&view=diff ============================================================================== --- logging/site/branches/experimental-twig-textile/src/site/pages/team-list.html.twig (original) +++ logging/site/branches/experimental-twig-textile/src/site/pages/team-list.html.twig Fri Mar 30 11:26:02 2012 @@ -20,17 +20,15 @@ limitations under the License. {% block title %}Charter{% endblock %} {% block content %} -<h1>Project team</h1> +{% filter textile %} -<p>A successful project requires many people to play many roles. Some members write code or documentation, while -others are valuable as testers, submitting patches and suggestions.</p> +h1. Project team -<p>The team is comprised of Members and Contributors. Members have direct access to the source of a project and -actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the -Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project -are greatly appreciated.</p> +A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions. -<h2>Team members</h2> +The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated. + +h2. Team members <table class="table table-bordered table-striped"> <thead> @@ -128,4 +126,5 @@ are greatly appreciated.</p> </tr> </tbody> </table> +{% endfilter %} {% endblock %} \ No newline at end of file
