X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=322615c50244941119a54f50373ba0ab08e56b85;hp=e067adba00f9aa3edbf360871a46033028568f71;hb=f6f07df0e34fa108554f0549268a0a00736a140f;hpb=f7cef2a966b4a887a1ab4f199c380bdbe21f081c

diff --git a/content.mdwn b/content.mdwn
index e067adba..322615c5 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,29 +5,45 @@ week in which they were introduced.
 
 ## Topics by content ##
 
-* [[Introduction to functional programming|topics/week1]]
+* [[Introduction to functional programming|topics/week1 kapulet intro]]
 
 * [[Order: static versus dynamic|topics/week1 order]]
 
+* The Lambda Calculus
+
+    * [[Intro to the Lambda Calculus|topics/week2 lambda intro]]
+
+    * [[Advanced notes on the Lambda Calculus|topics/week2 lambda advanced]]
+
+    * Encoding data types in the Lambda Calculus
+
+        * [[Booleans, Tuples, Lists, and Numbers|topics/week2 encodings]] 
+
 ## Topics by week ##
 
 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]]
+* [[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