You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2007/04/05 17:53:45 UTC

svn commit: r525851 - in /incubator/uima/site/trunk/uima-website: docs/ docs/downloads/gldv/ xdocs/ xdocs/downloads/gldv/ xdocs/stylesheets/

Author: twgoetz
Date: Thu Apr  5 08:53:38 2007
New Revision: 525851

URL: http://svn.apache.org/viewvc?view=rev&rev=525851
Log:
No Jira: various website updates.  GLDV page updated.  Navigation links reordered.
Separate javadocs page removed and content moved to documentation page.

Added:
    incubator/uima/site/trunk/uima-website/docs/downloads/gldv/gldv07-uima-netter.pdf   (with props)
    incubator/uima/site/trunk/uima-website/xdocs/downloads/gldv/gldv07-uima-netter.pdf   (with props)
Removed:
    incubator/uima/site/trunk/uima-website/docs/downloads/gldv/gldv07-uima-netter.doc
    incubator/uima/site/trunk/uima-website/xdocs/downloads/gldv/gldv07-uima-netter.doc
Modified:
    incubator/uima/site/trunk/uima-website/docs/apache-board-status.html
    incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html
    incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html
    incubator/uima/site/trunk/uima-website/docs/codeConventions.html
    incubator/uima/site/trunk/uima-website/docs/communication.html
    incubator/uima/site/trunk/uima-website/docs/contribution-policy.html
    incubator/uima/site/trunk/uima-website/docs/decisions.html
    incubator/uima/site/trunk/uima-website/docs/dependencies.html
    incubator/uima/site/trunk/uima-website/docs/distribution.html
    incubator/uima/site/trunk/uima-website/docs/documentation.html
    incubator/uima/site/trunk/uima-website/docs/downloads.html
    incubator/uima/site/trunk/uima-website/docs/faq.html
    incubator/uima/site/trunk/uima-website/docs/get-involved.html
    incubator/uima/site/trunk/uima-website/docs/gldv07.html
    incubator/uima/site/trunk/uima-website/docs/index-draft.html
    incubator/uima/site/trunk/uima-website/docs/index.html
    incubator/uima/site/trunk/uima-website/docs/javadoc.html
    incubator/uima/site/trunk/uima-website/docs/license.html
    incubator/uima/site/trunk/uima-website/docs/mail-lists.html
    incubator/uima/site/trunk/uima-website/docs/management.html
    incubator/uima/site/trunk/uima-website/docs/news.html
    incubator/uima/site/trunk/uima-website/docs/project-guidelines.html
    incubator/uima/site/trunk/uima-website/docs/roles.html
    incubator/uima/site/trunk/uima-website/docs/sandbox.html
    incubator/uima/site/trunk/uima-website/docs/svn.html
    incubator/uima/site/trunk/uima-website/docs/team-list.html
    incubator/uima/site/trunk/uima-website/docs/uima-specification.html
    incubator/uima/site/trunk/uima-website/xdocs/documentation.xml
    incubator/uima/site/trunk/uima-website/xdocs/gldv07.xml
    incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml

Modified: incubator/uima/site/trunk/uima-website/docs/apache-board-status.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/apache-board-status.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/apache-board-status.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/apache-board-status.html Thu Apr  5 08:53:38 2007
@@ -89,13 +89,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -110,8 +110,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -125,13 +123,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/codeConventions.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/codeConventions.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/codeConventions.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/codeConventions.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/communication.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/communication.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/communication.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/communication.html Thu Apr  5 08:53:38 2007
@@ -91,13 +91,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -112,8 +112,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -127,13 +125,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/contribution-policy.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/contribution-policy.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/contribution-policy.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/contribution-policy.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/decisions.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/decisions.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/decisions.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/decisions.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/dependencies.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/dependencies.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/dependencies.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/dependencies.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/distribution.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/distribution.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/distribution.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/distribution.html Thu Apr  5 08:53:38 2007
@@ -89,13 +89,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -110,8 +110,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -125,13 +123,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/documentation.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/documentation.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/documentation.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/documentation.html Thu Apr  5 08:53:38 2007
@@ -29,7 +29,8 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
                                                     <meta name="author" value="
- UIMA Documentation Team">
+   UIMA Documentation Team
+  ">
             <meta name="email" value="uima-dev@incubator.apache.org">
             
            
@@ -38,7 +39,7 @@
             
             
             
