ILRT/UB link updates

9 files changed, 30 insertions, 29 deletions

diff --git a/LICENSE.html b/LICENSE.html
index 14870654..ed4d12ed 100644
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -56,8 +56,8 @@ All Rights Reserved.</p>
 
    <blockquote>
 
-     <p>Copyright (C) 2000-2005 <a href="http://purl.org/net/dajobe/">David Beckett</a>,
-<a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a>.</p>
+     <p>Copyright (C) 2000-2005 <a href="http://purl.org/net/dajobe/">David Beckett</a><br />
+     Copyright (C) 2000-2005 <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a>.</p>
        
      <p>Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -78,7 +78,8 @@ All Rights Reserved.</p>
 
 <hr />
 
-<p>Copyright 2000-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a>, <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2000-2005 <a href="http://purl.org/net/dajobe/">David Beckett</a><br />
+Copyright (C) 2000-2005 <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/Makefile.am b/Makefile.am
index d0577865..bfb92b38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,8 @@
 #
 # $Id$
 #
-# Copyright (C) 2000-2004, David Beckett http://purl.org/net/dajobe/
-# Institute for Learning and Research Technology http://www.ilrt.bristol.ac.uk/
-# University of Bristol, UK http://www.bristol.ac.uk/
+# Copyright (C) 2000-2005 David Beckett http://purl.org/net/dajobe/
+# Copyright (C) 2000-2005 University of Bristol, UK http://www.bristol.ac.uk/
 # 
 # This package is Free Software and part of Redland http://librdf.org/
 # 
diff --git a/NEWS.html b/NEWS.html
index 6ae68393..f318e02e 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -162,7 +162,7 @@ statement to have one less 'const', to match the code.<br />
 raptor.h now includes stdarg.h<br />
 Portability fixes for win32<br />
 Updates to
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle</a>
+<a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a>
 parser to only allow language with non-datatyped literals;
 allow a '_' immediately after a ':' in qnames and make
 bare ':' work.<br />
@@ -180,7 +180,7 @@ for the full details of the changes.</p>
 
 <h2 id="D2004-05-11-V1.3.0">2004-05-11 Raptor Version 1.3.0 Released</h2>
 <p>
-Updated <a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle</a> parser to fix the collections syntax, add integer literals and allow - in names.<br />
+Updated <a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a> parser to fix the collections syntax, add integer literals and allow - in names.<br />
 Added support for guessing a parser from content or identifiers<br />
 Completed parser feature support<br />
 Added sending HTTP Accept: headers for WWW retrieval when possible<br />
@@ -194,7 +194,7 @@ for the full details of the changes.</p>
 
 <h2 id="D2004-01-24-V1.2.0">2004-01-24 Raptor Version 1.2.0 Released</h2>
 <p>Added a
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle</a> parser (was N-Triples Plus) now with collections.<br />
+<a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a> parser (was N-Triples Plus) now with collections.<br />
 Added raptor_syntaxes_enumerate to get syntax name, label,
 mime_type or uri_string of all known parsers.<br />
 Added WWW access via BSD libfetch if available.<br />
@@ -203,7 +203,7 @@ Updated the GNOME GUI grapper program to report errors and warnings<br />
 
 <h2 id="D2003-12-31-V1.1.0">2003-12-31 Raptor Version 1.1.0 Released</h2>
 <p>Added an
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2003/11/ntriplesplus/">N-Triples Plus</a> parser<br />
+<a href="http://www.dajobe.org/2003/11/ntriplesplus/">N-Triples Plus</a> parser<br />
 Updated for <a href="http://www.w3.org/TR/2003/WD-rdf-syntax-grammar-20031010/">RDF/XML Revised Working Draft</a> (10 October 2003) allowing <code>rdf:RDF</code> to be optional by default.  No further changes were needed for <a href="http://www.w3.org/TR/2003/PR-rdf-syntax-grammar-20031215/">RDF/XML Revised Proposed Recommendation</a> (15 December 2003)<br />
 Made URI class constructors, methods and factory methods as
 well as some other utility functions using or returning URIs or
@@ -379,7 +379,8 @@ Added better XML parser auto-detection for various expats and libxml
 
 <hr />
 
-<p>Copyright 2001-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a>, <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2001-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a><br />
+Copyright (C) 2001-2005 <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/README.html b/README.html
index 209b1d0a..e13f8077 100644
--- a/README.html
+++ b/README.html
@@ -8,7 +8,7 @@
 <body>
 
 <h1 style="text-align:center">Raptor RDF Parser Toolkit</h1>
-<h2 style="text-align:center"><a href="http://purl.org/net/dajobe/">Dave Beckett</a><br /><a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a><br /><a href="http://www.bristol.ac.uk/">University of Bristol</a></h2>
+<h2 style="text-align:center"><a href="http://purl.org/net/dajobe/">Dave Beckett</a></h2>
   
 
 <h2>Overview</h2>
@@ -83,7 +83,7 @@ for the <a href="http://www.w3.org/TR/rdf-testcases/">RDF Test Cases</a>.
 <h3>Turtle Parser</h3>
 
 <p>A parser for the
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle Terse RDF Triple Language</a>
+<a href="http://www.dajobe.org/2004/01/turtle/">Turtle Terse RDF Triple Language</a>
 syntax, designed as a useful subset of
 <a href="http://www.w3.org/DesignIssues/Notation3">Notation 3</a>.
 </p>
@@ -211,7 +211,8 @@ future plans and announcement of releases.</p>
 
 <hr />
 
