You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/25 09:42:22 UTC

svn commit: r425317 [1/2] - in /geronimo/site/trunk: docs/ xdocs/

Author: jdillon
Date: Tue Jul 25 00:42:20 2006
New Revision: 425317

URL: http://svn.apache.org/viewvc?rev=425317&view=rev
Log:
Tidy up xdoc formatting

Modified:
    geronimo/site/trunk/docs/dependencies.html
    geronimo/site/trunk/docs/development.html
    geronimo/site/trunk/docs/devtools.html
    geronimo/site/trunk/docs/faq.html
    geronimo/site/trunk/docs/found-a-bug.html
    geronimo/site/trunk/docs/get-involved.html
    geronimo/site/trunk/docs/mailing.html
    geronimo/site/trunk/docs/newshistory.html
    geronimo/site/trunk/docs/powered_by.html
    geronimo/site/trunk/xdocs/contributors.xml
    geronimo/site/trunk/xdocs/dependencies.xml
    geronimo/site/trunk/xdocs/development.xml
    geronimo/site/trunk/xdocs/devtools.xml
    geronimo/site/trunk/xdocs/events.xml
    geronimo/site/trunk/xdocs/faq.xml
    geronimo/site/trunk/xdocs/found-a-bug.xml
    geronimo/site/trunk/xdocs/get-involved.xml
    geronimo/site/trunk/xdocs/guidelines.xml
    geronimo/site/trunk/xdocs/index.xml
    geronimo/site/trunk/xdocs/license.xml
    geronimo/site/trunk/xdocs/mailing.xml
    geronimo/site/trunk/xdocs/navigation.xml
    geronimo/site/trunk/xdocs/newshistory.xml
    geronimo/site/trunk/xdocs/powered_by.xml
    geronimo/site/trunk/xdocs/roadmap.xml
    geronimo/site/trunk/xdocs/schemas.xml
    geronimo/site/trunk/xdocs/svn.xml
    geronimo/site/trunk/xdocs/verification.xml

Modified: geronimo/site/trunk/docs/dependencies.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/dependencies.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/dependencies.html (original)
+++ geronimo/site/trunk/docs/dependencies.html Tue Jul 25 00:42:20 2006
@@ -238,34 +238,58 @@
         <td>
             <p>
                                                             <p>
-  Apache Geronimo derives the majority of it's functionality from external projects.
-  These projects, which we somtimes refer to as part of the "Geronimo Mosiac", 
-  are independent, healthy open source communities with separate identity.
-  We try to collaborate with this as much as we can, working in those projects 
-  as much as we work here in Apache Geronimo.  
-  </p>
+                Apache Geronimo derives the majority of it's functionality from external projects.
+                These projects, which we somtimes refer to as part of the "Geronimo Mosiac", 
+                are independent, healthy open source communities with separate identity.
+                We try to collaborate with this as much as we can, working in those projects 
+                as much as we work here in Apache Geronimo.
+            </p>
                                                                                 <p>
-  We believe that open source is valuable because of the communities behind the code - 
-  and in the case of Apache Geronimo, the 'mosaic' of projects brings additional
-  health and diversity that go beyond a single project.
- </p>
-                                                                                <p> 
-  The external dependencies of Geronimo include (among <i>many</i> others):
-  </p>
+                We believe that open source is valuable because of the communities behind the code - 
+                and in the case of Apache Geronimo, the 'mosaic' of projects brings additional
+                health and diversity that go beyond a single project.
+            </p>
+                                                                                <p>
+                The external dependencies of Geronimo include (among <i>many</i> others):
+            </p>
                                                                                 <ul>
-    <li style="list-style-type:square"><a href="http://www.openejb.org/">OpenEJB</a></li>
-    <li style="list-style-type:square"><a href="http://ws.apache.org/axis/">Apache Axis</a></li>
-    <li style="list-style-type:square"><a href="http://mx4j.sourceforge.net/">MX4J</a></li>
-    <li style="list-style-type:square"><a href="http://jetty.mortbay.org/">Jetty</a></li>
-    <li style="list-style-type:square"><a href="http://tomcat.apache.org/">Apache Tomcat</a></li>
-    <li style="list-style-type:square"><a href="http://activemq.codehaus.org/">ActiveMQ</a></li>
-    <li style="list-style-type:square"><a href="http://activeio.codehaus.org/">ActiveIO</a></li>
-    <li style="list-style-type:square"><a href="http://activecluster.codehaus.org/">ActiveCluster</a></li>
-    <li style="list-style-type:square"><a href="http://servicemix.org/">ServiceMix</a></li>
-    <li style="list-style-type:square"><a href="http://tranql.codehaus.org/">TranQL</a></li>
-    <li style="list-style-type:square"><a href="http://www.antlr.org/">Antlr</a></li>
-    <li style="list-style-type:square"><a href="http://asm.objectweb.org">ASM</a></li>
-  </ul>
+                <li style="list-style-type:square">
+                    <a href="http://www.openejb.org/">OpenEJB</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://ws.apache.org/axis/">Apache Axis</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://mx4j.sourceforge.net/">MX4J</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://jetty.mortbay.org/">Jetty</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://tomcat.apache.org/">Apache Tomcat</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://activemq.codehaus.org/">ActiveMQ</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://activeio.codehaus.org/">ActiveIO</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://activecluster.codehaus.org/">ActiveCluster</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://servicemix.org/">ServiceMix</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://tranql.codehaus.org/">TranQL</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://www.antlr.org/">Antlr</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://asm.objectweb.org">ASM</a>
+                </li>
+            </ul>
                                                 </p>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/development.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/development.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/development.html (original)
+++ geronimo/site/trunk/docs/development.html Tue Jul 25 00:42:20 2006
@@ -237,16 +237,22 @@
     <tr>
         <td>
             <p>
-                                                            <p>Find out more about the inner workings of the open source community and the Apache Software Foundation <a href="http://www.apache.org">(ASF)</a>, how the Geronimo Project is managed, the different players involved in the project, and how to contribute. 
-</p>
+                                                            <p>
+                Find out more about the inner workings of the open source
+                community and the Apache Software Foundation
+                <a href="http://www.apache.org">(ASF)</a>, how the Geronimo Project
+                is managed, the different players involved in the project, and how to contribute.
+            </p>
                                                                                 <ul>
-    <li style="list-style-type:square">
-	<a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-process.html">Apache Geronimo Development Process</a></li>
-	<br />
-    <li style="list-style-type:square">
-	<a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-status.html">Apache Geronimo Development Status</a></li>
-	
-</ul>
+                <li style="list-style-type:square">
+                    <a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-process.html">Apache Geronimo Development Process</a>
+                </li>
+                <br />
+                <li style="list-style-type:square">
+                    <a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-status.html">Apache Geronimo Development Status</a>
+                </li>
+
+            </ul>
                                                                                 <p>Due to the frequent updates these pages are hosted at the <a href="http://cwiki.apache.org/geronimo">Apache Geronimo Wiki</a>.</p>
                                                 </p>
         </td>

Modified: geronimo/site/trunk/docs/devtools.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/devtools.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/devtools.html (original)
+++ geronimo/site/trunk/docs/devtools.html Tue Jul 25 00:42:20 2006
@@ -238,9 +238,10 @@
         <td>
             <p>
                                                             <p>
-        Welcome to the Apache Geronimo Development Tools Subproject.  The aim of this subproject is to provide a rich set of development tools for Geronimo, focusing on
-        application development, migration, and IDE integration.
-      </p>
+                Welcome to the Apache Geronimo Development Tools Subproject.
+                The aim of this subproject is to provide a rich set of development
+                tools for Geronimo, focusing on application development, migration, and IDE integration.
+            </p>
                                                 </p>
         </td>
     </tr>
@@ -261,21 +262,20 @@
         <td>
             <p>
                                                             <p>
-        The
-        <a href="http://www.eclipse.org/">Eclipse</a>
-        plug-in provides integration between Geronimo and the
-        <a href="http://www.eclipse.org/webtools/">Web Tools Project</a>
-        .
-        With this plug-in, users will be able to use the features in WTP to create, deploy and debug applications for Geronimo.
-      </p>
+                The <a href="http://www.eclipse.org/">Eclipse</a> plug-in provides 
+                integration between Geronimo and the <a href="http://www.eclipse.org/webtools/">Web Tools Project</a>.
+                With this plug-in, users will be able to use the features in WTP 
+                to create, deploy and debug applications for Geronimo.
+            </p>
                                                                                 <p>
