From: Chris <chris.barker@nyu.edu>
Date: Sun, 1 Feb 2015 19:45:40 +0000 (-0500)
Subject: adjustments, notes week 1
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=fa3c0b4b86fea54a5a66f046d99e303218d5beba;hp=-c

adjustments, notes week 1
---

fa3c0b4b86fea54a5a66f046d99e303218d5beba
diff --combined _topics_and_themes.mdwn
index 6b4c55fb,ab4a5338..6b4c55fb
--- a/_topics_and_themes.mdwn
+++ b/_topics_and_themes.mdwn
@@@ -1,27 -1,4 +1,27 @@@
 -*Coming, please wait...*
 +# Topics #
 +
 +These topics are organized in two ways: by their content, and by the
 +week in which they were introduced.
 +
 +## Topics by content ##
 +
 +* [[Basics of functional programming|topics/week1]]
 +
 +* [[Order: static versus dynamic|topics/week1 order]]
 +
 +## Topics by week ##
 +
 +Week 1: 
 +
 +* [[Order in programming languages and natural language|topics/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]]
 +* [[Advanced notes|week1 advanced notes]] 
 +
 +*More coming, please wait...*
  
  <!--
  Once we get up and running, the central focii of the course will be
diff --combined index.mdwn
index 6b7f1d99,b31723a1..c581a3ee
--- a/index.mdwn
+++ b/index.mdwn
@@@ -10,8 -10,6 +10,8 @@@ the Linguistics building at 10 Washingt
  One student session will be held every Wednesday from XX-YY at WHERE.
  -->
  
 +## [[Jump to content (lecture notes and more)|topics_and_themes.mdwn]] ##
 +
  
  ## Announcements ##
  
@@@ -38,12 -36,9 +38,12 @@@ we'll be doing the next week. It would 
  week's homework, for instance, before the session.
  -->
  
- *   Here is information about [[How to get the programming languages running on your computer]].
+ *   Here is information about [[How to get the programming languages running on your computer|installing]].
  
 -*   Here are [[Lecture notes for Week 1|topics/week1]]; and [[the homework|exercises/assignment1]]. There are also some [[advanced notes|topics/week1 advanced notes]].
 +* Here are lecture notes for week 1: [[order|topics/week1 order]];
 +[[the introduction to functional programming|topics/week1]], along
 +with [[the homework|exercises/assignment1]] and some [[advanced
 +notes|topics/week1 advanced notes]].
  
      > Topics: Basics of Functional Programming
  
@@@ -123,7 -118,7 +123,7 @@@ course is to enable you to make these t
  understanding of them to recognize them in use, use them yourself at least
  in simple ways, and to be able to read more about them when appropriate.
  
- [[More about the topics and larger themes of the course|topics and themes]]
+ [[More about the topics and larger themes of the course| topics and themes]]
  
  
  ## Who Can Participate? ##