use "/who" rather than "/w" to find our island

[jarrg-ian.git] / LICENCE

diff --git a/LICENCE b/LICENCE
index fc4b4ab3b588ac74f3fb42f1d181a713cd1904c5..57e176ef8d0b053e8655684b00f1ceaf7fcd6e2f 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -1,11 +1,20 @@
-jpctb is Free Software.
+Jarrg (and Yarrg) are Free Software.

 
 

-The Linux "jpctb" wrapper script is:
+The Linux "jarrg" wrapper script is:

   Copyright (C) 2009-2010 Ian Jackson
 
   Copyright (C) 2009-2010 Ian Jackson
 

-com.tedpearson.* Java source code is:
+net.chiark.yarrg.* Java code (except ClientHttpRequest) is:

   Copyright (C) 2009 Ted Pearson and Owen Dunn
   Copyright (C) 2010 Owen Dunn and Ian Jackson
   Copyright (C) 2009 Ted Pearson and Owen Dunn
   Copyright (C) 2010 Owen Dunn and Ian Jackson

+(much of this code was originally com.tedpearson.ypp.market.*)
+
+net.chiark.yarrg.ClientHttpRequest is copyright Vlad Petryshev,
+Ted Pearson, and Owen Dunn and licensed under the Apache license
+version 2.0.  See the file LICENCE.clienthttprequest.
+
+Java Accessibility Utilities are (C) Sun Microsystems Inc. and
+distributed under the Java Accessibility Utilities Version 1.3 Binary
+Code License Agreement.  See the file LICENCE.java-accessibility.

 
 All other components are:
   Copyright (C) 2009 Owen Dunn
 
 All other components are:
   Copyright (C) 2009 Owen Dunn


@@ -33,10 +42,3 @@ licence:
 # IN THE SOFTWARE.
 
 
 # IN THE SOFTWARE.
 
 

-com.myjavatools.web.* Java source code is copyright Vlad Petryshev,
-Ted Pearson, and Owen Dunn and licensed under the Apache license
-version 2.0 (see http://www.myjavatools.com/license.txt)
-
-Java Accessibility Utilities are (C) Sun Microsystems Inc. and
-distributed under the Java Accessibility Utilities Version 1.3 Binary
-Code License Agreement