diff --git a/book/controller.rst b/book/controller.rst
index 10d7bfc171f..e0f87887816 100644
--- a/book/controller.rst
+++ b/book/controller.rst
@@ -260,7 +260,7 @@ to ``$name``. Just make sure they the name of the placeholder is the
same as the name of the argument variable.
Take the following more-interesting example, where the controller has two
-arguments::
+arguments:
.. configuration-block::
@@ -681,7 +681,7 @@ read any flash messages from the session:
.. code-block:: html+twig
- {% for flash_message in app.session.flashbag.get('notice') %}
+ {% for flash_message in app.session.flashBag.get('notice') %}
{{ flash_message }}
@@ -714,7 +714,7 @@ The Request and Response Object
-------------------------------
As mentioned :ref:`earlier `, the framework will
-pass the ``Request`` object to any controller argument taht is type-hinted with
+pass the ``Request`` object to any controller argument that is type-hinted with
the ``Request`` class::
use Symfony\Component\HttpFoundation\Request;
diff --git a/changelog.rst b/changelog.rst
index f2e6122bbee..a8be5d4415c 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -13,6 +13,66 @@ documentation.
Do you also want to participate in the Symfony Documentation? Take a look
at the ":doc:`/contributing/documentation/overview`" article.
+March, 2016
+-----------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+* `#6282 `_ [Form] fix ``choice_label`` values (HeahDude)
+* `#5894 `_ [WIP] Added an article to explain how to upgrade third-party bundles to Symfony 3 (javiereguiluz)
+* `#6273 `_ [PHPUnit bridge] Add documentation for the component (theofidry)
+* `#6291 `_ fortrabbit deployment guide + index listing (ostark)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+* `#6366 `_ Removed server:stop code block for 2.3 (theyoux)
+* `#6347 `_ Add a note about enabling DebugBundle to use VarDumper inside Symfony (martijn80, javiereguiluz)
+* `#6320 `_ Fixed typo in path (timhovius)
+* `#6334 `_ Fixed yaml configuration of app.exception_controller (AAstakhov)
+* `#6315 `_ Remove third parameter from createFormBuilder call (Hocdoc)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `#6404 `_ fixed a typo (RickieL)
+* `#6411 `_ Fixed a typo in configuration-block (VarunAgw)
+* `#6414 `_ stick to Sphinx 1.3.x for the moment (xabbuh)
+* `#6399 `_ Fixed wrong code examples for Isbn constraint (AAstakhov)
+* `#6397 `_ Fix typo in SwitchUserListener file name (luxifer)
+* `#6382 `_ unused use instructions (bshevchenko)
+* `#6365 `_ Removed the PR table example (this is now included by GitHub template) (javiereguiluz)
+* `#6363 `_ Removed info about reducing visibility for private (AAstakhov)
+* `#6362 `_ [book] Updated link to Translatable Extension (AAstakhov)
+* `#6336 `_ Added minor clarification (ThomasLandauer)
+* `#6303 `_ Tweaked the Symfony Releases page (javiereguiluz)
+* `#6360 `_ Editing the Doctrine section to improve accuracy and readability (natechicago)
+* `#6352 `_ [book] controller ch review, part 3 (Talita Kocjan Zager)
+* `#6351 `_ [book] controller ch review, part 2 (Talita Kocjan Zager)
+* `#6349 `_ [book] controller ch review, part 1 (Talita Kocjan Zager)
+* `#6369 `_ Minor corrections (sfdumi)
+* `#6370 `_ Fixed typo (tabbi89)
+* `#6371 `_ Fix escaping of backtick inside double back-quotes (guilliamxavier)
+* `#6364 `_ [reference] [constraints] added missing colon character for Image constraint documentation in YAML format. (hhamon)
+* `#6345 `_ Remove link-local IPv6 address (snoek09)
+* `#6219 `_ Point that route parameters are also Request attributes (sfdumi)
+* `#6348 `_ [best practices] mostly typos (Talita Kocjan Zager)
+* `#6275 `_ [quick tour] mostly typos (Talita Kocjan Zager)
+* `#6305 `_ Mention IvoryCKEditorBundle in the Symfony Forms doc (javiereguiluz)
+* `#6331 `_ Rename DunglasApiBundle to ApiPlatform (sroze)
+* `#6328 `_ Update extension.rst - added caution box for people trying to remove the default file with services definitions (Pavel Jurecka)
+* `#6343 `_ Replace XLIFF number ids by strings (Triiistan)
+* `#6344 `_ Altered single / multiple inheritance sentence (outspaced)
+* `#6330 `_ [Form] reorder EntityType options (HeahDude)
+* `#6337 `_ Fix configuration.rst typo (gong023)
+* `#6295 `_ Update tools.rst (andrewtch)
+* `#6325 `_ Minor error (ThomasLandauer)
+* `#6311 `_ Improved TwigExtension to show default values and optional arguments (javiereguiluz)
+* `#6267 `_ [Form] fix 'data_class' option in EntityType (HeahDude)
+* `#6281 `_ Change isValid to isSubmitted. (mustafaaloko)
+
+
February, 2016
--------------
diff --git a/cookbook/form/direct_submit.rst b/cookbook/form/direct_submit.rst
index 8fd9e642e89..57440d527b4 100644
--- a/cookbook/form/direct_submit.rst
+++ b/cookbook/form/direct_submit.rst
@@ -84,6 +84,13 @@ method, pass the submitted data directly to
$form->get('firstName')->submit('Fabien');
+.. tip::
+
+ When submitting a form via a "PATCH" request, you may want to update only a few
+ submitted fields. To achieve this, you may pass an optional second boolean
+ parameter to ``submit()``. Passing ``false`` will remove any missing fields
+ within the form object. Otherwise, the mising fields will be set to ``null``.
+
.. _cookbook-form-submit-request:
Passing a Request to Form::submit() (Deprecated)
diff --git a/cookbook/session/avoid_session_start.rst b/cookbook/session/avoid_session_start.rst
index 87e798b6313..896ed8dd9c1 100644
--- a/cookbook/session/avoid_session_start.rst
+++ b/cookbook/session/avoid_session_start.rst
@@ -15,14 +15,14 @@ that a session is *always* started:
.. code-block:: html+twig
- {% for flashMessage in app.session.flashbag.get('notice') %}
+ {% for flashMessage in app.session.flashBag.get('notice') %}
{{ flashMessage }}
{% endfor %}
Even if the user is not logged in and even if you haven't created any flash messages,
-just calling the ``get()`` (or even ``has()``) method of the ``flashbag`` will
+just calling the ``get()`` (or even ``has()``) method of the ``flashBag`` will
start a session. This may hurt your application performance because all users will
receive a session cookie. To avoid this behavior, add a check before trying to
access the flash messages:
@@ -30,7 +30,7 @@ access the flash messages:
.. code-block:: html+twig
{% if app.request.hasPreviousSession %}
- {% for flashMessage in app.session.flashbag.get('notice') %}
+ {% for flashMessage in app.session.flashBag.get('notice') %}
{{ flashMessage }}
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
index b7dc01b672e..b88027df765 100644
--- a/quick_tour/the_controller.rst
+++ b/quick_tour/the_controller.rst
@@ -331,7 +331,7 @@ And you can display the flash message in the template like this:
.. code-block:: html+twig
- {% for flashMessage in app.session.flashbag.get('notice') %}
+ {% for flashMessage in app.session.flashBag.get('notice') %}
{{ flashMessage }}
@@ -344,4 +344,4 @@ That's all there is to it and I'm not even sure you'll have spent the full
10 minutes. You were briefly introduced to bundles in the first part and
all the features you've learned about so far are part of the core FrameworkBundle.
But thanks to bundles, everything in Symfony can be extended or replaced.
-That's the topic of the :doc:`next part of this tutorial `.
\ No newline at end of file
+That's the topic of the :doc:`next part of this tutorial `.