From 82d4a268944e7d24354db433df3adee96c16f6a7 Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Wed, 2 Nov 2016 19:36:15 +0100 Subject: [PATCH 1/2] [Doctrine] Slave/Master configuration options Like settle in the configuration options keep_slave should be a children of connections --- reference/configuration/doctrine.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index 7dfb3dc3b94..2f1504582ce 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -68,6 +68,7 @@ Full Default Configuration profiling: '%kernel.debug%' driver_class: ~ wrapper_class: ~ + keep_slave: false options: # an array of options key: [] @@ -209,6 +210,7 @@ Full Default Configuration logging="%kernel.debug%" platform-service="MyOwnDatabasePlatformService" server-version="5.6" + keep-slave="false" > bar string @@ -406,7 +408,6 @@ The following block shows all possible configuration keys: types: custom: Acme\HelloBundle\MyCustomType # the DBAL keepSlave option - keep_slave: false .. code-block:: xml From 80f6c35d6cdedfdd8fec8ff750000bb63feb451b Mon Sep 17 00:00:00 2001 From: Amrouche Hamza Date: Fri, 4 Nov 2016 20:04:25 +0100 Subject: [PATCH 2/2] Take xabbuh comments --- reference/configuration/doctrine.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index 2f1504582ce..1a58cfaeaa0 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -68,6 +68,7 @@ Full Default Configuration profiling: '%kernel.debug%' driver_class: ~ wrapper_class: ~ + # the DBAL keepSlave option keep_slave: false options: # an array of options @@ -407,7 +408,6 @@ The following block shows all possible configuration keys: enum: string types: custom: Acme\HelloBundle\MyCustomType - # the DBAL keepSlave option .. code-block:: xml