Author: seade
Date: Sat May 26 08:31:26 2007
New Revision: 541903

URL: http://svn.apache.org/viewvc?view=rev&rev=541903
Log:
More work on the new turbine TLP site.

Added:
    jakarta/turbine/site/xdocs/board-reports.xml
    jakarta/turbine/site/xdocs/contact.xml
    jakarta/turbine/site/xdocs/how-it-works.xml
    jakarta/turbine/site/xdocs/reports/
    jakarta/turbine/site/xdocs/who-we-are.xml
Modified:
    jakarta/turbine/site/README.txt
    jakarta/turbine/site/project.xml
    jakarta/turbine/site/xdocs/common/further-reading.xml
    jakarta/turbine/site/xdocs/download.xml
    jakarta/turbine/site/xdocs/examples.xml
    jakarta/turbine/site/xdocs/further-reading/index.xml
    jakarta/turbine/site/xdocs/how-to-help.xml
    jakarta/turbine/site/xdocs/index.xml
    jakarta/turbine/site/xdocs/navigation.xml
    jakarta/turbine/site/xdocs/turbine-concepts.xml

Modified: jakarta/turbine/site/README.txt
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/README.txt?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/README.txt (original)
+++ jakarta/turbine/site/README.txt Sat May 26 08:31:26 2007
@@ -1,7 +1,7 @@
 $Id$
 
-The Jakarta Turbine Website Instructions
-----------------------------------------
+The Turbine Website Instructions
+--------------------------------
 
 The Turbine web site is based on .xml files which are transformed
 into .html files using Maven.
@@ -9,7 +9,7 @@
 <http://maven.apache.org/>
 
 Once you have the site checked out locally, cd into your
-jakarta-Turbine-site directory and execute:
+turbine-site directory and execute:
 
 maven site
 
@@ -25,6 +25,5 @@
 To deploy the site execute:
 
 maven site:deploy
-
 To do this you need an account on the people.apache.org machine!!
 

Modified: jakarta/turbine/site/project.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/project.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/project.xml (original)
+++ jakarta/turbine/site/project.xml Sat May 26 08:31:26 2007
@@ -23,7 +23,7 @@
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://turbine.apache.org/</url>
-    <logo>/images/jakarta.png</logo>
+    <logo>/images/turbine.png</logo>
   </organization>
   <inceptionYear>2000</inceptionYear>
   <package>org.apache.turbine</package>
@@ -50,15 +50,21 @@
   <mailingLists>
     <mailingList>
       <name>Turbine User List</name>
-      <subscribe>[EMAIL PROTECTED]</subscribe>
-      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-      
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-turbine-user/</archive>
+      <subscribe>[EMAIL PROTECTED]</subscribe>
+      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/turbine-user/</archive>
     </mailingList>
     <mailingList>
       <name>Turbine Developer List</name>
-      <subscribe>[EMAIL PROTECTED]</subscribe>
-      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-      
<archive>http://mail-archives.apache.org/mod_mbox/jakarta-turbine-dev/</archive>
+      <subscribe>[EMAIL PROTECTED]</subscribe>
+      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/turbine-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Turbine General List</name>
+      <subscribe>[EMAIL PROTECTED]</subscribe>
+      <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+      
<archive>http://mail-archives.apache.org/mod_mbox/turbine-general/</archive>
     </mailingList>
   </mailingLists>
 

