aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2012-09-27 15:37:02 +0200
committerDavid Waern <david.waern@gmail.com>2012-09-27 15:37:02 +0200
commitbe616337301adf552fe8abed7c096b7c00393093 (patch)
treeeea268b60ded4dfe94b6acf31d7cd82d543cdfe1 /doc
parentd8b3b28044ea851059286663514198171f211b15 (diff)
parent47e6c8e77a4b8edbb1e4869ba5a0f76ee71ad8bb (diff)
Merge branch 'ghc-7.6' of http://darcs.haskell.org/haddock into ghc-7.6
Diffstat (limited to 'doc')
-rw-r--r--doc/README1
-rw-r--r--doc/haddock.xml7
2 files changed, 8 insertions, 0 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>