[project @ 1999-09-13 13:48:01 by simonmar]

GHC's web pages have moved to http://www.haskell.org/ghc/.

diff --git a/ghc/ANNOUNCE b/ghc/ANNOUNCE
index 4b7d3f4..566fa5d 100644 (file)
--- a/ghc/ANNOUNCE
+++ b/ghc/ANNOUNCE
@@ -9,11 +9,11 @@ Haskell is "the" standard lazy functional programming language; the
 current language version is Haskell 98, agreed in December 1998.
 Haskell related information is available from the Haskell home page at
 
-       http://haskell.org/
+       http://www.haskell.org/
 
 GHC's Web page lives at
 
-       http://research.microsoft.com/users/t-simonm/ghc/
+       http://www.haskell.org/ghc/
 
 + What's new
 =============
@@ -31,7 +31,7 @@ GHC's Web page lives at
 
 For full details see the release notes:
 
-       http://research.microsoft.com/users/t-simonm/ghc/Docs/latest/users_guide/users_guide-1.html#ss1.4
+       http://www.haskell.org/ghc/docs/latest/users_guide/users_guide-1.html#ss1.4
 
 + Mailing lists
 ================
@@ -50,8 +50,8 @@ users hang out on glasgow-haskell-users@haskell.org
 
 Relevant URLs on the World-Wide Web:
 
-GHC home page            http://research.microsoft.com/users/t-simonm/ghc/
-Haskell home page        http://haskell.org/
+GHC home page            http://www.haskell.org/ghc/
+Haskell home page        http://www.haskell.org/
 comp.lang.functional FAQ  http://www.cs.nott.ac.uk/Department/Staff/mpj/faq.html
 
 
@@ -61,7 +61,7 @@ comp.lang.functional FAQ  http://www.cs.nott.ac.uk/Department/Staff/mpj/faq.html
 The easy way is to go to the WWW page, which should be
 self-explanatory:
 
-       http://research.microsoft.com/users/t-simonm/ghc/
+       http://www.haskell.org/ghc/
 
 Once you have the distribution, please follow the pointers in the
 README file to find all of the documentation about this release.  NB:
@@ -90,4 +90,4 @@ haven't been tested due to lack of time/hardware:
 The installer's guide included in distribution gives a complete
 run-down of what-ports-work; an on-line version can be found at
 
-   http://research.microsoft.com/users/t-simonm/ghc/Docs/latest/installation_guide/installing.html
+   http://www.haskell.org/ghc/docs/latest/installation_guide/installing.html

diff --git a/ghc/README b/ghc/README
index 617620a..5053620 100644 (file)
--- a/ghc/README
+++ b/ghc/README
@@ -8,13 +8,13 @@ GHC is a batch compiler for Haskell 98.  See the file ANNOUNCE for
 information on the current version.
 
 Haskell is "the" standard lazy functional programming language.
-Haskell 98 is the current version of the language, released in 
+Haskell 98 is the current version of the language, released in
 December 1998.  The language definition is on the Web at
-http://research.microsoft.com/Users/simonpj/Haskell/haskell98.html
+http://www.haskell.org/definition/.
 
 More information on GHC can be found on its web page
 
-       http://www.dcs.gla.ac.uk/fp/software/ghc/
+       http://www.haskell.org/ghc/
 
 GHC documentation of interest:
 
@@ -87,8 +87,3 @@ E-mail contacts:
 Send mail to majordomo@haskell.org with 'help' in the body of the
 message for information on joining/leaving either of these mailing
 lists.
-
-Anonymous FTP site: ftp://ftp.dcs.gla.ac.uk/pub/haskell/glasgow.
-Mostly mirrored by ftp.cs.chalmers.se and haskell.org (same
-directory).  Also: sunsite.doc.ic.ac.uk, in
-computing/programming/languages/haskell/glasgow/.

diff --git a/ghc/docs/users_guide/intro.vsgml b/ghc/docs/users_guide/intro.vsgml
index 3f6e895..a092c86 100644 (file)
--- a/ghc/docs/users_guide/intro.vsgml
+++ b/ghc/docs/users_guide/intro.vsgml
@@ -161,8 +161,8 @@ of this guide!
 On the World-Wide Web, there are several URLs of likely interest:
 
 <itemize>
-<item>  <url name="Haskell home page" url="http://haskell.org/">
-<item>  <url name="GHC home page" url="http://research.microsoft.com/users/t-simonm/ghc/">
+<item>  <url name="Haskell home page" url="http://www.haskell.org/">
+<item>  <url name="GHC home page"     url="http://www.haskell.org/ghc/">
 <item>  <url name="Glasgow FP group page" url="http://www.dcs.gla.ac.uk/fp/">
 <item>  <url name="comp.lang.functional FAQ" url="http://www.cs.nott.ac.uk/Department/Staff/mpj/faq.html">
 </itemize>