From 886ccd5be40f690626ff610fcc7b3b40d72ef9a9 Mon Sep 17 00:00:00 2001
From: FlorianLB <flonqueubrochard@clever-age.com>
Date: Sat, 14 Dec 2013 15:34:42 +0100
Subject: [PATCH 1/2] switch custom DQL code example from multi-manager to
 single

---
 cookbook/doctrine/custom_dql_functions.rst | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/cookbook/doctrine/custom_dql_functions.rst b/cookbook/doctrine/custom_dql_functions.rst
index 9c863055c08..57527ed3e1c 100644
--- a/cookbook/doctrine/custom_dql_functions.rst
+++ b/cookbook/doctrine/custom_dql_functions.rst
@@ -17,17 +17,14 @@ In Symfony, you can register your custom DQL functions as follows:
         doctrine:
             orm:
                 # ...
-                entity_managers:
-                    default:
-                        # ...
-                        dql:
-                            string_functions:
-                                test_string: Acme\HelloBundle\DQL\StringFunction
-                                second_string: Acme\HelloBundle\DQL\SecondStringFunction
-                            numeric_functions:
-                                test_numeric: Acme\HelloBundle\DQL\NumericFunction
-                            datetime_functions:
-                                test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
+                dql:
+                    string_functions:
+                        test_string: Acme\HelloBundle\DQL\StringFunction
+                        second_string: Acme\HelloBundle\DQL\SecondStringFunction
+                    numeric_functions:
+                        test_numeric: Acme\HelloBundle\DQL\NumericFunction
+                    datetime_functions:
+                        test_datetime: Acme\HelloBundle\DQL\DatetimeFunction
 
     .. code-block:: xml
 

From fd4f4f2cc94f0cbaaf7c6710ba65f437dff38238 Mon Sep 17 00:00:00 2001
From: FlorianLB <flonqueubrochard@clever-age.com>
Date: Sun, 15 Dec 2013 09:38:48 +0100
Subject: [PATCH 2/2] switch custom DQL code example from multi-manager to
 single (PHP and XML)

---
 cookbook/doctrine/custom_dql_functions.rst | 42 +++++++++-------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/cookbook/doctrine/custom_dql_functions.rst b/cookbook/doctrine/custom_dql_functions.rst
index 57527ed3e1c..35141309b5e 100644
--- a/cookbook/doctrine/custom_dql_functions.rst
+++ b/cookbook/doctrine/custom_dql_functions.rst
@@ -38,15 +38,12 @@ In Symfony, you can register your custom DQL functions as follows:
             <doctrine:config>
                 <doctrine:orm>
                     <!-- ... -->
-                    <doctrine:entity-manager name="default">
-                        <!-- ... -->
-                        <doctrine:dql>
-                            <doctrine:string-function name="test_string>Acme\HelloBundle\DQL\StringFunction</doctrine:string-function>
-                            <doctrine:string-function name="second_string>Acme\HelloBundle\DQL\SecondStringFunction</doctrine:string-function>
-                            <doctrine:numeric-function name="test_numeric>Acme\HelloBundle\DQL\NumericFunction</doctrine:numeric-function>
-                            <doctrine:datetime-function name="test_datetime>Acme\HelloBundle\DQL\DatetimeFunction</doctrine:datetime-function>
-                        </doctrine:dql>
-                    </doctrine:entity-manager>
+                    <doctrine:dql>
+                        <doctrine:string-function name="test_string>Acme\HelloBundle\DQL\StringFunction</doctrine:string-function>
+                        <doctrine:string-function name="second_string>Acme\HelloBundle\DQL\SecondStringFunction</doctrine:string-function>
+                        <doctrine:numeric-function name="test_numeric>Acme\HelloBundle\DQL\NumericFunction</doctrine:numeric-function>
+                        <doctrine:datetime-function name="test_datetime>Acme\HelloBundle\DQL\DatetimeFunction</doctrine:datetime-function>
+                    </doctrine:dql>
                 </doctrine:orm>
             </doctrine:config>
         </container>
@@ -57,23 +54,16 @@ In Symfony, you can register your custom DQL functions as follows:
         $container->loadFromExtension('doctrine', array(
             'orm' => array(
                 // ...
-
-                'entity_managers' => array(
-                    'default' => array(
-                        // ...
-
-                        'dql' => array(
-                            'string_functions' => array(
-                                'test_string'   => 'Acme\HelloBundle\DQL\StringFunction',
-                                'second_string' => 'Acme\HelloBundle\DQL\SecondStringFunction',
-                            ),
-                            'numeric_functions' => array(
-                                'test_numeric' => 'Acme\HelloBundle\DQL\NumericFunction',
-                            ),
-                            'datetime_functions' => array(
-                                'test_datetime' => 'Acme\HelloBundle\DQL\DatetimeFunction',
-                            ),
-                        ),
+                'dql' => array(
+                    'string_functions' => array(
+                        'test_string'   => 'Acme\HelloBundle\DQL\StringFunction',
+                        'second_string' => 'Acme\HelloBundle\DQL\SecondStringFunction',
+                    ),
+                    'numeric_functions' => array(
+                        'test_numeric' => 'Acme\HelloBundle\DQL\NumericFunction',
+                    ),
+                    'datetime_functions' => array(
+                        'test_datetime' => 'Acme\HelloBundle\DQL\DatetimeFunction',
                     ),
                 ),
             ),