Merge branch '4.4'

OskarStark · OskarStark · commit 5bf67b81d015 · 2019-08-15T11:00:50.000+02:00
* 4.4:
  Remove duplicate namespace in code example
  Use correct code-block
  Remove space before self closing XML tag
  Remove duplicate word
diff --git a/forms.rst b/forms.rst
@@ -545,7 +545,7 @@ Form Type Options
 
 Each :ref:`form type <form-types>` has a number of options to configure it, as
 explained in the :doc:`Symfony form types reference </reference/forms/types>`.
-Two commonly used options options are ``required`` and ``label``.
+Two commonly used options are ``required`` and ``label``.
 
 The ``required`` Option
 .......................
diff --git a/routing.rst b/routing.rst
@@ -200,7 +200,7 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
 
     HTML forms only support ``GET`` and ``POST`` methods. If you're calling a
     route with a different method from an HTML form, add a hidden field called
-    ``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT" />``).
+    ``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT"/>``).
     If you create your forms with :doc:`Symfony Forms </forms>` this is done
     automatically for you.
 
@@ -1905,7 +1905,7 @@ Generating URLs in Templates
 The Twig template language used in :doc:`Symfony templates </templating>`
 provides some functions to generate both relative and absolute URLs:
 
-.. code-block:: twig
+.. code-block:: html+twig
 
     {# generates relative URLs #}
     <a href="{{ path('sign_up') }}">Sign up</a>
diff --git a/workflow.rst b/workflow.rst
@@ -656,7 +656,6 @@ Then you can access this metadata in your controller as follows::
 
     use App\Entity\BlogPost;
     use Symfony\Component\Workflow\Registry;
-    use App\Entity\BlogPost;
 
     public function myController(Registry $registry, BlogPost $post)
     {

Original file line number	Diff line number	Diff line change
`@@ -656,7 +656,6 @@ Then you can access this metadata in your controller as follows::`
`656`	`656`
`657`	`657`	`use App\Entity\BlogPost;`
`658`	`658`	`use Symfony\Component\Workflow\Registry;`
`659`		`- use App\Entity\BlogPost;`
`660`	`659`
`661`	`660`	`public function myController(Registry $registry, BlogPost $post)`
`662`	`661`	`{`