Update CHANGELOG.md

1 files changed, 29 insertions, 8 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b44c70..e0181c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,26 +4,47 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.6.0 – Upcoming
+ - Add builder pattern to condense configuration
+
+   ```
+   Config::new()
+       .merge(File::with_name("Settings"))
+       .merge(Environment::with_prefix("APP"))
+       .unwrap()
+   ```
+
 ## 0.5.2 – 2017-06-22
- - Parsing errors even for non required files – @Anthony25 ( #33 )
+ - Parsing errors even for non required files – [@Anthony25] ( [#33] )
+
+[@Anthony25]: https://github.com/Anthony25
+[#33]: https://github.com/mehcode/config-rs/pull/33
 
 ## 0.5.1 – 2017-06-16
  - Added config category to Cargo.toml
 
 ## 0.5.0 – 2017-06-16
- - `config.get` has been changed to take a type parameter and to deserialize into that type using serde. Old behavior (get a value variant) can be used by passing `config::Value` as the type parameter: `my_config.get::<config::Value>("..")`
+ - `config.get` has been changed to take a type parameter and to deserialize into that type using serde. Old behavior (get a value variant) can be used by passing `config::Value` as the type parameter: `my_config.get::<config::Value>("..")`. Some great help here from [@impowski] in [#25].
  - Propagate parse and type errors through the deep merge (remembering filename, line, etc.)
- - Remove directory traversal on `File`. This is likely temporary. I do _want_ this behavior but I can see how it should be optional. See #35
- - Add `File::with_name` to get automatic file format detection instead of manual `FileFormat::*` – @JordiPolo
- - Case normalization #26
- - Remove many possible panics #8
+ - Remove directory traversal on `File`. This is likely temporary. I do _want_ this behavior but I can see how it should be optional. See [#35]
+ - Add `File::with_name` to get automatic file format detection instead of manual `FileFormat::*` – [@JordiPolo]
+ - Case normalization [#26]
+ - Remove many possible panics [#8]
  - `my_config.refresh()` will do a full re-read from the source so live configuration is possible with some work to watch the file
 
+[#8]: https://github.com/mehcode/config-rs/issues/8
+[#35]: https://github.com/mehcode/config-rs/pull/35
+[#26]: https://github.com/mehcode/config-rs/pull/26
+[#25]: https://github.com/mehcode/config-rs/pull/25
+
+[@impowski]: https://github.com/impowski
+[@JordiPolo]: https://github.com/JordiPolo
+
 ## 0.4.0 - 2017-02-12
  - Remove global ( `config::get` ) API — It's now required to create a local configuration instance with `config::Config::new()` first.
- 
+
    If you'd like to have a global configuration instance, use `lazy_static!` as follows:
-   
+
    ```rust
    use std::sync::RwLock;
    use config::Config;