-        <strong>Prerequisites</strong>
-        <blockquote>
-          Several prerequistes are required to be downloaded and installed. Visit the 
-          <a href="http://download.eclipse.org/webtools/downloads/">WTP download site</a> and download the WebTools Platform Runtime 1.01 driver along with
-          its prereqs as mentioned in the Requirements section.
-        </blockquote>
-      </p>
+                <strong>Prerequisites</strong>
+                <blockquote>
+                    Several prerequistes are required to be downloaded and installed.
+                    Visit the <a href="http://download.eclipse.org/webtools/downloads/">WTP download site</a> 
+                    and download the WebTools Platform Runtime 1.01 driver along with
+                    its prereqs as mentioned in the Requirements section.
+                </blockquote>
+            </p>
                                                                                 <table border="0" cellspacing="0" cellpadding="0" width="100%">
     <tr>
         <td>
@@ -287,27 +287,36 @@
         <td>
             <blockquote>
                                                             <p>
-          <strong>Latest Release - Version 1.1.0</strong>
-          <p>
- 		    Version 1.1.0 of the Eclipse Plug-in has been released.  The plugin can be installed directly from within 
- 		    <a href="http://download3.eclipse.org/webtools/downloads/drops/R1.5/R-1.5.0-200606281455/">WTP version 1.5</a>, by clicking on the  "<a href="devtools/Screenshot_1.jpg">Don't see your server listed?</a>" link
-		    when defining a runtime in WTP.   
-		  </p>
-		</p>
+                    <strong>Latest Release - Version 1.1.0</strong>
+                    <p>
+                        Version 1.1.0 of the Eclipse Plug-in has been released.
+                        The plugin can be installed directly from within 
+                        <a href="http://download3.eclipse.org/webtools/downloads/drops/R1.5/R-1.5.0-200606281455/">WTP version 1.5</a>, 
+                        by clicking on the  "<a href="devtools/Screenshot_1.jpg">Don't see your server listed?</a>" link
+                        when defining a runtime in WTP.   
+                    </p>
+                </p>
                                                                                 <p>
-		  Alternatively, the plugin can be also be installed via the update manager by creating a new remote site pointing to http://geronimo.apache.org/devtools.
+                    Alternatively, the plugin can be also be installed via the 
+                    update manager by creating a new remote site pointing to 
+                    http://geronimo.apache.org/devtools.
 		</p>
                                                                                 <p>
-		  The plugin supports deployment to both Geronimo 1.0 and the latest 1.1 release.  See the <a href="http://cvs.apache.org/dist/geronimo/eclipse/PLUGIN_RELEASE-NOTES-1.1.0.txt">release notes</a> for additional information.       
-        </p>
+                    The plugin supports deployment to both Geronimo 1.0 and the 
+                    latest 1.1 release.
+                    See the <a href="http://cvs.apache.org/dist/geronimo/eclipse/PLUGIN_RELEASE-NOTES-1.1.0.txt">
+                    release notes</a> for additional information.
+                </p>
                                                                                 <hr color="#666666" width="100%" size="2" />
                                                                                 <p>
-          <strong>Daily Drivers</strong>
-          <p>
-            Unofficial daily drivers are available for download <a href="http://cvs.apache.org/dist/geronimo/eclipse/unstable/">here</a>.  
-            The available builds should also be used with all official releases of Geronimo.  
-          </p>        
-        </p>
+                    <strong>Daily Drivers</strong>
+                    <p>
+                        Unofficial daily drivers are available for download
+                        <a href="http://cvs.apache.org/dist/geronimo/eclipse/unstable/">here</a>.
+                        The available builds should also be used with all official
+                        releases of Geronimo.
+                    </p>
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -329,13 +338,18 @@
         <td>
             <blockquote>
                                                             <p>
-          Geronimo Plugin issues can be opened in Jira in the <a href="http://issues.apache.org/jira/browse/GERONIMODEVTOOLS">GERONIMODEVTOOLS</a> project.  
-          Eclipse Platform or WTP issues should be opened under <a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>. 
-        </p>
+                    Geronimo Plugin issues can be opened in Jira in the 
+                    <a href="http://issues.apache.org/jira/browse/GERONIMODEVTOOLS">GERONIMODEVTOOLS</a> project.
+                    Eclipse Platform or WTP issues should be opened under
+                    <a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>.
+                </p>
                                                                                 <p>
-          Questions regarding the plugin can be asked on the <a href="http://geronimo.apache.org/mailing.html">Geronimo mailing lists</a>.  Other questions pertaining to
-          Eclipse, WTP, or any Eclipse Project should be asked on the <a href="http://www.eclipse.org/newsgroups/">Eclipse Newsgroups</a>.
-        </p>
+                    Questions regarding the plugin can be asked on the 
+                    <a href="http://geronimo.apache.org/mailing.html">Geronimo mailing lists</a>.
+                    Other questions pertaining to
+                    Eclipse, WTP, or any Eclipse Project should be asked on the
+                    <a href="http://www.eclipse.org/newsgroups/">Eclipse Newsgroups</a>.
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -366,15 +380,15 @@
         <td>
             <p>
                                                             <p>
-        <strong>Geronimo Tooling for Eclipse</strong>
-        <blockquote>
-          The WTP Geronimo Server Adapter now being developed under the Geronimo Development Tools subproject. It is no longer being hosted and developed
-          under Eclipse.  Re-visit the <a href="http://www-128.ibm.com/developerworks/opensource/library/os-gerplug/">article</a> on this plug-in.
-          (
-          <i>2005-09-13</i>
-          )
-        </blockquote>
-      </p>
+                <strong>Geronimo Tooling for Eclipse</strong>
+                <blockquote>
+                    The WTP Geronimo Server Adapter now being developed under the 
+                    Geronimo Development Tools subproject. It is no longer being 
+                    hosted and developed under Eclipse.  Re-visit the 
+                    <a href="http://www-128.ibm.com/developerworks/opensource/library/os-gerplug/">article</a>
+                    on this plug-in. ( <i>2005-09-13</i>)
+                </blockquote>
+            </p>
                                                 </p>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/faq.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/faq.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/faq.html (original)
+++ geronimo/site/trunk/docs/faq.html Tue Jul 25 00:42:20 2006
@@ -238,59 +238,61 @@
         <td>
             <p>
                                                             <p>
-     <strong>What is Geronimo?</strong>
-      <blockquote>
-        Geronimo is Apache's ASF-licensed J2EE server project.
-        Please see the <a href="index.html">Overview</a> for more
-        information.
-      </blockquote>
-  </p>
+                <strong>What is Geronimo?</strong>
+                <blockquote>
+                    Geronimo is Apache's ASF-licensed J2EE server project.
+                    Please see the <a href="index.html">Overview</a> for more
+                    information.
+                </blockquote>
+            </p>
                                                                                 <p>
