From 9484a047544fe346e9b739237a8c39e3e8cdfc88 Mon Sep 17 00:00:00 2001
From: Jim <jim.pryor@nyu.edu>
Date: Sat, 31 Jan 2015 11:51:47 -0500
Subject: [PATCH] OCaml installation refinements

---
 ...ramming_languages_running_on_your_computer.mdwn | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/how_to_get_the_programming_languages_running_on_your_computer.mdwn b/how_to_get_the_programming_languages_running_on_your_computer.mdwn
index fc28bd7c..0275051c 100644
--- a/how_to_get_the_programming_languages_running_on_your_computer.mdwn
+++ b/how_to_get_the_programming_languages_running_on_your_computer.mdwn
@@ -235,6 +235,8 @@ However, if you're not able to get that working, don't worry about it much.
 
 The current version of OCaml is 4.02.1 (released October 2014).
 
+<!-- 3.12.1 July 2011; 4.00.1 Oct 2012; 4.01.0 Sept 2013; 4.02.0 Aug 2014; 4.02.1 Oct 2014 -->
+
 *   *Another instruction page focuses on [OPAM](http://ocaml.org/docs/install.html), also [this](https://opam.ocaml.org).*
 
 *   *[More details about installing OCaml on Macs, if needed](http://cocan.org/getting_started_with_ocaml_on_mac_os_x)*
@@ -252,8 +254,8 @@ The current version of OCaml is 4.02.1 (released October 2014).
     even if you don't know what MinGW or Cygwin are.
     Some features of this require Cygwin, but it looks like
     it should mostly work even for users without Cygwin.
-    At the time of this writing, only an installer for the previous
-    version of OCaml (3.11.0, from January 2010) is available.
+    At the time of this writing, only an installer for an earlier
+    version of OCaml (4.01.0, from September 2013) is available.
 
     To install the Findlib add-on, you must have the
     Cygwin system installed. We assume few of you do,
@@ -263,6 +265,9 @@ The current version of OCaml is 4.02.1 (released October 2014).
 
 *   **To install on Mac without MacPorts**
 
+    *Instructions coming*
+
+    <!--
     To install OCaml 3.12 (just released this summer), go to
     <http://caml.inria.fr/download.en.html>
     and download and install the "Binary distribution for Mac OS X"
@@ -283,14 +288,14 @@ The current version of OCaml is 4.02.1 (released October 2014).
 
     This will build an installer package which you should be able to
     double-click and install.
+    -->
 
 *   **To install on Mac with MacPorts**
 
-    You can install the previous version of OCaml (3.11.2,
-    from January 2010), together with the Findlib add-on, by opening a Terminal
-    and typing:
+    You can install the current version of OCaml (4.02.1, from October 2014),
+    together with the Findlib add-on and OPAM package manager, by opening a Terminal and typing:
 
-        sudo port install ocaml caml-findlib
+        sudo port install ocaml caml-findlib opam
 
     As with Scheme, it's helpful to also have rlwrap installed, and to start OCaml as `rlwrap ocaml`. This gives
     you a nice history of the commands you've already typed, which you can scroll up and down in with your
@@ -301,9 +306,9 @@ The current version of OCaml is 4.02.1 (released October 2014).
     Use your packaging system, for example, open a Terminal and
     type:
 
-        sudo apt-get install ocaml ocaml-findlib
+        sudo apt-get install ocaml ocaml-findlib opam
 
-    That will install a version of OCaml and the Findlib add-on.
+    That will install a version of OCaml and the Findlib add-on and OPAM package manager.
 
     If for some reason you can't get OCaml through your
     packaging system, you can go to
@@ -312,7 +317,7 @@ The current version of OCaml is 4.02.1 (released October 2014).
 
     If you can't get findlib through your packaging system, you'll
     need to download it from
-    <http://download.camlcity.org/download/findlib-1.2.6.tar.gz>.
+    <http://download.camlcity.org/download/findlib-1.5.5.tar.gz>.
     and use gcc to compile it yourself. If you don't know how to
     do that, you probably don't want to attempt this.
     Here are the INSTALL notes:
-- 
2.11.0