merged 2.0

fabpot · fabpot · commit 60cd5018595d · 2011-12-13T16:12:53.000+01:00
diff --git a/DependencyInjection/MonologExtension.php b/DependencyInjection/MonologExtension.php
@@ -31,7 +31,7 @@ class MonologExtension extends Extension
     /**
      * Loads the Monolog configuration.
      *
-     * @param array            $config    An array of configuration settings
+     * @param array            $configs   An array of configuration settings
      * @param ContainerBuilder $container A ContainerBuilder instance
      */
     public function load(array $configs, ContainerBuilder $container)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class MonologExtension extends Extension`
`31`	`31`	`/**`
`32`	`32`	`* Loads the Monolog configuration.`
`33`	`33`	`*`
`34`		`- * @param array $config An array of configuration settings`
	`34`	`+ * @param array $configs An array of configuration settings`
`35`	`35`	`* @param ContainerBuilder $container A ContainerBuilder instance`
`36`	`36`	`*/`
`37`	`37`	`public function load(array $configs, ContainerBuilder $container)`