Merge branch 'working'

* working:
  update juli8 to 1.4

Conflicts:
	index.mdwn

diff --git a/code/Juli8-v1.4.tgz b/code/Juli8-v1.4.tgz
new file mode 100644 (file)
index 0000000..9a29d83
Binary files /dev/null and b/code/Juli8-v1.4.tgz differ

diff --git a/index.mdwn b/index.mdwn
index 83ea0e0..74d0e21 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -169,6 +169,8 @@ Practical advice for working with OCaml and/or Haskell (will be posted someday);
 
 > Updated notes on [[Installing and Using the Juli8 Libraries|/juli8]] on Sun 5 April. 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`.
 
+> Small bug fix to Juli8 on Mon 6 April.
+
 > Topics: [[Using the OCaml Monad library|/topics/week9_using_the_monad_library]]; [[Programming with mutable state|/topics/week9_mutable_state]]; [[A State Monad Tutorial|/topics/week9_state_monad_tutorial]]; Using multiple monads together; [[Homework for weeks 8-9|/exercises/assignment8-9]]
 
 > Reading for Week 10: Groenendijk, Stokhof, and Veltman, "[[Coreference and Modality|/readings/coreference-and-modality.pdf]]" (1996)

diff --git a/juli8.mdwn b/juli8.mdwn
index bf89952..b12de03 100644 (file)
--- a/juli8.mdwn
+++ b/juli8.mdwn
@@ -91,7 +91,7 @@ Below, we'll give instructions on how to install Juli8 into your existing OCaml
 
         #use "juli8.ml";;
 
-4. Next create a folder in your `$HOME` directory named `.juli8`. **Download the Juli8 code from [[here|/code/Juli8-v1.3.tgz]].** That link will no doubt be updated frequently in April and May 2015. The current version is: 1.3, posted 5 April 2015. Copy the contents of the `Juli8` folder that you downloaded into the `$HOME/.juli8` folder that you created. (So `$HOME/.juli8` should contain folders `haskell`, `ocaml`, and so on.)
+4. Next create a folder in your `$HOME` directory named `.juli8`. **Download the Juli8 code from [[here|/code/Juli8-v1.4.tgz]].** That link will no doubt be updated frequently in April and May 2015. The current version is: 1.4, posted 6 April 2015. Copy the contents of the `Juli8` folder that you downloaded into the `$HOME/.juli8` folder that you created. (So `$HOME/.juli8` should contain folders `haskell`, `ocaml`, and so on.)
 
     Now whenever you start up OCaml, the Juli8 OCaml libraries (including their monad components, which we'll be making extensive use of) will automatically be loaded. <!-- If later you want to load Oleg's Delimcc library, type `#load "delimcc.cma";;` then use the `Delimcc` module. -->