symfony
diff --git a/‎book/doctrine.rst‎
Lines changed: 7 additions & 0 deletions b/‎book/doctrine.rst‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎book/forms.rst‎
Lines changed: 2 additions & 2 deletions
Display the source diff b/‎book/forms.rst‎
Lines changed: 2 additions & 2 deletions
Display the source diff
diff --git a/‎book/http_cache.rst‎
Lines changed: 1 addition & 1 deletion b/‎book/http_cache.rst‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎book/internals.rst‎
Lines changed: 10 additions & 10 deletions b/‎book/internals.rst‎
Lines changed: 10 additions & 10 deletions
diff --git a/‎book/performance.rst‎
Lines changed: 1 addition & 1 deletion b/‎book/performance.rst‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎book/propel.rst‎
Lines changed: 3 additions & 3 deletions b/‎book/propel.rst‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎book/routing.rst‎
Lines changed: 4 additions & 4 deletions b/‎book/routing.rst‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎book/security.rst‎
Lines changed: 8 additions & 8 deletions b/‎book/security.rst‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎book/testing.rst‎
Lines changed: 3 additions & 3 deletions b/‎book/testing.rst‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎book/translation.rst‎
Lines changed: 1 addition & 1 deletion b/‎book/translation.rst‎
Lines changed: 1 addition & 1 deletion
@@ -1441,12 +1441,19 @@ using. The following types are supported in Doctrine:
   * ``date``
   * ``time``
   * ``datetime``
+  * ``datetimetz``
 
 * **Other Types**
 
   * ``boolean``
   * ``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`_.
 
 
@@ -1412,7 +1412,7 @@ renders the form:
 
         {% form_theme form 'AcmeTaskBundle:Form:fields.html.twig' 'AcmeTaskBundle:Form:fields2.html.twig' %}
 
-        {{ form(form) }}
+        <!-- ... render the form -->
 
     .. code-block:: html+php
 
@@ -1421,7 +1421,7 @@ renders the form:
 
         <?php $view['form']->setTheme($form, array('AcmeTaskBundle:Form', 'AcmeTaskBundle:Form')) ?>
 
-        <?php echo $view['form']->form($form) ?>
+        <!-- ... render the form -->
 
 The ``form_theme`` tag (in Twig) "imports" the fragments defined in the given
 template and uses them when rendering the form. In other words, when the
 
@@ -535,7 +535,7 @@ example).
     The 304 status code means "Not Modified". It's important because with
     this status code the response does *not* contain the actual content being
     requested. Instead, the response is simply a light-weight set of directions that
-    tell cache that it should use its stored version.
+    tells the cache that it should use its stored version.
 
 Like with expiration, there are two different HTTP headers that can be used
 to implement the validation model: ``ETag`` and ``Last-Modified``.
 
@@ -30,7 +30,7 @@ on top of the previous one.
 
 The deepest level is the :namespace:`Symfony\\Component\\HttpFoundation`
 component. HttpFoundation provides the main objects needed to deal with HTTP.
-It is an Object-Oriented abstraction of some native PHP functions and
+It is an object-oriented abstraction of some native PHP functions and
 variables:
 
 * The :class:`Symfony\\Component\\HttpFoundation\\Request` class abstracts
@@ -424,6 +424,10 @@ and set a new ``Exception`` object, or do nothing::
         Support for HTTP status code constants was added in Symfony 2.4.
 
+.. seealso::
+
+    Read more on the :ref:`kernel.exception event <component-http-kernel-kernel-exception>`.
+
 .. index::
    single: Event Dispatcher
 
@@ -434,10 +438,6 @@ The event dispatcher is a standalone component that is responsible for much
 of the underlying logic and flow behind a Symfony request. For more information,
 see the :doc:`Event Dispatcher Component Documentation </components/event_dispatcher/introduction>`.
 
-.. seealso::
-
-    Read more on the :ref:`kernel.exception event <component-http-kernel-kernel-exception>`.
-
 .. index::
    single: Profiler
 
@@ -592,20 +592,20 @@ the configuration for the development environment:
 
         // load the profiler
         $container->loadFromExtension('framework', array(
-            'profiler' => array('only-exceptions' => false),
+            'profiler' => array('only_exceptions' => false),
         ));
 
         // enable the web profiler
         $container->loadFromExtension('web_profiler', array(
             'toolbar'             => true,
-            'intercept-redirects' => true,
+            'intercept_redirects' => true,
             'verbose'             => true,
         ));
 
-When ``only-exceptions`` is set to ``true``, the profiler only collects data
+When ``only_exceptions`` is set to ``true``, the profiler only collects data
 when an exception is thrown by the application.
 
-When ``intercept-redirects`` is set to ``true``, the web profiler intercepts
+When ``intercept_redirects`` is set to ``true``, the web profiler intercepts
 the redirects and gives you the opportunity to look at the collected data
 before following the redirect.
 
@@ -643,7 +643,7 @@ If you enable the web profiler, you also need to mount the profiler routes:
         );
 
 As the profiler adds some overhead, you might want to enable it only under
-certain circumstances in the production environment. The ``only-exceptions``
+certain circumstances in the production environment. The ``only_exceptions``
 settings limits profiling to 500 pages, but what if you want to get
 information when the client IP comes from a specific address, or for a limited
 portion of the website? You can use a Profiler Matcher, learn more about that
 
@@ -37,7 +37,7 @@ to ensure that the cache is cleared whenever any source files change. Otherwise,
 the updates you've made won't be seen.
 
 For example, to disable these checks in APC, simply add ``apc.stat=0`` to
-your php.ini configuration.
+your ``php.ini`` configuration.
 
 .. index::
    single: Performance; Autoloader
 
@@ -476,8 +476,8 @@ Commands
 
 You should read the dedicated section for `Propel commands in Symfony2`_.
 
-.. _`Working With Symfony2`: http://propelorm.org/cookbook/symfony2/working-with-symfony2.html#installation
-.. _`PropelBundle configuration section`: http://propelorm.org/cookbook/symfony2/working-with-symfony2.html#configuration
+.. _`Working With Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#installation
+.. _`PropelBundle configuration section`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2.html#configuration
 .. _`Relationships`: http://propelorm.org/documentation/04-relationships.html
 .. _`Behaviors reference section`: http://propelorm.org/documentation/#behaviors-reference