Added: jakarta/turbine/site/xdocs/board-reports.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/board-reports.xml?view=auto&rev=541903
==============================================================================
--- jakarta/turbine/site/xdocs/board-reports.xml (added)
+++ jakarta/turbine/site/xdocs/board-reports.xml Sat May 26 08:31:26 2007
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<document>
+
+ <properties>
+  <title>Board Reports</title>
+  <author email="[EMAIL PROTECTED]">Scott Eade</author>
+ </properties>
+
+<body>
+
+<section name="Reports to the Board of the Apache Software Foundation">
+
+<p>
+As part of the <a href="http://www.apache.org/";>Apache Software Foundation</a>
+we must report to the board about our activity. These reports are due quarterly
+and are public.  As part of our move to a top-level project (TLP), we are
+required o report monthly for the first three months.
+</p>
+
+<ul>
+<li>Our first report is due June 2007.</li>
+<!--<li><a href="reports/report-2007-06.html">June 2007 Report</a></li>-->
+<!--<li><a href="reports/report-2007-07.html">July 2007 Report</a></li>-->
+<!--<li><a href="reports/report-2007-08.html">August 2007 Report</a></li>-->
+<!--<li><a href="reports/report-2007-11.html">November 2007 Report</a></li>-->
+<!--<li><a href="reports/report-2008-02.html">February 2008 Report</a></li>-->
+<!--<li><a href="reports/report-2008-05.html">May 2008 Report</a></li>-->
+</ul>
+
+</section>
+
+</body>
+</document>

Modified: jakarta/turbine/site/xdocs/common/further-reading.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/common/further-reading.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/common/further-reading.xml (original)
+++ jakarta/turbine/site/xdocs/common/further-reading.xml Sat May 26 08:31:26 
2007
@@ -23,7 +23,7 @@
 
 <body>
 
-<section name="Related Jakarta Apache Projects">
+<section name="Related Apache Projects">
 
 <p>
   <a href="http://velocity.apache.org/engine/";>Velocity</a> is a view 

