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/08/31 16:24:03 UTC
svn commit: r1163634 - in /uima/site/trunk/uima-website: ./ docs/
docs/staging/ xdocs/ xdocs/staging/
Author: schor
Date: Wed Aug 31 14:24:01 2011
New Revision: 1163634
URL: http://svn.apache.org/viewvc?rev=1163634&view=rev
Log:
[UIMA-2221] found a solution. To insert the tm symbol, use %trade; -- < but Anakia doesn't like this. So, instead use & # 0 1 5 3 ; (no spaces). Anakia converts this to the iso-8859-1 char code for this (hex 99 I think) in the HTML output. That used to work, but now the Apache webserver converts the char coding of the page to UTF-8. So, add a step after Anakia processing which converts all of the special TM characters into & t r a d e ; (no spaces) which browsers seem to honor correctly.
Modified:
uima/site/trunk/uima-website/build.xml
uima/site/trunk/uima-website/docs/annotators.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/code-scan-tools.html
uima/site/trunk/uima-website/docs/codeConventions.html
uima/site/trunk/uima-website/docs/contribution-policy.html
uima/site/trunk/uima-website/docs/decisions.html
uima/site/trunk/uima-website/docs/dev-docbook.html
uima/site/trunk/uima-website/docs/distribution-before-2.3.1.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/external-resources.html
uima/site/trunk/uima-website/docs/get-involved.html
uima/site/trunk/uima-website/docs/index.html
uima/site/trunk/uima-website/docs/mail-lists.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/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/staging/osgi.html
uima/site/trunk/uima-website/docs/svn.html
uima/site/trunk/uima-website/docs/team-list.html
uima/site/trunk/uima-website/docs/uima-specification.html
uima/site/trunk/uima-website/xdocs/sandbox.xml
uima/site/trunk/uima-website/xdocs/staging/osgi.xml
Modified: uima/site/trunk/uima-website/build.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/build.xml?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/build.xml (original)
+++ uima/site/trunk/uima-website/build.xml Wed Aug 31 14:24:01 2011
@@ -86,6 +86,12 @@
lastModifiedCheck="true"
templatePath="xdocs/stylesheets">
</anakia>
+
+ <!-- convert x99 (tm) to & trade ; -->
+ <replace dir="${docs.dest}/" token="â¢" value="&trade;" summary="true">
+ <include name="*.html"/>
+ <include name="staging/*.html"/>
+ </replace>
<!--copy todir="${docs.dest}/images" filtering="no">
<fileset dir="${docs.src}/images">
Modified: uima/site/trunk/uima-website/docs/annotators.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/annotators.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/annotators.html (original)
+++ uima/site/trunk/uima-website/docs/annotators.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<blockquote class="sectionBody">
<p class="note">As of August 2011, this page is out of date and nothing links to it; it will be deleted in the future.</p>
<p>
-UIMA Annotators do the real work of extracting structured information from unstructured data. You can write your
+UIMA™ Annotators do the real work of extracting structured information from unstructured data. You can write your
own annotators, use the annotators available here, or find UIMA annotators on the web, often
at various repositories.
</p>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/building-uima.html (original)
+++ uima/site/trunk/uima-website/docs/building-uima.html Wed Aug 31 14:24:01 2011
@@ -174,7 +174,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Building Apache UIMA from sources"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Building Apache UIMA from sources</h1></a>
+ <a name="Building Apache UIMA™ from sources"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Building Apache UIMA™ from sources</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html (original)
+++ uima/site/trunk/uima-website/docs/bulk-contribution-checklist.html Wed Aug 31 14:24:01 2011
@@ -174,7 +174,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Apache UIMA Bulk Contribution Checklist"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA Bulk Contribution Checklist</h1></a>
+ <a name="Apache UIMA™ Bulk Contribution Checklist"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA™ Bulk Contribution Checklist</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/code-scan-tools.html (original)
+++ uima/site/trunk/uima-website/docs/code-scan-tools.html Wed Aug 31 14:24:01 2011
@@ -174,7 +174,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Apache UIMA code scanning tools"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA code scanning tools</h1></a>
+ <a name="Apache UIMA™ code scanning tools"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA™ code scanning tools</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
Modified: uima/site/trunk/uima-website/docs/codeConventions.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/codeConventions.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/codeConventions.html (original)
+++ uima/site/trunk/uima-website/docs/codeConventions.html Wed Aug 31 14:24:01 2011
@@ -179,7 +179,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>
- To improve the readability and maintainability of the Apache UIMA code,
+ To improve the readability and maintainability of the Apache UIMA™ code,
we have adopted the following code conventions. All UIMA developers
should adhere to these guidelines when committing changes or submitting patches.
</p>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/contribution-policy.html (original)
+++ uima/site/trunk/uima-website/docs/contribution-policy.html Wed Aug 31 14:24:01 2011
@@ -183,7 +183,7 @@
<p align="center">Discussion of this document is occuring on the uima-dev mailing list.</p>
<br />
<p>
-The Apache UIMA Contribution Policy is summarized below:
+The Apache UIMA™ Contribution Policy is summarized below:
</p>
<ul>
<li>
Modified: uima/site/trunk/uima-website/docs/decisions.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/decisions.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/decisions.html (original)
+++ uima/site/trunk/uima-website/docs/decisions.html Wed Aug 31 14:24:01 2011
@@ -14,7 +14,7 @@
- <title>Apache UIMA - Apache UIMA Project Guidelines</title>
+ <title>Apache UIMA - Apache UIMA™ Project Guidelines</title>
</head>
<body>
@@ -28,7 +28,7 @@
</a>
</td>
<td align='CENTER'>
- <div class="pageBanner">Apache UIMA Project Guidelines</div>
+ <div class="pageBanner">Apache UIMA™ Project Guidelines</div>
</td>
<td align='RIGHT'>
<a href="http://www.apache.org">
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/dev-docbook.html (original)
+++ uima/site/trunk/uima-website/docs/dev-docbook.html Wed Aug 31 14:24:01 2011
@@ -174,7 +174,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Apache UIMA Docbook Bookshelf"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA Docbook Bookshelf</h1></a>
+ <a name="Apache UIMA™ Docbook Bookshelf"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA™ Docbook Bookshelf</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
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=1163634&r1=1163633&r2=1163634&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 Wed Aug 31 14:24:01 2011
@@ -188,7 +188,7 @@
Java 6 library method, surprisingly doesn't cause a mvn driven compile failure (if Maven is running under Java 6).</p>
<p>
<ul>
- <li><a href="#Building the Apache UIMA base distribution">Building the Apache UIMA base distribution</a></li>
+ <li><a href="#Building the Apache UIMA™ base distribution">Building the Apache UIMA base distribution</a></li>
<li><a href="#Building the Apache UIMA-AS distribution">Building the Apache UIMA-AS distribution</a></li>
<li><a href="#Building Apache UIMA Sandbox distributions">Building Apache UIMA Sandbox distributions</a></li>
<li><a href="#Building the Eclipse Update Site">Building the Eclipse Update Site</a></li>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-annotator.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-annotator.html Wed Aug 31 14:24:01 2011
@@ -181,7 +181,7 @@
<blockquote class="sectionBody">
<p>
The "Getting Started: Writing My First UIMA Annotator"
- guide should help you to write your first UIMA annotator component.
+ guide should help you to write your first UIMA™ annotator component.
UIMA annotators are the analysis
components that can be plugged into the UIMA framework to
analyze unstructured information; for example an annotator could
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-examples.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-examples.html Wed Aug 31 14:24:01 2011
@@ -181,7 +181,7 @@
<blockquote class="sectionBody">
<p>
This
- guide helps you install the Apache UIMA Java SDK release
+ guide helps you install the Apache UIMA™ Java SDK release
package and shows you how run the UIMA analysis example
using some of the UIMA tooling.
</p>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-pears.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-pears.html Wed Aug 31 14:24:01 2011
@@ -189,8 +189,8 @@
- <a name="What are UIMA PEAR files">
- <h2>What are UIMA PEAR files
+ <a name="What are UIMA™ PEAR files">
+ <h2>What are UIMA™ PEAR files
</h2>
</a>
</td></tr>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uima-why.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-why.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>
- The "Getting Started: Why UIMA" guide should help you to understand what UIMA is,
+ The "Getting Started: Why UIMA" guide should help you to understand what UIMA™ is,
what it can be used for, and how you can use it.
</p>
<table class="subsectionTable">
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uimaas-what.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uimaas-what.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>
- The "Getting Started: Apache UIMA Asynchronous Scaleout " guide should help you to understand UIMA AS: how it relates to the core UIMA framework, what are the main concepts of UIMA AS, and an example application scenario.
+ The "Getting Started: Apache UIMA™ Asynchronous Scaleout " guide should help you to understand UIMA AS: how it relates to the core UIMA framework, what are the main concepts of UIMA AS, and an example application scenario.
</p>
<table class="subsectionTable">
<tr><td>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uimacpp-huh.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>
- The "Getting Started: Apache UIMA C++ Framework" guide should help you to understand how UIMA C++ enables the creation of UIMA compliant Analysis Engines (AE) in C++ and other programming languages, and how these AE interact with UIMA's Java framework.
+ The "Getting Started: Apache UIMA™ C++ Framework" guide should help you to understand how UIMA C++ enables the creation of UIMA compliant Analysis Engines (AE) in C++ and other programming languages, and how these AE interact with UIMA's Java framework.
</p>
<table class="subsectionTable">
<tr><td>
Modified: uima/site/trunk/uima-website/docs/documentation.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/documentation.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/documentation.html (original)
+++ uima/site/trunk/uima-website/docs/documentation.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>Here you will find
- <a href="#manuals_and_guides">Apache UIMA Manuals and Guides</a> (Overview and Setup, Tutorials and Users' Guides, Tools, and References),
+ <a href="#manuals_and_guides">Apache UIMA™ Manuals and Guides</a> (Overview and Setup, Tutorials and Users' Guides, Tools, and References),
the
<a href="#javadocs">Javadocs</a> for the
public APIs of UIMA, and
Modified: uima/site/trunk/uima-website/docs/downloads.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/downloads.html (original)
+++ uima/site/trunk/uima-website/docs/downloads.html Wed Aug 31 14:24:01 2011
@@ -175,7 +175,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Downloading Apache UIMA"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Downloading Apache UIMA</h1></a>
+ <a name="Downloading Apache UIMA™"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Downloading Apache UIMA™</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/external-resources.html (original)
+++ uima/site/trunk/uima-website/docs/external-resources.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<blockquote class="sectionBody">
<p>
-Here are some links to Apache UIMA components available from other places. If you find other links that
+Here are some links to Apache UIMA™ components available from other places. If you find other links that
you think should be listed here, please drop us a line on on uima-dev or uima-user. Similarly,
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/get-involved.html (original)
+++ uima/site/trunk/uima-website/docs/get-involved.html Wed Aug 31 14:24:01 2011
@@ -179,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>
Modified: uima/site/trunk/uima-website/docs/index.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/index.html (original)
+++ uima/site/trunk/uima-website/docs/index.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>
- Welcome to the Apache UIMA project. Our goal is to support a thriving community of users and
+ Welcome to the Apache UIMA™ project. 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.
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/mail-lists.html (original)
+++ uima/site/trunk/uima-website/docs/mail-lists.html Wed Aug 31 14:24:01 2011
@@ -180,7 +180,7 @@
<tr><td>
<blockquote class="sectionBody">
<p>
- There are currently three publicly available mailing lists for Apache UIMA:
+ There are currently three publicly available mailing lists for Apache UIMA™:
Modified: uima/site/trunk/uima-website/docs/news.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/news.html (original)
+++ uima/site/trunk/uima-website/docs/news.html Wed Aug 31 14:24:01 2011
@@ -403,7 +403,7 @@
</td></tr>
<tr><td>
<blockquote class="subsectionBody">
- <p>This release only has the Apache 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>
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=1163634&r1=1163633&r2=1163634&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 Wed Aug 31 14:24:01 2011
@@ -180,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>.
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/one-time-setup.html (original)
+++ uima/site/trunk/uima-website/docs/one-time-setup.html Wed Aug 31 14:24:01 2011
@@ -179,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 Apache 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>
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/project-guidelines.html (original)
+++ uima/site/trunk/uima-website/docs/project-guidelines.html Wed Aug 31 14:24:01 2011
@@ -182,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>
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=1163634&r1=1163633&r2=1163634&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 Wed Aug 31 14:24:01 2011
@@ -173,7 +173,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Doing an Apache UIMA Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Doing an Apache UIMA Release</h1></a>
+ <a name="Doing an Apache UIMA™ Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Doing an Apache UIMA™ Release</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
Modified: uima/site/trunk/uima-website/docs/release.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/release.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/release.html (original)
+++ uima/site/trunk/uima-website/docs/release.html Wed Aug 31 14:24:01 2011
@@ -173,7 +173,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Doing an Apache UIMA Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Doing an Apache UIMA Release</h1></a>
+ <a name="Doing an Apache UIMA™ Release"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Doing an Apache UIMA™ Release</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
Modified: uima/site/trunk/uima-website/docs/roles.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/roles.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/roles.html (original)
+++ uima/site/trunk/uima-website/docs/roles.html Wed Aug 31 14:24:01 2011
@@ -174,7 +174,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Apache UIMA Roles and Responsibilities"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA Roles and Responsibilities</h1></a>
+ <a name="Apache UIMA™ Roles and Responsibilities"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA™ Roles and Responsibilities</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
Modified: uima/site/trunk/uima-website/docs/staging/osgi.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/staging/osgi.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/staging/osgi.html (original)
+++ uima/site/trunk/uima-website/docs/staging/osgi.html Wed Aug 31 14:24:01 2011
@@ -179,7 +179,7 @@
</td></tr>
<tr><td>
<blockquote class="sectionBody">
- <p>OSGi is not supported directly by the UIMA framework; the framework has no knowledge or interfaces for making use of it.
+ <p>OSGi is not supported directly by the UIMA™ framework; the framework has no knowledge or interfaces for making use of it.
However, components are being packaged as OSGi bundles: in particular, there are Eclipse Plugin tools that are packaged this way.
The Eclipse plugins are organized further using the Eclipse infrastructure for Features and Update Sites.</p>
<p>The addon annotators are being packaged experimentally as OSGi bundles. Due to UIMA not knowing about OSGi,
Modified: uima/site/trunk/uima-website/docs/svn.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/svn.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/svn.html (original)
+++ uima/site/trunk/uima-website/docs/svn.html Wed Aug 31 14:24:01 2011
@@ -174,7 +174,7 @@
<div class="sectionTable">
<table class="sectionTable">
<tr><td>
- <a name="Apache UIMA Source Code"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA Source Code</h1></a>
+ <a name="Apache UIMA™ Source Code"><h1><img src="images/UIMA_4sq50tightCropSolid.png"/> Apache UIMA™ Source Code</h1></a>
</td></tr>
<tr><td>
<blockquote class="sectionBody">
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=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/team-list.html (original)
+++ uima/site/trunk/uima-website/docs/team-list.html Wed Aug 31 14:24:01 2011
@@ -190,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>
Modified: uima/site/trunk/uima-website/docs/uima-specification.html
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/uima-specification.html?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/uima-specification.html (original)
+++ uima/site/trunk/uima-website/docs/uima-specification.html Wed Aug 31 14:24:01 2011
@@ -177,7 +177,7 @@
</td></tr>
<tr><td>
<blockquote class="sectionBody">
- <p>Apache UIMA is an Apache-licensed open source implementation of the
+ <p>Apache UIMA™ is an Apache-licensed open source implementation of the
<i>UIMA specification</i> being developed concurrently by a technical committee (TC) within
<a href="http://www.oasis-open.org" target="_blank">OASIS</a>, a standards organization. We encourage UIMA
developers to become familiar with the UIMA specification by visiting the following links.</p>
Modified: uima/site/trunk/uima-website/xdocs/sandbox.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/sandbox.xml?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/sandbox.xml (original)
+++ uima/site/trunk/uima-website/xdocs/sandbox.xml Wed Aug 31 14:24:01 2011
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="iso-8859-1"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
Modified: uima/site/trunk/uima-website/xdocs/staging/osgi.xml
URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/staging/osgi.xml?rev=1163634&r1=1163633&r2=1163634&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/staging/osgi.xml (original)
+++ uima/site/trunk/uima-website/xdocs/staging/osgi.xml Wed Aug 31 14:24:01 2011
@@ -32,7 +32,7 @@
<section name="OSGi packaging and support">
- <p>OSGi is not supported directly by the UIMA framework; the framework has no knowledge or interfaces for making use of it.
+ <p>OSGi is not supported directly by the UIMA™ framework; the framework has no knowledge or interfaces for making use of it.
However, components are being packaged as OSGi bundles: in particular, there are Eclipse Plugin tools that are packaged this way.
The Eclipse plugins are organized further using the Eclipse infrastructure for Features and Update Sites.</p>