Merge branch '2.4' into 2.5

symfony · Jun 27, 2014 · deb7835 · deb7835
2 parents 741ad05 + ec0f87b
commit deb7835
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/cookbook/console/console_command.rst b/cookbook/console/console_command.rst
@@ -14,9 +14,8 @@ Automatically Registering Commands
 To make the console commands available automatically with Symfony2, create a
 ``Command`` directory inside your bundle and create a PHP file suffixed with
 ``Command.php`` for each command that you want to provide. For example, if you
-want to extend the AcmeDemoBundle (available in the Symfony Standard
-Edition) to greet you from the command line, create ``GreetCommand.php`` and
-add the following to it::
+want to extend the AcmeDemoBundle to greet you from the command line, create
+``GreetCommand.php`` and add the following to it::
 
     // src/Acme/DemoBundle/Command/GreetCommand.php
     namespace Acme\DemoBundle\Command;

diff --git a/cookbook/deployment/azure-website.rst b/cookbook/deployment/azure-website.rst
@@ -4,24 +4,6 @@
 Deploying to Microsoft Azure Website Cloud
 ==========================================
 
-SensioLabs and Microsoft announce their partnership during the upcoming PHP Tour
-in Lyon (France). This announcement covers several strategic aspects including
-the integration of Symfony into the Microsoft Azure Website Cloud platform
-destined to leverage all the devops aspects from Azure Websites to the Symfony2
-developers community.
-
-The two companies will provide all the needed tutorials allowing both
-communities and companies to migrate their Symfony applications to the Microsoft
-Azure Cloud platform.
-
-Additionally, Microsoft and SensioLabs are working on integrating Symfony into
-the Azure Website gallery in an effort to simplify the deployment of Symfony
-applications and provide a complete offer to satisfy various company's target
-markets.
-
-Objectives
-----------
-
 Simply put, this cookbook illustrates how to deploy a very simple **Symfony2
 Standard Edition** web application. You can easily download a copy of the
 Symfony Standard Edition on the `downloads`_ page. Also, this cookbook assumes

diff --git a/reference/forms/types/options/method.rst.inc b/reference/forms/types/options/method.rst.inc
@@ -17,14 +17,14 @@ used to decide whether to process the form submission in the
 * DELETE
 * PATCH
 
-.. note:
+.. note::
 
     When the method is PUT, PATCH, or DELETE, Symfony will automatically
     render a ``_method`` hidden field in your form. This is used to "fake"
     these HTTP methods, as they're not supported on standard browsers. For
     more information, see :doc:`/cookbook/routing/method_parameters`.
 
-.. note:
+.. note::
 
     The PATCH method allows submitting partial data. In other words, if the
     submitted form data is missing certain fields, those will be ignored