From d3fa2976568fa8575c5e74ab69195544f4ea477b Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Sun, 11 May 2014 01:54:57 +0200 Subject: [PATCH] Fixed typos --- components/templating/introduction.rst | 2 +- contributing/code/bc.rst | 2 +- contributing/code/patches.rst | 2 +- cookbook/assetic/asset_management.rst | 2 +- cookbook/assetic/uglifyjs.rst | 2 +- cookbook/doctrine/dbal.rst | 2 +- cookbook/security/named_encoders.rst | 2 +- reference/constraints/Valid.rst | 2 +- reference/forms/types/choice.rst | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/templating/introduction.rst b/components/templating/introduction.rst index 4fd9c0f2aaa..1e5b0999b4c 100644 --- 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/contributing/code/bc.rst b/contributing/code/bc.rst index 0e55eb2d18f..43f048f0e3f 100644 --- a/contributing/code/bc.rst +++ b/contributing/code/bc.rst @@ -138,7 +138,7 @@ your overridden method wouldn't match anymore and generate a fatal error. .. note:: As with interfaces, we limit ourselves to changes that can be upgraded - easily. We will document the precise ugprade instructions in the UPGRADE + easily. We will document the precise upgrade instructions in the UPGRADE file in Symfony's root directory. In some cases, only specific properties and methods are tagged with the ``@api`` diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index aa9037d2c56..930b4787b2f 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -401,7 +401,7 @@ messages of all the commits. When you are finished, execute the push command. .. _ProGit: http://git-scm.com/book .. _GitHub: https://github.com/signup/free -.. _`Github's Documentation`: https://help.github.com/articles/ignoring-files +.. _`GitHub's Documentation`: https://help.github.com/articles/ignoring-files .. _Symfony2 repository: https://github.com/symfony/symfony .. _dev mailing-list: http://groups.google.com/group/symfony-devs .. _travis-ci.org: https://travis-ci.org/ diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst index 8c16204ea0e..44f3ca310f7 100644 --- 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 index 19413842ca9..747b759e55a 100644 --- 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 ` -and :ref:`dump your assetic assets `. +and :ref:`dump your assetic assets `. .. tip:: diff --git a/cookbook/doctrine/dbal.rst b/cookbook/doctrine/dbal.rst index 71349c6bc75..17a403f0c26 100644 --- a/cookbook/doctrine/dbal.rst +++ b/cookbook/doctrine/dbal.rst @@ -174,7 +174,7 @@ mapping type: 'dbal' => array( 'connections' => array( 'default' => array( - // other connection parameers + // other connection parameters 'mapping_types' => array( 'enum' => 'string', ), diff --git a/cookbook/security/named_encoders.rst b/cookbook/security/named_encoders.rst index cf9ea3770c2..3b22a2d9343 100644 --- a/cookbook/security/named_encoders.rst +++ b/cookbook/security/named_encoders.rst @@ -105,7 +105,7 @@ named encoders: This creates an encoder named ``harsh``. In order for a ``User`` instance to use it, the class must implement :class:`Symfony\\Component\\Security\\Core\\Encoder\\EncoderAwareInterface`. -The interface requires one method - ``getEncoderName`` - which should reutrn +The interface requires one method - ``getEncoderName`` - which should return the name of the encoder to use:: // src/Acme/UserBundle/Entity/User.php diff --git a/reference/constraints/Valid.rst b/reference/constraints/Valid.rst index 635f0bddfd2..7acbb4ddec1 100644 --- 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 index f7e298ec0aa..0532f41cd76 100644 --- a/reference/forms/types/choice.rst +++ b/reference/forms/types/choice.rst @@ -173,7 +173,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``. |