From 2ec09a3fab297b25095f95091843452fa6b7f8bd Mon Sep 17 00:00:00 2001 From: Andrew M Date: Mon, 10 Mar 2014 18:30:21 +0200 Subject: [PATCH] Fix typos, remove trailing whitespace. --- components/serializer.rst | 2 +- reference/configuration/framework.rst | 6 +++--- reference/constraints/UniqueEntity.rst | 8 ++++---- reference/dic_tags.rst | 4 ++-- reference/forms/twig_reference.rst | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/serializer.rst b/components/serializer.rst index 4064743c076..e45dc61f74c 100644 --- a/components/serializer.rst +++ b/components/serializer.rst @@ -186,7 +186,7 @@ JMSSerializer A popular third-party library, `JMS serializer`_, provides a more sophisticated albeit more complex solution. This library includes the -ability to configure how your objects should be serialize/deserialized via +ability to configure how your objects should be serialized/deserialized via annotations (as well as YAML, XML and PHP), integration with the Doctrine ORM, and handling of other complex cases (e.g. circular references). diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index ade3c89fe22..0f06b609f67 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -171,9 +171,9 @@ cookie_lifetime **type**: ``integer`` **default**: ``null`` -This determines the lifetime of the session - in seconds. It will use ``null`` by +This determines the lifetime of the session - in seconds. It will use ``null`` by default, which means ``session.cookie_lifetime`` value from ``php.ini`` will be used. -Setting this value to ``0`` means the cookie is valid for the length of the browser +Setting this value to ``0`` means the cookie is valid for the length of the browser session. cookie_path @@ -204,7 +204,7 @@ cookie_httponly **type**: ``Boolean`` **default**: ``false`` -This determines whether cookies should only accessible through the HTTP protocol. +This determines whether cookies should only be accessible through the HTTP protocol. This means that the cookie won't be accessible by scripting languages, such as JavaScript. This setting can effectively help to reduce identity theft through XSS attacks. diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst index 2c05d02863b..bdc90af17fe 100644 --- a/reference/constraints/UniqueEntity.rst +++ b/reference/constraints/UniqueEntity.rst @@ -64,7 +64,7 @@ table: * @Assert\Email() */ protected $email; - + // ... } @@ -97,7 +97,7 @@ table: // DON'T forget this use statement!!! use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; - + class Author { public static function loadValidatorMetadata(ClassMetadata $metadata) @@ -142,8 +142,8 @@ em **type**: ``string`` The name of the entity manager to use for making the query to determine the -uniqueness. If it's left blank, the correct entity manager will determined for -this class. For that reason, this option should probably not need to be +uniqueness. If it's left blank, the correct entity manager will be determined +for this class. For that reason, this option should probably not need to be used. repositoryMethod diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index cbb8ca4c6a9..ab3228c895d 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -847,7 +847,7 @@ swiftmailer.default.plugin If you're using a custom SwiftMailer plugin (or want to create one), you can register it with SwiftMailer by creating a service for your plugin and tagging -it with ``swiftmailer.default.plugin`` (it has no options). +it with ``swiftmailer.default.plugin`` (it has no options). .. note:: @@ -901,7 +901,7 @@ translation.loader **Purpose**: To register a custom service that loads translations -By default, translations are loaded form the filesystem in a variety of different +By default, translations are loaded from the filesystem in a variety of different formats (YAML, XLIFF, PHP, etc). If you need to load translations from some other source, first create a class that implements the :class:`Symfony\\Component\\Translation\\Loader\\LoaderInterface` interface:: diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst index 06654a89916..1088f4f6f88 100644 --- a/reference/forms/twig_reference.rst +++ b/reference/forms/twig_reference.rst @@ -267,7 +267,7 @@ to see what options you have available. Behind the scenes, these variables are made available to the ``FormView`` object of your form when the Form component calls ``buildView`` and ``buildViewBottomUp`` - on each "node" of your form tree. To see what "view" variables a particularly + on each "node" of your form tree. To see what "view" variables a particular field has, find the source code for the form field (and its parent fields) and look at the above two functions.