-            <title>Apache UIMA - Documentation</title>
+            <title>Apache UIMA - Apache UIMA Documentation</title>
         </head>
 
         <body bgcolor="#ffffff" text="#000000" link="#525D76">        
@@ -53,7 +54,7 @@
                     <td align='CENTER'>
                     <td width="80%" align="center" valign="bottom" bgcolor="#ffffff">
         <font color="#625972" size="+3" face="arial,helvetica,sanserif">
-    <b>Documentation</b>
+    <b>Apache UIMA Documentation</b>
 </font>
 </td>
                     </td>
@@ -90,13 +91,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +112,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,14 +125,14 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
 </li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
+</li>
                 </ul>
             <p><strong>Conferences</strong></p>
         <ul>
@@ -147,14 +146,41 @@
                                                                       <table border="0" cellspacing="0" cellpadding="2" width="100%">
         <tr><td bgcolor="#726982">
         <font color="#ffffff" face="arial,helvetica,sanserif">
-          <a name="Apache UIMA Documentation"><strong>Apache UIMA Documentation</strong></a>
+          <a name="UIMA Manuals and Guides"><strong>UIMA Manuals and Guides</strong></a>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+                                    <p>
+    <a href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">
+     Version 2.1.0-incubating
+    </a>
+   </p>
+                            </blockquote>
+        </p>
+      </td></tr>
+      <tr><td><br/></td></tr>
+    </table>
+
+                                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+        <tr><td bgcolor="#726982">
+        <font color="#ffffff" face="arial,helvetica,sanserif">
+          <a name="UIMA Javadoc"><strong>UIMA Javadoc</strong></a>
         </font>
       </td></tr>
       <tr><td>
         <blockquote>
                                     <p>
-    <a href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">Version 2.1.0-incubating</a>
-  </p>
+    Apache UIMA Javadoc is available in two formats. You can browse the
+    javadoc online, or you can download it as a .zip file and unzip it
+    to a local directory.
+   </p>
+                                                <p>
+    <a href="apidocs">Browse Apache UIMA Javadoc Online</a>
+   </p>
+                                                <p>
+    <a href="apidocs.zip">Download Apache UIMA Javadoc</a>
+   </p>
                             </blockquote>
         </p>
       </td></tr>

Modified: incubator/uima/site/trunk/uima-website/docs/downloads.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/downloads.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/downloads.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Added: incubator/uima/site/trunk/uima-website/docs/downloads/gldv/gldv07-uima-netter.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads/gldv/gldv07-uima-netter.pdf?view=auto&rev=525851
==============================================================================
Binary file - no diff available.

Propchange: incubator/uima/site/trunk/uima-website/docs/downloads/gldv/gldv07-uima-netter.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/uima/site/trunk/uima-website/docs/faq.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/faq.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/faq.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/faq.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/get-involved.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/get-involved.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/get-involved.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/get-involved.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/gldv07.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/gldv07.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/gldv07.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/gldv07.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,14 +124,14 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
 </li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
+</li>
                 </ul>
             <p><strong>Conferences</strong></p>
         <ul>
@@ -175,11 +173,7 @@
       <tr><td>
         <blockquote>
                                     <p>
-  The workshop programme is not fully finalized as not all speakers have confirmed their attendance yet.
-  See below for a list of accepted presentations with confirmation status (if you're one of the authors
-  and haven't confirmed or canceled your attendance yet, please do so by sending email to the programme
-  committee).  Some of the abstracts
-  are available online.
+  See you all at the conference!
 </p>
                                                 <ul>
 <li><strong>Gurevych et al.</strong>: <a href="./downloads/gldv/gldv07-uima-gurevych1.pdf">Darmstadt Knowledge Processing Repository Based on UIMA</a> <strong>[confirmed]</strong> </li>
@@ -188,7 +182,7 @@
 <li><strong>Gnjatovic et al.</strong>: <a href="./downloads/gldv/gldv07-uima-gnjatovic.pdf">Processing dialogue-based data in the UIMA framework</a> <strong>[confirmed]</strong></li>
 <li><strong>Kaiser &amp; Zavrel</strong>: A new UIMA Annotator: the Textkernel Information Extraction Engine <strong>[confirmed]</strong></li>
 <li><strong>Gurevych et al.</strong>: <a href="./downloads/gldv/gldv07-uima-gurevych2.pdf">Teaching "Unstructured Information Management: Theory and Applications" to Computational Linguistics Students</a> <strong>[confirmed]</strong></li>
