From: Jim <jim.pryor@nyu.edu>
Date: Tue, 14 Apr 2015 14:11:39 +0000 (-0400)
Subject: Merge branch 'working'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=125425bcdfe8dd60ddd326b68bfdb80a806d0920;hp=32ce1118599528c2f407d7fba1f14a658f918e94

Merge branch 'working'

* working:
  update gsv2.ml
---

diff --git a/content.mdwn b/content.mdwn
index cd409666..e6a02aff 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -8,6 +8,7 @@ week in which they were introduced.
 *   [[What is computation?|topics/week3_what_is_computation]]
 
 *   [[Kaplan on Plexy|topics/week6_plexy]]
+*   [[Groenendijk, Stokhof, and Veltman|/topics/week10_gsv]]
 
 *   Functional Programming
 
@@ -75,6 +76,7 @@ week in which they were introduced.
     *   [[Programming with mutable state|/topics/week9_mutable_state]]
     *   [[A State Monad Tutorial|/topics/week9_state_monad_tutorial]]
     *   [[Using multiple monads together|/topics/week9_monad_transformers]]
+    *   [[Groenendijk, Stokhof, and Veltman|/topics/week10_gsv]]
 
 
 ## Topics by week ##
@@ -157,3 +159,6 @@ Week 9:
 Week 10:
 
 *    Groenendijk, Stokhof, and Veltman, "[[Coreference and Modality|/readings/coreference-and-modality.pdf]]" (1996)
+*    [[Notes on GSV|/topics/week10_gsv]], with links to code
+
+
diff --git a/index.mdwn b/index.mdwn
index 00082462..c4c3e435 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -167,7 +167,7 @@ Practical advice for working with OCaml and/or Haskell (will be posted someday);
 
 (**Week 9**) Thursday April 2
 
-> Updated notes on [[Installing and Using the Juli8 Libraries|/juli8]] on Sun 5 April. Continued to fix some bugs and improve the monad transformers. Latest version posted Monday evening, 13 April: [[v1.6|/code/Juli8-v1.6.tgz]]. This version is needed to run the GSV.ml code.
+> Updated notes on [[Installing and Using the Juli8 Libraries|/juli8]] on Sun 5 April. Continued to fix some bugs and improve the monad transformers. Latest version posted Monday evening, 13 April: [[v1.6|/code/Juli8-v1.6.tgz]]. This version is needed to run [[the gsv2.ml code|/code/gsv2.ml]].
 
 <!--
 The major change is to make the Monad libraries easier to use. Now you can just use `Monad.Reader(struct type env = ... end)`; you don't need to furthermore ask for the `M` submodule of that generated module. Relatedly, the `List` and `Monad.List` modules are now different; the former has lots of list-related functions and the latter only the monadic interface. Similarly for `Option` and `Monad.Option`.
@@ -183,7 +183,7 @@ We've posted a [[State Monad Tutorial]].
 
 (**Week 10**) Thursday April 9
 
-> Topics: We will be discussing the reading posted above.
+> Topics: We will be discussing the reading posted above. Here are [[notes and links to code|/topics/week10_gsv]].