-      <strong>I'd like to find out more about the project and
-        possibly contribute. What do I do next?
-      </strong>
-      <blockquote>Participation on the project is via the mailing
-        list and the source code repository. You join by subscribing
-        to the mailing list and participating in discussions. You
-        can help by contributing your ideas, enthusiasm, code,
-        documentation, and tests. The fundamental tenet of the Apache
-        Software Foundation is that great communities build great
-        code. The emphasis is on community; the code comes from that.
-        If you want to help, just join the mailing list, see what
-        needs to be done, and do it. Welcome!
-      </blockquote>
-    </p>
-                                                                                <p> 
-      <strong>Where is the mailing list, and how can I
-        subscribe?
-      </strong>
-      <blockquote>
-        The users mailing list is user@geronimo.apache.org. You can subscribe by sending an e-mail to
-        <a href="mailto:user-subscribe@geronimo.apache.org">user-subscribe@geronimo.apache.org</a>. To catch up on old messages, read the
-        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-user/">mailing
-        list archive</a>.
-        <br />
-        <br />
-        The developers mailing list is dev@geronimo.apache.org, a
-        high-volume list currently receiving from 600 to 1,000 messages
-        a month. You can subscribe by sending an e-mail to
-        <a href="mailto:dev-subscribe@geronimo.apache.org">dev-subscribe@geronimo.apache.org</a>. To catch up on old messages, read the
-        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-dev/">mailing
-        list archive</a>.
-      </blockquote>
-    </p>
+                <strong>
+                    I'd like to find out more about the project and
+                    possibly contribute. What do I do next?
+                </strong>
+                
+                <blockquote>
+                    Participation on the project is via the mailing
+                    list and the source code repository. You join by subscribing
+                    to the mailing list and participating in discussions. You
+                    can help by contributing your ideas, enthusiasm, code,
+                    documentation, and tests. The fundamental tenet of the Apache
+                    Software Foundation is that great communities build great
+                    code. The emphasis is on community; the code comes from that.
+                    If you want to help, just join the mailing list, see what
+                    needs to be done, and do it. Welcome!
+                </blockquote>
+            </p>
                                                                                 <p>
-      <strong>Does this project use a wiki?
-      </strong>
-      <blockquote>
-        It does - the
-        <a href="http://wiki.apache.org/geronimo/FrontPage">Geronimo wiki</a>
-        complements the work taking place on the mailing list and provides
-        additional information on the project. To track changes to the wiki,
-        visit the <a href="http://wiki.apache.org/geronimo/RecentChanges">recent
-        changes</a> page.
-      </blockquote>
-</p>
+                <strong>Where is the mailing list, and how can I subscribe?</strong>
+                <blockquote>
+                    The users mailing list is user@geronimo.apache.org. You can subscribe by sending an e-mail to
+                    <a href="mailto:user-subscribe@geronimo.apache.org">user-subscribe@geronimo.apache.org</a>.
+                    To catch up on old messages, read the
+                    <a href="http://mail-archives.apache.org/mod_mbox/geronimo-user/">mailing
+                    list archive</a>.
+                    <br />
+                            <br />
+                    The developers mailing list is dev@geronimo.apache.org, a
+                    high-volume list currently receiving from 600 to 1,000 messages
+                    a month. You can subscribe by sending an e-mail to
+                    <a href="mailto:dev-subscribe@geronimo.apache.org">dev-subscribe@geronimo.apache.org</a>.
+                    To catch up on old messages, read the
+                    <a href="http://mail-archives.apache.org/mod_mbox/geronimo-dev/">mailing
+                    list archive</a>.
+                </blockquote>
+            </p>
+                                                                                <p>
+                <strong>Does this project use a wiki?</strong>
+                <blockquote>
+                    It does - the
+                    <a href="http://wiki.apache.org/geronimo/FrontPage">Geronimo wiki</a>
+                    complements the work taking place on the mailing list and provides
+                    additional information on the project. To track changes to the wiki,
+                    visit the <a href="http://wiki.apache.org/geronimo/RecentChanges">recent
+                    changes</a> page.
+                </blockquote>
+            </p>
                                                 </p>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/found-a-bug.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/found-a-bug.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/found-a-bug.html (original)
+++ geronimo/site/trunk/docs/found-a-bug.html Tue Jul 25 00:42:20 2006
@@ -238,40 +238,40 @@
         <td>
             <p>
                                                             <p>
-If you think you've found a problem with Geronimo, there are several ways
-to proceed.
-</p>
+                If you think you've found a problem with Geronimo, there are several ways
+                to proceed.
+            </p>
                                                                                 <p>
-You can begin by raising the issue on the Geronimo User mailing list
-(see <a href="mailing.html">Mailing Lists</a>).
-</p>
+                You can begin by raising the issue on the Geronimo User mailing list
+                (see <a href="mailing.html">Mailing Lists</a>).
+            </p>
                                                                                 <p>
-You can also search JIRA, our issue-tracking system, to see if the problem
-has already been noted (visit <a href="http://issues.apache.org/jira/browse/GERONIMO">JIRA</a>).
-If the issue is not listed there, you can add a new JIRA issue describing
-it.  Please include detailed steps to reproduce the problem.
-</p>
+                You can also search JIRA, our issue-tracking system, to see if the problem
+                has already been noted (visit <a href="http://issues.apache.org/jira/browse/GERONIMO">JIRA</a>).
+                If the issue is not listed there, you can add a new JIRA issue describing
+                it.  Please include detailed steps to reproduce the problem.
+            </p>
                                                                                 <p>
-If you have a fix for the issue, you can generate a patch file to send
-the fix to us.  You need to check out the current source code from Subversion
-(see <a href="svn.html">Source Code</a>), make
-the necessary changes, and then do a full build with all tests enabled and
-make sure the server still starts and runs as expected (try <tt>maven -o clean
-new</tt> to run a full build), and of course, confirm that the problem is
-actually fixed.  Then, go to the base directory of your Geronimo checkout,
-and run a command like
-<tt>svn diff &gt; fix-for-my-bug.patch</tt> to generate a patch file.
-</p>
+                If you have a fix for the issue, you can generate a patch file to send
+                the fix to us.  You need to check out the current source code from Subversion
+                (see <a href="svn.html">Source Code</a>), make
+                the necessary changes, and then do a full build with all tests enabled and
+                make sure the server still starts and runs as expected (try <tt>maven -o clean
+                new</tt> to run a full build), and of course, confirm that the problem is
+                actually fixed.  Then, go to the base directory of your Geronimo checkout,
+                and run a command like
+                <tt>svn diff &gt; fix-for-my-bug.patch</tt> to generate a patch file.
+            </p>
                                                                                 <p>
-To submit a patch, create an issue in
-<a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220">JIRA</a>
-that describes the problem, and add your patch file as an attachment.  Please
-include detailed steps to reproduce the problem in the issue description,
-and a test case in the patch where possible.
-</p>
+                To submit a patch, create an issue in
+                <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220">JIRA</a>
+                that describes the problem, and add your patch file as an attachment.  Please
+                include detailed steps to reproduce the problem in the issue description,
+                and a test case in the patch where possible.
+            </p>
                                                                                 <p>
-Thanks for working with us to improve Apache Geronimo!
-</p>
+                Thanks for working with us to improve Apache Geronimo!
+            </p>
                                                 </p>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/get-involved.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/get-involved.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/get-involved.html (original)
+++ geronimo/site/trunk/docs/get-involved.html Tue Jul 25 00:42:20 2006
@@ -238,8 +238,9 @@
         <td>
             <p>
                                                             <p>
-    The Apache Geronimo project was built by the open source community for the open source community – we welcome your input and contributions!
-</p>
+                The Apache Geronimo project was built by the open source community
+                for the open source community – we welcome your input and contributions!
+            </p>
                                                                                 <table border="0" cellspacing="0" cellpadding="0" width="100%">
     <tr>
         <td>
@@ -251,12 +252,12 @@
         <td>
             <blockquote>
                                                             <ul>
-    <li style="list-style-type:square">Source code and fixes contributions</li>
-	<li style="list-style-type:square">Documentation assistance</li>
-	<li style="list-style-type:square">Product and feature suggestions</li>
-	<li style="list-style-type:square">Detailed and constructive feedback</li>
-	<li style="list-style-type:square">Articles and whitepapers</li>
-  </ul>
+                    <li style="list-style-type:square">Source code and fixes contributions</li>
+                    <li style="list-style-type:square">Documentation assistance</li>
+                    <li style="list-style-type:square">Product and feature suggestions</li>
+                    <li style="list-style-type:square">Detailed and constructive feedback</li>
+                    <li style="list-style-type:square">Articles and whitepapers</li>
+                </ul>
                                                 </blockquote>
         </td>
     </tr>
@@ -278,11 +279,11 @@
         <td>
             <blockquote>
                                                             <ul>
