Merge branch '2.4' into 2.5

weaverryan · weaverryan · commit c04293408ebe · 2014-06-11T10:51:02.000-05:00
Conflicts:
	book/translation.rst
diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -92,6 +92,8 @@ Files and Directories
 * When you list a Symfony file/directory hierarchy, use ``your-project/`` as the
   top level directory. E.g.
 
+  .. code-block:: text
+
       your-project/
       ├─ app/
       ├─ src/
diff --git a/cookbook/console/commands_as_services.rst b/cookbook/console/commands_as_services.rst
@@ -90,9 +90,9 @@ have some ``NameRepository`` service that you'll use to get your default value::
 
         public function __construct(NameRepository $nameRepository)
         {
-            parent::__construct();
-            
             $this->nameRepository = $nameRepository;
+            
+            parent::__construct();
         }
 
         protected function configure()

Original file line number	Diff line number	Diff line change
@@ -90,9 +90,9 @@ have some ``NameRepository`` service that you'll use to get your default value::
`90`	`90`
`91`	`91`	`public function __construct(NameRepository $nameRepository)`
`92`	`92`	`{`
`93`		`- parent::__construct();`
`94`		`-`
`95`	`93`	`$this->nameRepository = $nameRepository;`
	`94`	`+`
	`95`	`+ parent::__construct();`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`protected function configure()`