Merge branch 'pryor'

diff --git a/offsite_reading.mdwn b/offsite_reading.mdwn
index 6c0435e..e0e1617 100644 (file)
--- a/offsite_reading.mdwn
+++ b/offsite_reading.mdwn
@@ -128,7 +128,7 @@ get more out of. (Rinse and repeat.)
        | [Monads as containers](http://www.haskell.org/haskellwiki/Monads_as_containers)
        | [What a monad is not](http://www.haskell.org/haskellwiki/What_a_Monad_is_not)
 *      [Haskell wikibook: Understanding monads](http://en.wikibooks.org/wiki/Haskell/Understanding_monads)
-*      [Haskell WikiBook: Monad Transformers](http://en.wikibooks.org/wiki/Haskell/Monad_transformers)
+*      [Haskell wikibook: Monad Transformers](http://en.wikibooks.org/wiki/Haskell/Monad_transformers)
 
 *      [You Could Have Invented Monads! (And Maybe You Already Have.)](http://blog.sigfpe.com/2006/08/you-could-have-invented-monads-and.html)
 *      Yet Another Monad Tutorial: [part 1](http://mvanier.livejournal.com/3917.html) [part 2](http://mvanier.livejournal.com/4305.html)
@@ -215,7 +215,8 @@ in M. Broy, editor, *Marktoberdorf Summer School on Program Design Calculi*, Spr
 *      [Continuations In Scheme](http://tech.phillipwright.com/2010/05/23/continuations-in-scheme/)
 *      [Understanding Scheme Continuations](http://sanjaypande.blogspot.com/2004/06/understanding-scheme-continuations.html). This is tagged "Part I" but I think there's no further parts.
 *      [Continuations for Curmudgeons](http://www.intertwingly.net/blog/2005/04/13/Continuations-for-Curmudgeons) [Commentary](http://lambda-the-ultimate.org/node/643)
-*      [Haskell wiki on Continuations](http://www.haskell.org/haskellwiki/Continuation)<p>
+*      [Haskell wiki on Continuations](http://www.haskell.org/haskellwiki/Continuation)
+*      [Haskell wikibook on Continuation Passing Style](http://en.wikibooks.org/wiki/Haskell/Continuation_passing_style)<p>
 *      [[!wikipedia Delimited continuation]]
 *      [Composable Continuations Tutorial](http://community.schemewiki.org/?composable-continuations-tutorial) at SchemeWiki
 *      [Post by Ken](http://lambda-the-ultimate.org/node/1197#comment-12927) on Lambda the Ultimate explaining difference between undelimited and delimited continuations
@@ -236,7 +237,7 @@ in M. Broy, editor, *Marktoberdorf Summer School on Program Design Calculi*, Spr
 ## The Curry-Howard Correspondence ##
 *      The [[!wikipedia Curry-Howard isomorphism]]
 *      [The Curry-Howard correspondence in Haskell](http://www.thenewsh.com/~newsham/formal/curryhoward/)
-*      [The Curry-Howard Isomorphism](http://en.wikibooks.org/wiki/Haskell/The_Curry-Howard_isomorphism) at Haskell wiki<p>
+*      [Haskell wikibook on the Curry-Howard Isomorphism](http://en.wikibooks.org/wiki/Haskell/The_Curry-Howard_isomorphism) at Haskell wiki<p>
 
 
 

diff --git a/translating_between_OCaml_Scheme_and_Haskell.mdwn b/translating_between_OCaml_Scheme_and_Haskell.mdwn
index 63b3263..d0f7442 100644 (file)
--- a/translating_between_OCaml_Scheme_and_Haskell.mdwn
+++ b/translating_between_OCaml_Scheme_and_Haskell.mdwn
@@ -140,9 +140,9 @@ There are some more hints about Scheme [here](/assignment8/) and [here](/week1/)
 We will however try to give some general advice about how to translate between OCaml and Haskell.
 
 *      Again, it may sometimes be useful to [try Haskell in your web browser](http://tryhaskell.org/)
-*      There are many Haskell tutorials and textbooks available. This is probably the most actively developed: [Haskell Wikibook](http://en.wikibooks.org/wiki/Haskell)
-*      [Yet Another Haskell Tutorial](http://www.cs.utah.edu/~hal/docs/daume02yaht.pdf) (much of this excellent book has supposedly been integrated into the Haskell Wikibook)
-*      All About Monads has supposedly also been integrated into the Haskell Wikibook
+*      There are many Haskell tutorials and textbooks available. This is probably the most actively developed: [Haskell wikibook](http://en.wikibooks.org/wiki/Haskell)
+*      [Yet Another Haskell Tutorial](http://www.cs.utah.edu/~hal/docs/daume02yaht.pdf) (much of this excellent book has supposedly been integrated into the Haskell wikibook)
+*      All About Monads has supposedly also been integrated into the Haskell wikibook
 *      (A not-so-)[Gentle Introduction to Haskell](http://web.archive.org/web/http://www.haskell.org/tutorial/) (archived)
 *      [Learn You a Haskell for Great Good](http://learnyouahaskell.com/)
 
@@ -672,7 +672,7 @@ Haskell has more built-in support for monads, but one can define the monads one
 
        For more details, see:
 
-       *       [Haskell Wikibook on do-notation](http://en.wikibooks.org/wiki/Haskell/do_Notation)
+       *       [Haskell wikibook on do-notation](http://en.wikibooks.org/wiki/Haskell/do_Notation)
        *       [Do-notation considered harmful](http://www.haskell.org/haskellwiki/Do_notation_considered_harmful)
 
 *      If you like the Haskell do-notation, there's [a library](http://www.cas.mcmaster.ca/~carette/pa_monad/) you can compile and install to let you use something similar in OCaml.

diff --git a/week7.mdwn b/week7.mdwn
index 8fb3a3c..2111ed8 100644 (file)
--- a/week7.mdwn
+++ b/week7.mdwn
@@ -461,10 +461,10 @@ Theory](/advanced_topics/monads_in_category_theory).
 
 See also:
 
-*      [Haskell Wikibook on Monad Laws](http://www.haskell.org/haskellwiki/Monad_Laws).
-*      [Haskell Wikibook on Understanding Monads](http://en.wikibooks.org/wiki/Haskell/Understanding_monads)
-*      [Haskell Wikibook on Advanced Monads](http://en.wikibooks.org/wiki/Haskell/Advanced_monads)
-*      [Haskell Wikibook on do-notation](http://en.wikibooks.org/wiki/Haskell/do_Notation)
+*      [Haskell wikibook on Monad Laws](http://www.haskell.org/haskellwiki/Monad_Laws).
+*      [Haskell wikibook on Understanding Monads](http://en.wikibooks.org/wiki/Haskell/Understanding_monads)
+*      [Haskell wikibook on Advanced Monads](http://en.wikibooks.org/wiki/Haskell/Advanced_monads)
+*      [Haskell wikibook on do-notation](http://en.wikibooks.org/wiki/Haskell/do_Notation)
 
 
 Here are some papers that introduced monads into functional programming: