aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ANNOUNCE35
-rw-r--r--CHANGES12
-rw-r--r--doc/haddock.xml2
-rw-r--r--haddock.cabal5
-rw-r--r--haddock.spec2
5 files changed, 35 insertions, 21 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index d06508c0..e56f341f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,29 +1,28 @@
--------------------------------------------
--- Haddock 2.9.0
+-- Haddock 2.9.3
--------------------------------------------
A new version of Haddock, the Haskell documentation tool, is out!
-This version is compatible with .haddock files produced by the version of
-Haddock that comes with GHC 7.0.1.
+This is the version that comes with GHC 7.2.1 (although that executable claims
+it is version 2.9.2!)
+
+Apologies to people who have sent in patches that haven't made it into this
+release, they will go into the next one.
--------------------------------------------
--- Changes in version 2.9.0
+-- Changes in version 2.9.3
--------------------------------------------
-Changes in version 2.9.0
-
- * Drop support for ghc < 7
-
- * New flag --qual for qualification of names
+Changes in version 2.9.3
- * Print doc coverage information to stdout when generating docs
+ * Build with GHC 7.2.1
- * Include an 'All' option in the A-Z subdivided index
+ * Support blank lines in results of examples
- * Make TOC group header identifiers validate
+ * A type signatures for multiple names generates one signature in the output
- * Minor changes to the API
+ * Minor bug fixes
--------------------------------------------
-- Links
@@ -50,12 +49,12 @@ Code repository:
The following people contributed patches to this release:
-Tobias Brandt
-Mark Lentczner
+Max Bolingbroke
Ian Lynagh
-Simon Marlow
-Simon Michael
-Ryan Newton
+Simon Hengel
+Jose Pedro Magalhaes
+Simon Peyton Jones
+Michal Terepeta
David Waern
--------------------------------------------
diff --git a/CHANGES b/CHANGES
index 511ad0db..7f65c913 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+Changes in version 2.9.3
+
+ [This is the version that comes with GHC 7.2.1 although it claims it's 2.9.2!]
+
+ * Build with GHC 7.2.1
+
+ * Support blank lines in results of examples
+
+ * A type signature for multiple names generates one signature in the output
+
+ * Minor bug fixes
+
Changes in version 2.9.2
* Build with GHC 7.0.2
diff --git a/doc/haddock.xml b/doc/haddock.xml
index 9528dc90..d444be5f 100644
--- a/doc/haddock.xml
+++ b/doc/haddock.xml
@@ -21,7 +21,7 @@
<holder>Simon Marlow, David Waern</holder>
</copyright>
<abstract>
- <para>This document describes Haddock version 2.9.2, a Haskell
+ <para>This document describes Haddock version 2.9.3, a Haskell
documentation tool.</para>
</abstract>
</bookinfo>
diff --git a/haddock.cabal b/haddock.cabal
index de11e7f7..e767e397 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
name: haddock
-version: 2.9.2
+version: 2.9.3
cabal-version: >= 1.10
license: BSD3
build-type: Simple
@@ -48,6 +48,9 @@ extra-source-files:
haddock.spec
haskell.vim
src/haddock.sh
+-- The test files shouldn't have to go here, but the source files for
+-- the test-suite stanzas don't get picked up by `cabal sdist`.
+ tests/html-tests/runtests.hs
data-files:
html/frames.html
diff --git a/haddock.spec b/haddock.spec
index 973446c1..95617a37 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -17,7 +17,7 @@
# version label of your release tarball.
%define name haddock
-%define version 2.9.2
+%define version 2.9.3
%define release 1
Name: %{name}