Merge branch '2.4' into 2.5

Conflicts: book/translation.rst
symfony · Jun 11, 2014 · c042934 · c042934
2 parents 882471f + d45a60f
commit c042934
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
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()