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

diff --git a/week1.mdwn b/week1.mdwn
index 5d368704..967f8144 100644
--- a/week1.mdwn
+++ b/week1.mdwn
@@ -14,7 +14,7 @@ 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. 
+*	[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.)
@@ -37,7 +37,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:
 
@@ -313,7 +312,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 +327,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
@@ -357,6 +356,9 @@ combinatorial logic</td>
 </table>
 
 
+[Correction: OCaml is Turing complete, but I'm not sure if the merely functional part is; I suspect it's not.]
+
+
 Rosetta Stone
 =============