X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=week1.mdwn;h=c13fa7ca8787de96d87d81694544064fa1654522;hp=8d1ad0dd3a0ec34188415d1b6d76dc817c1956f2;hb=93600ef645fa8bbb304288ea2161ec06b017762e;hpb=75b0a95a29b968c3a6c42c04bdb4a908f586cd15

diff --git a/week1.mdwn b/week1.mdwn
index 8d1ad0dd..c13fa7ca 100644
--- a/week1.mdwn
+++ b/week1.mdwn
@@ -57,26 +57,24 @@ 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 won't participate in that convention; we'll probably just say "term" and "expression" indiscriminately for expressions of any of these three forms.
+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:
 
-<blockquote><code>
-x<p>
-(y x)<p>
-(x x)<p>
-(\x y)<p>
-(\x x)<p>
-(\x (\y x))<p>
-(x (\x x))<p>
-((\x (x x)) (\x (x x)))<p>
-</code></blockquote>
+	x
+	(y x)
+	(x x)
+	(\x y)
+	(\x x)
+	(\x (\y x))
+	(x (\x x))
+	((\x (x x)) (\x (x x)))
 
 The lambda calculus has an associated proof theory. For now, we can regard the
 proof theory as having just one rule, called the rule of **beta-reduction** or
 "beta-contraction". Suppose you have some expression of the form:
 
-	((\a M) N)
+	((\ a M) N)
 
 that is, an application of an abstract to some other expression. This compound form is called a **redex**, meaning it's a "beta-reducible expression." `(\a M)` is called the **head** of the redex; `N` is called the **argument**, and `M` is called the **body**.
 
@@ -605,7 +603,6 @@ Here's how it looks to say the same thing in various of these languages.
 
 	It's easy to be lulled into thinking this is a kind of imperative construction. *But it's not!* It's really just a shorthand for the compound "let"-expressions we've already been looking at, taking the maximum syntactically permissible scope. (Compare the "dot" convention in the lambda calculus, discussed above.)
 
-
 9.	Some shorthand
 
 	OCaml permits you to abbreviate:
@@ -654,6 +651,8 @@ Here's how it looks to say the same thing in various of these languages.
 
 	or in other words, interpret the rest of the file or interactive session with `bar` assigned the function `(lambda (x) B)`.
 
+<!--
+
 
 10.	Shadowing
 
@@ -682,6 +681,7 @@ Here's how it looks to say the same thing in various of these languages.
 
 	When a previously-bound variable is rebound in the way we see here, that's called **shadowing**: the outer binding is shadowed during the scope of the inner binding.
 
+-->
 
 Some more comparisons between Scheme and OCaml
 ----------------------------------------------