Merge branch '3.4' into 4.4

* 3.4:
  Explain why the env var is in lowercase
  Update symfony_server.rst - proxy env lowercase
  Use non-deprecated options key

Author: javiereguiluz

frontend/encore/babel.rst

@@ -25,10 +25,10 @@ Need to extend the Babel configuration further? The easiest way is via
         }, {
             // node_modules is not processed through Babel by default
             // but you can whitelist specific modules to process
-            include_node_modules: ['foundation-sites'],
+            includeNodeModules: ['foundation-sites'],
 
             // or completely control the exclude rule (note that you
-            // can't use both "include_node_modules" and "exclude" at
+            // can't use both "includeNodeModules" and "exclude" at
             // the same time)
             exclude: /bower_components/
         })

setup/symfony_server.rst

@@ -63,13 +63,13 @@ Enabling PHP-FPM
 When the server starts it will check for common patterns like ``web/app.php``,
 ``web/app_dev.php`` or ``public/index.php``. If a file like this is found the
 server will automatically start with PHP-FPM enabled. Otherwise the server will
-start without PHP-FPM and will show a ``Page not found`` page when trying to 
+start without PHP-FPM and will show a ``Page not found`` page when trying to
 access a ``.php`` file in the browser.
 
 .. tip::
 
     When an ``index.html`` and a front controller like e.g. ``index.php`` are
-    both present the server will still start with PHP-FPM enabled but the 
+    both present the server will still start with PHP-FPM enabled but the
     ``index.html`` will take precedence over the front controller. This means
     when an ``index.html`` file is present in ``public`` or ``web``, it will be
     displayed instead of the ``index.php`` which would show e.g. the Symfony
@@ -215,12 +215,18 @@ new custom domain.
     Browse the http://127.0.0.1:7080 URL to get the full list of local project
     directories, their custom domains, and port numbers.
 
-When running console commands, add the ``HTTPS_PROXY`` env var to make custom
+When running console commands, add the ``https_proxy`` env var to make custom
 domains work:
 
 .. code-block:: terminal
 
-    $ HTTPS_PROXY=http://127.0.0.1:7080 curl https://my-domain.wip
+    $ https_proxy=http://127.0.0.1:7080 curl https://my-domain.wip
+
+.. note::
+
+    Although env var names are always defined in uppercase, the ``https_proxy``
+    env var `is treated differently`_ than other env vars and its name must be
+    spelled in lowercase.
 
 .. tip::
 
@@ -359,3 +365,4 @@ debug any issues.
 .. _`proxy settings in Windows`: https://www.dummies.com/computers/operating-systems/windows-10/how-to-set-up-a-proxy-in-windows-10/
 .. _`proxy settings in macOS`: https://support.apple.com/guide/mac-help/enter-proxy-server-settings-on-mac-mchlp2591/mac
 .. _`proxy settings in Ubuntu`: https://help.ubuntu.com/stable/ubuntu-help/net-proxy.html.en
+.. `is treated differently`: https://ec.haxx.se/usingcurl/usingcurl-proxies#http_proxy-in-lower-case-only