-    <li style="list-style-type:square">To discuss Apache Geronimo topics check out the <a href="mailing.html">mailling lists</a>.</li>
-	<li style="list-style-type:square">Informal discussion also occurs on the <a href="irc://irc.freenode.net/geronimo">#geronimo IRC channel</a> on <a href="http://freenode.net/">freenode.net</a>.(<a href="http://www.irchelp.org/">Help with IRC</a>). A log of this discussion can be found <a href="http://servlet.uwyn.com/drone/log/bevinbot/geronimo">here</a>.</li>
-	<li style="list-style-type:square">Bugs and other issues can be posted on the project <a href="http://issues.apache.org/jira/browse/GERONIMO">JIRA</a>.</li>
-	<li style="list-style-type:square">Additional documentation and discussion can be found on the project <a href="http://cwiki.apache.org/geronimo/">wiki</a>.</li>
-  </ul>
+                    <li style="list-style-type:square">To discuss Apache Geronimo topics check out the <a href="mailing.html">mailling lists</a>.</li>
+                    <li style="list-style-type:square">Informal discussion also occurs on the <a href="irc://irc.freenode.net/geronimo">#geronimo IRC channel</a> on <a href="http://freenode.net/">freenode.net</a>.(<a href="http://www.irchelp.org/">Help with IRC</a>). A log of this discussion can be found <a href="http://servlet.uwyn.com/drone/log/bevinbot/geronimo">here</a>.</li>
+                    <li style="list-style-type:square">Bugs and other issues can be posted on the project <a href="http://issues.apache.org/jira/browse/GERONIMO">JIRA</a>.</li>
+                    <li style="list-style-type:square">Additional documentation and discussion can be found on the project <a href="http://cwiki.apache.org/geronimo/">wiki</a>.</li>
+                </ul>
                                                 </blockquote>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/mailing.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/mailing.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/mailing.html (original)
+++ geronimo/site/trunk/docs/mailing.html Tue Jul 25 00:42:20 2006
@@ -238,8 +238,8 @@
         <td>
             <p>
                                                             <p>
-There are currently three publicly available mailing lists for Geronimo:
-</p>
+                There are currently three publicly available mailing lists for Geronimo:
+            </p>
                                                                                 <table border="0" cellspacing="0" cellpadding="0" width="100%">
     <tr>
         <td>
@@ -250,18 +250,34 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p>The user mailing list is for users of Geronimo to share their experiences and ask questions.  Many of the developers monitor that list as well, to make sure questions don't go unanswered.  Currently this list has relatively low traffic, although it is increasing after the release of Geronimo V1.0.</p>
+                                                            <p>
+                    The user mailing list is for users of Geronimo to share their 
+                    experiences and ask questions.  Many of the developers monitor 
+                    that list as well, to make sure questions don't go unanswered.
+                    Currently this list has relatively low traffic, although it is 
+                    increasing after the release of Geronimo V1.0.
+                </p>
                                                                                 <ul>
-  <li style="list-style-type:square"><a href="mailto:user-subscribe@geronimo.apache.org">Subscribe</a> to user@geronimo.apache.org</li>
-  <li style="list-style-type:square"><a href="mailto:user-unsubscribe@geronimo.apache.org">Unsubscribe</a> from user@geronimo.apache.org</li>
-</ul>
+                    <li style="list-style-type:square">
+                        <a href="mailto:user-subscribe@geronimo.apache.org">Subscribe</a> to user@geronimo.apache.org</li>
+                    <li style="list-style-type:square">
+                        <a href="mailto:user-unsubscribe@geronimo.apache.org">Unsubscribe</a> from user@geronimo.apache.org</li>
+                </ul>
                                                                                 <b>Archives:</b>
                                                                                 <ul type="disc">
-  <li style="list-style-type:square"><a href="http://mail-archives.apache.org/mod_mbox/geronimo-user/">Apache mod_mbox</a></li>
-  <li style="list-style-type:square"><a href="http://www.mail-archive.com/user%40geronimo.apache.org/">mail-archive</a></li>
-  <li style="list-style-type:square"><a href="http://marc.theaimsgroup.com/?l=geronimo-user&amp;r=1&amp;w=2">MARC</a></li>
-  <li style="list-style-type:square"><a href="http://news.gmane.org/gmane.comp.java.geronimo.user">GMANE</a></li>
-</ul>
+                    <li style="list-style-type:square">
+                        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-user/">Apache mod_mbox</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://www.mail-archive.com/user%40geronimo.apache.org/">mail-archive</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://marc.theaimsgroup.com/?l=geronimo-user&amp;r=1&amp;w=2">MARC</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://news.gmane.org/gmane.comp.java.geronimo.user">GMANE</a>
+                    </li>
+                </ul>
                                                 </blockquote>
         </td>
     </tr>
@@ -282,18 +298,34 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p>The developer mailing list is used by the developers to discuss plans, make decisions, vote on technical issues, etc.  It also gets change notices whenever issues are added to or updated in JIRA.  This list has a higher volume, though some conversations take place on <a href="get-involved.html#irc-channel">IRC</a> as well.</p>
+                                                            <p>
+                    The developer mailing list is used by the developers to discuss 
+                    plans, make decisions, vote on technical issues, etc.  It also 
+                    gets change notices whenever issues are added to or updated in JIRA.
+                    This list has a higher volume, though some conversations take place on 
+                    <a href="get-involved.html#irc-channel">IRC</a> as well.
+                </p>
                                                                                 <ul>
-  <li style="list-style-type:square"><a href="mailto:dev-subscribe@geronimo.apache.org">Subscribe</a> to dev@geronimo.apache.org</li>
-  <li style="list-style-type:square"><a href="mailto:dev-unsubscribe@geronimo.apache.org">Unsubscribe</a> from dev@geronimo.apache.org</li>
-</ul>
+                    <li style="list-style-type:square">
+                        <a href="mailto:dev-subscribe@geronimo.apache.org">Subscribe</a> to dev@geronimo.apache.org</li>
+                    <li style="list-style-type:square">
+                        <a href="mailto:dev-unsubscribe@geronimo.apache.org">Unsubscribe</a> from dev@geronimo.apache.org</li>
+                </ul>
                                                                                 <b>Archives:</b>
                                                                                 <ul type="disc">
-  <li style="list-style-type:square"><a href="http://mail-archives.apache.org/mod_mbox/geronimo-dev/">Apache mod_mbox</a></li>
-  <li style="list-style-type:square"><a href="http://www.mail-archive.com/dev%40geronimo.apache.org/">mail-archive</a></li>
-  <li style="list-style-type:square"><a href="http://marc.theaimsgroup.com/?l=geronimo-dev&amp;r=1&amp;w=2">MARC</a></li>
-  <li style="list-style-type:square"><a href="http://news.gmane.org/gmane.comp.java.geronimo.devel">GMANE</a></li>
-</ul>
+                    <li style="list-style-type:square">
+                        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-dev/">Apache mod_mbox</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://www.mail-archive.com/dev%40geronimo.apache.org/">mail-archive</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://marc.theaimsgroup.com/?l=geronimo-dev&amp;r=1&amp;w=2">MARC</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://news.gmane.org/gmane.comp.java.geronimo.devel">GMANE</a>
+                    </li>
+                </ul>
                                                 </blockquote>
         </td>
     </tr>
@@ -314,16 +346,26 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p>This list receives notifications (with diffs) every time a change is committed to the Geronimo source tree.  It also receives change notices for changes to the Geronimo Wiki.</p>
+                                                            <p>
+                    This list receives notifications (with diffs) every time a change
+                    is committed to the Geronimo source tree.  It also receives change
+                    notices for changes to the Geronimo Wiki.
+                </p>
                                                                                 <ul>
-  <li style="list-style-type:square"><a href="mailto:scm-subscribe@geronimo.apache.org">Subscribe</a> to scm@geronimo.apache.org</li>
-  <li style="list-style-type:square"><a href="mailto:scm-unsubscribe@geronimo.apache.org">Unsubscribe</a> from scm@geronimo.apache.org</li>
-</ul>
+                    <li style="list-style-type:square">
+                        <a href="mailto:scm-subscribe@geronimo.apache.org">Subscribe</a> to scm@geronimo.apache.org</li>
+                    <li style="list-style-type:square">
+                        <a href="mailto:scm-unsubscribe@geronimo.apache.org">Unsubscribe</a> from scm@geronimo.apache.org</li>
+                </ul>
                                                                                 <b>Archives:</b>
                                                                                 <ul type="disc">
