From ff2e024f737017d32e3dc39a7ab2322d54e56ca3 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Sat, 8 Sep 2012 12:08:37 +0200
Subject: Update doc/README

---
 doc/README | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

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
 
-- 
cgit v1.2.3


From 0f6c13f66ea335bf371ab49125371ac665de6cf8 Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Sat, 8 Sep 2012 12:17:17 +0200
Subject: Add documentation for URL labels

---
 doc/haddock.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

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>
-- 
cgit v1.2.3