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
symfony · Aug 16, 2014 · 46f3108 · 46f3108
2 parents 4d5adaa + 6a303ff
commit 46f3108
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/components/templating/introduction.rst b/components/templating/introduction.rst
@@ -103,7 +103,7 @@ In a template:
 
 .. note::
 
-    The global variables can be overriden by a local variable in the template
+    The global variables can be overridden by a local variable in the template
     with the same name.
 
 Output Escaping

diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst
@@ -487,7 +487,7 @@ by Symfony (as the asset files are in the ``dev`` environment). This is on
 purpose - letting Symfony generate these files dynamically in a production
 environment is just too slow.
 
-.. _cookbook-asetic-dump-prod:
+.. _cookbook-assetic-dump-prod:
 
 Instead, each time you use your app in the ``prod`` environment (and therefore,
 each time you deploy), you should run the following task:

diff --git a/cookbook/assetic/uglifyjs.rst b/cookbook/assetic/uglifyjs.rst
@@ -172,7 +172,7 @@ apply this filter when debug mode is off (e.g. ``app.php``):
 
 To try this out, switch to your ``prod`` environment (``app.php``). But before
 you do, don't forget to :ref:`clear your cache <book-page-creation-prod-cache-clear>`
-and :ref:`dump your assetic assets <cookbook-asetic-dump-prod>`.
+and :ref:`dump your assetic assets <cookbook-assetic-dump-prod>`.
 
 .. tip::
 

diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst
@@ -26,7 +26,7 @@ an ``Address`` instance in the ``$address`` property.
 .. code-block:: php
 
     // src/Acme/HelloBundle/Entity/Address.php
-    namespace Amce\HelloBundle\Entity;
+    namespace Acme\HelloBundle\Entity;
 
     class Address
     {

diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
@@ -183,7 +183,7 @@ Field Variables
 | choices                | ``array``    | A nested array containing the ``ChoiceView`` objects of           |
 |                        |              | the remaining choices.                                            |
 +------------------------+--------------+-------------------------------------------------------------------+
-| separator              | ``string``   | The seperator to use between choice groups.                       |
+| separator              | ``string``   | The separator to use between choice groups.                       |
 +------------------------+--------------+-------------------------------------------------------------------+
 | empty_value            | ``mixed``    | The empty value if not already in the list, otherwise             |
 |                        |              | ``null``.                                                         |