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 2011/01/13 23:16:50 UTC

svn commit: r1058765 [2/3] - in /uima/site/trunk/uima-website: docs/ docs/staging/ xdocs/ xdocs/staging/ xdocs/stylesheets/

Modified: uima/site/trunk/uima-website/docs/faq.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/faq.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/faq.html (original)
+++ uima/site/trunk/uima-website/docs/faq.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
-			UIMA Documentation Team
+			Apache UIMA Documentation Team
 		">
   <meta name="email" value="dev@uima.apache.org">
                         
@@ -158,12 +158,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -433,8 +437,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/get-involved.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/get-involved.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/get-involved.html (original)
+++ uima/site/trunk/uima-website/docs/get-involved.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -175,7 +179,7 @@
       <tr><td>
         <blockquote class="sectionBody">
                                     <p>
-The Apache UIMA project is actively seeking new contributors to work on all
+The Apache UIMA™ project is actively seeking new contributors to work on all
   aspects of the project.  We need and appreciate all contributions,
 including documentation help, source code development and feedback. 
   </p>
@@ -307,8 +311,10 @@ ASF JIRA</a> account. 
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/gldv07.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gldv07.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/gldv07.html (original)
+++ uima/site/trunk/uima-website/docs/gldv07.html Thu Jan 13 22:16:47 2011
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -304,8 +308,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/gscl09.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gscl09.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/gscl09.html (original)
+++ uima/site/trunk/uima-website/docs/gscl09.html Thu Jan 13 22:16:47 2011
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -352,8 +356,10 @@ Links
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/iks09.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/iks09.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/iks09.html (original)
+++ uima/site/trunk/uima-website/docs/iks09.html Thu Jan 13 22:16:47 2011
@@ -159,12 +159,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -280,8 +284,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/index.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/index.html (original)
+++ uima/site/trunk/uima-website/docs/index.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
-			UIMA Documentation Team 
+			Apache UIMA Documentation Team 
 		">
   <meta name="email" value="dev@uima.apache.org">
                         
@@ -158,12 +158,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -176,7 +180,7 @@
       <tr><td>
         <blockquote class="sectionBody">
                                     <p>
-				Welcome to Apache UIMA. Our goal is to support a thriving community of users and
+				Welcome to Apache UIMA™. Our goal is to support a thriving community of users and
 				developers of UIMA frameworks, tools, and annotators,        
         facilitating the analysis of unstructured content such as text, audio and
 				video.