Added: jakarta/turbine/site/xdocs/contact.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/contact.xml?view=auto&rev=541903
==============================================================================
--- jakarta/turbine/site/xdocs/contact.xml (added)
+++ jakarta/turbine/site/xdocs/contact.xml Sat May 26 08:31:26 2007
@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<document>
+
+ <properties>
+  <title>Contact us</title>
+  <author email="[EMAIL PROTECTED]">Scott Eade</author>
+ </properties>
+
+<body>
+
+<section name="Contact us">
+
+<p>
+The communication between the developers and the user community in the Apache
+Turbine project is intended to be as open and accessible as possible. This is
+why we prefer to have <a href="#Mailing lists">public mailing lists</a> to 
which
+everyone can subscribe and which are archived.
+</p>
+
+<p>
+For bug reporting and issue tracking, Turbine uses the <a href="#Issue 
tracking">
+JIRA bug tracker</a> at the Apache Software Foundation. Please report bugs 
using
+the tracker, if you send them to the mailing lists, most of the times a member 
of
+the Turbine Community will point you there anyway. Using the bug tracker makes
+sure that your bug report is recorded and processed in a timely manner. 
+</p>
+
+</section>
+
+<section name="Mailing lists">
+
+<p>
+Please be aware that sending confidential or private data to these lists is 
strongly
+discouraged and if this happens, we can not do anything to remove or erase this
+information from public archives.
+</p>
+
+<p>
+We also strongly frown upon disclaimers attached to mails sent to these lists
+that declare the contents to be confidential, private or only intended for the
+recipient. But we understand that these disclaimers are often beyond your 
control.
+However, by sending mail to a Turbine mailing list, the intended recipient is
+the general public.
+</p>
+
+<table class="bodyTable">
+    <thead>
+        <tr class="a">
+            <th>List name</th>
+            <th>Address</th>
+            <th>Archives</th>
+            <th>Subscribe</th>
+            <th>Unsubscribe</th>
+            <th>Purpose</th>
+          </tr>
+    </thead>
+    <tbody>
+        <tr class="b">
+            <td><a name="general">general</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Send a message</a></td>
+            <td><a 
href="http://mail-archives.apache.org/mod_mbox/turbine-general/"; 
class="externalLink">Main archive</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Subscribe</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Unsubscribe</a></td>
+            <td>
+              Discuss matters relating to the Turbine project as a whole (e.g. 
matters relating
+              to possible changes to procedures, the project website, etc.).
+            </td>
+        </tr>
+        <tr class="a">
+            <td><a name="user">user</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Send a message</a></td>
+            <td><a 
href="http://mail-archives.apache.org/mod_mbox/turbine-user/"; 
class="externalLink">Main archive</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Subscribe</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Unsubscribe</a></td>
+            <td>
+              General discussion for developers wanting to use Apache Turbine 
or components of it.
+            </td>
+        </tr>
+        <tr class="b">
+            <td><a name="dev">dev</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Send a message</a></td>
+            <td><a 
href="http://mail-archives.apache.org/mod_mbox/turbine-dev/"; 
class="externalLink">Main archive</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Subscribe</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Unsubscribe</a></td>
+            <td>
+              Watch the Turbine development process. Participate in Turbine 
development yourself.
+            </td>
+        </tr>
+        <tr class="a">
+            <td><a name="commits">commits</a></td>
+            <td>&#160;</td>
+            <td><a 
href="http://mail-archives.apache.org/mod_mbox/turbine-commits/"; 
class="externalLink">Main archive</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Subscribe</a></td>
+            <td><a href="mailto:[EMAIL PROTECTED]">Unsubscribe</a></td>
+            <td>
+                Monitor the changes to the Turbine Source Code repository.
+            </td>
+        </tr>
+    </tbody>
+</table>
+      
+<table class="bodyTable">
+    <thead>
+        <tr class="b">
+            <th>List name</th>
+            <th>Description</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr class="a">
+            <td><a href="#general">general</a></td>
+            <td>
+              This list is used for general, Turbine project related,
+              discussion and announcements. This list is not for
+              specific questions on how to do something using Turbine
+              but for questions about Turbine. Usually very low
+              volume.
+            </td>
+        </tr>
+        <tr class="b">
+            <td><a href="#user">user</a></td>
+            <td>
+              This mailing list is intended for questions around using Apache 
Turbine and its
+              sub projects in your own code and pretty much everything else 
related to Turbine.
+              If you are a developer and want to use Turbine, subscribe here. 
This list has a moderate volume.
+            </td>
+        </tr>
+        <tr class="a">
+            <td><a href="#dev">dev</a></td>
+            <td>
+              Found a bug, have a patch, want to improve Turbine? Subscribe to 
this mailing list, this is where
+              all the developers hang out. Please do not ask questions on how 
to use Turbine
+              unless it is related to a problem with Turbine itself. This list 
has low to moderate volume.
+            </td>
+        </tr>
+        <tr class="b">
+            <td><a href="#commits">commits</a></td>
+            <td>
+              This list reflects all the commit messages to the Turbine 
Subversion source code repository.
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</section>
+
+<section name="Issue Tracking">
+
+<p>
+Currently Turbine uses a single issue tracker with the various Turbine sub 
projects
+configured as components:
+</p>
+
+<table class="bodyTable">
+    <thead>
+        <tr class="a">
+            <th>Project</th>
+            <th>Issue tracker</th>
+            <th>Component</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr class="b">
+            <td>Turbine core - trunk</td>
+            <td><a href="https://issues.apache.org/jira/browse/TRB"; 
class="externalLink">JIRA</a></td>
+            <td>Core</td>
+        </tr>
+        <tr class="a">
+            <td>Turbine core - 2.3 branch</td>
+            <td><a href="https://issues.apache.org/jira/browse/TRB"; 
class="externalLink">JIRA</a></td>
+            <td>Turbine 2.3</td>
+        </tr>
+        <tr class="b">
+            <td>Fulcrum - all components</td>
+            <td><a href="https://issues.apache.org/jira/browse/TRB"; 
class="externalLink">JIRA</a></td>
+            <td>Fulcrum</td>
+        </tr>
+        <tr class="a">
+            <td>M.E.T.A.</td>
+            <td><a href="https://issues.apache.org/jira/browse/TRB"; 
class="externalLink">JIRA</a></td>
+            <td>M.E.T.A.</td>
+        </tr>
+        <tr class="b">
+            <td>Turbine Site</td>
+            <td><a href="https://issues.apache.org/jira/browse/TRB"; 
class="externalLink">JIRA</a></td>
+            <td>Site</td>
+        </tr>
+    </tbody>
+</table>
+       
+</section>
+
+<section name="Contacting the Apache Turbine PMC">
+
+<p>
+The Apache Turbine Project Management Committee (PMC) provides oversight to the
+project and is legally responsible for all software releases. It reports to 
the 
+<a href="http://www.apache.org/foundation/board/";>Board of the Apache Software
+Foundation</a> quarterly. The reports are <a href="board-reports.html">archived
+and public</a>.
+</p>
+
+<p>
+The Apache Turbine PMC can be reached at
+<a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>. 
+</p>
+
+</section>
+
+</body>
+</document>

