summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authoraclement <aclement>2010-01-25 20:57:53 +0000
committeraclement <aclement>2010-01-25 20:57:53 +0000
commit046261e20078530352a063c6c1eef9f44bb98f23 (patch)
treebccc73845a7a6469971f7e7f43eb3fb0c14d4d8c /docs
parent9c07816d4839596800d3e2bcd709a6df2f0c5ba3 (diff)
downloadaspectj-046261e20078530352a063c6c1eef9f44bb98f23.tar.gz
aspectj-046261e20078530352a063c6c1eef9f44bb98f23.zip
292168
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/faq.xml13
1 files changed, 6 insertions, 7 deletions
diff --git a/docs/faq/faq.xml b/docs/faq/faq.xml
index ce3aed6f0..bcba754d7 100644
--- a/docs/faq/faq.xml
+++ b/docs/faq/faq.xml
@@ -165,7 +165,7 @@
</question>
<answer>
<para>Since AspectJ 1.5.2, source code and documentation is available under the
- <ulink url="http://eclipse.org/legal/epl-v10.html">Eclipse Public License 1.0</ulink>.
+ <ulink url="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License 1.0</ulink>.
</para>
<para>AspectJ 1.1 through 1.5.1 source code and documentation is available under the
<ulink url="http://eclipse.org/legal/cpl-v10.html">Common Public License 1.0</ulink>.
@@ -176,12 +176,11 @@
that precludes for-profit or commercial
redistribution.
</para>
- <para>Most users only want to use AspectJ to build programs they distribute.
- There are no restrictions here. When you distribute your program, be sure to
- include all the runtime classes from the aspectjrt.jar for that version of AspectJ.
- When distributing only the runtime classes, you need not provide any notice that
- the program was compiled with AspectJ or includes binaries from the AspectJ project,
- except as necessary to preserve the warranty disclaimers in our license.
+ <para>The runtime jar aspectjrt.jar and its distribution are also covered by the
+ <ulink url="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License</ulink>.
+ </para>
+ <para>For answers to common licensing questions, see the
+ <ulink url="http://www.eclipse.org/legal/eplfaq.php">Eclipse Public License FAQ</ulink>.
</para>
<para>
</para>