-  <li style="list-style-type:square"><a href="http://mail-archives.apache.org/mod_mbox/geronimo-scm/">Apache mod_mbox</a></li>
-  <li style="list-style-type:square"><a href="http://news.gmane.org/gmane.comp.java.geronimo.cvs">GMANE</a></li>
-</ul>
+                    <li style="list-style-type:square">
+                        <a href="http://mail-archives.apache.org/mod_mbox/geronimo-scm/">Apache mod_mbox</a>
+                    </li>
+                    <li style="list-style-type:square">
+                        <a href="http://news.gmane.org/gmane.comp.java.geronimo.cvs">GMANE</a>
+                    </li>
+                </ul>
                                                 </blockquote>
         </td>
     </tr>
@@ -344,7 +386,13 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p>The Geronimo PMC has a mailing list to resolve any administrative issues, and the group working on TCK has a mailing list to discuss compliance issues. The first is limited to PMC members (most committers on the project), while the second is limited to committers who have signed an NDA to work on the TCK compliance effort.</p>
+                                                            <p>
+                    The Geronimo PMC has a mailing list to resolve any administrative
+                    issues, and the group working on TCK has a mailing list to discuss
+                    compliance issues. The first is limited to PMC members (most
+                    committers on the project), while the second is limited to committers
+                    who have signed an NDA to work on the TCK compliance effort.
+                </p>
                                                 </blockquote>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/newshistory.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/newshistory.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/newshistory.html (original)
+++ geronimo/site/trunk/docs/newshistory.html Tue Jul 25 00:42:20 2006
@@ -247,133 +247,166 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p>                2006-01-05<br />                <strong>Geronimo Version 1.0 is now Available</strong>                <blockquote>                        Geronimo Version 1.0 which has passed the J2EE Certification Test Suite is now available for download <a href="downloads.html">here</a>. This release represents the combined efforts of many engineers from several OpenSource projects and individual contributors from around the world. Please download, use the product and provide your comments and feedback to <a href="mailto:user@geronimo.apache.org">user@geronimo.apache.org</a>.
-                </blockquote>
-                <hr color="#666666" width="100%" size="2" />
-    </p>
-                                                                                <p>
-		2005-11-01<br />
-       <strong>Virtuas Announces Support for Apache Geronimo</strong>
-        <blockquote>
-          <a href="http://www.virtuas.com/">Virtuas</a> 
-          <a href="http://home.businesswire.com/portal/site/google/index.jsp?ndmViewId=news_view&amp;newsId=20051101006492&amp;newsLang=en">announced</a>
-          support for Apache Geronimo, starting with the M5 certified release.
-        </blockquote>
-		<hr color="#666666" width="100%" size="2" />
-    </p>
-                                                                                <p>
-		2005-10-25<br />
-       <strong>IBM Announces WebSphere Community Edition, based on Apache Geronimo</strong>
-        <blockquote>
-          Today <a href="http://www.ibm.com/">IBM</a> announced a new product, 
-          <a href="http://www-306.ibm.com/software/info1/websphere/index.jsp?tab=landings/was-ce">
-          WebSphere Application Server Community Edition</a> based on Apache Geronimo.
-        </blockquote>
-		<hr color="#666666" width="100%" size="2" /> 
-    </p>
-                                                                                <p>
-		2005-10-05<br />
-		<strong>Apache Geronimo 1.0-M5 Released : Certified J2EE 1.4 Server</strong>
-		<blockquote>
-			With great pleasure the Apache Geronimo Team would like to announce the official release of Milestone 5 (M5) of Apache Geronimo.
+                                                            <p>
+                    2006-01-05<br />
+                    <strong>Geronimo Version 1.0 is now Available</strong>
+                    <blockquote>
+                        Geronimo Version 1.0 which has passed the J2EE Certification Test Suite
+                        is now available for download <a href="downloads.html">here</a>.
+                        This release represents the combined efforts of many engineers from
+                        several OpenSource projects and individual contributors from around the world.
+                        Please download, use the product and provide your comments and feedback to
+                        <a href="mailto:user@geronimo.apache.org">user@geronimo.apache.org</a>.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-11-01<br />
+                    <strong>Virtuas Announces Support for Apache Geronimo</strong>
+                    <blockquote>
+                        <a href="http://www.virtuas.com/">Virtuas</a>
+                        <a href="http://home.businesswire.com/portal/site/google/index.jsp?ndmViewId=news_view&amp;newsId=20051101006492&amp;newsLang=en">announced</a>
+                        support for Apache Geronimo, starting with the M5 certified release.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-10-25<br />
+                    <strong>IBM Announces WebSphere Community Edition, based on Apache Geronimo</strong>
+                    <blockquote>
+                        Today <a href="http://www.ibm.com/">IBM</a> announced a new product, 
+                        <a href="http://www-306.ibm.com/software/info1/websphere/index.jsp?tab=landings/was-ce">
+                        WebSphere Application Server Community Edition</a> based on Apache Geronimo.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-10-05<br />
+                    <strong>Apache Geronimo 1.0-M5 Released : Certified J2EE 1.4 Server</strong>
+                    <blockquote>
+			With great pleasure the Apache Geronimo Team would like to announce the 
+                        official release of Milestone 5 (M5) of Apache Geronimo.
 			Significant Changes Since the M4 Release
 			<ul>
-				<li style="list-style-type:square">Official J2EE 1.4 Certification</li>
-				<li style="list-style-type:square">Complete Tomcat integration</li>
-				<li style="list-style-type:square">Configuration of ports, hosts, and most other attributes without rebuilding the server</li>
-				<li style="list-style-type:square">Developer preview of web management console</li>
-			</ul>
+                            <li style="list-style-type:square">Official J2EE 1.4 Certification</li>
+                            <li style="list-style-type:square">Complete Tomcat integration</li>
+                            <li style="list-style-type:square">Configuration of ports, hosts, and most other attributes without rebuilding the server</li>
+                            <li style="list-style-type:square">Developer preview of web management console</li>
+                        </ul>
 			All release materials can be downloaded from the <a href="downloads.html">Download</a> page.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-09-13<br />
-		<strong>Geronimo Tooling for Eclipse</strong>
-		<blockquote>
-			The WTP Geronimo Server Adapter now being developed under the Geronimo Development Tools <a href="devtools.html">subproject</a>. It is no longer being hosted and developed under Eclipse. Re-visit the <a href="http://www.ibm.com/developerworks/opensource/library/os-gerplug/">article</a> on this plug-in.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" /> 
-	</p>
-                                                                                <p>
-		2005-08-28<br />
-		<strong>Apache Geronimo Now With LDAP</strong>
-		<blockquote>
-			Apache Geronimo now includes <a href="http://directory.apache.org/">Apache Directory</a> which allows Geronimo to provide and build on a unified security layer for applications. Geronimo can now offer a framework for certificate management and platform for single-signon.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-08-25<br />
-		<strong>Geronimo Book Update</strong>
-		<blockquote>
-			Aaron Mulder's online book <a href="http://chariotsolutions.com/geronimo/">Apache Geronimo Development and Deployment</a> has been updated to cover the Milestone 4 release.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-08-10<br />
-		<strong>Milestone 4 Released</strong>
-		<blockquote>
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-09-13<br />
+                    <strong>Geronimo Tooling for Eclipse</strong>
+                    <blockquote>
+			The WTP Geronimo Server Adapter now being developed under the Geronimo 
+                        Development Tools <a href="devtools.html">subproject</a>. It is no longer 
+                        being hosted and developed under Eclipse. Re-visit the 
+                        <a href="http://www.ibm.com/developerworks/opensource/library/os-gerplug/">article</a> 
+                        on this plug-in.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-08-28<br />
+                    <strong>Apache Geronimo Now With LDAP</strong>
+                    <blockquote>
+			Apache Geronimo now includes <a href="http://directory.apache.org/">Apache Directory</a>
+                        which allows Geronimo to provide and build on a unified security layer for applications.
+                        Geronimo can now offer a framework for certificate management and platform for single-signon.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-08-25<br />
+                    <strong>Geronimo Book Update</strong>
+                    <blockquote>
+			Aaron Mulder's online book <a href="http://chariotsolutions.com/geronimo/">Apache Geronimo Development and Deployment</a>
+                        has been updated to cover the Milestone 4 release.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-08-10<br />
+                    <strong>Milestone 4 Released</strong>
+                    <blockquote>
 			The Milestone 4 release has been posted for download. Major improvements include:
 			<ul>