Modified: jakarta/turbine/site/xdocs/download.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/download.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/download.xml (original)
+++ jakarta/turbine/site/xdocs/download.xml Sat May 26 08:31:26 2007
@@ -18,7 +18,7 @@
 <document>
 
   <properties>
-    <title>Downloading Jakarta Turbine</title>
+    <title>Downloading Turbine</title>
   </properties>
 
 <body>

Modified: jakarta/turbine/site/xdocs/examples.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/examples.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/examples.xml (original)
+++ jakarta/turbine/site/xdocs/examples.xml Sat May 26 08:31:26 2007
@@ -34,7 +34,7 @@
 </subsection>
 <subsection name="OSWorkflow Example">
        <p>
-       <a 
href="http://jakarta.apache.org/turbine/fulcrum/fulcrum-osworkflow-example/index.html";>This</a>
+       <a 
href="http://turbine.apache.org/fulcrum/fulcrum-osworkflow-example/index.html";>This</a>
        example app shows how to integrate the <a 
href="http://www.opensymphony.com/";>OSWorkflow</a> engine
        into Turbine.  You can click through the various screens following the 
progress of your workflow.       
        </p>

Modified: jakarta/turbine/site/xdocs/further-reading/index.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/further-reading/index.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/further-reading/index.xml (original)
+++ jakarta/turbine/site/xdocs/further-reading/index.xml Sat May 26 08:31:26 
2007
@@ -68,7 +68,7 @@
     </ul>
     </subsection>
 
-    <subsection name="Related Jakarta Apache Projects">    
+    <subsection name="Related Apache Projects">    
     <ul>
       <li>
         <a href="http://velocity.apache.org/engine/";>Velocity</a> -  A view 
@@ -86,11 +86,6 @@
         framework used by Turbine and many other projects.
         No more commenting System.out.println()'s in your code!
       </li>
-    </ul>
-    </subsection>
-    
-    <subsection name="Related Apache Projects">
-    <ul>
       <li>
         <a href="http://maven.apache.org";>Maven</a> - A Java 
         project management and project comprehension tool. Maven is based on 
the 

Added: jakarta/turbine/site/xdocs/how-it-works.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/how-it-works.xml?view=auto&rev=541903
==============================================================================
--- jakarta/turbine/site/xdocs/how-it-works.xml (added)
+++ jakarta/turbine/site/xdocs/how-it-works.xml Sat May 26 08:31:26 2007
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<document>
+
+ <properties>
+  <title>How it works</title>
+  <author email="[EMAIL PROTECTED]">Scott Eade</author>
+ </properties>
+
+<body>
+
+<section name="How the Apache Turbine project works">
+
+<p>
+We have evolved into Top Level state from being a founding and long-time member
+of the Apache Jakarta Project and owe most of our rules and guidelines to the
+Jakarta project and are grateful for the guidance that we got from the Jakarta 
people.
+</p>
+
+<p>
+This is an evolving document and we expect it to branch away from the Jakarta
+rules in the future. For the moment, we will reference the Jakarta project
+guidelines here and apply these to the Apache Turbine Project.
+</p>
+
+<subsection name="Project Guidelines">
+
+<p>
+This document defines the guidelines of the Apache Turbine Project. It includes
+definitions of the various categories of membership, who is able to vote, how
+conflicts are resolved by voting, and the procedures to follow for proposing
+and making changes to the codebase of the Project.
+</p>
+
+<dl>
+<dt><a href="http://jakarta.apache.org/site/roles.html"; 
class="externalLink">Roles and Responsibilities</a></dt>
+<dd> Defines the recognized roles in the project.</dd>
+<dt><a href="http://jakarta.apache.org/site/communication.html"; 
class="externalLink">Communication</a></dt>
+<dd> Defines how users and developers communicate.</dd>
+<dt><a href="http://jakarta.apache.org/site/decisions.html"; 
class="externalLink">Decision Making</a></dt>
+<dd> Defines how action items are proposed and voted on.</dd>
+<dt><a href="http://jakarta.apache.org/site/source.html"; 
class="externalLink">Source Repositories</a></dt>
+<dd> Defines how the Project's source code is organized and developed.</dd>
+<dt><a href="http://jakarta.apache.org/site/management.html"; 
class="externalLink">Project Management</a></dt>
+<dd> Defines the roles and responsibilities of the Project Management 
Committee (PMC).</dd>
+<dt><a href="http://jakarta.apache.org/site/newproject.html"; 
class="externalLink">New Subproject Proposals</a></dt>
+<dd> Defines the methodology for proposing new top level Jakarta 
Subprojects.</dd>
+</dl>
+
+<p>
+Like its ancestor at The Jakarta Site, this is a living document. Changes can 
be
+made by the Project Management Committee. Suggestions for changes should be
+discussed on the Turbine general mailing list.
+</p>
+
+</subsection>
+
+</section>
+
+</body>
+</document>

