Merge branch '4.2'

* 4.2:
  [Flex] Tell that `var/logs/` directory was renamed
  Fix local proxy URI scheme

Author: javiereguiluz

setup/flex.rst

@@ -270,6 +270,9 @@ manual steps:
 #. Remove the ``bin/symfony_requirements`` script and if you need a replacement
    for it, use the new `Symfony Requirements Checker`_.
 
+#. Update the ``.gitignore`` file to replace the existing ``var/logs/`` entry
+   by ``var/log/``, which is the new name for the log directory.
+
 Customizing Flex Paths
 ----------------------
 

setup/symfony_server.rst

@@ -183,7 +183,7 @@ If this is the first time you run the proxy, you must follow these additional st
 
 * Open the **network configuration** of your operating system;
 * Find the **proxy settings** and select the **"Automatic Proxy Configuration"**;
-* Set the following URL as its value: ``https://127.0.0.1:7080/proxy.pac``
+* Set the following URL as its value: ``http://127.0.0.1:7080/proxy.pac``
 
 Defining the Local Domain
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -202,15 +202,15 @@ new custom domain.
 
 .. tip::
 
-    Browse the https://127.0.0.1:7080 URL to get the full list of local project
+    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
 domains work:
 
 .. code-block:: terminal
 
-    $ HTTPS_PROXY=https://127.0.0.1:7080 curl https://my-domain.wip
+    $ HTTPS_PROXY=http://127.0.0.1:7080 curl https://my-domain.wip
 
 .. tip::