preparing v2.0.0

rubiii · Nov 4, 2011 · 25f6e4a · 25f6e4a
1 parent 9853c1c
commit 25f6e4a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+== 2.0.0 (2011-11-04)
+
+  * Replaced the automatic loading of a user-local ambience.yml with an option to
+    load an app-specific config by providing a path to the additonal config via
+    an AMBIENCE_CONFIG environment variable.
+
 == 1.0.0 (2011-06-15)
 
   * Cleaned up the project's setup.

diff --git a/README.md b/README.md
@@ -39,8 +39,9 @@ Ambience loads your config and converts it into a Hash:
 { "auth" => { "address" => "http://example.com", "username" => "ferris", "password" => "test" } }
 ```
 
-Afterwards it tries to merge these settings with local ones specified in an `Ambience.local_config` file.  
-If you're using JRuby, Ambience will merge all JVM properties with the config Hash:
+Afterwards it tries to merge these settings with app-specific setting stored in a file which path is
+provided through the AMBIENCE_CONFIG environment variable. Also, if you're using JRuby, Ambience will
+merge all JVM properties with the config Hash:
 
 ``` ruby
 auth.address = "http://live.example.com"

diff --git a/lib/ambience/version.rb b/lib/ambience/version.rb
@@ -1,5 +1,5 @@
 module Ambience
 
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 
 end