symfony · FlorianLB · Sep 18, 2013 · Sep 19, 2013 · Sep 23, 2013 · Sep 23, 2013
diff --git a/book/controller.rst b/book/controller.rst
@@ -339,7 +339,7 @@ working with forms, for example::
     {
         $form = $this->createForm(...);
 
-        $form->bind($request);
+        $form->handleRequest($request);
         // ...
     }
 
@@ -392,8 +392,13 @@ itself.
 
     Extending the base class is *optional* in Symfony; it contains useful
     shortcuts but nothing mandatory. You can also extend
-    :class:`Symfony\\Component\\DependencyInjection\\ContainerAware`. The service
-    container object will then be accessible via the ``container`` property.
+    :class:`Symfony\\Component\\DependencyInjection\\ContainerAware` or use
+    the class:`Symfony\\Component\\DependencyInjection\\ContainerAwareTrait` trait
+    (if you have PHP 5.4). The service container object will then be accessible
+    via the ``container`` property.
+
+.. versionadded:: 2.4
+    The ``ContainerAwareTrait`` is new in Symfony 2.4.
 
 .. note::
 
@@ -496,9 +501,9 @@ value to each variable.
     directly by duplicating the current request. When this
     :ref:`sub request <http-kernel-sub-requests>` is executed via the ``http_kernel``
     service the ``HttpKernel`` returns a ``Response`` object::
-    
+
         use Symfony\Component\HttpKernel\HttpKernelInterface;
-    
+
         $path = array(
             '_controller' => 'AcmeHelloBundle:Hello:fancy',
             'name'        => $name,
@@ -686,7 +691,8 @@ For example, imagine you're processing a form submit::
     {
         $form = $this->createForm(...);
 
-        $form->bind($this->getRequest());
+        $form->handleRequest($this->getRequest());
+
         if ($form->isValid()) {
             // do some sort of processing
 
@@ -744,12 +750,15 @@ headers and content that's sent back to the client::
     use Symfony\Component\HttpFoundation\Response;
 
     // create a simple Response with a 200 status code (the default)
-    $response = new Response('Hello '.$name, 200);
+    $response = new Response('Hello '.$name, Response::HTTP_OK);
 
     // create a JSON-response with a 200 status code
     $response = new Response(json_encode(array('name' => $name)));
     $response->headers->set('Content-Type', 'application/json');
 
+.. versionadded:: 2.4
+    Support for HTTP status code constants was added in Symfony 2.4.
+
 .. tip::
 
     The ``headers`` property is a

diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -1449,6 +1449,11 @@ using. The following types are supported in Doctrine:
   * ``object`` (serialized and stored in a ``CLOB`` field)
   * ``array`` (serialized and stored in a ``CLOB`` field)
   * ``blob`` (mapped to a resource stream)
+  * ``simple_array`` (serialized using :phpfunction:`implode()` and :phpfunction:`explode()`,
+    with a comma as delimiter, and stored in a ``CLOB`` field)
+  * ``json_array`` (serialized using :phpfunction:`json_encode()` and :phpfunction:`json_decode()`,
+    and stored in a ``CLOB`` field)
+  * ``guid``
 
 For more information, see Doctrine's `Mapping Types documentation`_.