clarify changelog for major release

CHANGELOG.md

@@ -3,16 +3,16 @@
 
 Added several new features including MariaDB support and future parser
 
+####Backwards-incompatible Changes
+* Remove the deprecated `database`, `database_user`, and `database_grant` resources. The correct resources to use are `mysql`, `mysql_user`, and `mysql_grant` respectively.
+
 ####Features
 * Add MariaDB Support
-* Renamed `database_user` to `mysql_user`
-* Renamed `database` to `mysql_database`
-* Renamed `database_grant` to `mysql_grant`
 * The mysqltuner perl script has been updated to 1.3.0 based on work at http://github.com/major/MySQLTuner-perl
 * Add future parse support, fixed issues with undef to empty string
 * Pass the backup credentials to 'SHOW DATABASES'
 * Ability to specify the Includedir for `mysql::server`
-* `mysql::db` now has an import_timeout feature that defaults to 300
+* `mysql::db` now has an import\_timeout feature that defaults to 300
 * The `mysql` class has been removed
 * `mysql::server` now takes an `override_options` hash that will affect the installation
 * Ability to install both dev and client dev