Merge branch '3.4' into 4.0

* 3.4:
  Fixed some wrong file paths
  Change code file location
  Fix typo for variable name
  Add link to configuration documentation
  Add composer require symfony/webpack-encore-pack
  Reword the intro of a console article
  Fix typo in Memcached adapter documentation

Author: javiereguiluz

components/cache/adapters/memcached_adapter.rst

@@ -263,7 +263,7 @@ Available Options
     small outgoing messages and sending them all at once.
 
 ``use_udp`` (type: ``bool``, default: ``false``)
-    Enables or disabled the use of `User Datagram Protocol (UDP)`_ mode (instead
+    Enables or disables the use of `User Datagram Protocol (UDP)`_ mode (instead
     of `Transmission Control Protocol (TCP)`_ mode), where all operations are
     executed in a "fire-and-forget" manner; no attempt to ensure the operation
     has been received or acted on will be made once the client has executed it.

components/console/console_arguments.rst

@@ -1,12 +1,14 @@
 .. index::
     single: Console; Console arguments
 
-Understanding how Console Arguments Are Handled
-===============================================
+Understanding how Console Arguments and Options Are Handled
+===========================================================
 
-It can be difficult to understand the way arguments are handled by the console application.
-The Symfony Console application, like many other CLI utility tools, follows the behavior
-described in the `docopt`_ standards.
+Symfony Console applications follow the same `docopt`_ standard used in most
+CLI utility tools. This article explains how to handle edge-cases when the
+commands define options with required values, without values, etc. Read
+:doc:`this other article </console/input>` to learn about using arguments and
+options inside Symfony Console commands.
 
 Have a look at the following command that has three options::
 

console/input.rst

@@ -257,7 +257,7 @@ To solve this issue, you have to set the option's default value to ``false``::
 
 Now check the value of the option and keep in mind that ``false !== null``::
 
-    $optionValue = $input->getOptions('yell');
+    $optionValue = $input->getOption('yell');
     $yell = ($optionValue !== false);
     $yellLouder = ($optionValue === 'louder');
 

frontend/encore/installation.rst

@@ -23,7 +23,7 @@ Then, install Encore into your project with Yarn:
 
     .. code-block:: terminal
 
-        $ composer require encore
+        $ composer require symfony/webpack-encore-pack
         $ yarn install
 
     This will create a ``webpack.config.js`` file, add the ``assets/`` directory, and add ``node_modules/`` to

page_creation.rst

@@ -329,6 +329,7 @@ Ok, time to finish mastering the fundamentals by reading these articles:
 * :doc:`/routing`
 * :doc:`/controller`
 * :doc:`/templating`
+* :doc:`/configuration`
 
 Then, learn about other important topics like the
 :doc:`service container </service_container>`,

reference/forms/types/options/choice_label.rst.inc

@@ -17,7 +17,7 @@ more control::
             'maybe' => null,
         ),
         'choice_label' => function ($choiceValue, $key, $value) {
-            if ($value == choiceValue) {
+            if ($value == $choiceValue) {
                 return 'Definitely!';
             }