aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-07-22 11:59:40 (EDT)
committerGlyn Normington2010-07-22 11:59:40 (EDT)
commita45e77f48bf45df9ebf8abb458c61033128e264a (patch)
tree6d064998b228a3dfce88605e1541035debedfa63
parent002e9724e9fba7cd4484cb5c260d2fde6ea8ad10 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-a45e77f48bf45df9ebf8abb458c61033128e264a.zip
org.eclipse.gemini.web.gemini-web-container-a45e77f48bf45df9ebf8abb458c61033128e264a.tar.gz
org.eclipse.gemini.web.gemini-web-container-a45e77f48bf45df9ebf8abb458c61033128e264a.tar.bz2
bug 320648: fix About.html to be dual-licensed.
-rw-r--r--build-web-container/resources/About.html11
1 files changed, 9 insertions, 2 deletions
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index 9c83ee0..6b68a0d 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -11,9 +11,16 @@
<P>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+Eclipse Public License Version 1.0 ("EPL") and of the Apache License Version 2.0.
+
+You may elect to redistribute this code under either of these licenses.
+
+A copy of the EPL is available
at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
+For purposes of the EPL, "Program" will mean the Content.
+
+A copy of the Apache License Version 2.0 is available at
+<A href="http://www.opensource.org/licenses/apache2.0.php">http://www.opensource.org/licenses/apache2.0.php</A>.</P>
<P>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party ("Redistributor") and different terms and conditions may