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 2013/02/05 15:24:33 UTC
svn commit: r1442603 - in
/uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features:
uima-eclipse-user-agreement.html uima-eclipse-user-agreement.txt
Author: schor
Date: Tue Feb 5 14:24:33 2013
New Revision: 1442603
URL: http://svn.apache.org/viewvc?rev=1442603&view=rev
Log:
[UIMA-2636] fix trademark notice at bottom
Modified:
uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.html
uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.txt
Modified: uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.html
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.html?rev=1442603&r1=1442602&r2=1442603&view=diff
==============================================================================
--- uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.html (original)
+++ uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.html Tue Feb 5 14:24:33 2013
@@ -121,6 +121,7 @@ contact the Apache Software Foundation t
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+Apache UIMA is a trademark of the Apache Software Foundation in the United States, other countries, or both.</small></p>
</body>
</html>
\ No newline at end of file
Modified: uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.txt
URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.txt?rev=1442603&r1=1442602&r2=1442603&view=diff
==============================================================================
--- uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.txt (original)
+++ uima/build/trunk/uima-build-resources/src/main/resources/licenses-eclipse-plugs-features/uima-eclipse-user-agreement.txt Tue Feb 5 14:24:33 2013
@@ -105,6 +105,5 @@ Content may contain encryption software.
another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is permitted.
-<small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small>
-</body>
-</html>
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+Apache UIMA is a trademark of the Apache Software Foundation in the United States, other countries, or both.
\ No newline at end of file