Homogenise the licence, and bring it up to date.

git-svn-id: svn://svn.tartarus.org/sgt/halibut@4023 cda61777-01e9-0310-a592-d414129be87e

diff --git a/LICENCE b/LICENCE
index b1bfa8b..f5f065b 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-Halibut is copyright (c) 1999-2001 Simon Tatham and James Aylett.
+Halibut is copyright (c) 1999-2004 Simon Tatham and James Aylett.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

diff --git a/doc/licence.but b/doc/licence.but
index 90c63bd..4c01c29 100644 (file)
--- a/doc/licence.but
+++ b/doc/licence.but
@@ -1,10 +1,8 @@
-\versionid $Id: licence.but,v 1.1 2004/03/25 18:33:02 simon Exp $
+\versionid $Id: licence.but,v 1.2 2004/04/01 17:36:42 simon Exp $
 
 \A{licence} Halibut Licence
 
-Halibut is copyright 2004 Simon Tatham.
-
-Portions copyright James Aylett.
+Halibut is copyright (c) 1999-2004 Simon Tatham and James Aylett.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
@@ -20,7 +18,8 @@ included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
-FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.