aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Sierra <mail@stuartsierra.com>2010-01-25 11:24:31 -0500
committerStuart Sierra <mail@stuartsierra.com>2010-01-25 11:24:31 -0500
commit9baad3c4f0c556e804b564ba4f1b249d36f02207 (patch)
treeb5599e29afe1dc151180d74bac5770b7d0140010
parent5bed152898d7c68c3d5fb48054d03939052625df (diff)
Describe version numbering corresponding to Clojure versions
-rw-r--r--README.txt26
1 files changed, 11 insertions, 15 deletions
diff --git a/README.txt b/README.txt
index a0054ac0..a1a6b5b6 100644
--- a/README.txt
+++ b/README.txt
@@ -63,21 +63,17 @@ any unit tests fail. To omit this testing phase from the build, add
= Clojure-contrib Versions =
-There are currently two versions of clojure-contrib, stored in
-separate branches on github.
-
-The master branch represents the latest and greatest contrib code and
-is tied to the master branch of clojure
-(http://github.com/richhickey/clojure ). If you're using this branch,
-you'll want to be sure to keep your clojure and clojure-contrib code
-in sync, though breaking changes between them are pretty rare in
-practice.
-
-The clojure-1.0-compatible branch is designed to stay compatible with
-clojure release 1.0. New contrib features may be added to this branch,
-at the discretion of the contributors, but not necessarily. If you
-wish to stay on a "standard release" of clojure, this is the branch
-for you.
+Versions of clojure-contrib are matched to versions of Clojure.
+
+If you are using Clojure 1.0, use clojure-contrib 1.0.*
+
+If you are using Clojure 1.1, use clojure-contrib 1.1.*
+
+If you are using Clojure from the "master" branch on Github, use
+clojure-contrib from the "master" branch on Github.
+
+If you are using Clojure from the "new" branch on Github, use
+clojure-contrib from the "new" branch on Github.