Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 29e6ac8329a6 · 2019-03-27T17:01:20.000+01:00
* 3.4:
  Fix the example about overriding the getProjectDir method
diff --git a/deployment.rst b/deployment.rst
@@ -236,7 +236,7 @@ kernel and return your project's root directory::
 
         public function getProjectDir()
         {
-            return __DIR__.'/..';
+            return dirname(__DIR__);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ kernel and return your project's root directory::`
`236`	`236`
`237`	`237`	`public function getProjectDir()`
`238`	`238`	`{`
`239`		`- return __DIR__.'/..';`
	`239`	`+ return dirname(__DIR__);`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`