You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/12/24 00:32:29 UTC

svn commit: r606637 - in /incubator/uima/site/trunk/uima-website: docs/ xdocs/

Author: schor
Date: Sun Dec 23 15:32:22 2007
New Revision: 606637

URL: http://svn.apache.org/viewvc?rev=606637&view=rev
Log:
[UIMA-679] Correct license in html files, update documentation page to reflect where the docs are on dist/incubator/uima, update download page for mirror support and for release notes on dist/incubator/uima (following conventions exemplified by httpd and ant as exemplars).

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/doc-uima-examples.html
    incubator/uima/site/trunk/uima-website/docs/doc-uima-why.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/external-resources.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/downloads.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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/apache-board-status.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/apache-board-status.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/code-scan-tools.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/codeConventions.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/codeConventions.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/communication.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/communication.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/contribution-policy.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/contribution-policy.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/decisions.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/decisions.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/dependencies.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/dependencies.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/distribution.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/distribution.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

Modified: incubator/uima/site/trunk/uima-website/docs/doc-uima-examples.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/doc-uima-examples.html?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/doc-uima-examples.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/doc-uima-examples.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

Modified: incubator/uima/site/trunk/uima-website/docs/doc-uima-why.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/doc-uima-why.html?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/doc-uima-why.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/doc-uima-why.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/documentation.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/documentation.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 
@@ -148,29 +152,55 @@
                                                                       <table border="0" cellspacing="0" cellpadding="2" width="100%">
         <tr><td bgcolor="#726982">
         <font color="#ffffff" face="arial,helvetica,sanserif">
