Merge branch 'working'

[lambda.git] / content.mdwn

diff --git a/content.mdwn b/content.mdwn
index 1ec4a92..1178c43 100644 (file)
--- a/content.mdwn
+++ b/content.mdwn
@@ -22,13 +22,14 @@ week in which they were introduced.
     *   Practical advice for working with OCaml and/or Haskell (will be posted soon)
     *   [[Kaplan on Plexy|topics/week6_plexy]] and the Maybe type
     *   Interpreter for Lambda terms
-    *   Starting with Monads
+    *   [[Introducing Monads|topics/week7_introducing_monads]]
 
 *   Order, "static versus dynamic"
 
     *   [[Order in programming languages and natural language|topics/week1 order]]
     *   [[Reduction Strategies and Normal Forms in the Lambda Calculus|topics/week3_evaluation_order]]
     *   [[Unit and its usefulness|topics/week3 unit]]
+    *   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
 
 *   The Untyped Lambda Calculus
 
@@ -50,14 +51,14 @@ week in which they were introduced.
 *   Combinatory logic
 
     *   [[Introduction|topics/week3 combinatory logic]]
-    *   Interpreter for Combinatory Logic terms
+    *   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
 
 *   Typed Lambda Calculi
 
     *   [[Simply-typed lambda calculus|topics/week5 simply typed]] (will be updated)
     *   [[System F|topics/week5 system F]] (will be updated)
     *   Types in OCaml and Haskell (will be posted soon)
-    *   Starting with Monads
+    *   [[Introducing Monads|topics/week7_introducing_monads]]
 
 
 ## Topics by week ##
@@ -118,8 +119,6 @@ Week 6:
 
 Week 7:
 
-*   Interpreter for Combinatory Logic terms
+*   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
 *   Interpreter for Lambda terms
-*   Starting with Monads
-
-
+*   [[Introducing Monads|topics/week7_introducing_monads]]