Mar 19, 2014 · Mar 10, 2014
diff --git a/components/serializer.rst b/components/serializer.rst

 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 beserialize/deserialized via
 ability to configure how your objects should beserialized/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

 **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

 **type**: ``Boolean`` **default**: ``false``

 This determines whether cookies should only accessible through the HTTP protocol.
 This determines whether cookies should onlybeaccessible 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
             * @Assert\Email()
             */
            protected $email;


            // ...
        }


        // DON'T forget this use statement!!!
        use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;


        class Author
        {
            public static function loadValidatorMetadata(ClassMetadata $metadata)
 **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 willdetermined for
 this class. For that reason, this option should probably not need to be
 uniqueness. If it's left blank, the correct entity manager willbe determined
 forthis 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

 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::


 **Purpose**: To register a custom service that loads translations

 By default, translations are loadedform the filesystem in a variety of different
 By default, translations are loadedfrom 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

    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 aparticularly
    on each "node" of your form tree. To see what "view" variables aparticular
    field has, find the source code for the form field (and its parent fields)
    and look at the above two functions.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 beserialize/deserialized via
		ability to configure how your objects should beserialized/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).

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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
Expand DownExpand Up		@@ -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 onlybeaccessible 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.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -64,7 +64,7 @@ table:
		* @Assert\Email()
		*/
		protected $email;


		// ...
		}

Expand DownExpand Up		@@ -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)
Expand DownExpand Up		@@ -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 willdetermined for
		this class. For that reason, this option should probably not need to be
		uniqueness. If it's left blank, the correct entity manager willbe determined
		forthis class. For that reason, this option should probably not need to be
		used.

		repositoryMethod
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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::

Expand DownExpand Up		@@ -901,7 +901,7 @@ translation.loader

		Purpose: To register a custom service that loads translations

		By default, translations are loadedform the filesystem in a variety of different
		By default, translations are loadedfrom 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::
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 aparticularly
		on each "node" of your form tree. To see what "view" variables aparticular
		field has, find the source code for the form field (and its parent fields)
		and look at the above two functions.

Expand Down