Modified: jakarta/turbine/site/xdocs/how-to-help.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/how-to-help.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/how-to-help.xml (original)
+++ jakarta/turbine/site/xdocs/how-to-help.xml Sat May 26 08:31:26 2007
@@ -47,7 +47,7 @@
     <ul>
         <li>
             XML formatted docs (xdoc) - This is used to generate the 
documentation
-            on the jakarta site.  The source for this documentation can be 
found
+            on the Turbine site.  The source for this documentation can be 
found
             in the xdocs directory in the source distribution.  To submit 
additional
             documentation in this form or patches to existing documentation, 
please
             create an issue  
@@ -55,8 +55,8 @@
             using the &quot;Site&quot; component and attach the patch files 
(or new files).
         </li>
         <li>
-            Mailing list - The archives of <a href="mailto:[EMAIL 
PROTECTED]">[EMAIL PROTECTED]</a>
-            and <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
+            Mailing list - The archives of <a href="mailto:[EMAIL 
PROTECTED]">[EMAIL PROTECTED]</a>
+            and <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
             are an excellent source of information for the project.
             Answering questions that are asked on the mailing list or
             simply posting information that might be of use to other
@@ -64,7 +64,7 @@
             project.
         </li>
         <li>
-            The <a href="http://wiki.apache.org/jakarta-turbine/";>Jakarta 
Turbine
+            The <a href="http://wiki.apache.org/jakarta-turbine/";>Turbine
             Wiki</a> another repository of documentation for the project.  It
             contains development information, user documentation, how-to 
documents,
             discussion of new features, etc.  Anyone can add new pages and 
edit existing
@@ -94,7 +94,7 @@
 <p>
     If you do discover a defect in the Turbine product, please create a defect 
issue in
     <a href="http://issues.apache.org/jira/browse/TRB";>our bug tracker</a> 
clearly
-    discribing the problem.  If you can take the time to track down the source 
of the problem,
+    describing the problem.  If you can take the time to track down the source 
of the problem,
     it would certainly help speed the process of getting it corrected.  Of 
course, actually
     fixing the problem and attaching a patch to the issue would be greatly 
appreciated.
 </p>

Modified: jakarta/turbine/site/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/index.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/index.xml (original)
+++ jakarta/turbine/site/xdocs/index.xml Sat May 26 08:31:26 2007
@@ -18,12 +18,12 @@
 <document>
 
   <properties>
-    <title>Jakarta Turbine</title>
+    <title>Turbine</title>
   </properties>
 
 <body>
 
-<section name="Jakarta Turbine Web Application Framework">
+<section name="Apache Turbine Web Application Framework">
 
   <p>
     Turbine is a servlet based framework that allows experienced Java