-				<li style="list-style-type:square">EJB support is complete</li>
-				<li style="list-style-type:square">Web Services support is complete</li>
-				<li style="list-style-type:square">JSR-77 support, including the Management EJB</li>
-				<li style="list-style-type:square">Security configuration has changed dramatically</li>
-			</ul>
-			This release is feature complete and passes the J2EE TCK automated test suite, but full certification is not yet complete. Please visit the <a href="downloads.html">Download</a> page and take a look at the <a href="http://cvs.apache.org/dist/geronimo/1.0-M4/RELEASE-NOTES-1.0-M4.txt">release notes</a>.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-07-11<br />
-		<strong>Apache Geronimo First OSS App Server With JBI Support</strong>
-		<blockquote>
-			The standard Apache Geronimo deployer now supports JBI deployment units - any jar which includes META-INF/jbi.xml) - in order to auto-deploy JBI components and serivce assemblies. JBI support provided by the <a href="http://servicemix.org/">ServiceMix</a> Open Source Enterprise Service Bus. We will be acquiring a TCK license to certifiy that we conform to the JSR-208 standard.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-06-30<br />
-		<strong>Apache Geronimo passes TCK 1.4.1a test suite</strong>
-		<blockquote>
-			The Apache Geronimo team is proud to announce that Apache Geronimo passes the J2EE TCK 1.4.1a test suite. Congratulations to all and thanks for all the hard work. There is some remaining work to do, and the team will continue to complete our initial project goal, full J2EE certification.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-06-21<br />
-		<strong>Apache Geronimo Resource Page at IBM DevWorks</strong>
-		<blockquote>
-			IBM has created an Apache Geronimo resource site at <a href="http://www.ibm.com/developerworks/opensource/top-projects/geronimo.html">developerWorks</a>.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-06-11<br />
-		<strong>Free Book on Geronimo</strong>
-		<blockquote>
-			Katia Aresti González has made her book on Apache Geronimo titled <a href="http://nuxor.net/katia/geronimospanish.pdf">Estudio del servidor Geronimo y desarrollo de aplicaciones prácticas</a> available as a free download. Written in Spanish, the book is available under the terms of the Creative Commons license. 
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-05-06<br />
-		<strong>Geronimo Tooling for Eclipse</strong>
-		<blockquote>
-			IBM contributes <a href="http://www.eclipse.org/webtools/jst/components/server/M4/news/geronimo.html">tooling</a> for Geronimo to the Eclipse Web Tools Project. There's also a good article about it <a href="http://www-128.ibm.com/developerworks/opensource/library/os-gerplug/">here</a>.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2005-01-01<br />
-		<strong>Geronimo in CTS Testing</strong>
-		<blockquote>
-			The Apache Geronimo server is now in CTS (TCK) testing. This is a long process, but this is the final phase in delivering a certified J2EE 1.4 server. Stay tuned!
-		</blockquote>
-<!--		<hr color="#666666" width="100%" size="2"/> -->
-	</p>
+                            <li style="list-style-type:square">EJB support is complete</li>
+                            <li style="list-style-type:square">Web Services support is complete</li>
+                            <li style="list-style-type:square">JSR-77 support, including the Management EJB</li>
+                            <li style="list-style-type:square">Security configuration has changed dramatically</li>
+                        </ul>
+			This release is feature complete and passes the J2EE TCK automated test suite, but full 
+                        certification is not yet complete. Please visit the <a href="downloads.html">Download</a> 
+                        page and take a look at the <a href="http://cvs.apache.org/dist/geronimo/1.0-M4/RELEASE-NOTES-1.0-M4.txt">release notes</a>.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-07-11<br />
+                    <strong>Apache Geronimo First OSS App Server With JBI Support</strong>
+                    <blockquote>
+			The standard Apache Geronimo deployer now supports JBI deployment units - 
+                        any jar which includes META-INF/jbi.xml) - in order to auto-deploy JBI components 
+                        and serivce assemblies. JBI support provided by the <a href="http://servicemix.org/">ServiceMix</a> 
+                        Open Source Enterprise Service Bus. We will be acquiring a TCK license to certifiy that 
+                        we conform to the JSR-208 standard.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-06-30<br />
+                    <strong>Apache Geronimo passes TCK 1.4.1a test suite</strong>
+                    <blockquote>
+			The Apache Geronimo team is proud to announce that Apache Geronimo 
+                        passes the J2EE TCK 1.4.1a test suite. Congratulations to all and 
+                        thanks for all the hard work. There is some remaining work to do, 
+                        and the team will continue to complete our initial project goal, 
+                        full J2EE certification.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-06-21<br />
+                    <strong>Apache Geronimo Resource Page at IBM DevWorks</strong>
+                    <blockquote>
+			IBM has created an Apache Geronimo resource site at
+                        <a href="http://www.ibm.com/developerworks/opensource/top-projects/geronimo.html">developerWorks</a>.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-06-11<br />
+                    <strong>Free Book on Geronimo</strong>
+                    <blockquote>
+			Katia Aresti González has made her book on Apache Geronimo titled
+                        <a href="http://nuxor.net/katia/geronimospanish.pdf">Estudio del servidor Geronimo y desarrollo de aplicaciones prácticas</a>
+                        available as a free download. Written in Spanish, the book is available
+                        under the terms of the Creative Commons license. 
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-05-06<br />
+                    <strong>Geronimo Tooling for Eclipse</strong>
+                    <blockquote>
+			IBM contributes <a href="http://www.eclipse.org/webtools/jst/components/server/M4/news/geronimo.html">tooling</a>
+                        for Geronimo to the Eclipse Web Tools Project. There's also a good article about it 
+                        <a href="http://www-128.ibm.com/developerworks/opensource/library/os-gerplug/">here</a>.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2005-01-01<br />
+                    <strong>Geronimo in CTS Testing</strong>
+                    <blockquote>
+			The Apache Geronimo server is now in CTS (TCK) testing. This is a long process, 
+                        but this is the final phase in delivering a certified J2EE 1.4 server. Stay tuned!
+                    </blockquote>
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -395,21 +428,25 @@
         <td>
             <blockquote>
                                                             <p>
-		2004-10-30<br />
-		<strong>Response on code concerns</strong>
-		<blockquote>
-			The Apache Software Foundation has sent a response to the attorneys representing JBoss Inc. detailing our conclusions related to the letter from Oct 31, 2003. Copies of the <a href="20031031_jboss.pdf">original letter</a> and the <a href="20041028_jbossresponse.pdf">response</a> are available for inspection.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2004-11-10<br />
-		<strong>Milestone 3 Released</strong>
-		<blockquote>
-			The Milestone 3 release has been posted for download. Visit the <a href="downloads.html">Download</a> page and take a look at the <a href="http://cvs.apache.org/dist/geronimo/v1.0-M3/RELEASE-NOTES-1.0-M3.txt">release notes</a>!
-		</blockquote>
-<!--		<hr color="#666666" width="100%" size="2"/> -->
-	</p>
+                    2004-10-30<br />
+                    <strong>Response on code concerns</strong>
+                    <blockquote>
+			The Apache Software Foundation has sent a response to the attorneys 
+                        representing JBoss Inc. detailing our conclusions related to the 
+                        letter from Oct 31, 2003. Copies of the <a href="20031031_jboss.pdf">original letter</a>
+                        and the <a href="20041028_jbossresponse.pdf">response</a> are available for inspection.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2004-11-10<br />
+                    <strong>Milestone 3 Released</strong>
+                    <blockquote>
+			The Milestone 3 release has been posted for download. Visit the 
+                        <a href="downloads.html">Download</a> page and take a look at the 
+                        <a href="http://cvs.apache.org/dist/geronimo/v1.0-M3/RELEASE-NOTES-1.0-M3.txt">release notes</a>!
+                    </blockquote>
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -431,21 +468,27 @@
         <td>
             <blockquote>
                                                             <p>
