Merge branch '6.4' into 7.0

* 6.4:
  Fix group handler name
  [Bundle] Fix Bundle configuration root key

bundles/configuration.rst

@@ -94,7 +94,7 @@ class, you can add all the logic related to processing the configuration in that
             // use it directly to configure the service container (when defining an
             // extension class, you also have to do this merging and processing)
             $containerConfigurator->services()
-                ->get('acme.social.twitter_client')
+                ->get('acme_social.twitter_client')
                 ->arg(0, $config['twitter']['client_id'])
                 ->arg(1, $config['twitter']['client_secret'])
             ;
@@ -343,7 +343,7 @@ For example, imagine your bundle has the following example config:
             https://symfony.com/schema/dic/services/services-1.0.xsd"
     >
         <services>
-            <service id="acme.social.twitter_client" class="Acme\SocialBundle\TwitterClient">
+            <service id="acme_social.twitter_client" class="Acme\SocialBundle\TwitterClient">
                 <argument></argument> <!-- will be filled in with client_id dynamically -->
                 <argument></argument> <!-- will be filled in with client_secret dynamically -->
             </service>
@@ -366,7 +366,7 @@ In your extension, you can load this and dynamically set its arguments::
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $definition = $container->getDefinition('acme.social.twitter_client');
+        $definition = $container->getDefinition('acme_social.twitter_client');
         $definition->replaceArgument(0, $config['twitter']['client_id']);
         $definition->replaceArgument(1, $config['twitter']['client_secret']);
     }

logging/monolog_email.rst

@@ -292,7 +292,7 @@ get logged on the server as well as the emails being sent:
                 ->handler('grouped')
             ;
 
-            $monolog->handler('group')
+            $monolog->handler('grouped')
                 ->type('group')
                 ->members(['streamed', 'deduplicated'])
             ;
@@ -322,7 +322,7 @@ get logged on the server as well as the emails being sent:
             ;
         };
 
-This uses the ``group`` handler to send the messages to the two
+This uses the ``grouped`` handler to send the messages to the two
 group members, the ``deduplicated`` and the ``stream`` handlers. The messages will
 now be both written to the log file and emailed.