@@ -349,8 +353,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/license.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/license.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/license.html (original)
+++ uima/site/trunk/uima-website/docs/license.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -399,8 +403,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/lrec08.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/lrec08.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/lrec08.html (original)
+++ uima/site/trunk/uima-website/docs/lrec08.html Thu Jan 13 22:16:47 2011
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -296,8 +300,10 @@ Graham Wilcock (University of Helsinki, 
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/lsm09.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/lsm09.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/lsm09.html (original)
+++ uima/site/trunk/uima-website/docs/lsm09.html Thu Jan 13 22:16:47 2011
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -296,8 +300,10 @@ Contact Nicolas.Hernandez (@univ-nantes.
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/mail-lists.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/mail-lists.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/mail-lists.html (original)
+++ uima/site/trunk/uima-website/docs/mail-lists.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
-   UIMA Documentation Team
+   Apache UIMA Documentation Team
   ">
   <meta name="email" value="dev@uima.apache.org">
                         
@@ -158,12 +158,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -176,7 +180,7 @@
       <tr><td>
         <blockquote class="sectionBody">
                                     <p>
-    There are currently three publicly available mailing lists for UIMA:
+    There are currently three publicly available mailing lists for Apache UIMA™:
    
    
 
@@ -425,8 +429,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/management.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/management.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/management.html (original)
+++ uima/site/trunk/uima-website/docs/management.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -175,9 +179,135 @@
       <tr><td>
         <blockquote class="sectionBody">
                                     <p>
-        The Project Management Committee (PMC) has not yet been formed.
-        It will be formed when and if the project graduates from the
-        Incubator.   </p>
+        The Project Management Committee (PMC) was formed by the Apache Board
+        on 18 March 2010.  <!-- The bylaws were last amended on 6 October 2004. -->
+        There is no preset number of seats on the PMC.  The PMC will strive to
+        add every committer that, in the opinion of the PMC as 
+        determined by a vote, displays the capability and desire to help guide 
+        the project. The PMC will nominate a chairperson from amongst their 
+        ranks for presentation to the Board. The list of current members can be found in our
+        <a href="team-list.html">team list</a>.
+      </p>
+                                                      <table class="subsectionTable">
+        <tr><td>
+       
+       
+       
+          <a name="Roles">
+            <h2>Roles
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>
+          The PMC is responsible for the strategic direction
+          and success of the UIMA Project. This governing body is expected to
+          ensure the project's welfare and guide its overall direction. The PMC
+          may not necessarily participate in the day-to-day coding but is
+          involved in the overall development plans, the alleviation of any
+          bottlenecks, the resolution of conflicts, and the overall technical
+          success of the project.
+        </p>
+                                                <p>
+          The PMC is answerable to the Apache Board with its Chairman serving as
+          primary liaison.
+        </p>
+                            </blockquote>
+        </td></tr>
+    </table>
+                                                      <table class="subsectionTable">
+        <tr><td>
+       
+       
+       
+          <a name="Meetings">
+            <h2>Meetings
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>The PMC discusses issues and determines strategic direction via mail
+           list.  All binding votes happen on the PMC list.
+        </p>
+                            </blockquote>
+        </td></tr>
+    </table>
+                                                      <table class="subsectionTable">
+        <tr><td>
+       
+       
+       
+          <a name="Membership">
+            <h2>Membership
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>
+          PMC members may resign at any time. A committer will remain on the UIMA 
+          PMC until removed by desire of the committer, action of the board, or
+          vote by the PMC.  The Chairman may resign as Chairman at any time 
+          without resigning membership to the PMC. The chairperson will serve 
+          until voluntary resignation, action of the board, or vote by the PMC.
+          The Chairman or any member may be removed from the PMC by a 3/4
+          vote of the PMC.
+        </p>
+                                                <p>
+          In order to be elected to the PMC, a person must have served as a
+          <a href="roles.html">Committer</a> and be
+          nominated by a PMC Member. The nominee must receive 3/4 positive vote
+          with a minimum of 3 positive votes.  Abstaining PMC voters do not 
+          affect the result.
+        </p>
+                            </blockquote>
+        </td></tr>
+    </table>
+                                                      <table class="subsectionTable">
+        <tr><td>
+       
+       
+       
+          <a name="Creation of Subprojects">
+            <h2>Creation of Subprojects
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>
+          PMC members may propose the creation of new subprojects. Creation of 
+          a new subproject requires approval by 3/4 positive vote with a minimum
+          of 3 positive votes of the PMC.  Abstaining PMC voters do not 
+          affect the result.  New code enters the UIMA Project in accordance with
+          ASF policy.
+        </p>
+                            </blockquote>
+        </td></tr>
+    </table>
+                                                      <table class="subsectionTable">
+        <tr><td>
+       
+       
+       
+          <a name="Voting">
+            <h2>Voting
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>The call for a vote on issues not detailed here may specify 
+        requirements for passage. The minimum and default requirement for a 
+        passing vote is simple majority of PMC members casting ballots.
+        The default voting period is 10 days and the minimum is 7 days unless
+        the success or failure is arithmetically known.
+        </p>
+                            </blockquote>
+        </td></tr>
+    </table>
                             </blockquote>
         </p>
       </td></tr>
@@ -193,8 +323,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/maven-design.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/maven-design.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/maven-design.html (original)
+++ uima/site/trunk/uima-website/docs/maven-design.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -788,8 +792,10 @@ our svn tree, in a top level directory n
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/news.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/news.html (original)
+++ uima/site/trunk/uima-website/docs/news.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
-			UIMA Documentation Team
+			Apache UIMA Documentation Team
 		">
   <meta name="email" value="dev@uima.apache.org">
                         
@@ -158,12 +158,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -171,7 +175,7 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
-        <a name="News"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;News</h1></a>
+        <a name="Apache UIMA News"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Apache UIMA News</h1></a>
       </td></tr>
       <tr><td>
         <blockquote class="sectionBody">
@@ -179,7 +183,7 @@
             <tr >
       <td>10 December 2010</td>
       <td><a href='#10 December 2010'>
-                  UIMA Java SDK 2.3.1 released
+                  Apache UIMA Java SDK 2.3.1 released
                 </a>
       </td>
       </tr>  
@@ -303,13 +307,13 @@
        
           <a name="10 December 2010">
             <h2>10 December 2010
-                        &ndash; UIMA Java SDK 2.3.1 released
+                        &ndash; Apache UIMA Java SDK 2.3.1 released
                         </h2>
           </a>
       </td></tr>
       <tr><td>
         <blockquote class="subsectionBody">
-                                    <p>This release only has the UIMA Java SDK, and does not yet have the other
+                                    <p>This release only has the Apache UIMA™ Java SDK, and does not yet have the other
           components.  It is backwards compatible with previous releases, except
           that Java 5 is now the minimum Java level required.</p>
                                                 <p>
@@ -712,8 +716,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/one-time-release-setup.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/one-time-release-setup.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/one-time-release-setup.html (original)
+++ uima/site/trunk/uima-website/docs/one-time-release-setup.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -176,7 +180,7 @@
         <blockquote class="sectionBody">
                                     <p>
     Here you will find information on how to set up various tools 
-    and configurations needed when releasing Apache UIMA artifacts.
+    and configurations needed when releasing Apache UIMA™ artifacts.
   </p>
                                                 <p>First, be sure you've done the general
     <a href="one-time-setup.html">one-time-setup</a>.    
@@ -273,8 +277,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/one-time-setup.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/one-time-setup.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/one-time-setup.html (original)
+++ uima/site/trunk/uima-website/docs/one-time-setup.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -175,7 +179,7 @@
       <tr><td>
         <blockquote class="sectionBody">
                                     <p>
-    Here you will find information on how to set up various tools used in working with UIMA source code, including:
+    Here you will find information on how to set up various tools used in working with Apache UIMA™ source code, including:
     <ul>
       <li><a href="#svn-setup">SVN</a></li>
       <li><a href="#maven-setup">Maven</a></li>
@@ -318,8 +322,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/privacy-policy.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/privacy-policy.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/privacy-policy.html (original)
+++ uima/site/trunk/uima-website/docs/privacy-policy.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
-   UIMA Documentation Team
+   Apache UIMA Documentation Team
   ">
   <meta name="email" value="dev@uima.apache.org">
                         
@@ -158,12 +158,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -219,8 +223,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/project-guidelines.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/project-guidelines.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/project-guidelines.html (original)
+++ uima/site/trunk/uima-website/docs/project-guidelines.html Thu Jan 13 22:16:47 2011
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -178,7 +182,7 @@
         </font></h3>
                                                 <p align="center">Discussion of this document is occuring on the uima-dev mailing list.</p>
                                                 <br />
-                                                <p>This document defines the guidelines of the Apache UIMA Project. It includes
+                                                <p>This document defines the guidelines of the Apache UIMA™ Project. It includes
         definitions of the various categories of membership, who is able to vote, how
         conflicts are resolved by voting, and the procedures to follow for proposing and
         making changes to the codebase of the Project.</p>
@@ -246,8 +250,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/release-before-2.3.1.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/release-before-2.3.1.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/release-before-2.3.1.html (original)
+++ uima/site/trunk/uima-website/docs/release-before-2.3.1.html Thu Jan 13 22:16:47 2011
@@ -8,12 +8,12 @@
         <head>
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
-                                          <meta name="author" value="UIMA Documentation Team">
+                                          <meta name="author" value="Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
                         
-                        <title>Apache UIMA - Doing a UIMA Release</title>
+                        <title>Apache UIMA - Doing an Apache UIMA Release</title>
         </head>
 
         <body>
@@ -27,7 +27,7 @@
                             </a>
                     </td>
                     <td align='CENTER'>
-                          <div class="pageBanner">Doing a UIMA Release</div>
+                          <div class="pageBanner">Doing an Apache UIMA Release</div>
                     </td>
                     <td align='RIGHT'>
                                   <a href="http://www.apache.org">
@@ -156,12 +156,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -169,7 +173,7 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
-        <a name="Doing a UIMA Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Doing a UIMA Release</h1></a>
+        <a name="Doing an Apache UIMA™ Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Doing an Apache UIMA™ Release</h1></a>
       </td></tr>
       <tr><td>
         <blockquote class="sectionBody">
@@ -621,8 +625,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/release.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/release.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/release.html (original)
+++ uima/site/trunk/uima-website/docs/release.html Thu Jan 13 22:16:47 2011
@@ -8,12 +8,12 @@
         <head>
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
-                                          <meta name="author" value="UIMA Documentation Team">
+                                          <meta name="author" value="Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
                         
-                        <title>Apache UIMA - Doing a UIMA Release</title>
+                        <title>Apache UIMA - Doing an Apache UIMA Release</title>
         </head>
 
         <body>
@@ -27,7 +27,7 @@
                             </a>
                     </td>
                     <td align='CENTER'>
-                          <div class="pageBanner">Doing a UIMA Release</div>
+                          <div class="pageBanner">Doing an Apache UIMA Release</div>
                     </td>
                     <td align='RIGHT'>
                                   <a href="http://www.apache.org">
@@ -156,12 +156,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -169,7 +173,7 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
-        <a name="Doing a UIMA Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Doing a UIMA Release</h1></a>
+        <a name="Doing an Apache UIMA™ Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Doing an Apache UIMA™ Release</h1></a>
       </td></tr>
       <tr><td>
         <blockquote class="sectionBody">
@@ -721,8 +725,10 @@ mvn install -Papache-release</pre>
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/roles.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/roles.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/roles.html (original)
+++ uima/site/trunk/uima-website/docs/roles.html Thu Jan 13 22:16:47 2011
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -170,13 +174,13 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
-        <a name="Apache UIMA Roles and Responsibilities"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Apache UIMA Roles and Responsibilities</h1></a>
+        <a name="Apache UIMA™ Roles and Responsibilities"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Apache UIMA™ Roles and Responsibilities</h1></a>
       </td></tr>
       <tr><td>
         <blockquote class="sectionBody">
                                     <h3 align="center"><font color="#FF0000"><b>Note: This is a working draft
         document.</b></font></h3>
-                                                <p align="center">Discussion of this document is occuring on the uima-dev mailing list.</p>
+                                                <p align="center">Discussion of this document is occurring on the uima-dev mailing list.</p>
                                                 <br />
                                                 <p> The roles and responsibilities that people can assume in the project are based on
         merit. Everybody can help no matter what their role. Those who have been long term or
@@ -387,8 +391,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/sandbox.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/sandbox.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/sandbox.html (original)
+++ uima/site/trunk/uima-website/docs/sandbox.html Thu Jan 13 22:16:47 2011
@@ -9,12 +9,12 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
                         
-                        <title>Apache UIMA - UIMA Sandbox</title>
+                        <title>Apache UIMA - Apache UIMA Sandbox</title>
         </head>
 
         <body>
@@ -28,7 +28,7 @@
                             </a>
                     </td>
                     <td align='CENTER'>
-                          <div class="pageBanner">UIMA Sandbox</div>
+                          <div class="pageBanner">Apache UIMA Sandbox</div>
                     </td>
                     <td align='RIGHT'>
                                   <a href="http://www.apache.org">
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -170,12 +174,12 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
-        <a name="UIMA Sandbox"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;UIMA Sandbox</h1></a>
+        <a name="Apache UIMA Sandbox"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Apache UIMA Sandbox</h1></a>
       </td></tr>
       <tr><td>
         <blockquote class="sectionBody">
                                     <p>
-The UIMA sandbox is a workspace that is open to all UIMA committers and developers who would like to 
+The Apache UIMA™ sandbox is a workspace that is open to all UIMA committers and developers who would like to 
 contribute code and join the UIMA developer community.  The sandbox hosts analysis components 
 and tooling around UIMA.  All the components are free to use and licensed under the 
 <a href="license.html">Apache Software License</a>.
@@ -750,8 +754,10 @@ document; used by the FileSystemCollecti
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/staging/svn.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/staging/svn.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/staging/svn.html (original)
+++ uima/site/trunk/uima-website/docs/staging/svn.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="../license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -736,8 +740,10 @@ mvn install
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/staging/testing-builds.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/staging/testing-builds.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/staging/testing-builds.html (original)
+++ uima/site/trunk/uima-website/docs/staging/testing-builds.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="../license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -257,8 +261,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/svn.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/svn.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/svn.html (original)
+++ uima/site/trunk/uima-website/docs/svn.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -170,7 +174,7 @@
                                                           <div class="sectionTable">
       <table class="sectionTable">
         <tr><td>
-        <a name="Apache UIMA Source Code"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Apache UIMA Source Code</h1></a>
+        <a name="Apache UIMA™ Source Code"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/>&nbsp;Apache UIMA™ Source Code</h1></a>
       </td></tr>
       <tr><td>
         <blockquote class="sectionBody">
@@ -500,8 +504,10 @@ http://jira.atlassian.com/browse/SVN-37<
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/team-list.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/team-list.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/team-list.html (original)
+++ uima/site/trunk/uima-website/docs/team-list.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -186,7 +190,7 @@
       </td></tr>
       <tr><td>
         <blockquote class="subsectionBody">
-                                    <p>The current committers on the Apache UIMA project are
+                                    <p>The current committers on the Apache UIMA™ project are
   <table>
 <!-- <tr><th>Name</th></tr> -->
 <tr><td>Michael Baessler</td></tr>
@@ -291,8 +295,10 @@ If you would like to become a committer,
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>

Modified: uima/site/trunk/uima-website/docs/testing-builds.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/testing-builds.html?rev=1058765&r1=1058764&r2=1058765&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/testing-builds.html (original)
+++ uima/site/trunk/uima-website/docs/testing-builds.html Thu Jan 13 22:16:47 2011
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
             <style type="text/css">@import "stylesheets/base.css";</style>
                                           <meta name="author" value="
- UIMA Documentation Team">
+ Apache UIMA Documentation Team">
   <meta name="email" value="dev@uima.apache.org">
                         
             
@@ -157,12 +157,16 @@
             <div class="navBarItem">      <div class="navPartHeading">ASF</div>
                 </div>
                 <div class="navBar">
-                  <div class="navBarItem">      <a href="./license.html">License</a>
+                  <div class="navBarItem">      <a href="http://www.apache.org/licenses/" target="_blank">License <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://apache.org/foundataion/thanks.html" target="_blank">ASF Sponsors <img src="images/offsitelink.png"</a>
                 </div>
                           <div class="navBarItem">      <a href="http://www.apache.org/foundation/sponsorship.html" target="_blank">ASF Sponsorship <img src="images/offsitelink.png"</a>
                 </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/foundation/thanks.html" target="_blank">Thanks <img src="images/offsitelink.png"</a>
+                </div>
+                          <div class="navBarItem">      <a href="http://www.apache.org/security" target="_blank">Security <img src="images/offsitelink.png"</a>
+                </div>
             </div>
         </div>
                 </td>
@@ -286,8 +290,10 @@
                     <tr>
                       <td><a href="index.html">Home</a></td>
                       <td><a href="privacy-policy.html">Privacy Policy</a></td>
-                      <td>
-                Copyright &#169; 2006-2009, The Apache Software Foundation
+                      <td style="font-size:75%">
+                Copyright &#169; 2006-2011, The Apache Software Foundation.<br/>
+                Apache UIMA, UIMA, the Apache UIMA logo and the Apache Feather logo are trademarks of The Apache Software Foundation.<br/>
+                All other marks mentioned may be trademarks or registered trademarks of their respective owners.
                       </td>
                       <td><a href="mailto:dev@uima.apache.org">Contact us</a></td>
                     </tr>