Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 1f851670a3ce · 2013-11-01T22:19:06.000-05:00
diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -7,14 +7,14 @@ look and feel familiar, you should follow these standards.
 Sphinx
 ------
 
-* The following characters are choosen for different heading levels: level 1
+* The following characters are chosen for different heading levels: level 1
   is ``=``, level 2 ``-``, level 3 ``~``, level 4 ``.`` and level 5 ``"``;
 * Each line should break approximately after the first word that crosses the
   72nd character (so most lines end up being 72-78 characters);
 * The ``::`` shorthand is *preferred* over ``.. code-block:: php`` to begin a PHP
   code block (read `the Sphinx documentation`_ to see when you should use the
   shorthand);
-* Inline hyperlinks are **not** used. Seperate the link and their target
+* Inline hyperlinks are **not** used. Separate the link and their target
   definition, which you add on the bottom of the page;
 * You should use a form of *you* instead of *we*.
 
diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst
@@ -62,7 +62,7 @@ Basic Usage
         // src/Acme/BlogBundle/Entity/Author.php
         namespace Acme\BlogBundle\Entity;
         
-        use Symfomy\Component\Validator\Mapping\ClassMetadata;
+        use Symfony\Component\Validator\Mapping\ClassMetadata;
         use Symfony\Component\Validator\Constraints as Assert;
   
         class Author
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
@@ -152,7 +152,7 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
 .. note::
     
     If you are working with a collection of Doctrine entities, it will be helpful
-    to read the documention for the :doc:`/reference/forms/types/collection`
+    to read the documentation for the :doc:`/reference/forms/types/collection`
     as well. In addition, there is a complete example in the cookbook article
     :doc:`/cookbook/form/form_collections`.
     