-		2003-11-18<br />
-		<strong>ASF as OSS J2EE TCK Licensee</strong>
-		<blockquote>
-			The Apache Software Foundation becomes the first open-source J2EE(tm) TCK licensee. Taking advantage of the result of changes to the Java Community Process that allow open source implementations of Java specificaitons, the Geronimo project is now able to test and certify the codebase. Testing will begin at the appropriate time.
-		</blockquote>
-		<hr color="#666666" width="100%" size="2" />
-	</p>
-                                                                                <p>
-		2003-11-11 <br />
-		<strong>Questions about Code</strong>
-		<blockquote>
-			We have recieved a mail  <a href="20031031_jboss.pdf">a letter on behalf of the JBoss Group, LCC dated October 31, 2003</a> that asks for clarifications regarding similarity between parts of the Geronimo codebase and the JBoss codebase. We are in the process of actively reviewing not only the specific claims but also the code base in general.
-		</blockquote>
-<!--		<hr color="#666666" width="100%" size="2"/> -->
-	</p>
+                    2003-11-18<br />
+                    <strong>ASF as OSS J2EE TCK Licensee</strong>
+                    <blockquote>
+			The Apache Software Foundation becomes the first open-source 
+                        J2EE(tm) TCK licensee. Taking advantage of the result of changes 
+                        to the Java Community Process that allow open source implementations 
+                        of Java specificaitons, the Geronimo project is now able to test and 
+                        certify the codebase. Testing will begin at the appropriate time.
+                    </blockquote>
+                    <hr color="#666666" width="100%" size="2" />
+                </p>
+                                                                                <p>
+                    2003-11-11 <br />
+                    <strong>Questions about Code</strong>
+                    <blockquote>
+			We have recieved a mail <a href="20031031_jboss.pdf">a letter on behalf of the JBoss Group, LCC dated October 31, 2003</a>
+                        that asks for clarifications regarding similarity between parts of the 
+                        Geronimo codebase and the JBoss codebase. We are in the process of actively 
+                        reviewing not only the specific claims but also the code base in general.
+                    </blockquote>
+                </p>
                                                 </blockquote>
         </td>
     </tr>

Modified: geronimo/site/trunk/docs/powered_by.html
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/docs/powered_by.html?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/docs/powered_by.html (original)
+++ geronimo/site/trunk/docs/powered_by.html Tue Jul 25 00:42:20 2006
@@ -238,9 +238,9 @@
         <td>
             <p>
                                                             <p>
-Below is a list of companies already providing services and support for
-Apache Geronimo:
-</p>
+                Below is a list of companies already providing services and support for
+                Apache Geronimo:
+            </p>
                                                                                 <table border="0" cellspacing="0" cellpadding="0" width="100%">
     <tr>
         <td>
@@ -251,8 +251,15 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p><a href="http://www.chariotsolutions.com/">Chariot Solutions</a> is a Java/J2EE architecture and development consulting firm.  With deep expertise in enterprise  architecture, systems integration, application security, performance tuning, technology mentoring, and open source, Chariot can help make the most of any Geronimo deployment.  For more, see how Chariot is <a href="http://www.chariotsolutions.com/geronimo/">involved with Geronimo</a> and visit our <a href="http://www.chariotsolutions.com/javalab/presentations.jsp">recent presentations</a>.
-</p>
+                                                            <p>
+                    <a href="http://www.chariotsolutions.com/">Chariot Solutions</a>
+                    is a Java/J2EE architecture and development consulting firm.
+                    With deep expertise in enterprise  architecture, systems integration,
+                    application security, performance tuning, technology mentoring,
+                    and open source, Chariot can help make the most of any Geronimo deployment.
+                    For more, see how Chariot is <a href="http://www.chariotsolutions.com/geronimo/">involved with Geronimo</a>
+                    and visit our <a href="http://www.chariotsolutions.com/javalab/presentations.jsp">recent presentations</a>.
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -273,8 +280,17 @@
     <tr>
         <td>
             <blockquote>
-                                                            <p><a href="http://www.covalent.net">Covalent Technologies</a> offers full commercial development and production-level technical support and professional services for Apache Geronimo.  Founded in 1998, Covalent Technologies is the leading provider of products and services for the Apache Tomcat Application Server, Apache Geronimo Application Server, Apache Axis Web Services Framework, and Apache HTTP, the world's leading Web server. Covalent is one of the few sources for full commercial support for Apache, Tomcat, Geronimo and Axis on a global basis.
-</p>
+                                                            <p>
+                    <a href="http://www.covalent.net">Covalent Technologies</a>
+                    offers full commercial development and production-level technical
+                    support and professional services for Apache Geronimo.  Founded in 1998,
+                    Covalent Technologies is the leading provider of products and
+                    services for the Apache Tomcat Application Server,
+                    Apache Geronimo Application Server, Apache Axis Web Services Framework,
+                    and Apache HTTP, the world's leading Web server. Covalent is one of the
+                    few sources for full commercial support for Apache, Tomcat, Geronimo and 
+                    Axis on a global basis.
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -296,8 +312,16 @@
         <td>
             <blockquote>
                                                             <p>
-As the market leader in application middleware, IBM is an active contributor to the Apache Geronimo project. IBM provides expert technical support through the <a href="http://www.ibm.com/software/webservers/appserv/geronimo/support/">IBM Support for Apache Geronimo</a> Web site and offers developer articles and tutorials through <a href="http://www.ibm.com/developerworks/opensource/top-projects/geronimo.html">IBM developerWorks</a>. IBM also provides a lightweight J2EE application server based on Apache Geronimo, visit the <a href="http://www.ibm.com/developerworks/websphere/zones/was/wasce.html">WebSphere Application Server Community Edition</a> Web site for additional information.
-</p>
+                    As the market leader in application middleware, IBM is an
+                    active contributor to the Apache Geronimo project. IBM
+                    provides expert technical support through the
+                    <a href="http://www.ibm.com/software/webservers/appserv/geronimo/support/">IBM Support for Apache Geronimo</a>
+                    Web site and offers developer articles and tutorials through
+                    <a href="http://www.ibm.com/developerworks/opensource/top-projects/geronimo.html">IBM developerWorks</a>.
+                    IBM also provides a lightweight J2EE application server based on Apache Geronimo,
+                    visit the <a href="http://www.ibm.com/developerworks/websphere/zones/was/wasce.html">WebSphere Application Server Community Edition</a>
+                    Web site for additional information.
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -319,8 +343,16 @@
         <td>
             <blockquote>
                                                             <p>
-Founded in 2005 by the architects of the ActiveMQ messaging platform, <a href="http://www.logicblaze.com/">LogicBlaze</a> provides development, services and support for solutions integrated with Apache Geronimo, including ActiveMQ and the ServiceMix Enterprise Service Bus. LogicBlaze's mission is to deliver services that enable open source technologies in business-critical operations; to collaborate with open source communities and projects for mutual benefit; and to support software developers, systems integrators and other business partners to advance the adoption of open source technologies in the enterprise.
-</p>
+                    Founded in 2005 by the architects of the ActiveMQ messaging platform,
+                    <a href="http://www.logicblaze.com/">LogicBlaze</a> provides development,
+                    services and support for solutions integrated with Apache Geronimo,
+                    including ActiveMQ and the ServiceMix Enterprise Service Bus.
+                    LogicBlaze's mission is to deliver services that enable open source
+                    technologies in business-critical operations; to collaborate with 
+                    open source communities and projects for mutual benefit; and to 
+                    support software developers, systems integrators and other business 
+                    partners to advance the adoption of open source technologies in the enterprise.
+                </p>
                                                 </blockquote>
         </td>
     </tr>
@@ -342,9 +374,13 @@
         <td>
             <blockquote>
                                                             <p>