-<li><strong>Netter &amp; Meyer</strong>: <a href="./downloads/gldv/gldv07-uima-netter.doc">ICE - Intelligent Content Engineering</a> <strong>[confirmed]</strong></li>
+<li><strong>Netter &amp; Meyer</strong>: <a href="./downloads/gldv/gldv07-uima-netter.pdf">ICE - Intelligent Content Engineering</a> <strong>[confirmed]</strong></li>
 <li><strong>Tomanek et al.</strong>: <a href="./downloads/gldv/gldv07-uima-tomanek.pdf">An UIMA-Based Tool Suite for Semantic Text Processing</a> <strong>[confirmed]</strong></li>
 <li><strong>Blohm et al.</strong>: <a href="./downloads/gldv/gldv07-uima-blohm.pdf">Iterative Learning of Relation Patterns for Market Analysis with UIMA</a> <strong>[confirmed]</strong></li>
 <li><strong>Hahn et al.</strong>: <a href="./downloads/gldv/gldv07-uima-hahn.pdf">An UIMA Annotation Type System for a Generic Text Mining Architecture</a> <strong>[confirmed]</strong></li>

Modified: incubator/uima/site/trunk/uima-website/docs/index-draft.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/index-draft.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/index-draft.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/index-draft.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/index.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/index.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/index.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/index.html Thu Apr  5 08:53:38 2007
@@ -91,13 +91,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -112,8 +112,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -127,13 +125,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/javadoc.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/javadoc.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/javadoc.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/javadoc.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/license.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/license.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/license.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/license.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/mail-lists.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/mail-lists.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/mail-lists.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/mail-lists.html Thu Apr  5 08:53:38 2007
@@ -91,13 +91,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -112,8 +112,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -127,13 +125,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/management.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/management.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/management.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/management.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/news.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/news.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/news.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/news.html Thu Apr  5 08:53:38 2007
@@ -91,13 +91,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -112,8 +112,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -127,13 +125,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/project-guidelines.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/project-guidelines.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/project-guidelines.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/project-guidelines.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/roles.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/roles.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/roles.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/roles.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/sandbox.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/sandbox.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/sandbox.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/sandbox.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/svn.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/svn.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/svn.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/svn.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/team-list.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/team-list.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/team-list.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/team-list.html Thu Apr  5 08:53:38 2007
@@ -90,13 +90,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -111,8 +111,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -126,13 +124,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/docs/uima-specification.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/uima-specification.html?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/uima-specification.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/uima-specification.html Thu Apr  5 08:53:38 2007
@@ -89,13 +89,13 @@
 </li>
                     <li>    <a href="./news.html">News</a>
 </li>
-                    <li>    <a href="./license.html">License</a>
-</li>
-                    <li>    <a href="http://www.apache.org/">ASF</a>
+                    <li>    <a href="./documentation.html">Documentation</a>
 </li>
                     <li>    <a href="./downloads.html">Downloads</a>
 </li>
-                    <li>    <a href="./javadoc.html">javadoc</a>
+                    <li>    <a href="./license.html">License</a>
+</li>
+                    <li>    <a href="http://www.apache.org/">ASF</a>
 </li>
                 </ul>
             <p><strong>Community</strong></p>
@@ -110,8 +110,6 @@
 </li>
                     <li>    <a href="./mail-lists.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="./documentation.html">Documentation</a>
-</li>
                     <li>    <a href="./faq.html">FAQ</a>
 </li>
                     <li>    <a href="http://cwiki.apache.org/UIMA/">Wiki</a>
@@ -125,13 +123,13 @@
 </li>
                     <li>    <a href="./distribution.html">Creating a Distribution</a>
 </li>
-                    <li>    <a href="./sandbox.html">Sandbox</a>
-</li>
                     <li>    <a href="./codeConventions.html">Code Conventions</a>
 </li>
                     <li>    <a href="http://issues.apache.org/jira/browse/uima ">JIRA</a>
 </li>
                     <li>    <a href="./uima-specification.html">UIMA Specification</a>
+</li>
+                    <li>    <a href="./sandbox.html">Sandbox</a>
 </li>
                 </ul>
             <p><strong>Conferences</strong></p>

