Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit 3ae4a3dfd15c · 2018-12-12T16:08:08.000+01:00
* 3.4:
  Fix variable name in code snippet
diff --git a/components/asset.rst b/components/asset.rst
@@ -215,7 +215,7 @@ that path over and over again::
     // result: /static/images/logo.png?v1
 
     // Base path is ignored when using absolute paths
-    echo $package->getUrl('/logo.png');
+    echo $pathPackage->getUrl('/logo.png');
     // result: /logo.png?v1
 
 Request Context Aware Assets
@@ -239,7 +239,7 @@ class can take into account the context of the current request::
     // result: /somewhere/static/images/logo.png?v1
 
     // Both "base path" and "base url" are ignored when using absolute path for asset
-    echo $package->getUrl('/logo.png');
+    echo $pathPackage->getUrl('/logo.png');
     // result: /logo.png?v1
 
 Now that the request context is set, the ``PathPackage`` will prepend the