-.. _`Propel commands in Symfony2`: http://propelorm.org/cookbook/symfony2/working-with-symfony2#the-commands
+.. _`Propel commands in Symfony2`: http://propelorm.org/Propel/cookbook/symfony2/working-with-symfony2#the-commands
@@ -707,8 +707,8 @@ form via the same URL, while using distinct controllers for the two actions.
 
     If no ``methods`` are specified, the route will match on *all* methods.
 
-Adding a Host
-~~~~~~~~~~~~~
+Adding a Host Requirement
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
     Host matching support was added in Symfony 2.2
@@ -1067,8 +1067,8 @@ from the new routing resource.
     :doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/routing>`
     to see how.
 
-Adding a Host regex to Imported Routes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Adding a Host requirement to Imported Routes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. versionadded:: 2.2
     Host matching support was added in Symfony 2.2
 
@@ -146,7 +146,7 @@ that looks like the following:
 * Any URL matching ``/admin/*`` is secured, and only the ``admin`` user
   can access it;
 * All URLs *not* matching ``/admin/*`` are accessible by all users (and the
-  user is never prompted to login).
+  user is never prompted to log in).
 
 Let's look briefly at how security works and how each part of the configuration
 comes into play.
@@ -373,10 +373,10 @@ submission (i.e.  ``/login_check``):
 
         # app/config/routing.yml
         login:
-            pattern:   /login
+            path:   /login
             defaults:  { _controller: AcmeSecurityBundle:Security:login }
         login_check:
-            pattern:   /login_check
+            path:   /login_check
 
     .. code-block:: xml
 
@@ -387,11 +387,11 @@ submission (i.e.  ``/login_check``):
             xsi:schemaLocation="http://symfony.com/schema/routing
                 http://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <route id="login" pattern="/login">
+            <route id="login" path="/login">
                 <default key="_controller">AcmeSecurityBundle:Security:login</default>
             </route>
 
-            <route id="login_check" pattern="/login_check" />
+            <route id="login_check" path="/login_check" />
         </routes>
 
     ..  code-block:: php
             ),
         ));
 
-In this example, if a user tries to login via HTTP authentication, the authentication
+In this example, if a user tries to log in via HTTP authentication, the authentication
 system will use the ``in_memory`` user provider. But if the user tries to
-login via the form login, the ``user_db`` provider will be used (since it's
+log in via the form login, the ``user_db`` provider will be used (since it's
 the default for the firewall as a whole).
 
 For more information about user provider and firewall configuration, see
@@ -1860,7 +1860,7 @@ Impersonating a User
 --------------------
 
 Sometimes, it's useful to be able to switch from one user to another without
-having to logout and login again (for instance when you are debugging or trying
+having to log out and log in again (for instance when you are debugging or trying
 to understand a bug a user sees that you can't reproduce). This can be easily
 done by activating the ``switch_user`` firewall listener:
 
 
@@ -244,9 +244,9 @@ document::
         )
 
     The ``server`` array is the raw values that you'd expect to normally
-    find in the PHP `$_SERVER`_ superglobal. For example, to set the `Content-Type`,
-    `Referer` and `X-Requested-With' HTTP headers, you'd pass the following (mind
-    the `HTTP_` prefix for non standard headers)::
+    find in the PHP `$_SERVER`_ superglobal. For example, to set the ``Content-Type``,
+    ``Referer`` and ``X-Requested-With`` HTTP headers, you'd pass the following (mind
+    the ``HTTP_`` prefix for non standard headers)::
 
         $client->request(
             'GET',
 
@@ -534,7 +534,7 @@ locale via routing.
 Fallback and Default Locale
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If the locale hasn't been set explicitly in the session, the ``fallback_locale``
+If the locale hasn't been set explicitly in the session, the ``fallback``
 configuration parameter will be used by the ``Translator``. The parameter
 defaults to ``en`` (see `Configuration`_).