doctrine.rst - suggestions by ryan symfony#1

timglabisch · timglabisch · commit 5d291340d1c2 · 2015-01-17T20:38:23.000+01:00
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -608,18 +608,18 @@ For example, the following looks for entity classes in the ``App\Entity`` namesp
             ),
         ));
 
-Detecting a Mapping MetadataDriver
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Detecting a Mapping Configuration Format
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If the ``type`` on the bundle configuration isn't set,
-the DoctrineBundle will try to detect the correct metadata driver for
+the DoctrineBundle will try to detect the correct mapping configuration format for
 the bundle. The DoctrineBundle will look for files following the filename pattern 
 ``[BundleDirectory]/[ResourceConfigurationDirectory]/*.orm.[Extension]``.
 The ``ResourceConfigurationDirectory``, by default, points to
 ``Resources/config/doctrine``.
 
 The bundle looks for (in this order) XML, YAML and PHP files.
-Using the ``automapping`` feature, every bundle can have only one configuration format.
+Using the ``auto_mapping`` feature, every bundle can have only one configuration format.
 The bundle will stop as soon as it locates one.
 
 If it wasn't possible to determine a configuration format, it will check if
