You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/07/06 21:06:52 UTC

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

Author: rec
Date: Sat Jul  6 19:06:51 2013
New Revision: 1500314

URL: http://svn.apache.org/r1500314
Log:
no Jira - Fix links to Apache Confluence wiki

Modified:
    uima/site/trunk/uima-website/docs/annotators.html
    uima/site/trunk/uima-website/docs/apache-board-status.html
    uima/site/trunk/uima-website/docs/building-uima.html
    uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html
    uima/site/trunk/uima-website/docs/checklist-release.html
    uima/site/trunk/uima-website/docs/code-scan-tools.html
    uima/site/trunk/uima-website/docs/codeConventions.html
    uima/site/trunk/uima-website/docs/communication.html
    uima/site/trunk/uima-website/docs/contribution-policy.html
    uima/site/trunk/uima-website/docs/decisions.html
    uima/site/trunk/uima-website/docs/dependencies.html
    uima/site/trunk/uima-website/docs/dev-docbook.html
    uima/site/trunk/uima-website/docs/dev-quick.html
    uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html
    uima/site/trunk/uima-website/docs/distribution.html
    uima/site/trunk/uima-website/docs/doc-uima-annotator.html
    uima/site/trunk/uima-website/docs/doc-uima-examples.html
    uima/site/trunk/uima-website/docs/doc-uima-pears.html
    uima/site/trunk/uima-website/docs/doc-uima-why.html
    uima/site/trunk/uima-website/docs/doc-uimaas-what.html
    uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html
    uima/site/trunk/uima-website/docs/documentation.html
    uima/site/trunk/uima-website/docs/downloads.html
    uima/site/trunk/uima-website/docs/eclipse-update-site.html
    uima/site/trunk/uima-website/docs/external-resources.html
    uima/site/trunk/uima-website/docs/faq.html
    uima/site/trunk/uima-website/docs/get-involved.html
    uima/site/trunk/uima-website/docs/gldv07.html
    uima/site/trunk/uima-website/docs/gscl09.html
    uima/site/trunk/uima-website/docs/gscl13.html
    uima/site/trunk/uima-website/docs/iks09.html
    uima/site/trunk/uima-website/docs/index.html
    uima/site/trunk/uima-website/docs/license.html
    uima/site/trunk/uima-website/docs/lrec08.html
    uima/site/trunk/uima-website/docs/lsm09.html
    uima/site/trunk/uima-website/docs/mail-lists.html
    uima/site/trunk/uima-website/docs/management.html
    uima/site/trunk/uima-website/docs/maven-design.html
    uima/site/trunk/uima-website/docs/news.html
    uima/site/trunk/uima-website/docs/one-time-release-setup.html
    uima/site/trunk/uima-website/docs/one-time-setup.html
    uima/site/trunk/uima-website/docs/privacy-policy.html
    uima/site/trunk/uima-website/docs/project-guidelines.html
    uima/site/trunk/uima-website/docs/release-before-2.3.1.html
    uima/site/trunk/uima-website/docs/release.html
    uima/site/trunk/uima-website/docs/roles.html
    uima/site/trunk/uima-website/docs/ruta.html
    uima/site/trunk/uima-website/docs/sandbox.html
    uima/site/trunk/uima-website/docs/saving-svn-resources.html
    uima/site/trunk/uima-website/docs/staging/osgi.html
    uima/site/trunk/uima-website/docs/staging/testing-builds.html
    uima/site/trunk/uima-website/docs/svn.html
    uima/site/trunk/uima-website/docs/team-list.html
    uima/site/trunk/uima-website/docs/testing-builds.html
    uima/site/trunk/uima-website/docs/toolsServers.html
    uima/site/trunk/uima-website/docs/uima-specification.html
    uima/site/trunk/uima-website/docs/updating-website.html
    uima/site/trunk/uima-website/xdocs/faq.xml
    uima/site/trunk/uima-website/xdocs/get-involved.xml
    uima/site/trunk/uima-website/xdocs/index.xml
    uima/site/trunk/uima-website/xdocs/release-before-2.3.1.xml
    uima/site/trunk/uima-website/xdocs/release.xml
    uima/site/trunk/uima-website/xdocs/sandbox.xml
    uima/site/trunk/uima-website/xdocs/stylesheets/project.xml
    uima/site/trunk/uima-website/xdocs/team-list.xml

