diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst index 385e0999e4e..fca5515fb89 100644 --- 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/GreaterThan.rst b/reference/constraints/GreaterThan.rst index b3f4f42df79..1c1b19055d1 100644 --- a/reference/constraints/GreaterThan.rst +++ b/reference/constraints/GreaterThan.rst @@ -93,5 +93,5 @@ message **type**: ``string`` **default**: ``This value should be greater than {{ compared_value }}`` -This is the message that will be shown if the value is not greather than the +This is the message that will be shown if the value is not greater than the comparison value. diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst index 48aa7ab9744..9b1b6c7e0e0 100644 --- a/reference/constraints/Isbn.rst +++ b/reference/constraints/Isbn.rst @@ -31,8 +31,8 @@ on an object that will contain a ISBN number. .. code-block:: yaml - # src/Acme/BookcaseBunlde/Resources/config/validation.yml - Acme\BookcaseBunlde\Entity\Book: + # src/Acme/BookcaseBundle/Resources/config/validation.yml + Acme\BookcaseBundle\Entity\Book: properties: isbn: - Isbn: @@ -42,7 +42,7 @@ on an object that will contain a ISBN number. .. code-block:: php-annotations - // src/Acme/BookcaseBunlde/Entity/Book.php + // src/Acme/BookcaseBundle/Entity/Book.php use Symfony\Component\Validator\Constraints as Assert; class Book @@ -59,8 +59,8 @@ on an object that will contain a ISBN number. .. code-block:: xml - - + + @@ -72,8 +72,8 @@ on an object that will contain a ISBN number. .. code-block:: php - // src/Acme/BookcaseBunlde/Entity/Book.php - namespace Acme\BookcaseBunlde\Entity; + // src/Acme/BookcaseBundle/Entity/Book.php + namespace Acme\BookcaseBundle\Entity; use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Constraints as Assert; diff --git a/reference/constraints/Url.rst b/reference/constraints/Url.rst index 818156e3d73..0548c2f527d 100644 --- 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 index f74f736e61b..dc4095c52d3 100644 --- a/reference/forms/types/entity.rst +++ b/reference/forms/types/entity.rst @@ -152,7 +152,7 @@ These options inherit from the :doc:`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`.