Modified: incubator/uima/site/trunk/uima-website/xdocs/documentation.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/documentation.xml?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/documentation.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/documentation.xml Thu Apr  5 08:53:38 2007
@@ -1,40 +1,59 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
-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
+ 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.
+ "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>Documentation</title>
-<author email="uima-dev@incubator.apache.org">
- UIMA Documentation Team</author>
-</properties>
-
-<body>
-<section name="Apache UIMA Documentation">
-  <p>
-    <a href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">Version 2.1.0-incubating</a>
-  </p>
-</section>
+ <properties>
+  <title>Apache UIMA Documentation</title>
+  <author email="uima-dev@incubator.apache.org">
+   UIMA Documentation Team
+  </author>
+ </properties>
+
+ <body>
+  <section name="UIMA Manuals and Guides">
+   <p>
+    <a
+     href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">
+     Version 2.1.0-incubating
+    </a>
+   </p>
+  </section>
+
+  <section name="UIMA Javadoc">
+
+   <p>
+    Apache UIMA Javadoc is available in two formats. You can browse the
+    javadoc online, or you can download it as a .zip file and unzip it
+    to a local directory.
+   </p>
+   <p>
+    <a href="apidocs">Browse Apache UIMA Javadoc Online</a>
+   </p>
+   <p>
+    <a href="apidocs.zip">Download Apache UIMA Javadoc</a>
+   </p>
+  </section>
 
-</body>
+ </body>
 
 </document>
 

Added: incubator/uima/site/trunk/uima-website/xdocs/downloads/gldv/gldv07-uima-netter.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/downloads/gldv/gldv07-uima-netter.pdf?view=auto&rev=525851
==============================================================================
Binary file - no diff available.

Propchange: incubator/uima/site/trunk/uima-website/xdocs/downloads/gldv/gldv07-uima-netter.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/uima/site/trunk/uima-website/xdocs/gldv07.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/gldv07.xml?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/gldv07.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/gldv07.xml Thu Apr  5 08:53:38 2007
@@ -46,11 +46,7 @@
 
 <subsection name="Workshop programme">
 <p>
-  The workshop programme is not fully finalized as not all speakers have confirmed their attendance yet.
-  See below for a list of accepted presentations with confirmation status (if you're one of the authors
-  and haven't confirmed or canceled your attendance yet, please do so by sending email to the programme
-  committee).  Some of the abstracts
-  are available online.
+  See you all at the conference!
 </p>
 
 <ul>
@@ -60,12 +56,41 @@
 <li><strong>Gnjatovic et al.</strong>: <a href="./downloads/gldv/gldv07-uima-gnjatovic.pdf">Processing dialogue-based data in the UIMA framework</a> <strong>[confirmed]</strong></li>
 <li><strong>Kaiser &amp; Zavrel</strong>: A new UIMA Annotator: the Textkernel Information Extraction Engine <strong>[confirmed]</strong></li>
 <li><strong>Gurevych et al.</strong>: <a href="./downloads/gldv/gldv07-uima-gurevych2.pdf">Teaching "Unstructured Information Management: Theory and Applications" to Computational Linguistics Students</a> <strong>[confirmed]</strong></li>
-<li><strong>Netter &amp; Meyer</strong>: <a href="./downloads/gldv/gldv07-uima-netter.doc">ICE - Intelligent Content Engineering</a> <strong>[confirmed]</strong></li>
+<li><strong>Netter &amp; Meyer</strong>: <a href="./downloads/gldv/gldv07-uima-netter.pdf">ICE - Intelligent Content Engineering</a> <strong>[confirmed]</strong></li>
 <li><strong>Tomanek et al.</strong>: <a href="./downloads/gldv/gldv07-uima-tomanek.pdf">An UIMA-Based Tool Suite for Semantic Text Processing</a> <strong>[confirmed]</strong></li>
 <li><strong>Blohm et al.</strong>: <a href="./downloads/gldv/gldv07-uima-blohm.pdf">Iterative Learning of Relation Patterns for Market Analysis with UIMA</a> <strong>[confirmed]</strong></li>
 <li><strong>Hahn et al.</strong>: <a href="./downloads/gldv/gldv07-uima-hahn.pdf">An UIMA Annotation Type System for a Generic Text Mining Architecture</a> <strong>[confirmed]</strong></li>
 </ul>