-Founded in 1999, <a href="http://www.virtuas.com/">Virtuas</a> provides strategic and innovative open source solutions and consulting for enterprises worldwide. With
-multiple Apache Geronimo committers as a part of the team, Virtuas has intricate knowledge of the Geronimo code base and architecture, and can help leverage Geronimo from implementation, customization and support. Virtuas is focused on forging strong alliances with clients to share risk and foster innovation.
-</p>
+                    Founded in 1999, <a href="http://www.virtuas.com/">Virtuas</a> provides 
+                    strategic and innovative open source solutions and consulting for enterprises 
+                    worldwide. With multiple Apache Geronimo committers as a part of the team, 
+                    Virtuas has intricate knowledge of the Geronimo code base and architecture, 
+                    and can help leverage Geronimo from implementation, customization and support. 
+                    Virtuas is focused on forging strong alliances with clients to share risk and foster innovation.
+                </p>
                                                 </blockquote>
         </td>
     </tr>

Modified: geronimo/site/trunk/xdocs/contributors.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/xdocs/contributors.xml?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/xdocs/contributors.xml (original)
+++ geronimo/site/trunk/xdocs/contributors.xml Tue Jul 25 00:42:20 2006
@@ -1,5 +1,21 @@
 <?xml version="1.0"?>
 
+<!--
+    Copyright 2003-2006 The Apache Software Foundation
+    
+    Licensed 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>Apache Geronimo Committers</title>

Modified: geronimo/site/trunk/xdocs/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/xdocs/dependencies.xml?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/xdocs/dependencies.xml (original)
+++ geronimo/site/trunk/xdocs/dependencies.xml Tue Jul 25 00:42:20 2006
@@ -1,66 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright 2003-2004 The Apache Software Foundation
 
+<!--
+    Copyright 2003-2006 The Apache Software Foundation
+    
     Licensed 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
-  
+    
+        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>Apache Geronimo - Project Dependencies</title>
-  <author email="dev@geronimo.apache.org">Geronimo Documentation Team</author>
- </properties>
-
- <body>
-  <section name="The 'Mosaic'">
-
-  <p>
-  Apache Geronimo derives the majority of it's functionality from external projects.
-  These projects, which we somtimes refer to as part of the "Geronimo Mosiac", 
-  are independent, healthy open source communities with separate identity.
-  We try to collaborate with this as much as we can, working in those projects 
-  as much as we work here in Apache Geronimo.  
-  </p>
-
-  <p>
-  We believe that open source is valuable because of the communities behind the code - 
-  and in the case of Apache Geronimo, the 'mosaic' of projects brings additional
-  health and diversity that go beyond a single project.
- </p>
-
-  <p> 
-  The external dependencies of Geronimo include (among <i>many</i> others):
-  </p>
-
-  <ul>
-    <li style="list-style-type:square"><a href="http://www.openejb.org/">OpenEJB</a></li>
-    <li style="list-style-type:square"><a href="http://ws.apache.org/axis/">Apache Axis</a></li>
-    <li style="list-style-type:square"><a href="http://mx4j.sourceforge.net/">MX4J</a></li>
-    <li style="list-style-type:square"><a href="http://jetty.mortbay.org/">Jetty</a></li>
-    <li style="list-style-type:square"><a href="http://tomcat.apache.org/">Apache Tomcat</a></li>
-    <li style="list-style-type:square"><a href="http://activemq.codehaus.org/">ActiveMQ</a></li>
-    <li style="list-style-type:square"><a href="http://activeio.codehaus.org/">ActiveIO</a></li>
-    <li style="list-style-type:square"><a href="http://activecluster.codehaus.org/">ActiveCluster</a></li>
-    <li style="list-style-type:square"><a href="http://servicemix.org/">ServiceMix</a></li>
-    <li style="list-style-type:square"><a href="http://tranql.codehaus.org/">TranQL</a></li>
-    <li style="list-style-type:square"><a href="http://www.antlr.org/">Antlr</a></li>
-    <li style="list-style-type:square"><a href="http://asm.objectweb.org">ASM</a></li>
-  </ul>
+    <properties>
+        <title>Apache Geronimo - Project Dependencies</title>
+        <author email="dev@geronimo.apache.org">Geronimo Documentation Team</author>
+    </properties>
+
+    <body>
+        <section name="The 'Mosaic'">
+
+            <p>
+                Apache Geronimo derives the majority of it's functionality from external projects.
+                These projects, which we somtimes refer to as part of the "Geronimo Mosiac", 
+                are independent, healthy open source communities with separate identity.
+                We try to collaborate with this as much as we can, working in those projects 
+                as much as we work here in Apache Geronimo.
+            </p>
+
+            <p>
+                We believe that open source is valuable because of the communities behind the code - 
+                and in the case of Apache Geronimo, the 'mosaic' of projects brings additional
+                health and diversity that go beyond a single project.
+            </p>
+
+            <p>
+                The external dependencies of Geronimo include (among <i>many</i> others):
+            </p>
+
+            <ul>
+                <li style="list-style-type:square">
+                    <a href="http://www.openejb.org/">OpenEJB</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://ws.apache.org/axis/">Apache Axis</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://mx4j.sourceforge.net/">MX4J</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://jetty.mortbay.org/">Jetty</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://tomcat.apache.org/">Apache Tomcat</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://activemq.codehaus.org/">ActiveMQ</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://activeio.codehaus.org/">ActiveIO</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://activecluster.codehaus.org/">ActiveCluster</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://servicemix.org/">ServiceMix</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://tranql.codehaus.org/">TranQL</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://www.antlr.org/">Antlr</a>
+                </li>
+                <li style="list-style-type:square">
+                    <a href="http://asm.objectweb.org">ASM</a>
+                </li>
+            </ul>
 
-</section>
+        </section>
 
-</body>
+    </body>
 </document>
    

Modified: geronimo/site/trunk/xdocs/development.xml
URL: http://svn.apache.org/viewvc/geronimo/site/trunk/xdocs/development.xml?rev=425317&r1=425316&r2=425317&view=diff
==============================================================================
--- geronimo/site/trunk/xdocs/development.xml (original)
+++ geronimo/site/trunk/xdocs/development.xml Tue Jul 25 00:42:20 2006
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
-
-    Copyright 2004 The Apache Software Foundation
-
+    Copyright 2003-2006 The Apache Software Foundation
+    
     Licensed 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
-
+    
+        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.
@@ -17,31 +16,36 @@
     limitations under the License.
 -->
 
-
 <document>
 
- <properties>
-  <title>Apache Geronimo</title>
-  <author email="dev@geronimo.apache.org">Geronimo Documentation Team</author>
- </properties>
-
- <body>
-<section name="Apache Geronimo Development">
-
-<p>Find out more about the inner workings of the open source community and the Apache Software Foundation <a href="http://www.apache.org">(ASF)</a>, how the Geronimo Project is managed, the different players involved in the project, and how to contribute. 
-</p>
-
-  <ul>
-    <li style="list-style-type:square">
-	<a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-process.html">Apache Geronimo Development Process</a></li>
-	<br />
-    <li style="list-style-type:square">
-	<a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-status.html">Apache Geronimo Development Status</a></li>
-	
-</ul>
+    <properties>
+        <title>Apache Geronimo</title>
+        <author email="dev@geronimo.apache.org">Geronimo Documentation Team</author>
+    </properties>
+
+    <body>
+        <section name="Apache Geronimo Development">
+
+            <p>
+                Find out more about the inner workings of the open source
+                community and the Apache Software Foundation
+                <a href="http://www.apache.org">(ASF)</a>, how the Geronimo Project
+                is managed, the different players involved in the project, and how to contribute.
+            </p>
+
+            <ul>
+                <li style="list-style-type:square">
+                    <a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-process.html">Apache Geronimo Development Process</a>
+                </li>
+                <br />
+                <li style="list-style-type:square">
+                    <a href="http://cwiki.apache.org/GMOxPMGT/apache-geronimo-development-status.html">Apache Geronimo Development Status</a>
+                </li>
+
+            </ul>
 
-<p>Due to the frequent updates these pages are hosted at the <a href="http://cwiki.apache.org/geronimo">Apache Geronimo Wiki</a>.</p>
+            <p>Due to the frequent updates these pages are hosted at the <a href="http://cwiki.apache.org/geronimo">Apache Geronimo Wiki</a>.</p>
 
-</section>
-</body>
+        </section>
+    </body>
 </document>