diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index 735b04b207..82f691f6be 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -53,9 +53,8 @@ class DoctrineExtension extends LoaderExtension
      *
      *      <doctrine:dbal dbname="sfweb" user="root" />
      *
-     * @param array $config A configuration array
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function dbalLoad($config, BuilderConfiguration $configuration)
     {
@@ -138,9 +137,8 @@ class DoctrineExtension extends LoaderExtension
     /**
      * Loads the Doctrine ORM configuration.
      *
-     * @param array $config A configuration array
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function ormLoad($config, BuilderConfiguration $configuration)
     {
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php
index 8a3ccda6ac..363bd13f24 100755
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php
@@ -30,6 +30,12 @@ class MongoDBExtension extends LoaderExtension
         $this->bundles = $bundles;
     }
 
+    /**
+     * Loads the MongoDB configuration.
+     *
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
+     */
     public function mongodbLoad($config, BuilderConfiguration $configuration)
     {
         $loader = new XmlFileLoader(__DIR__.'/../Resources/config');
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php
index a50596457a..5b17e486eb 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php
@@ -47,10 +47,8 @@ class WebExtension extends LoaderExtension
     /**
      * Loads the web configuration.
      *
-     * @param array                $config        A configuration array
-     * @param BuilderConfiguration $configuration A BuilderConfiguration instance
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function configLoad($config, BuilderConfiguration $configuration)
     {
@@ -171,9 +169,8 @@ class WebExtension extends LoaderExtension
     /**
      * Loads the templating configuration.
      *
-     * @param array $config A configuration array
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function templatingLoad($config, BuilderConfiguration $configuration)
     {
diff --git a/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php b/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
index 1ecfc2a0e7..951bea2bd4 100644
--- a/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
+++ b/src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
@@ -17,9 +17,8 @@ class PropelExtension extends LoaderExtension
     /**
      * Loads the Propel configuration.
      *
-     * @param array $config A configuration array
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function configLoad($config, BuilderConfiguration $configuration)
     {
@@ -48,9 +47,8 @@ class PropelExtension extends LoaderExtension
     /**
      * Loads the DBAL configuration.
      *
-     * @param array $config A configuration array
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function dbalLoad($config, BuilderConfiguration $configuration)
     {
diff --git a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
index 1664523fd6..f57e9d9379 100644
--- a/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
+++ b/src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
@@ -40,9 +40,8 @@ class SwiftMailerExtension extends LoaderExtension
      *        <swift:spool path="/path/to/spool/" />
      *      </swift:mailer>
      *
-     * @param array $config A configuration array
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function mailerLoad($config, BuilderConfiguration $configuration)
     {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
index 5125095c65..4c6d7ed9c4 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
@@ -24,6 +24,12 @@ use Symfony\Components\DependencyInjection\BuilderConfiguration;
  */
 class TwigExtension extends LoaderExtension
 {
+    /**
+     * Loads the Twig configuration.
+     *
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
+     */
     public function configLoad($config, BuilderConfiguration $configuration)
     {
         if (!$configuration->hasDefinition('twig')) {
diff --git a/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php b/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
index 5804273eed..d70c3bcfca 100644
--- a/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
+++ b/src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
@@ -35,10 +35,8 @@ class ZendExtension extends LoaderExtension
      *
      *      <zend:logger priority="info" path="/path/to/some.log" />
      *
-     * @param array                $config        A configuration array
-     * @param BuilderConfiguration $configuration A BuilderConfiguration instance
-     *
-     * @return BuilderConfiguration A BuilderConfiguration instance
+     * @param array                                                        $config        An array of configuration settings
+     * @param \Symfony\Components\DependencyInjection\BuilderConfiguration $configuration A BuilderConfiguration instance
      */
     public function loggerLoad($config, BuilderConfiguration $configuration)
     {