X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=e4e81495f53bbcd44acd741b5e93fb3c0a3e6385;hp=6b4c55fb02f3f7bc94e308c167babd1b09617f20;hb=9412638eb0c74f8e462440c244edc7b5c81cfeec;hpb=47a1e74d28317b889a39c4ab9233445fb05f402f

diff --git a/content.mdwn b/content.mdwn
index 6b4c55fb..e4e81495 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,46 +5,31 @@ week in which they were introduced.
 
 ## Topics by content ##
 
-* [[Basics of functional programming|topics/week1]]
+* [[Introduction to functional programming|topics/week1 kapulet intro]]
 
 * [[Order: static versus dynamic|topics/week1 order]]
 
 ## Topics by week ##
 
-Week 1: 
+Week 1:
 
-* [[Order in programming languages and natural language|topics/order]]
+* [[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 on functional programming|topics/week1 kapulet advanced]]
 * [[Homework for week 1|exercises/assignment1]]
-* [[Advanced notes|week1 advanced notes]] 
+
+Week 2:
+
+* [[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|exercises/assignment2]]
+
+
+
 
 *More coming, please wait...*
 
-<!--
-Once we get up and running, the central focii of the course will be
-**continuations**, **types**, and **monads**. One of the on-going themes will
-concern evaluation order and issues about how computations (inferences,
-derivations) unfold in (for instance) time.  The key analytic technique is to
-form a static, order-independent model of a dynamic process. We'll be
-discussing this in much more detail as the course proceeds.
-
-The logical systems we'll be looking at include:
-
-*	the "pure"/untyped lambda calculus
-*	combinatorial logic
-*	the simply-typed lambda calculus
-*	polymorphic types with System F
-*	some discussion of dependent types
-*	if time permits, "indeterministic" or "preemptively parallel" computation and linear logic
-
-
-Other keywords:
-	recursion using the Y-combinator
-	evaluation-order stratgies
-	normalizing properties
-	the Curry-Howard isomorphism(s)
-	monads in category theory and computation
--->