Merge branch '2.0' into 2.1

fabpot · fabpot · commit 08757db05ece · 2013-03-01T07:42:22.000+01:00
* 2.0:
  [Console] Fixed comment

Conflicts:
	src/Symfony/Component/Console/Output/OutputInterface.php
diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
@@ -123,7 +123,7 @@ public function getVerbosity()
     /**
      * Writes a message to the output and adds a newline at the end.
      *
-     * @param string|array $messages The message as an array of lines of a single string
+     * @param string|array $messages The message as an array of lines or a single string
      * @param integer      $type     The type of output
      *
      * @api
@@ -136,7 +136,7 @@ public function writeln($messages, $type = 0)
     /**
      * Writes a message to the output.
      *
-     * @param string|array $messages The message as an array of lines of a single string
+     * @param string|array $messages The message as an array of lines or a single string
      * @param Boolean      $newline  Whether to add a newline or not
      * @param integer      $type     The type of output
      *
diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -33,7 +33,7 @@ interface OutputInterface
     /**
      * Writes a message to the output.
      *
-     * @param string|array $messages The message as an array of lines of a single string
+     * @param string|array $messages The message as an array of lines or a single string
      * @param Boolean      $newline  Whether to add a newline or not
      * @param integer      $type     The type of output (0: normal, 1: raw, 2: plain)
      *

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function getVerbosity()`
`123`	`123`	`/**`
`124`	`124`	`* Writes a message to the output and adds a newline at the end.`
`125`	`125`	`*`
`126`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`126`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`127`	`127`	`* @param integer $type The type of output`
`128`	`128`	`*`
`129`	`129`	`* @api`
`@@ -136,7 +136,7 @@ public function writeln($messages, $type = 0)`
`136`	`136`	`/**`
`137`	`137`	`* Writes a message to the output.`
`138`	`138`	`*`
`139`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`139`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`140`	`140`	`* @param Boolean $newline Whether to add a newline or not`
`141`	`141`	`* @param integer $type The type of output`
`142`	`142`	`*`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ interface OutputInterface`
`33`	`33`	`/**`
`34`	`34`	`* Writes a message to the output.`
`35`	`35`	`*`
`36`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`36`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`37`	`37`	`* @param Boolean $newline Whether to add a newline or not`
`38`	`38`	`* @param integer $type The type of output (0: normal, 1: raw, 2: plain)`
`39`	`39`	`*`