Modified: uima/site/trunk/uima-website/docs/annotators.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/annotators.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/annotators.html (original)
+++ uima/site/trunk/uima-website/docs/annotators.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/apache-board-status.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/apache-board-status.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/apache-board-status.html (original)
+++ uima/site/trunk/uima-website/docs/apache-board-status.html Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/building-uima.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/building-uima.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/building-uima.html (original)
+++ uima/site/trunk/uima-website/docs/building-uima.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html (original)
+++ uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/checklist-release.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/checklist-release.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/checklist-release.html (original)
+++ uima/site/trunk/uima-website/docs/checklist-release.html Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/code-scan-tools.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/code-scan-tools.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/code-scan-tools.html (original)
+++ uima/site/trunk/uima-website/docs/code-scan-tools.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/codeConventions.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/codeConventions.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/codeConventions.html (original)
+++ uima/site/trunk/uima-website/docs/codeConventions.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/communication.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/communication.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/communication.html (original)
+++ uima/site/trunk/uima-website/docs/communication.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/contribution-policy.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/contribution-policy.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/contribution-policy.html (original)
+++ uima/site/trunk/uima-website/docs/contribution-policy.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/decisions.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/decisions.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/decisions.html (original)
+++ uima/site/trunk/uima-website/docs/decisions.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/dependencies.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dependencies.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/dependencies.html (original)
+++ uima/site/trunk/uima-website/docs/dependencies.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/dev-docbook.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dev-docbook.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/dev-docbook.html (original)
+++ uima/site/trunk/uima-website/docs/dev-docbook.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/dev-quick.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/dev-quick.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/dev-quick.html (original)
+++ uima/site/trunk/uima-website/docs/dev-quick.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html (original)
+++ uima/site/trunk/uima-website/docs/distribution-before-2.3.1.html Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/distribution.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/distribution.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/distribution.html (original)
+++ uima/site/trunk/uima-website/docs/distribution.html Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/doc-uima-annotator.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-annotator.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-annotator.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-annotator.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/doc-uima-examples.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-examples.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-examples.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-examples.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/doc-uima-pears.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-pears.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-pears.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-pears.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/doc-uima-why.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-why.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-why.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-why.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/doc-uimaas-what.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimaas-what.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uimaas-what.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uimaas-what.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/documentation.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/documentation.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/documentation.html (original)
+++ uima/site/trunk/uima-website/docs/documentation.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/downloads.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/downloads.html (original)
+++ uima/site/trunk/uima-website/docs/downloads.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/eclipse-update-site.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/eclipse-update-site.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/eclipse-update-site.html (original)
+++ uima/site/trunk/uima-website/docs/eclipse-update-site.html Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/external-resources.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/external-resources.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/external-resources.html (original)
+++ uima/site/trunk/uima-website/docs/external-resources.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/faq.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/faq.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/faq.html (original)
+++ uima/site/trunk/uima-website/docs/faq.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>
@@ -284,7 +284,7 @@
         <blockquote class="subsectionBody">
                                     <p>
 					It does; see:
-					<a href="http://cwiki.apache.org/UIMA/">
+					<a href="http://cwiki.apache.org/confluence/display/UIMA/">
 						UIMA wiki
 					</a>
 					. It will complement the work taking place on the

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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/get-involved.html (original)
+++ uima/site/trunk/uima-website/docs/get-involved.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>
@@ -224,7 +224,7 @@ Bugs and other issues can be posted on t
 </li>
 <li>
 Additional documentation and discussion can be found on the project
-<a href="http://cwiki.apache.org/UIMA/">wiki</a>
+<a href="http://cwiki.apache.org/confluence/display/UIMA/">wiki</a>
 </li>
 </ul>
                             </blockquote>