Modified: jakarta/turbine/site/xdocs/navigation.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/navigation.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/navigation.xml (original)
+++ jakarta/turbine/site/xdocs/navigation.xml Sat May 26 08:31:26 2007
@@ -15,14 +15,14 @@
 limitations under the License.
 -->
        
-<project name="Jakarta Turbine Site"
-        href="http://jakarta.apache.org/turbine";>
+<project name="Turbine Site"
+        href="http://turbine.apache.org";>
 
-    <title>Jakarta Turbine Site</title>
+    <title>Turbine Site</title>
 
     <body>
     <links>
-      <item name="Turbine"                 href="/turbine/index.html"/>
+      <item name="Turbine"                 href="/turbine/"/>
       <item name="Fulcrum"                 href="/fulcrum/"/>
       <item name="META"                    href="/meta/"/>
     </links>
@@ -77,8 +77,15 @@
         <item name="TDK"                   href="/tdk/index.html"/>
     </menu>
 
+    <menu name="Community">
+        <item name="Who we are"                  href="/who-we-are.html"/>
+        <item name="Contact us"                  href="/contact.html"/>
+        <item name="How to help"                 href="/how-to-help.html"/>
+        <item name="How it works"                href="/how-it-works.html"/>
+        <item name="Board reports"               href="/board-reports.html"/>
+    </menu>
+
     <menu name="General Development Information">
-        <item name="How To Help"                 href="how-to-help.html"/>
         <item name="Coding Specification"  href="/common/code-standards.html"/>
         <item name="Developer Links"       
href="/common/developer-links.html"/>
         <item name="Improving Documentation"          
href="/common/documentation.html"/>

Modified: jakarta/turbine/site/xdocs/turbine-concepts.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/turbine-concepts.xml?view=diff&rev=541903&r1=541902&r2=541903
==============================================================================
--- jakarta/turbine/site/xdocs/turbine-concepts.xml (original)
+++ jakarta/turbine/site/xdocs/turbine-concepts.xml Sat May 26 08:31:26 2007
@@ -27,7 +27,7 @@
 
 <p>Looking for a modern web application architecture for your Java
 development? Turbine is an open source server-side Java framework from
-the Jakarta Apache project. Any servlet container supporting Servlet
+the Apache Software Foundation. Any servlet container supporting Servlet
 Specification 2.2 or better can be used to run your Turbine
 application.</p>
 

Added: jakarta/turbine/site/xdocs/who-we-are.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/site/xdocs/who-we-are.xml?view=auto&rev=541903
==============================================================================
--- jakarta/turbine/site/xdocs/who-we-are.xml (added)
+++ jakarta/turbine/site/xdocs/who-we-are.xml Sat May 26 08:31:26 2007
@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<document>
+
+ <properties>
+  <title>Who we are</title>
+  <author email="[EMAIL PROTECTED]">Scott Eade</author>
+ </properties>
+
+<body>
+
+<section name="Who we are">
+
+<p>
+The Apache Turbine Project operates on a meritocracy: the more you do, the more
+responsibility you will obtain. This page lists all of the people who have gone
+the extra mile and are Committers or members of the Project Management 
Committee.
+If you would like to get involved, the first step is to join the mailing lists.
+</p>
+
+<p>
+We ask that you please do not send us emails privately asking for support. We 
are
+non-paid volunteers who help out with the project and we do not necessarily 
have
+the time or energy to help people on an individual basis. Instead, we have 
setup
+mailing lists which often contain hundreds of individuals who will help answer
+detailed requests for help. The benefit of using mailing lists over private
+communication is that it is a shared resource where others can also learn from
+common mistakes and as a community we all grow together. 
+</p>
+
+</section>
+
+<section name="Project Management Committee (PMC)">
+TBC
+</section>
+
+<section name="Apache Turbine Committers">
+TBC
+</section>
+
+<section name="Apache Turbine Emeriti">
+
+<p>
+Our emeriti are project committers that have not been active on the project,
+committed code or participated on the mailing lists for more than twelve 
months.
+</p>
+
+TBC
+</section>
+
+</body>
+</document>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to