Merge branch '3.4' into 4.2

* 3.4:
  Reorganized the Workflow docs

Author: javiereguiluz

_build/redirection_map

@@ -414,3 +414,5 @@
 /frontend/encore/legacy-apps /frontend/encore/legacy-applications
 /configuration/external_parameters /configuration/environment_variables
 /contributing/code/patches /contributing/code/pull_requests
+/workflow/state-machines /workflow/introduction
+/workflow/usage /workflow

reference/configuration/framework.rst

@@ -2302,8 +2302,9 @@ type
 
 **type**: ``string`` **possible values**: ``'workflow'`` or ``'state_machine'``
 
-Defines the kind fo workflow that is going to be created, which can be either
-a :doc:`normal workflow </workflow/usage>` or a :doc:`state machine </workflow/state-machines>`.
+Defines the kind of workflow that is going to be created, which can be either
+a normal workflow or a state machine. Read :doc:`this article </workflow/introduction>`
+to know their differences.
 
 .. _`HTTP Host header attacks`: http://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
 .. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning