Skip to content

Commit 46f3108

Browse files
committed
minor #4126 Rebased #3848 (WouterJ)
This PR was merged into the 2.3 branch. Discussion ---------- Rebased #3848 Rebased version of @pborreli's #3848 Commits ------- 6a303ff Fixed typos
2 parents 4d5adaa + 6a303ff commit 46f3108

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

components/templating/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ In a template:
103103

104104
.. note::
105105

106-
The global variables can be overriden by a local variable in the template
106+
The global variables can be overridden by a local variable in the template
107107
with the same name.
108108

109109
Output Escaping

cookbook/assetic/asset_management.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ by Symfony (as the asset files are in the ``dev`` environment). This is on
487487
purpose - letting Symfony generate these files dynamically in a production
488488
environment is just too slow.
489489

490-
.. _cookbook-asetic-dump-prod:
490+
.. _cookbook-assetic-dump-prod:
491491

492492
Instead, each time you use your app in the ``prod`` environment (and therefore,
493493
each time you deploy), you should run the following task:

cookbook/assetic/uglifyjs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ apply this filter when debug mode is off (e.g. ``app.php``):
172172
173173
To try this out, switch to your ``prod`` environment (``app.php``). But before
174174
you do, don't forget to :ref:`clear your cache <book-page-creation-prod-cache-clear>`
175-
and :ref:`dump your assetic assets <cookbook-asetic-dump-prod>`.
175+
and :ref:`dump your assetic assets <cookbook-assetic-dump-prod>`.
176176

177177
.. tip::
178178

reference/constraints/Valid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ an ``Address`` instance in the ``$address`` property.
2626
.. code-block:: php
2727
2828
// src/Acme/HelloBundle/Entity/Address.php
29-
namespace Amce\HelloBundle\Entity;
29+
namespace Acme\HelloBundle\Entity;
3030
3131
class Address
3232
{

reference/forms/types/choice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Field Variables
183183
| choices | ``array`` | A nested array containing the ``ChoiceView`` objects of |
184184
| | | the remaining choices. |
185185
+------------------------+--------------+-------------------------------------------------------------------+
186-
| separator | ``string`` | The seperator to use between choice groups. |
186+
| separator | ``string`` | The separator to use between choice groups. |
187187
+------------------------+--------------+-------------------------------------------------------------------+
188188
| empty_value | ``mixed`` | The empty value if not already in the list, otherwise |
189189
| | | ``null``. |

0 commit comments

Comments
 (0)