FIX #1861: floating-point constants for infinity and NaN in via-C

[ghc-hetmet.git] / docs / users_guide / parallel.xml

diff --git a/docs/users_guide/parallel.xml b/docs/users_guide/parallel.xml
index fc7ca94..96e4e56 100644 (file)
--- a/docs/users_guide/parallel.xml
+++ b/docs/users_guide/parallel.xml
@@ -5,7 +5,7 @@
   </indexterm>
 
   <para>GHC implements some major extensions to Haskell to support 
-  concurrent and parallel programming.  Let us first etablish terminology:
+  concurrent and parallel programming.  Let us first establish terminology:
   <itemizedlist>
        <listitem><para><emphasis>Parallelism</emphasis> means running
          a Haskell program on multiple processors, with the goal of improving
@@ -33,12 +33,12 @@
              url="http://research.microsoft.com/copyright/accept.asp?path=/users/simonpj/papers/concurrent-haskell.ps.gz">
              Concurrent Haskell paper</ulink> is still an excellent
              resource, as is <ulink
-             url="http://research.microsoft.com/%7Esimonpj/papers/marktoberdorf">Tackling
+             url="http://research.microsoft.com/%7Esimonpj/papers/marktoberdorf/">Tackling
              the awkward squad</ulink>.
   </para><para>
   To the programmer, Concurrent Haskell introduces no new language constructs;
   rather, it appears simply as a library, <ulink
-  url="http://www.haskell.org/ghc/docs/latest/html/libraries/base/Control-Concurrent.html">
+  url="../libraries/base/Control-Concurrent.html">
              Control.Concurrent</ulink>.  The functions exported by this
              library include:
   <itemizedlist>
@@ -62,7 +62,7 @@ the FFI with concurrency</ulink>.</para></listitem>
     it.</para>
 
    <para>The main library you need to use STM is <ulink
-  url="http://www.haskell.org/ghc/docs/latest/html/libraries/stm/Control-Concurrent-STM.html">
+  url="../libraries/stm/Control-Concurrent-STM.html">
              Control.Concurrent.STM</ulink>. The main features supported are these:
 <itemizedlist>
 <listitem><para>Atomic blocks.</para></listitem>
@@ -83,7 +83,7 @@ All these features are described in the papers mentioned earlier.
   By default GHC runs your program on one processor; if you
      want it to run in parallel you must link your program
       with the <option>-threaded</option>, and run it with the RTS
-      <option>-N</option> option; see  <xref linkend="sec-using-smp" />).
+      <option>-N</option> option; see  <xref linkend="using-smp" />).
       The runtime will
       schedule the running Haskell threads among the available OS
       threads, running as many in parallel as you specified with the
@@ -110,7 +110,7 @@ All these features are described in the papers mentioned earlier.
     linkend="concurrent-haskell"/>), but the simplest mechanism for extracting parallelism from pure code is
       to use the <literal>par</literal> combinator, which is closely related to (and often used
       with) <literal>seq</literal>.  Both of these are available from <ulink
-       url="../libraries/base/Control-Parallel.html"><literal>Control.Parallel</literal></ulink>:</para>
+       url="../libraries/parallel/Control-Parallel.html"><literal>Control.Parallel</literal></ulink>:</para>
 
 <programlisting>
 infixr 0 `par`
@@ -163,7 +163,7 @@ nfib n | n &#60;= 1 = 1
 
     <para>More sophisticated combinators for expressing parallelism are
       available from the <ulink
-       url="../libraries/base/Control-Parallel-Strategies.html"><literal>Control.Parallel.Strategies</literal></ulink> module.
+       url="../libraries/parallel/Control-Parallel-Strategies.html"><literal>Control.Parallel.Strategies</literal></ulink> module.
       This module builds functionality around <literal>par</literal>,
       expressing more elaborate patterns of parallel computation, such as
       parallel <literal>map</literal>.</para>