+          <a name="Documentation"><strong>Documentation</strong></a>
+        </font>
+      </td></tr>
+      <tr><td>
+        <blockquote>
+                                    <p>Here you will find 
+      <a href="#manuals_and_guides">UIMA Manuals and Guides</a> (Overview and Setup, Tutorials and Users' Guides, Tools, and References), 
+      the 
+      <a href="#javadocs">Javadocs</a> for the
+    public APIs of UIMA, and 
+      <a href="#getting_started">Getting Started Guides</a>.
+        
+    <ul><li>Note: The UIMA manuals/guides and Javadocs are also distributed 
+      as part of the binary distribution.</li></ul>
+    </p>
+                                                      <table id="manuals_and_guides" border="0" cellspacing="0" cellpadding="2" width="100%">
+  
+ 
+      <tr><td bgcolor="#9289A2">
+        <font color="#ffffff" face="arial,helvetica,sanserif">
           <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.2.0-incubating/docs/html/index.html">
-     Version 2.2.0-incubating
-    </a>
-   </p>
-                                                <p>
-    <a href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">
-     Version 2.1.0-incubating
-    </a>
-   </p>
+     The documentation for UIMA the current version of UIMA is available in both 
+     HTML and as four PDF files (suitable for printing):
+     <ul>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/html/">HTML</a></li>       
+       <br />
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/overview_and_setup.pdf">PDF: Overview and Setup</a></li>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/tutorials_and_users_guides.pdf">PDF: Tutorials and Users' Guides</a></li>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/tools.pdf">PDF: Tools</a></li>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/references.pdf">PDF: References</a></li>
+     </ul>
+    </p>
+                                                <br />
+                                                <p>Previous releases (HTML only)</p>
+                                                <p><a href="downloads/releaseDocs/2.2.0-incubating/docs/html/index.html">Version 2.2.0-incubating</a></p>
+                                                <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">
+                                                      <table id="javadocs" border="0" cellspacing="0" cellpadding="2" width="100%">
+  
+ 
+      <tr><td bgcolor="#9289A2">
         <font color="#ffffff" face="arial,helvetica,sanserif">
           <a name="Javadoc (current version only)"><strong>Javadoc (current version only)</strong></a>
         </font>
@@ -178,24 +208,23 @@
       <tr><td>
         <blockquote>
                                     <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 2.2.0-incubating Javadoc Online</a>
-   </p>
-                                                <p>
-    <a href="apidocs.zip">Download Apache UIMA 2.2.0-incubating Javadoc</a>
+    Apache UIMA Javadoc is supplied with the binary distribution, or can be built from the
+     source distribution.  We also make it available directly from this website, 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.
+    
+   <ul>
+     <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/api/">Javadoc online</a></li>
+     <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/apiDocs.zip">.zip file</a></li>
+   </ul>
    </p>
                             </blockquote>
-        </p>
       </td></tr>
       <tr><td><br/></td></tr>
     </table>
-
-                                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
-        <tr><td bgcolor="#726982">
+                                                      <table id="getting_started" border="0" cellspacing="0" cellpadding="2" width="100%">
+  
+ 
+      <tr><td bgcolor="#9289A2">
         <font color="#ffffff" face="arial,helvetica,sanserif">
           <a name="Getting Started"><strong>Getting Started</strong></a>
         </font>
@@ -219,6 +248,10 @@
 		the UIMA analysis examples that are provided with the release package.</li>
 	</ul>
    </p>
+                            </blockquote>
+      </td></tr>
+      <tr><td><br/></td></tr>
+    </table>
                             </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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/downloads.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/downloads.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 
@@ -152,31 +156,27 @@
       </td></tr>
       <tr><td>
         <blockquote>
-                                    <p>Use the links below to download a binary distribution of Apache UIMA from
+                                    <p>Use the links below to download Apache UIMA from
 one of our mirrors.  It is good practice to
 <a href="[location]#VerifyDownload">verify the integrity</a>
 of the distribution files, especially if you are using one of our
-mirror sites.  In order to do this you must use the signatures from
-our <a href="http://www.apache.org/dist/incubator/uima/">main distribution
-directory</a>.</p>
+mirror sites.</p>
                                                 <p>Only current recommended releases are available on the main
 distribution site and its mirrors.  Older releases are available from
 the <a href="http://archive.apache.org/dist/incubator/uima/">archive download
 site.</a></p>
-                                                <p>Apache UIMA is distributed as <code>zip</code>, <code>tar.gz</code> and
-<code>tar.bz2</code> archives - the contents are the same.  Please
+                                                <p>Apache UIMA is distributed as source and binary (ready-to-use) packages.
+  These are available in
+  <code>zip</code>, <code>tar.gz</code> and
+<code>tar.bz2</code> archive formats.  Please
 note that the <code>tar.*</code> archives contain file names longer
 than 100 characters and have been created using GNU tar extensions.
 Thus they must be untarred with a GNU compatible version of
 <code>tar</code>.</p>
-                            </blockquote>
-        </p>
-      </td></tr>
-      <tr><td><br/></td></tr>
-    </table>
-
-                                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
-        <tr><td bgcolor="#726982">
+                                                      <table border="0" cellspacing="0" cellpadding="2" width="100%">
+  
+ 
+      <tr><td bgcolor="#9289A2">
         <font color="#ffffff" face="arial,helvetica,sanserif">
           <a name="Mirror"><strong>Mirror</strong></a>
         </font>
@@ -202,6 +202,10 @@
 <input type="submit" value="Change" />
 </form>
                             </blockquote>
+      </td></tr>
+      <tr><td><br/></td></tr>
+    </table>
+                            </blockquote>
         </p>
       </td></tr>
       <tr><td><br/></td></tr>
@@ -236,7 +240,9 @@
                                                 <p>
     <strong>Apache UIMA version 2.2.1-incubating</strong>
     <br /> Release Date: 21-Dec-2007
-    <br /><a href="downloads/releaseDocs/2.2.1-incubating/RELEASE_NOTES.html">Release Notes</a>
+    <br /><a href="http://www.apache.org/dist/incubator/uima/RELEASE_NOTES-uimaj-2.2.1-incubating.html">Release Notes.HTML</a>
+    <br /><a href="http://www.apache.org/dist/incubator/uima/RELEASE_NOTES-uimaj-2.2.1-incubating.txt">Release Notes.txt</a>
+    
   </p>
                                                 <p><strong>Binary Distributions</strong>
     <ul>
@@ -373,8 +379,18 @@
   <code>.asc</code> files.  To be able to use the PGP signature files, you need to obtain the UIMA
   developers' public keys from a trusted source.  The keys do come with the distribution as well,
   but obviously using those is not a good way to ascertain the pedigree of a distribution.  Instead,
-  get the <a href="https://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS">
-  keys directly out of the UIMA SVN repository</a>.  Depending how sure you want to be that those
+  get the keys from the main Apache distribution site (not a mirror), or 
+  directly out of the UIMA SVN repository.
+    <dl><dt /><dd>(Right click the following links, and select save link/target as ...)</dd></dl>
+    <ul>
+      <li><a href="http://www.apache.org/dist/incubator/uima/KEYS">KEYS from Apache main distribution site</a></li>
+      <li><a href="https://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS">
+        KEYS from the main UIMA SVN repository using https security</a>
+      </li>
+    </ul>
+    
+  
+   Depending how sure you want to be that those
   keys are really the ones you can trust, you may think of even safer ways to obtain them (for example,
   go to ApacheCon and get them personally).
   </p>

Modified: incubator/uima/site/trunk/uima-website/docs/external-resources.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/external-resources.html?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/external-resources.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/external-resources.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/faq.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/faq.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/get-involved.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/get-involved.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/gldv07.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/gldv07.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/index-draft.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/index-draft.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/index.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/index.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/javadoc.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/javadoc.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/license.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/license.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/mail-lists.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/mail-lists.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/management.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/management.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/news.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/news.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/project-guidelines.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/project-guidelines.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/roles.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/roles.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/sandbox.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/sandbox.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/svn.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/svn.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/team-list.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/team-list.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/uima-specification.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/uima-specification.html Sun Dec 23 15:32:22 2007
@@ -1,18 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <!--
-Copyright 1999-2004 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
+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.
+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.
 -->
 
 

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?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/documentation.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/documentation.xml Sun Dec 23 15:32:22 2007
@@ -29,37 +29,57 @@
  </properties>
 
  <body>
-  <section name="UIMA Manuals and Guides">
-   <p>
-    <a
-     href="downloads/releaseDocs/2.2.0-incubating/docs/html/index.html">
-     Version 2.2.0-incubating
-    </a>
-   </p>
-   <p>
-    <a
-     href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">
-     Version 2.1.0-incubating
-    </a>
-   </p>
-  </section>
+  
+  <section name="Documentation">
+    <p>Here you will find 
+      <a href="#manuals_and_guides">UIMA Manuals and Guides</a> (Overview and Setup, Tutorials and Users&apos; Guides, Tools, and References), 
+      the 
+      <a href="#javadocs">Javadocs</a> for the
+    public APIs of UIMA, and 
+      <a href="#getting_started">Getting Started Guides</a>.
+        
+    <ul><li>Note: The UIMA manuals/guides and Javadocs are also distributed 
+      as part of the binary distribution.</li></ul>
+    </p>
+  
+  <subsection name="UIMA Manuals and Guides" id="manuals_and_guides">
+       
+   <p>
+     The documentation for UIMA the current version of UIMA is available in both 
+     HTML and as four PDF files (suitable for printing):
+     <ul>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/html/">HTML</a></li>       
+       <br />
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/overview_and_setup.pdf">PDF: Overview and Setup</a></li>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/tutorials_and_users_guides.pdf">PDF: Tutorials and Users&apos; Guides</a></li>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/tools.pdf">PDF: Tools</a></li>
+       <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/pdf/references.pdf">PDF: References</a></li>
+     </ul>
+    </p>
+    <br />
+
+   <p>Previous releases (HTML only)</p>
+    
+   <p><a href="downloads/releaseDocs/2.2.0-incubating/docs/html/index.html">Version 2.2.0-incubating</a></p>
+   <p><a href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">Version 2.1.0-incubating</a></p>
+    
+  </subsection>
 
-  <section name="Javadoc (current version only)">
+  <subsection name="Javadoc (current version only)" id="javadocs">
 
    <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 2.2.0-incubating Javadoc Online</a>
-   </p>
-   <p>
-    <a href="apidocs.zip">Download Apache UIMA 2.2.0-incubating Javadoc</a>
+    Apache UIMA Javadoc is supplied with the binary distribution, or can be built from the
+     source distribution.  We also make it available directly from this website, 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.
+    
+   <ul>
+     <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/api/">Javadoc online</a></li>
+     <li><a href="http://www.apache.org/dist/incubator/uima/docs/uimaj-2.2.1-incubating/apiDocs.zip">.zip file</a></li>
+   </ul>
    </p>
-  </section>
+  </subsection>
     
-  <section name="Getting Started">
+  <subsection name="Getting Started" id="getting_started">
    <p>
     The UIMA "Getting Started" guides are intended to offer a quick overview of UIMA and how it works. 
     They are designed to address different audiences that want to work with UIMA.
@@ -77,9 +97,8 @@
 		the UIMA analysis examples that are provided with the release package.</li>
 	</ul>
    </p>
+  </subsection>
   </section>
-  
-
  </body>
 
 </document>

Modified: incubator/uima/site/trunk/uima-website/xdocs/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/downloads.xml?rev=606637&r1=606636&r2=606637&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/downloads.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/downloads.xml Sun Dec 23 15:32:22 2007
@@ -28,29 +28,29 @@
 
 <section name="Downloading Apache UIMA">
   
-  <p>Use the links below to download a binary distribution of Apache UIMA from
+  <p>Use the links below to download Apache UIMA from
 one of our mirrors.  It is good practice to
 <a href="[location]#VerifyDownload">verify the integrity</a>
 of the distribution files, especially if you are using one of our
-mirror sites.  In order to do this you must use the signatures from
-our <a href="http://www.apache.org/dist/incubator/uima/">main distribution
-directory</a>.</p>
+mirror sites.</p>
 
 <p>Only current recommended releases are available on the main
 distribution site and its mirrors.  Older releases are available from
 the <a href="http://archive.apache.org/dist/incubator/uima/">archive download
 site.</a></p>
   
-<p>Apache UIMA is distributed as <code>zip</code>, <code>tar.gz</code> and
-<code>tar.bz2</code> archives - the contents are the same.  Please
+<p>Apache UIMA is distributed as source and binary (ready-to-use) packages.
+  These are available in
+  <code>zip</code>, <code>tar.gz</code> and
+<code>tar.bz2</code> archive formats.  Please
 note that the <code>tar.*</code> archives contain file names longer
 than 100 characters and have been created using GNU tar extensions.
 Thus they must be untarred with a GNU compatible version of
 <code>tar</code>.</p> 
   
-</section>  
   
-<section name="Mirror">
+  
+<subsection name="Mirror">
 
 <p>You are currently using <b>[preferred]</b>.  If you encounter a
 problem with this mirror, please select another mirror.  If all
@@ -71,6 +71,7 @@
 </select>
 <input type="submit" value="Change" />
 </form>
+</subsection>
 </section>
   
 <section name="Latest Official Release">
@@ -85,7 +86,9 @@
   <p>
     <strong>Apache UIMA version 2.2.1-incubating</strong>
     <br/> Release Date: 21-Dec-2007
-    <br/><a href="downloads/releaseDocs/2.2.1-incubating/RELEASE_NOTES.html">Release Notes</a>
+    <br/><a href="http://www.apache.org/dist/incubator/uima/RELEASE_NOTES-uimaj-2.2.1-incubating.html">Release Notes.HTML</a>
+    <br/><a href="http://www.apache.org/dist/incubator/uima/RELEASE_NOTES-uimaj-2.2.1-incubating.txt">Release Notes.txt</a>
+    
   </p>
   
   <p><strong>Binary Distributions</strong>
@@ -190,8 +193,18 @@
   <code>.asc</code> files.  To be able to use the PGP signature files, you need to obtain the UIMA
   developers' public keys from a trusted source.  The keys do come with the distribution as well,
   but obviously using those is not a good way to ascertain the pedigree of a distribution.  Instead,
-  get the <a href="https://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS">
-  keys directly out of the UIMA SVN repository</a>.  Depending how sure you want to be that those
+  get the keys from the main Apache distribution site (not a mirror), or 
+  directly out of the UIMA SVN repository.
+    <dl><dt /><dd>(Right click the following links, and select save link/target as ...)</dd></dl>
+    <ul>
+      <li><a href="http://www.apache.org/dist/incubator/uima/KEYS">KEYS from Apache main distribution site</a></li>
+      <li><a href="https://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/uimaj-distr/src/main/readme/KEYS">
+        KEYS from the main UIMA SVN repository using https security</a>
+      </li>
+    </ul>
+    
+  
+   Depending how sure you want to be that those
   keys are really the ones you can trust, you may think of even safer ways to obtain them (for example,
   go to ApacheCon and get them personally).
   </p>