fix more broken links

diff --git a/content.mdwn b/content.mdwn
index 6b4c55f..8dbb20c 100644 (file)
--- a/content.mdwn
+++ b/content.mdwn
@@ -13,38 +13,13 @@ week in which they were introduced.
 
 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]]
 Basics of functional programming: `let`, `case`, pattern matching, and
 recursion.  Definitions of factorial.
 * [[Homework for week 1|exercises/assignment1]]
 This discussion considers conjunction in a language that recognized presupposition failure.
 * [[Introduction to functional programming|topics/week1]]
 Basics of functional programming: `let`, `case`, pattern matching, and
 recursion.  Definitions of factorial.
 * [[Homework for week 1|exercises/assignment1]]

-* [[Advanced notes|week1 advanced notes]] 
+* [[Advanced notes|topics/week1 advanced notes]]

 
 *More coming, please wait...*
 
 
 *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
--->

diff --git a/index.mdwn b/index.mdwn
index 9d85c39..0aa7cf4 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -10,7 +10,7 @@ the Linguistics building at 10 Washington Place, in room 103 (front of the first
 One student session will be held every Wednesday from XX-YY at WHERE.
 -->
 
 One student session will be held every Wednesday from XX-YY at WHERE.
 -->
 

-## [[Jump to content (lecture notes and more)|topics/content.mdwn]] ##
+## [[Jump to content (lecture notes and more)|content]] ##

 
 ## Announcements ##
 
 
 ## Announcements ##