X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=intensionality_monad.mdwn;h=83824a42adfc318dd4bdf536cb8ba8dce8818ac3;hp=3b69ef9fb8101a91a19b3cc57889bc642b455048;hb=5eafd339063de2c77f30a7c9aea2ed1c09bc7673;hpb=01979f60c8474ffe20e4a1a20d59bfff5d3950c6

diff --git a/intensionality_monad.mdwn b/intensionality_monad.mdwn
index 3b69ef9f..83824a42 100644
--- a/intensionality_monad.mdwn
+++ b/intensionality_monad.mdwn
@@ -7,11 +7,9 @@ the same thing as making use of the reader monad.
 This technique was beautifully re-invented
 by Ben-Avi and Winter (2007) in their paper [A modular
 approach to
->>>>>>> f879a647e289a67b992caaafd497910259a81040
 intensionality](http://parles.upf.es/glif/pub/sub11/individual/bena_wint.pdf),
 though without explicitly using monads.
 
-
 All of the code in the discussion below can be found here: [[intensionality-monad.ml]].
 To run it, download the file, start OCaml, and say 
 
@@ -21,7 +19,7 @@ Note the extra `#` attached to the directive `use`.
 
 First, the familiar linguistic problem:
 
-       	   Bill left.  
+       Bill left.  
 	   Cam left.
 	   Ann believes [Bill left].
 	   Ann believes [Cam left].
@@ -57,16 +55,16 @@ generalized quantifiers.
 The main difference between the intensional types and the extensional
 types is that in the intensional types, the arguments are functions
 from worlds to extensions: intransitive verb phrases like "left" now
-take intensional concepts as arguments (type s->e) rather than plain
+take individual concepts as arguments (type s->e) rather than plain
 individuals (type e), and attitude verbs like "think" now take
 propositions (type s->t) rather than truth values (type t).
 In addition, the result of each predicate is an intension.
 This expresses the fact that the set of people who left in one world
 may be different than the set of people who left in a different world.
-Normally, the dependence of the extension of a predicate to the world
+(Normally, the dependence of the extension of a predicate to the world
 of evaluation is hidden inside of an evaluation coordinate, or built
 into the the lexical meaning function, but we've made it explicit here
-in the way that the intensionality monad makes most natural.
+in the way that the intensionality monad makes most natural.)
 
 The intenstional types are more complicated than the intensional
 types.  Wouldn't it be nice to make the complicated types available