fixing CHANGELOG and adding note about label_errors. fixes bootstrap-ruby#155

Author: potenza

CHANGELOG.md

@@ -1,6 +1,17 @@
+## Pending Release (master-branch only)
+
+Bugfixes:
+
+  - Use #underscore, not #downcase for help text scope (#140, @atipugin)
+
+Features:
+
+  - Allow users to display validation errors in labels (#144, @timcheadle)
+
 ## 2.2.0 (2014-09-16)
 
 Bugfixes:
+
   - Fixed an exception raised when form_group block returns nil (#111)
   - Fixed an exception on human_attribute_name when using bootstrap_form_tag (#115)
   - Set offset in form_group without label in horizontal layout (#94, @datWav)
@@ -23,8 +34,6 @@ Features:
   - Added the ability to pass any attributes to wrapper (#136, @atipugin)
   - Split monolithic test file into several smaller files (#141, @spacewander)
   - Added role="form" attribute to forms (#142, @spacewander)
-  - Allow users to display validation errors in labels (#144, @timcheadle)
-  - Use #underscore, not #downcase for help text scope (#140, @atipugin)
 
 ## 2.1.1 (2014-04-20)
 

README.md

@@ -433,7 +433,7 @@ You can turn off inline errors for the entire form like this:
 <% end %>
 ```
 
-### Label Errors
+### Label Errors (Master-branch only)
 
 You can also display validation errors in the field's label; just turn
 on the `:label_errors` option. Here's an example: