diff --git a/docs/installing.vsgml b/docs/installing.vsgml
index 5438b7202f75b00ee20668a24fbf8e737c612a69..4030811bdc1a6719ce61c468c2077222c1913aee 100644
--- a/docs/installing.vsgml
+++ b/docs/installing.vsgml
@@ -2,7 +2,7 @@
<article>
<title>Building and Installing the Glasgow Functional Programming Tools Suite
-Version 4.01
+Version 4.02
<author>The GHC Team,
Department of Computing Science,
University of Glasgow,
diff --git a/ghc/ANNOUNCE b/ghc/ANNOUNCE
index 7fc912c954a618f2c4384c7b5ff993bc96059a48..afe5a937898dacfd7ab1dd313cb0af4335b2f4a7 100644
--- a/ghc/ANNOUNCE
+++ b/ghc/ANNOUNCE
@@ -1,4 +1,4 @@
- The Glasgow Haskell Compiler -- version 4.01
+ The Glasgow Haskell Compiler -- version 4.02
==============================================
We are pleased to announce a new release of the Glasgow Haskell
@@ -14,20 +14,20 @@ related information is available from the Haskell home page at
+ What's new
=============
-GHC 4.01 is a small increment over 4.00. Many bugs have been fixed.
-The following features are new:
-
- * Weak pointers,
- * The foreign function interface is now complete.
-
-In addition, bootstrapping the compiler should now work out of the box.
+GHC 4.02 fixes several bugs in 4.01 and adds one new feature: scoped
+type variables. Some Haskell 98 features are also now supported,
+including lazy name clash detection and scoped infix declarations.
The following things have not been fixed yet:
* The native code generator is still flaky, and is turned off by
default for the time being.
+
* The profiler is still flaky.
+ * The garbage collector is still a two-space copying collector. We're
+ working on a generational collector right now.
+
+ Mailing lists
================
@@ -70,7 +70,8 @@ for tar, please)!
To compile up this source-only release, you need a machine with 32+MB
memory, GNU C (`gcc'), `perl' plus a version of GHC installed (version
-2.10 at least). This release is known to work on the following platforms:
+2.10 at least, 3.02 recommended). This release is known to work on
+the following platforms:
* i386-unknown-{linux,solaris2,freebsd,cygwin32}
* sparc-sun-{sunos4,solaris2}
diff --git a/ghc/PATCHLEVEL b/ghc/PATCHLEVEL
index 7de5789b308b38f7c4b3eb5ea08926357f42f08f..95e745935d23403588245c5ea11dba16faf553cc 100644
--- a/ghc/PATCHLEVEL
+++ b/ghc/PATCHLEVEL
@@ -1 +1 @@
-The Glamorous Glasgow Haskell Compiler, version 4.01, patchlevel 0
+The Glamorous Glasgow Haskell Compiler, version 4.02, patchlevel 0
diff --git a/ghc/README b/ghc/README
index 566b28084aaec6fcb76dd49406757ffa4e942f9e..2769b7b5f910fc0be26286148b8394cf7f0be2d7 100644
--- a/ghc/README
+++ b/ghc/README
@@ -1,5 +1,11 @@
-This is version 4.01 of the Glorious Glasgow Haskell compilation
-system (GHC). GHC 4.01 is a compiler for Haskell 1.4.
+The Glasgow Haskell Compiler
+============================
+
+(this file is fptools/ghc/README in a source distribution, and
+fptools/README in a binary distribution).
+
+GHC is a batch compiler for Haskell 1.4. See the file ANNOUNCE for
+information on the current version.
Haskell is "the" standard lazy functional programming language.
Haskell 1.4 is the current version of the language, released in
@@ -8,7 +14,7 @@ http://www.haskell.org/report/index.html.
More information on GHC can be found on its web page
- http://www.dcs.gla.ac.uk/fp/software/ghc
+ http://www.dcs.gla.ac.uk/fp/software/ghc/
GHC documentation of interest:
diff --git a/ghc/docs/users_guide/4-02-notes.vsgml b/ghc/docs/users_guide/4-02-notes.vsgml
new file mode 100644
index 0000000000000000000000000000000000000000..663a78700358899c7ae52989601360f98fd93e56
--- /dev/null
+++ b/ghc/docs/users_guide/4-02-notes.vsgml
@@ -0,0 +1,35 @@
+<sect1>Release notes for version~4.02---12/98
+<label id="release-4-02">
+<p>
+
+<itemize>
+
+<item> Some Haskell 98 changes:
+ <itemize>
+ <item> Lazy name-clash detection.
+ <item> Scoped infix declarations.
+ </itemize>
+
+<item> Scoped type variables implemented.
+
+<item> Several bugs in _ccall_GC and foreign export fixed.
+
+<item> Warnings for unused variables should work now (they didn't before).
+
+<item> Simplifier improvements:
+ <itemize>
+ <item> Much better treatment of strict arguments.
+ <item> Function arguments of unlifted type are treated as strict.
+ <item> Better treatment of bottoming Ids.
+ <item> No need for worker/wrapper split for fns that are merely strict.
+ <item> Fewer iterations needed, I hope.
+ </itemize>
+
+<item> Strictness of primitive operations is now explicit and used by
+the simplifier.
+
+<item> Less gratuitous renaming in interface files and abs C.
+
+<item> <tt/OccName/ is a separate module, and is an abstract data type.
+
+</itemize>
diff --git a/ghc/docs/users_guide/users_guide.vsgml b/ghc/docs/users_guide/users_guide.vsgml
index a864e54bba49368beb781238179a8006f5af8269..fa8c83dd22fba6f5448e9de1104eacb045049e19 100644
--- a/ghc/docs/users_guide/users_guide.vsgml
+++ b/ghc/docs/users_guide/users_guide.vsgml
@@ -1,6 +1,6 @@
<!doctype linuxdoc system [
<!ENTITY intro SYSTEM "intro.sgml" >
- <!ENTITY relnotes SYSTEM "4-01-notes.sgml" >
+ <!ENTITY relnotes SYSTEM "4-02-notes.sgml" >
<!ENTITY using SYSTEM "using.sgml" >
<!ENTITY runtime SYSTEM "runtime_control.sgml" >
<!ENTITY prof SYSTEM "profiling.sgml" >
@@ -18,7 +18,7 @@
]>
<article>
-<title>The Glasgow Haskell Compiler User's Guide, Version~4.01
+<title>The Glasgow Haskell Compiler User's Guide, Version~4.02
<author>The GHC Team,
Department of Computing Science,
University of Glasgow,
diff --git a/ghc/mk/version.mk b/ghc/mk/version.mk
index 85cb9b127655166861009d2cec5eff3ec581709f..a8d42fe98dcf05c0f8df025c27255ad8fb2a0838 100644
--- a/ghc/mk/version.mk
+++ b/ghc/mk/version.mk
@@ -21,8 +21,8 @@
ProjectName = The Glorious Glasgow Haskell Compilation System
ProjectNameShort = ghc
-ProjectVersion = 4.01
-ProjectVersionInt = 401
+ProjectVersion = 4.02
+ProjectVersionInt = 402
ProjectPatchLevel = 0
#