Modified: uima/site/trunk/uima-website/docs/gldv07.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gldv07.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/gldv07.html (original)
+++ uima/site/trunk/uima-website/docs/gldv07.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/gscl09.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gscl09.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/gscl09.html (original)
+++ uima/site/trunk/uima-website/docs/gscl09.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/gscl13.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/gscl13.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/gscl13.html (original)
+++ uima/site/trunk/uima-website/docs/gscl13.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/iks09.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/iks09.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/iks09.html (original)
+++ uima/site/trunk/uima-website/docs/iks09.html Sat Jul  6 19:06:51 2013
@@ -81,12 +81,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/index.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/index.html (original)
+++ uima/site/trunk/uima-website/docs/index.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/license.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/license.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/license.html (original)
+++ uima/site/trunk/uima-website/docs/license.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/lrec08.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/lrec08.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/lrec08.html (original)
+++ uima/site/trunk/uima-website/docs/lrec08.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/lsm09.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/lsm09.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/lsm09.html (original)
+++ uima/site/trunk/uima-website/docs/lsm09.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/mail-lists.html (original)
+++ uima/site/trunk/uima-website/docs/mail-lists.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/management.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/management.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/management.html (original)
+++ uima/site/trunk/uima-website/docs/management.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/maven-design.html (original)
+++ uima/site/trunk/uima-website/docs/maven-design.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

Modified: uima/site/trunk/uima-website/docs/news.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/news.html (original)
+++ uima/site/trunk/uima-website/docs/news.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&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 Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/one-time-setup.html (original)
+++ uima/site/trunk/uima-website/docs/one-time-setup.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/privacy-policy.html (original)
+++ uima/site/trunk/uima-website/docs/privacy-policy.html Sat Jul  6 19:06:51 2013
@@ -80,12 +80,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/project-guidelines.html (original)
+++ uima/site/trunk/uima-website/docs/project-guidelines.html Sat Jul  6 19:06:51 2013
@@ -79,12 +79,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>

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=1500314&r1=1500313&r2=1500314&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 Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>
@@ -222,7 +222,7 @@ please see <a href="release.html">this</
 		</p>
                                                 <p>  
 		  The previous UIMA release plans and a release plan template are available in the UIMA wiki at
-		  <a href="http://cwiki.apache.org/UIMA/release-plan.html">http://cwiki.apache.org/UIMA/release-plan.html</a>
+		  <a href="http://cwiki.apache.org/confluence/display/UIMA/release-plan.html">http://cwiki.apache.org/confluence/display/UIMA/release-plan.html</a>
 		</p>
                             </blockquote>
         </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=1500314&r1=1500313&r2=1500314&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/release.html (original)
+++ uima/site/trunk/uima-website/docs/release.html Sat Jul  6 19:06:51 2013
@@ -78,12 +78,12 @@
                     <a href="http://news.gmane.org/gmane.comp.apache.uima.general" target="_blank"><em> Users</em> <img src="images/offsitelink.png" /></a>
                   <a href="http://news.gmane.org/gmane.comp.apache.uima.devel" target="_blank"><em>Dev</em> <img src="images/offsitelink.png" /></a>
               </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/powered-by-apache-uima.html" target="_blank">Powered By UIMA <img src="images/offsitelink.png"/></a>
                 </div>
                     <br style="line-height: .5em"/>
                           <div class="navBarItem">      <a href="http://issues.apache.org/jira/browse/uima" target="_blank">Issue tracker <img src="images/offsitelink.png"/></a>
                 </div>
-                          <div class="navBarItem">      <a href="http://cwiki.apache.org/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
+                          <div class="navBarItem">      <a href="http://cwiki.apache.org/confluence/display/UIMA/" target="_blank">Wiki <img src="images/offsitelink.png"/></a>
                 </div>
             </div>
                       <br/>
@@ -295,7 +295,7 @@ A previous version of this page, with th
 		</p>
                                                 <p>  
 		  The previous UIMA release plans and a release plan template are available in the UIMA wiki at
-		  <a href="http://cwiki.apache.org/UIMA/release-plan.html">http://cwiki.apache.org/UIMA/release-plan.html</a>
+		  <a href="http://cwiki.apache.org/confluence/display/UIMA/release-plan.html">http://cwiki.apache.org/confluence/display/UIMA/release-plan.html</a>
 		</p>
                             </blockquote>
         </td></tr>