From ff2e024f737017d32e3dc39a7ab2322d54e56ca3 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Sat, 8 Sep 2012 12:08:37 +0200 Subject: Update doc/README --- doc/README | 1 + 1 file changed, 1 insertion(+) 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 Date: Sat, 8 Sep 2012 12:17:17 +0200 Subject: Add documentation for URL labels --- doc/haddock.xml | 7 +++++++ 1 file changed, 7 insertions(+) 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 <...>. If the output format supports it, the URL will be turned into a hyperlink when rendered. + + The URL can be followed by an optional label: + +<http://example.com label> + + The label is then used as a descriptive text for the hyperlink, if the + output format supports it.
-- cgit v1.2.3 From 80922e0f52f304c357779292254305ad6f17805d Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Fri, 21 Sep 2012 14:22:32 +0200 Subject: Disable Unicode test for now --- tests/html-tests/tests/Unicode.hs | 6 ------ tests/html-tests/tests/Unicode.hs.disabled | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 tests/html-tests/tests/Unicode.hs create mode 100644 tests/html-tests/tests/Unicode.hs.disabled diff --git a/tests/html-tests/tests/Unicode.hs b/tests/html-tests/tests/Unicode.hs deleted file mode 100644 index d5bbf445..00000000 --- a/tests/html-tests/tests/Unicode.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Unicode where - --- | γλώσσα -x :: Int -x = 1 - diff --git a/tests/html-tests/tests/Unicode.hs.disabled b/tests/html-tests/tests/Unicode.hs.disabled new file mode 100644 index 00000000..d5bbf445 --- /dev/null +++ b/tests/html-tests/tests/Unicode.hs.disabled @@ -0,0 +1,6 @@ +module Unicode where + +-- | γλώσσα +x :: Int +x = 1 + -- cgit v1.2.3 From 605502fbd9879268a13bf5f400d98b128fb8d1fc Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Fri, 21 Sep 2012 14:35:45 +0200 Subject: Update TypeOperators test for GHC 7.6.1 Type operators can't be used as type variables anymore! --- tests/html-tests/tests/TypeOperators.hs | 4 +- tests/html-tests/tests/TypeOperators.html.ref | 54 ---------------------- tests/html-tests/tests/mini_TypeOperators.html.ref | 8 ---- 3 files changed, 1 insertion(+), 65 deletions(-) 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 `O` f) a
  • newtype Flip (~>) b a = Flip {}
    • O` f) a

    newtype Flip (~>) b a

    Constructors

    Flip 

    Fields

    unFlip :: a ~> b
     

    data Flip (~>) b a

    Date: Fri, 21 Sep 2012 16:02:24 +0200 Subject: Remove (Monad (Either e)) instance from ref. rendering of CrossPackageDocs I do not really understand why the behavior changed, so I'll open a ticket, so that we can further investigate. --- tests/html-tests/tests/CrossPackageDocs.html.ref | 10 ---------- 1 file changed, 10 deletions(-) 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  Monad (Either e)