From 9734374c2b35bf54c1cb7d5a467e6dedae20a661 Mon Sep 17 00:00:00 2001
From: Peter Taoussanis <ptaoussanis@gmail.com>
Date: Thu, 24 Apr 2014 13:38:35 +0700
Subject: [PATCH] v2.1.0-SNAPSHOT

---
 CHANGELOG.md | 3 +++
 README.md    | 3 +--
 project.clj  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4989560..3ef2cbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,12 @@
 
  * **CHANGE**: Default :missing translations entry now avoids <>'s (no need for html escaping).
  * **CHANGE**: `languages` now returns languages as "localized (unlocalized)" pairs rather than "unlocalized (localized)" pairs.
+ * **CHANGE** (from RC1): ClojureScript macros are now in primary `tower.clj` ns.
  * **NEW**: `timezones` fn now supports optional timezone-ids arg.
  * **NEW**: Add `all-timezone-ids` set.
  * **NEW**: `locale`, `try-locale` now have an optional arg to return simplified (lang-only) locales.
+ * [#43] **NEW**: Translation fns can now take a _vector_ of descending-preference locales (@vvvvalvalval).
+ * [#43] **NEW**: Ring middleware now automatically attaches a smarter translation fn that'll search through all of a client's sorted Accept-Language header languages when looking for a translation.
 
 
 ## v2.1.0-RC1 / 2014 Mar 30
diff --git a/README.md b/README.md
index 2c44b84..af7668a 100644
--- a/README.md
+++ b/README.md
@@ -119,8 +119,7 @@ In all cases, translation requests are logged upon fallback to fallback locale o
 
 ```clojure
 (ns my-clojurescript-ns
-  (:require-macros [taoensso.tower :as tower-macros :refer (with-tscope)])
-  (:require        [taoensso.tower :as tower]))
+  (:require [taoensso.tower :as tower :refer-macros (with-tscope)]))
 
 (def ^:private tconfig
   {:fallback-locale :en
diff --git a/project.clj b/project.clj
index 8cbd533..be5fd50 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.taoensso/tower "2.1.0-RC1"
+(defproject com.taoensso/tower "2.1.0-SNAPSHOT"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure i18n & L10n library"
   :url "https://github.com/ptaoussanis/tower"
@@ -13,7 +13,7 @@
   [[org.clojure/clojure "1.4.0"]
    [com.taoensso/encore "1.5.0"]
    [com.taoensso/timbre "3.1.6"]
-   [markdown-clj        "0.9.41"]]
+   [markdown-clj        "0.9.43"]]
 
   :test-paths ["test" "src"]
   :profiles