aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/README1
-rw-r--r--doc/haddock.xml7
-rw-r--r--tests/html-tests/tests/CrossPackageDocs.html.ref10
-rw-r--r--tests/html-tests/tests/TypeOperators.hs4
-rw-r--r--tests/html-tests/tests/TypeOperators.html.ref54
-rw-r--r--tests/html-tests/tests/Unicode.hs.disabled (renamed from tests/html-tests/tests/Unicode.hs)0
-rw-r--r--tests/html-tests/tests/mini_TypeOperators.html.ref8
7 files changed, 9 insertions, 75 deletions
diff --git a/doc/README b/doc/README
index ab9c0f2f..5bc038bf 100644
--- a/doc/README
+++ b/doc/README
@@ -8,6 +8,7 @@ process the documentation on your system, and a Makefile to actually
do the processing (so, on Windows, you'll need Cygwin or MSys in
addition to the DocBook XML tools). To build the HTML documentation:
+ $ autoconf
$ ./configure
$ make html
diff --git a/doc/haddock.xml b/doc/haddock.xml
index 7ddfdccd..a38b70cf 100644
--- a/doc/haddock.xml
+++ b/doc/haddock.xml
@@ -1830,6 +1830,13 @@ module A where
<literal>&lt;...&gt;</literal>. If the output format supports
it, the URL will be turned into a hyperlink when
rendered.</para>
+
+ The URL can be followed by an optional label:
+<programlisting>
+&lt;http://example.com label&gt;
+</programlisting>
+ The label is then used as a descriptive text for the hyperlink, if the
+ output format supports it.
</section>
<section>
diff --git a/tests/html-tests/tests/CrossPackageDocs.html.ref b/tests/html-tests/tests/CrossPackageDocs.html.ref
index 57bf900d..39353720 100644
--- a/tests/html-tests/tests/CrossPackageDocs.html.ref
+++ b/tests/html-tests/tests/CrossPackageDocs.html.ref
@@ -328,16 +328,6 @@ defined in the <a href=""
><td class="doc empty"
>&nbsp;</td
></tr
- ><tr
- ><td class="src"
- ><a href=""
- >Monad</a
- > (<a href=""
- >Either</a
- > e)</td
- ><td class="doc empty"
- >&nbsp;</td
- ></tr
></table
></div
></div
diff --git a/tests/html-tests/tests/TypeOperators.hs b/tests/html-tests/tests/TypeOperators.hs
index aa0fbe8c..edbb9344 100644
--- a/tests/html-tests/tests/TypeOperators.hs
+++ b/tests/html-tests/tests/TypeOperators.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE TypeOperators #-}
module TypeOperators (
-- * stuff
(:-:),
@@ -5,7 +6,6 @@ module TypeOperators (
Op,
O(..),
biO,
- Flip(..)
) where
data a :-: b
@@ -18,5 +18,3 @@ newtype (g `O` f) a = O { unO :: g (f a) }
biO :: (g `O` f) a
biO = undefined
-
-newtype Flip (~>) b a = Flip { unFlip :: a ~> b }
diff --git a/tests/html-tests/tests/TypeOperators.html.ref b/tests/html-tests/tests/TypeOperators.html.ref
index 0155ab0d..519547d6 100644
--- a/tests/html-tests/tests/TypeOperators.html.ref
+++ b/tests/html-tests/tests/TypeOperators.html.ref
@@ -94,20 +94,6 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
> :: (g `<a href=""
>O</a
>` f) a</li
- ><li class="src short"
- ><span class="keyword"
- >newtype</span
- > <a href=""
- >Flip</a
- > (~&gt;) b a = <a href=""
- >Flip</a
- > {<ul class="subs"
- ><li
- ><a href=""
- >unFlip</a
- > :: a ~&gt; b</li
- ></ul
- >}</li
></ul
></div
><div id="interface"
@@ -186,46 +172,6 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
>O</a
>` f) a</p
></div
- ><div class="top"
- ><p class="src"
- ><span class="keyword"
- >newtype</span
- > <a name="t:Flip" class="def"
- >Flip</a
- > (~&gt;) b a </p
- ><div class="subs constructors"
- ><p class="caption"
- >Constructors</p
- ><table
- ><tr
- ><td class="src"
- ><a name="v:Flip" class="def"
- >Flip</a
- ></td
- ><td class="doc empty"
- >&nbsp;</td
- ></tr
- ><tr
- ><td colspan="2"
- ><div class="subs fields"
- ><p class="caption"
- >Fields</p
- ><dl
- ><dt class="src"
- ><a name="v:unFlip" class="def"
- >unFlip</a
- > :: a ~&gt; b</dt
- ><dd class="doc empty"
- >&nbsp;</dd
- ></dl
- ><div class="clear"
- ></div
- ></div
- ></td
- ></tr
- ></table
- ></div
- ></div
></div
></div
><div id="footer"
diff --git a/tests/html-tests/tests/Unicode.hs b/tests/html-tests/tests/Unicode.hs.disabled
index d5bbf445..d5bbf445 100644
--- a/tests/html-tests/tests/Unicode.hs
+++ b/tests/html-tests/tests/Unicode.hs.disabled
diff --git a/tests/html-tests/tests/mini_TypeOperators.html.ref b/tests/html-tests/tests/mini_TypeOperators.html.ref
index f70a0fae..86b6beec 100644
--- a/tests/html-tests/tests/mini_TypeOperators.html.ref
+++ b/tests/html-tests/tests/mini_TypeOperators.html.ref
@@ -60,14 +60,6 @@ window.onload = function () {pageLoad();};
>biO</a
></p
></div
- ><div class="top"
- ><p class="src"
- ><span class="keyword"
- >data</span
- > <a href="" target="main"
- >Flip</a
- > (~&gt;) b a</p
- ></div
></div
></body
></html