Merge branch '7.4' into 8.0

* 7.4:
  Tweaks
  [Framework] Clarifying what `base_path` actually does

Author: javiereguiluz

reference/configuration/framework.rst

@@ -62,14 +62,17 @@ The directory to store cache files for annotations, in case
 assets
 ~~~~~~
 
+The following options configure the behavior of the
+:ref:`Twig asset() function <reference-twig-function-asset>`.
+
 .. _reference-assets-base-path:
 
 base_path
 .........
 
 **type**: ``string``
 
-This option allows you to define a base path to be used for assets:
+This option allows you to prepend a base path to the URLs generated for assets:
 
 .. configuration-block::
 
@@ -108,6 +111,9 @@ This option allows you to define a base path to be used for assets:
                 ->basePath('/images');
         };
 
+With this configuration, a call to ``asset('logo.png')`` will generate
+``/images/logo.png`` instead of ``/logo.png``.
+
 .. _reference-templating-base-urls:
 .. _reference-assets-base-urls: