Skip to content

Commit f379079

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Remove a word from the spelling list Typo fix : rolse ⮞ roles Added missing space : everytime ⮞ every time Typo fix : http-methode-override ⮞ http-method-override Typo fix : shoud⮞ should Update : advertize ⮞ advertise Typo fix : developped ⮞ developed Typo fix : developped ⮞ developed Typo fix : additonal ⮞ additional
2 parents d4c904f + 50b34ce commit f379079

File tree

9 files changed

+8
-9
lines changed

9 files changed

+8
-9
lines changed

_build/spelling_word_list.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
accessor
2-
advertize
32
Akamai
43
analytics
54
Ansi

components/http_client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ regular expression applied to relative URLs::
690690
],
691691
],
692692
// this is the index in the previous array that defines
693-
// the base URI that shoud be used to resolve relative URLs
693+
// the base URI that should be used to resolve relative URLs
694694
'https://api\.github\.com/'
695695
);
696696

configuration/env_var_processors.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Symfony provides the following env var processors:
124124
<parameter key="env(HTTP_METHOD_OVERRIDE)">true</parameter>
125125
</parameters>
126126
127-
<framework:config http-methode-override="%env(bool:HTTP_METHOD_OVERRIDE)%"/>
127+
<framework:config http-method-override="%env(bool:HTTP_METHOD_OVERRIDE)%"/>
128128
</container>
129129
130130
.. code-block:: php

create_framework/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ a fully-featured full-stack web framework.
4141
And each step will be the occasion to learn more about some of the Symfony
4242
Components.
4343

44-
Many modern web frameworks advertize themselves as being MVC frameworks. This
44+
Many modern web frameworks advertise themselves as being MVC frameworks. This
4545
tutorial won't talk about the MVC pattern, as the Symfony Components are able to
4646
create any type of frameworks, not just the ones that follow the MVC
4747
architecture. Anyway, if you have a look at the MVC semantics, this book is

form/create_custom_field_type.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ be implemented with a :doc:`ChoiceType </reference/forms/types/choice>` where th
1919
``choices`` option is set to the list of available shipping options.
2020

2121
However, if you use the same form type in several forms, repeating the list of
22-
``choices`` everytime you use it quickly becomes boring. In this example, a
22+
``choices`` every time you use it quickly becomes boring. In this example, a
2323
better solution is to create a custom form type based on ``ChoiceType``. The
2424
custom type looks and behaves like a ``ChoiceType`` but the list of choices is
2525
already populated with the shipping options so you don't need to define them.

security/access_control.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Take the following ``access_control`` entries as an example:
8383
],
8484
[
8585
'path' => '^/admin',
86-
'rolse' => 'ROLE_USER_HOST',
86+
'roles' => 'ROLE_USER_HOST',
8787
'host' => 'symfony\.com$',
8888
],
8989
[

setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ requirements. Open your console terminal and run this command:
3535
3636
.. note::
3737

38-
The Symfony binary is developped internally at Symfony. If you want to
38+
The Symfony binary is developed internally at Symfony. If you want to
3939
report a bug or suggest a new feature, please create an issue on
4040
`symfony/cli`_.
4141

setup/symfony_server.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The Symfony server is part of the ``symfony`` binary created when you
1919

2020
.. note::
2121

22-
The Symfony binary is developped internally at Symfony. If you want to
22+
The Symfony binary is developed internally at Symfony. If you want to
2323
report a bug or suggest a new feature, please create an issue on
2424
`symfony/cli`_.
2525

workflow.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ This means that each event has access to the following information:
453453
Returns a metadata.
454454

455455
For Guard Events, there is an extended :class:`Symfony\\Component\\Workflow\\Event\\GuardEvent` class.
456-
This class has these additonal methods:
456+
This class has these additional methods:
457457

458458
:method:`Symfony\\Component\\Workflow\\Event\\GuardEvent::isBlocked`
459459
Returns if transition is blocked.

0 commit comments

Comments
 (0)