Skip to content

Commit a97d940

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Remove duplicate namespace in code example Use correct code-block Remove space before self closing XML tag Remove duplicate word
2 parents 0ae7d76 + 59ff6f8 commit a97d940

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ Form Type Options
545545

546546
Each :ref:`form type <form-types>` has a number of options to configure it, as
547547
explained in the :doc:`Symfony form types reference </reference/forms/types>`.
548-
Two commonly used options options are ``required`` and ``label``.
548+
Two commonly used options are ``required`` and ``label``.
549549

550550
The ``required`` Option
551551
.......................

routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Use the ``methods`` option to restrict the verbs each route should respond to:
200200

201201
HTML forms only support ``GET`` and ``POST`` methods. If you're calling a
202202
route with a different method from an HTML form, add a hidden field called
203-
``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT" />``).
203+
``_method`` with the method to use (e.g. ``<input type="hidden" name="_method" value="PUT"/>``).
204204
If you create your forms with :doc:`Symfony Forms </forms>` this is done
205205
automatically for you.
206206

@@ -1910,7 +1910,7 @@ Generating URLs in Templates
19101910
The Twig template language used in :doc:`Symfony templates </templating>`
19111911
provides some functions to generate both relative and absolute URLs:
19121912

1913-
.. code-block:: twig
1913+
.. code-block:: html+twig
19141914

19151915
{# generates relative URLs #}
19161916
<a href="{{ path('sign_up') }}">Sign up</a>

workflow.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,6 @@ Then you can access this metadata in your controller as follows::
664664

665665
use App\Entity\BlogPost;
666666
use Symfony\Component\Workflow\Registry;
667-
use App\Entity\BlogPost;
668667

669668
public function myController(Registry $registry, BlogPost $post)
670669
{

0 commit comments

Comments
 (0)