X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=cabcc71b842f83f75665fe4e9fc89268566eb838;hp=2460087975c873a1a32f7dc780b866ba4c32e600;hb=0a1f912a433bdbcc699a72cbca5e2e60965eacd1;hpb=77a11e5ac8ff2e87989ade23aab7fa80177df26b
diff --git a/content.mdwn b/content.mdwn
index 24600879..cabcc71b 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,7 +5,7 @@ week in which they were introduced.
## Topics by content ##
-* [[Introduction to functional programming|topics/week1_kapulet_intro]]
+* [[Introduction to functional programming|topics/week1 kapulet intro]]
* [[Order: static versus dynamic|topics/week1 order]]
@@ -15,19 +15,25 @@ Week 1:
* [[Order in programming languages and natural language|topics/week1 order]]
This discussion considers conjunction in a language that recognized presupposition failure.
-* [[Introduction to functional programming|topics/week1_kapulet_intro]]
+* [[Introduction to functional programming|topics/week1 kapulet intro]]
Basics of functional programming: `let`, `case`, pattern matching, and
recursion. Definitions of factorial.
-* [[Advanced notes|topics/week1 advanced notes]]
+* [[Advanced notes on functional programming|topics/week1 kapulet advanced]]
* [[Homework for week 1|exercises/assignment1]]
Week 2:
-* [[Intro to the Lambda Calculus|topics/week2_lambda_intro]]
-* [[Advanced notes on the Lambda Calculus|topics/week2_lambda_advanced]]
-* Encoding Booleans, Tuples, Lists, and Numbers (in progress)
-* Homework for week 2 (in progress)
+* [[Introduction to the Lambda Calculus|topics/week2 lambda intro]]
+* [[Advanced notes on the Lambda Calculus|topics/week2 lambda advanced]]
+* [[Encoding Booleans, Tuples, Lists, and Numbers|topics/week2 encodings]];
+* [[Homework for week 2|exercises/assignment2]]
+Week 3:
+
+* More on Lists
+Introduces list comprehensions, shows how to encode `tail` in the Lambda Calculus
+* Combinatorial Logic
+* Homework for week 3