-<p>Copyright 2000-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a>, <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2000-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a><br />
+Copyright (C) 2000-2005 <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/RELEASE.html b/RELEASE.html
index b6bb9336..ccc65aec 100644
--- a/RELEASE.html
+++ b/RELEASE.html
@@ -467,7 +467,7 @@ this bug but it will not cause the test suite ('make check') to
 fail.</p>
 
 <p>Added additional 
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle</a>
+<a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a>
 parser tests that cover Notation 3 syntax that is not part of the
 Turtle language.</p>
 
@@ -847,7 +847,7 @@ available to check.</p>
 <h3>Parser Changes</h3>
 
 <p>The
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle</a>
+<a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a>
 parser was updated to only allow language with non-datatyped literals,
 allow a '_' immediately after a ':' in qnames and to make a bare ':'
 qname work correctly.
@@ -886,7 +886,7 @@ RDF-namespaced names in element and attributes and if they are
 forbidden giving an error otherwise if unknown, giving a warning.</p>
 
 <p>The
-<a href="http://www.ilrt.bristol.ac.uk/discovery/2004/01/turtle/">Turtle</a>
+<a href="http://www.dajobe.org/2004/01/turtle/">Turtle</a>
 parser was updated to correct the collections syntax, allow '-' in
 names and QNames and to add integer literals.  This parser now correctly
 uses <code>raptor_generate_id</code> when a blank identifier name is
@@ -964,7 +964,8 @@ for constructing strings from substrings appended or prepended.</p>
 
 <hr />
 
-<p>Copyright 2003-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a>, <a href="http://www.ilrt.bris.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2003-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a><br />
+Copyright (C) 2003-2005 <a href="http://www.ilrt.bris.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/TODO.html b/TODO.html
index 082d83e7..78fac405 100644
--- a/TODO.html
+++ b/TODO.html
@@ -73,7 +73,7 @@ content name such as a filename or URI (1.3.0)</li>
 <li>Made the N-Triples parser use <code>raptor_generate_id</code> for blank nodes identifiers (1.1.0)</li>
 <li>Updated the RDF/XML parser to handle libxml 2.6.0 SAX2 API which
 changes the names of all of the SAX1 calls (1.1.0).</li>
-<li>Added an <a href="http://www.ilrt.bristol.ac.uk/discovery/2003/11/ntriplesplus/">N-Triples Plus</a> parser (1.1.0)</li>
+<li>Added an <a href="http://www.dajobe.org/2003/11/ntriplesplus/">N-Triples Plus</a> parser (1.1.0)</li>
 <li>Correct line counting for N-Triples with \r\n line (DOS) files and
 when the line crosses a chunk. (1.1.0)</li>
 <li>Handle WIN32 file URIs starting <code>file://c:</code>... (1.1.0)</li>
@@ -148,7 +148,8 @@ area of the
 
 <hr />
 
-<p>Copyright 2001-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a>, <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2001-2005 <a href="http://purl.org/net/dajobe/">Dave Beckett</a><br />
+Copyright (C) 2001-2005 <a href="http://www.ilrt.bristol.ac.uk/">Institute for Learning and Research Technology</a>, <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/configure.ac b/configure.ac
index 63cc1227..3bd8a470 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,9 +5,8 @@ dnl (Process this file with autoconf to produce a configure script.)
 dnl
 dnl $Id$
 dnl
-dnl Copyright (C) 2000-2004, David Beckett http://purl.org/net/dajobe/
-dnl Institute for Learning and Research Technology http://www.ilrt.bristol.ac.uk/
-dnl University of Bristol, UK http://www.bristol.ac.uk/
+dnl Copyright (C) 2000-2005 David Beckett http://purl.org/net/dajobe/
+dnl Copyright (C) 2000-2005 University of Bristol, UK http://www.bristol.ac.uk/
 dnl 
 dnl This package is Free Software and part of Redland http://librdf.org/
 dnl 
diff --git a/manifest.pl b/manifest.pl
index 6a55371f..d61b7ba6 100755
--- a/manifest.pl
+++ b/manifest.pl
@@ -4,9 +4,8 @@
 #
 # $Id$
 #
-# Copyright (C) 2002-2004, David Beckett http://purl.org/net/dajobe/
-# Institute for Learning and Research Technology http://www.ilrt.bristol.ac.uk/
-# University of Bristol, UK http://www.bristol.ac.uk/
+# Copyright (C) 2002-2004 David Beckett http://purl.org/net/dajobe/
+# Copyright (C) 2002-2004 University of Bristol, UK http://www.bristol.ac.uk/
 # 
 # This package is Free Software and part of Redland http://librdf.org/
 # 
diff --git a/raptor-src-config.in b/raptor-src-config.in
index 3f21cc7d..fb444fd0 100644
--- a/raptor-src-config.in
+++ b/raptor-src-config.in
@@ -2,9 +2,8 @@
 #
 # $Id$
 #
-# Copyright (C) 2002-2004, David Beckett http://purl.org/net/dajobe/
-# Institute for Learning and Research Technology http://www.ilrt.bristol.ac.uk/
-# University of Bristol, UK http://www.bristol.ac.uk/
+# Copyright (C) 2002-2005 David Beckett http://purl.org/net/dajobe/
+# Copyright (C) 2002-2005 University of Bristol, UK http://www.bristol.ac.uk/
 # 
 # This package is Free Software and part of Redland http://librdf.org/
 #