-
+
+<!-- 
+<ul>
+<li><strong>11:00-11:15</strong> Workshop kick-off</li>
+<li><strong>11:15-11:40</strong> Gurevych et al.: <a href="./downloads/gldv/gldv07-uima-gurevych1.pdf">Darmstadt Knowledge Processing Repository Based on UIMA</a></li>
+<li><strong>11:40-12:05</strong> Gnjatovic et al.: <a href="./downloads/gldv/gldv07-uima-gnjatovic.pdf">Processing dialogue-based data in the UIMA framework</a></li>
+<li><strong>12:05-12:20</strong> Break</li>
+<li><strong>12:20-12:45</strong> Tomanek et al.: <a href="./downloads/gldv/gldv07-uima-tomanek.pdf">An UIMA-Based Tool Suite for Semantic Text Processing</a></li>
+<li><strong>12:45-13:10</strong> Hahn et al.: <a href="./downloads/gldv/gldv07-uima-hahn.pdf">An UIMA Annotation Type System for a Generic Text Mining Architecture</a></li>
+</ul>
+
+<ul>
+<li><strong>13:05-14:00</strong> Lunch
+</li>
+</ul>
+
+<ul>
+<li><strong>14:00-14:25</strong> Heyer &amp; Buechler: Kookurenzberechnungen mit UIMA und Medusa</li>
+<li><strong>14:25-14:50</strong> Blohm et al.: <a href="./downloads/gldv/gldv07-uima-blohm.pdf">Iterative Learning of Relation Patterns for Market Analysis with UIMA</a></li>
+<li><strong>14:50-15:00</strong> Break</li>
+<li><strong>15:00-15:25</strong> Wilcock: <a href="./downloads/gldv/gldv07-uima-wilcock.pdf">GATE and UIMA in Language Technology Teaching</a></li>
+<li><strong>15:25-15:50</strong> Gurevych et al.: <a href="./downloads/gldv/gldv07-uima-gurevych2.pdf">Teaching "Unstructured Information Management: Theory and Applications" to Computational Linguistics Students</a></li>
+<li><strong>15:50-16:00</strong> Break</li>
+<li><strong>16:00-16:25</strong> Kaiser &amp; Zavrel: A new UIMA Annotator: the Textkernel Information Extraction Engine</li>
+<li><strong>16:25-16:50</strong> Netter &amp; Meyer: <a href="./downloads/gldv/gldv07-uima-netter.doc">ICE - Intelligent Content Engineering</a></li>
+<li><strong>16:50-17:00</strong> Break </li>
+<li><strong>17:00-17:45</strong> Discussion</li>
+</ul>
+-->
+
 </subsection>
 
 <subsection name="Conference information">

Modified: incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml?view=diff&rev=525851&r1=525850&r2=525851
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Thu Apr  5 08:53:38 2007
@@ -14,10 +14,10 @@
     <menu name="General">
         <item name="Home"                   href="/index.html"/>
         <item name="News"                   href="/news.html"/>
+        <item name="Documentation"          href="/documentation.html"/>
+        <item name="Downloads"              href="/downloads.html"/>
         <item name="License"                href="/license.html"/>
         <item name="ASF"                    href="http://www.apache.org/"/>
-        <item name="Downloads"              href="/downloads.html"/>
-        <item name="javadoc"                href="/javadoc.html"/>
     </menu>
 
     <menu name="Community">
@@ -26,7 +26,6 @@
         <item name="Get Involved"           href="/get-involved.html"/>
         <item name="Committers"             href="/team-list.html"/>
         <item name="Mailing Lists"          href="/mail-lists.html"/>
-        <item name="Documentation"          href="/documentation.html"/>
         <item name="FAQ"                    href="/faq.html"/>
         <item name="Wiki"                   href="http://cwiki.apache.org/UIMA/"/>
     </menu>
@@ -35,10 +34,10 @@
         <item name="Source Code"            href="/svn.html"/>
         <item name="Building with Maven"    href="/svn.html#building.with.maven"/>
         <item name="Creating a Distribution"  href="/distribution.html"/>
-        <item name="Sandbox"                href="/sandbox.html"/>
         <item name="Code Conventions"       href="/codeConventions.html"/>
         <item name="JIRA"                   href="http://issues.apache.org/jira/browse/uima "/>
         <item name="UIMA Specification"     href="/uima-specification.html"/>  
+        <item name="Sandbox"                href="/sandbox.html"/>
         <!--
         <item name="Dependencies"           href="/dependencies.html"/>
         -->