Merge branch '2.1' into 2.2

Author: weaverryan

components/console/single_command_tool.rst

@@ -58,15 +58,14 @@ it is possible to remove this need by extending the application::
         }
     }
 
-When calling your console script, the command `MyCommand` will then always
+When calling your console script, the command ``MyCommand`` will then always
 be used, without having to pass its name.
 
 You can also simplify how you execute the application::
 
     #!/usr/bin/env php
     <?php
     // command.php
-
     use Acme\Tool\MyApplication;
 
     $application = new MyApplication();

components/dependency_injection/configurators.rst

@@ -78,7 +78,7 @@ in the application::
         public function loadFormatters()
         {
             // code to configure which formatters to use
-            $enabledFormatters = array();
+            $enabledFormatters = array(...);
             // ...
 
             $this->enabledFormatters = $enabledFormatters;

cookbook/configuration/web_server_configuration.rst

@@ -41,6 +41,14 @@ are:
     ``AllowOverride None`` and implement the rewrite rules in the ``web/.htaccess``
     into the virtualhost config.
 
+If you are using **php-cgi**, Apache does not pass HTTP basic username and
+password to PHP by default. To work around this limitation, you should use the
+following configuration snippet:
+
+.. code-block:: apache
+
+    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
 Nginx
 -----
 

cookbook/form/dynamic_form_modification.rst

@@ -607,7 +607,6 @@ your form::
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // ...
-        $subscriber = new AddNameFieldSubscriber($builder->getFormFactory());
         $builder->addEventSubscriber($this->registrationSportListener);
     }
 

cookbook/form/use_empty_data.rst

@@ -11,7 +11,7 @@ you form. For example::
 
     public function indexAction()
     {
-        $blog = // ...
+        $blog = ...;
 
         // $blog is passed in as the data, so the empty_data option is not needed
         $form = $this->createForm(new BlogType(), $blog);
@@ -35,8 +35,8 @@ that takes arguments. Remember, the default ``data_class`` option calls
 that constructor with no arguments::
 
     // src/Acme/DemoBundle/Form/Type/BlogType.php
-    // ...
 
+    // ...
     use Symfony\Component\Form\AbstractType;
     use Acme\DemoBundle\Entity\Blog;
     use Symfony\Component\OptionsResolver\OptionsResolverInterface;

reference/constraints/All.rst

@@ -82,7 +82,7 @@ entry in that array:
                 $metadata->addPropertyConstraint('favoriteColors', new Assert\All(array(
                     'constraints' => array(
                         new Assert\NotBlank(),
-                        new Assert\Length(array('limit' => 5)),
+                        new Assert\Length(array('min' => 5)),
                     ),
                 )));
             }