Merge "resourceloader: Soft-deprecate use of global LESS variables"

diff --combined includes/DefaultSettings.php
index 74d5fa4,b5c90d3..77d7b0e
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1304,7 -1304,7 +1304,7 @@@ $wgMimeInfoFile = 'includes/mime.info'
   * Sets an external MIME detector program. The command must print only
   * the MIME type to standard output.
   * The name of the file to process will be appended to the command given here.
 - * If not set or NULL, PHP's fileinfo extension will be used if available.
 + * If not set or NULL, PHP's mime_content_type function will be used.
   *
   * @par Example:
   * @code
@@@ -3754,20 -3754,18 +3754,18 @@@ $wgResourceLoaderValidateStaticJS = fal
   * at the beginning of all your .less files, with all the consequences.
   * In particular, string values must be escaped and quoted.
   *
-  * Changes to LESS variables do not trigger cache invalidation.
-  *
-  * If the LESS variables need to be dynamic, you can use the
-  * ResourceLoaderGetLessVars hook (since 1.25).
+  * Changes to this configuration do NOT trigger cache invalidation.
   *
   * @par Example:
   * @code
   *   $wgResourceLoaderLESSVars = [
-  *     'baseFontSize'  => '1em',
-  *     'smallFontSize' => '0.75em',
-  *     'WikimediaBlue' => '#006699',
+  *     'exampleFontSize'  => '1em',
+  *     'exampleBlue' => '#eee',
   *   ];
   * @endcode
   * @since 1.22
+  * @deprecated since 1.30 Use ResourceLoaderModule::getLessVars() instead to
+  *  add variables to individual modules that need them.
   */
  $wgResourceLoaderLESSVars = [
        /**