Merge branch '2.0'

DependencyInjection/Configuration.php

@@ -184,6 +184,7 @@ class Configuration implements ConfigurationInterface
                         ->useAttributeAsKey('name')
                         ->prototype('array')
                             ->children()
+                                ->scalarNode('driver')->defaultValue('mysql')->end()
                                 ->scalarNode('user')->defaultValue('root')->end()
                                 ->scalarNode('password')->defaultValue('')->end()
                                 ->scalarNode('dsn')->defaultValue('')->end()

Resources/doc/README.markdown

@@ -81,11 +81,17 @@ propel:
         attributes:           {}
 #        default_connection:       default
 #        connections:
-#           default:
-#               driver:             mysql
-#               user:               root
-#               password:           null
-#               dsn:                mysql:host=localhost;dbname=test
+#            default:
+#                driver:             mysql
+#                user:               root
+#                password:           null
+#                dsn:                mysql:host=localhost;dbname=test
+#                slaves:
+#                    slave_server_1:
+#                        user:       root
+#                        password:   null
+#                        dsn:        mysql:host=localhost;dbname=test_slave_1
+#
 #               options:
 #                   ATTR_PERSISTENT: false
 #               attributes: