Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e3143e85bff773e12e6900d896330ab2cc106731

>---------------------------------------------------------------

commit e3143e85bff773e12e6900d896330ab2cc106731
Author: Simon Marlow <[email protected]>
Date:   Thu Oct 13 16:43:09 2011 +0100

    fix doc bugs
    
    The description of GHC's divergence from the FFI spec was in the wrong
    place, and the xref was broken.

>---------------------------------------------------------------

 docs/users_guide/bugs.xml     |   31 ++++++++++++++++++-------------
 docs/users_guide/ffi-chap.xml |    2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs/users_guide/bugs.xml b/docs/users_guide/bugs.xml
index def9c20..12ef946 100644
--- a/docs/users_guide/bugs.xml
+++ b/docs/users_guide/bugs.xml
@@ -232,6 +232,23 @@ checking for duplicates.  The reason for this is 
efficiency, pure and simple.
           </varlistentry>
        </variablelist>
     </sect3>
+
+    <sect3 id="infelicities-ffi">
+      <title>The Foreign Function Interface</title>
+      <variablelist>
+      <varlistentry>
+        <term><literal>hs_init()</literal> not allowed
+        after <literal>hs_exit()</literal></term>
+        <listitem>
+          <para>The FFI spec requires the implementation to support
+            re-initialising itself after being shut down
+            with <literal>hs_exit()</literal>, but GHC does not
+            currently support that.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    </sect3>
+
   </sect2>
 
   <sect2 id="haskell-98-2010-undefined">
@@ -324,17 +341,6 @@ checking for duplicates.  The reason for this is 
efficiency, pure and simple.
           exceptions</primary></indexterm>.</para>
        </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><literal>hs_init()</literal> not allowed
-        after <literal>hs_exit()</literal></term>
-        <listitem>
-          <para>The FFI spec requires the implementation to support
-            re-initialising itself after being shut down
-            with <literal>hs_exit()</literal>, but GHC does not
-            currently support that.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </sect2>
 
@@ -345,8 +351,7 @@ checking for duplicates.  The reason for this is 
efficiency, pure and simple.
     <title>Known bugs or infelicities</title>
 
     <para>The bug tracker lists bugs that have been reported in GHC but not
-      yet fixed: see the <ulink 
url="http://sourceforge.net/projects/ghc/";>SourceForge GHC
-    page</ulink>.  In addition to those, GHC also has the following known bugs
+      yet fixed: see the <ulink url="http://hackage.haskell.org/trac/ghc/";>GHC 
Trac</ulink>.  In addition to those, GHC also has the following known bugs
       or  infelicities.  These bugs are more permanent; it is unlikely that
       any of them will be fixed in the short term.</para>
 
diff --git a/docs/users_guide/ffi-chap.xml b/docs/users_guide/ffi-chap.xml
index c037623..340d07d 100644
--- a/docs/users_guide/ffi-chap.xml
+++ b/docs/users_guide/ffi-chap.xml
@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
        <literal>hs_exit()</literal> will actually de-initialise the
        system.  NOTE that currently GHC's runtime cannot reliably
        re-initialise after this has happened,
-       see <xref linkend="ffi-divergence" />.</para>
+        see <xref linkend="infelicities-ffi" />.</para>
        </footnote>.</para>
 
        <para>NOTE: when linking the final program, it is normally



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to