X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=week1.mdwn;h=c68da8a0e636b1ceba1cdfbf955905168ee076dc;hp=e49724d988b25111363940f35236ce3904053dee;hb=87483b8ff52adf85fd8d80060427f9e67f698b8a;hpb=4e8aec5cb86b2838e8d556a9f8d6b2bcda215555

diff --git a/week1.mdwn b/week1.mdwn
index e49724d9..c68da8a0 100644
--- a/week1.mdwn
+++ b/week1.mdwn
@@ -191,27 +191,27 @@ When M and N are such that there's some P that M reduces to by zero or more step
 
 	M <~~> N
 
-This is what plays the role of equality in the lambda calculus. Hankin uses the symbol `=` for this. So too do Hindley and Seldin.
+This is what plays the role of equality in the lambda calculus. Hankin uses the symbol `=` for this. So too do Hindley and Seldin. Personally, I keep confusing that with the relation to be described next, so let's use this notation instead. Note that `M <~~> N` doesn't mean that each of `M` and `N` are reducible to each other; that only holds when `M` and `N` are the same expression. (Or, with our convention of only saying "reducible" for one or more reduction steps, it never holds.)
 
-In the metatheory, it's also sometimes useful to talk about formulas that are syntactically equivalent *before any reductions take place*. Hankin uses the symbol &equiv; for this. So too do Hindley and Seldin. We'll use that too, and will avoid using `=` when discussing metatheory for the lambda calculus. Instead we'll use `<~~>` as we said above. When we want to introduce a stipulative definition, we'll write it out longhand, as in:
+In the metatheory, it's also sometimes useful to talk about formulas that are syntactically equivalent *before any reductions take place*. Hankin uses the symbol <code>&equiv;</code> for this. So too do Hindley and Seldin. We'll use that too, and will avoid using `=` when discussing metatheory for the lambda calculus. Instead we'll use `<~~>` as we said above. When we want to introduce a stipulative definition, we'll write it out longhand, as in:
 
 >	T is defined to be `(M N)`.
 
 We'll regard the following two expressions:
 
-	(\x x y)
+	(\x (x y))
 
-	(\z z y)
+	(\z (z y))
 
 as syntactically equivalent, since they only involve a typographic change of a bound variable. Read Hankin section 2.3 for discussion of different attitudes one can take about this.
 
 Note that neither of those expressions are identical to:
 
-	(\x x w)
+	(\x (x w))
 
 because here it's a free variable that's been changed. Nor are they identical to:
 
-	(\y y y)
+	(\y (y y))
 
 because here the second occurrence of `y` is no longer free.
 
@@ -224,11 +224,11 @@ Shorthand
 The grammar we gave for the lambda calculus leads to some verbosity. There are several informal conventions in widespread use, which enable the language to be written more compactly. (If you like, you could instead articulate a formal grammar which incorporates these additional conventions. Instead of showing it to you, we'll leave it as an exercise for those so inclined.)
 
 
-Dot notation: dot means "put a left paren here, and put the right
+**Dot notation** Dot means "put a left paren here, and put the right
 paren as far the right as possible without creating unbalanced
 parentheses". So:
 
-	(\x (\y (xy)))
+	(\x (\y (x y)))
 
 can be abbreviated as:
 
@@ -236,23 +236,23 @@ can be abbreviated as:
 
 and:
 
-	(\x \y. (z y) z)
+	(\x (\y. (z y) z))
 
 would abbreviate:
 
-	(\x \y ((z y) z))
+	(\x (\y ((z y) z)))
 
 This on the other hand:
 
-	((\x \y. (z y) z)
+	(\x (\y. z y) z)
 
 would abbreviate:
 
-	((\x (\y (z y))) z)
+	(\x (\y (z y)) z)
 
-Parentheses: outermost parentheses around applications can be dropped. Moreover, applications will associate to the left, so `M N P` will be understood as `((M N) P)`. Finally, you can drop parentheses around abstracts, but not when they're part of an application. So you can abbreviate:
+**Parentheses** Outermost parentheses around applications can be dropped. Moreover, applications will associate to the left, so `M N P` will be understood as `((M N) P)`. Finally, you can drop parentheses around abstracts, but not when they're part of an application. So you can abbreviate:
 
-	(\x x y)
+	(\x. x y)
 
 as:
 
@@ -266,7 +266,7 @@ and:
 
 	z (\x. x y)
 
-Merging lambdas: an expression of the form `(\x (\y M))`, or equivalently, `(\x. \y. M)`, can be abbreviated as:
+**Merging lambdas** An expression of the form `(\x (\y M))`, or equivalently, `(\x. \y. M)`, can be abbreviated as:
 
 	(\x y. M)