X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=week1.mdwn;h=5ea3f421e69234c88e0fd974a486ad61e580fae0;hp=5d3687046d2ef02cbf94d6ff0c83790a5f51a7a6;hb=303e7febec777213e5e8d2b305406c2684dcac6a;hpb=599ae71cb186e4db700f0371c7caba2e80a66332

diff --git a/week1.mdwn b/week1.mdwn
index 5d368704..5ea3f421 100644
--- a/week1.mdwn
+++ b/week1.mdwn
@@ -10,14 +10,7 @@ Sometimes these notes will expand on things mentioned only briefly in class, or
 Basics of Lambda Calculus
 =========================
 
-See also:
-
-*	[Chris Barker's Lambda Tutorial](http://homepages.nyu.edu/~cb125/Lambda)
-*	[Lambda Animator](http://thyer.name/lambda-animator/)
-*       [Penn lambda calculator](http://www.ling.upenn.edu/lambda/) Pedagogical software developed by Lucas Champollion, Josh Tauberer and Maribel Romero.  Linguistically oriented. 
-*	MORE
-
-The lambda calculus we'll be focusing on for the first part of the course has no types. (Some prefer to say it instead has a single type---but if you say that, you have to say that functions from this type to this type also belong to this type. Which is weird.)
+The lambda calculus we'll be focusing on for the first part of the course has no types. (Some prefer to say it instead has a single type---but if you say that, you have to say that functions from this type to this type also belong to this type. Which is weird... In fact, though, such types are studied, under the name "recursive type." More about these later in the seminar.)
 
 Here is its syntax:
 
@@ -37,7 +30,6 @@ We'll tend to write <code>(&lambda;a M)</code> as just `(\a M)`, so we don't hav
 <strong>Application</strong>: <code>(M N)</code>
 </blockquote>
 
-Some authors reserve the term "term" for just variables and abstracts. We'll probably just say "term" and "expression" indiscriminately for expressions of any of these three forms.
 
 Examples of expressions:
 
@@ -131,7 +123,7 @@ because here the second occurrence of `y` is no longer free.
 
 There is plenty of discussion of this, and the fine points of how substitution works, in Hankin and in various of the tutorials we've linked to about the lambda calculus. We expect you have a good intuitive understanding of what to do already, though, even if you're not able to articulate it rigorously.
 
-*	MORE
+*	[More discussion in week 2 notes](/week2/#index1h1)
 
 
 Shorthand
@@ -313,7 +305,7 @@ Finally, you'll see the term **dynamic** used in a variety of ways in the litera
 
 *	dynamic versus static typing
 
-*	dynamic versus lexical scoping
+*	dynamic versus lexical [[!wikipedia Scope (programming) desc="scoping"]]
 
 *	dynamic versus static control operators
 
@@ -328,7 +320,7 @@ To read further about the relation between declarative or functional programming
 *	[[!wikipedia Purely functional]]
 *	[[!wikipedia Referential transparency (computer science)]]
 *	[[!wikipedia Imperative programming]]
-
+*	[[!wikipedia Side effect (computer science) desc="Side effects"]]
 
 
 Map
@@ -338,7 +330,7 @@ Map
 <tr>
 <td width=30%>Scheme (functional part)</td>
 <td width=30%>OCaml (functional part)</td>
-<td width=30%>C, Java, Pasval<br>
+<td width=30%>C, Java, Python<br>
 Scheme (imperative part)<br>
 OCaml (imperative part)</td>
 <tr>
@@ -357,14 +349,13 @@ combinatorial logic</td>
 </table>
 
 
+
 Rosetta Stone
 =============
 
 Here's how it looks to say the same thing in various of these languages.
 
-The following site may be useful; it lets you run a Scheme interpreter inside your web browser:
-
-*	[Try Scheme in your web browser](http://tryscheme.sourceforge.net/)
+The following site may be useful; it lets you run a Scheme interpreter inside your web browser: [Try Scheme in your web browser](http://tryscheme.sourceforge.net/). See also our links about [[learning Scheme]] and [[learning OCaml]].
 
 &nbsp;