Merge branch '2.3' into 2.5

* 2.3:
  Cleaned up javascript code
  Added a code example for emailing on 4xx and 5xx errors without 404's
  changed submit button label
  Missing apostrophe in source example.
  Added missing closing parenthesis to example.
  Fixed link to documentation standards
  fix Twig-extensions links
  Missing space
  Removed extra parenthesis

Conflicts:
	reference/dic_tags.rst

Author: weaverryan

best_practices/business-logic.rst

@@ -104,7 +104,7 @@ Now you can use the custom slugger in any controller class, such as the
         // ...
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $slug = $this->get('slugger')->slugify($post->getTitle()));
+            $slug = $this->get('slugger')->slugify($post->getTitle());
             $post->setSlug($slug);
 
             // ...

book/forms.rst

@@ -103,7 +103,7 @@ from inside a controller::
             $form = $this->createFormBuilder($task)
                 ->add('task', 'text')
                 ->add('dueDate', 'date')
-                ->add('save', 'submit', array('label' => 'Create Post'))
+                ->add('save', 'submit', array('label' => 'Create Task'))
                 ->getForm();
 
             return $this->render('AcmeTaskBundle:Default:new.html.twig', array(
@@ -219,7 +219,7 @@ controller::
         $form = $this->createFormBuilder($task)
             ->add('task', 'text')
             ->add('dueDate', 'date')
-            ->add('save', 'submit', array('label' => 'Create Post'))
+            ->add('save', 'submit', array('label' => 'Create Task'))
             ->getForm();
 
         $form->handleRequest($request);
@@ -297,7 +297,7 @@ To do this, add a second button with the caption "Save and add" to your form::
     $form = $this->createFormBuilder($task)
         ->add('task', 'text')
         ->add('dueDate', 'date')
-        ->add('save', 'submit', array('label' => 'Create Post'))
+        ->add('save', 'submit', array('label' => 'Create Task'))
         ->add('saveAndAdd', 'submit', array('label' => 'Save and Add'))
         ->getForm();
 

components/form/introduction.rst

@@ -514,7 +514,7 @@ by ``handleRequest()`` to determine whether a form has been submitted):
         $formBuilder = $formFactory->createBuilder('form', null, array(
             'action' => '/search',
             'method' => 'GET',
-        );
+        ));
 
         // ...
 

contributing/documentation/overview.rst

@@ -68,7 +68,7 @@ memorable name for the new branch:
 
 **Step 5.** Now make your changes in the documentation. Add, tweak, reword and
 even remove any content, but make sure that you comply with the
-doc:`/contributing/documentation/standards`.
+:doc:`/contributing/documentation/standards`.
 
 **Step 6.** **Push** the changes to your forked repository:
 

cookbook/doctrine/dbal.rst

@@ -166,7 +166,7 @@ mapping type:
         // app/config/config.php
         $container->loadFromExtension('doctrine', array(
             'dbal' => array(
-               mapping_types' => array(
+               'mapping_types' => array(
                   'enum'  => 'string',
                ),
             ),

cookbook/logging/monolog_email.rst

@@ -19,7 +19,12 @@ it is broken down.
             handlers:
                 mail:
                     type:         fingers_crossed
+                    # 500 errors are logged at the critical level
                     action_level: critical
+                    # to also log 400 level errors (but not 404's):
+                    # action_level: error
+                    # excluded_404:
+                    #     - ^/
                     handler:      buffered
                 buffered:
                     type:    buffer
@@ -48,6 +53,12 @@ it is broken down.
                     type="fingers_crossed"
                     action-level="critical"
                     handler="buffered"
+                    <!--
+                    To also log 400 level errors (but not 404's):
+                    action-level="error"
+                    And add this child inside this monolog:handler
+                    <monolog:excluded-404>^/</monolog:excluded-404>
+                    -->
                 />
                 <monolog:handler
                     name="buffered"
@@ -81,6 +92,11 @@ it is broken down.
                 'mail' => array(
                     'type'         => 'fingers_crossed',
                     'action_level' => 'critical',
+                    // to also log 400 level errors (but not 404's):
+                    // 'action_level' => 'error',
+                    // 'excluded_404s' => array(
+                    //     '^/',
+                    // ),
                     'handler'      => 'buffered',
                 ),
                 'buffered' => array(
@@ -108,7 +124,8 @@ setting means that the output is then passed onto the ``buffered`` handler.
 .. tip::
 
     If you want both 400 level and 500 level errors to trigger an email,
-    set the ``action_level`` to ``error`` instead of ``critical``.
+    set the ``action_level`` to ``error`` instead of ``critical``. See the
+    code above for an example.
 
 The ``buffered`` handler simply keeps all the messages for a request and
 then passes them onto the nested handler in one go. If you do not use this

cookbook/security/voters_data_permission.rst

@@ -98,7 +98,7 @@ edit a particular object. Here's an example implementation:
             // check if the voter is used correct, only allow one attribute
             // this isn't a requirement, it's just one easy way for you to
             // design your voter
-            if(1 !== count($attributes)) {
+            if (1 !== count($attributes)) {
                 throw new \InvalidArgumentException(
                     'Only one attribute is allowed for VIEW or EDIT'
                 );

cookbook/templating/twig_extension.rst

@@ -126,7 +126,7 @@ Learning further
 For a more in-depth look into Twig Extensions, please take a look at the
 `Twig extensions documentation`_.
 
-.. _`Twig official extension repository`: https://github.com/fabpot/Twig-extensions
+.. _`Twig official extension repository`: https://github.com/twigphp/Twig-extensions
 .. _`Twig extensions documentation`: http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
 .. _`global variables`: http://twig.sensiolabs.org/doc/advanced.html#id1
 .. _`functions`: http://twig.sensiolabs.org/doc/advanced.html#id2

reference/forms/types/collection.rst

@@ -180,7 +180,9 @@ you need is the JavaScript:
             var emailCount = '{{ form.emails|length }}';
 
             jQuery(document).ready(function() {
-                jQuery('#add-another-email').click(function() {
+                jQuery('#add-another-email').click(function(e) {
+                    e.preventDefault();
+
                     var emailList = jQuery('#email-fields-list');
 
                     // grab the prototype template
@@ -193,9 +195,7 @@ you need is the JavaScript:
 
                     // create a new list element and add it to the list
                     var newLi = jQuery('<li></li>').html(newWidget);
-                    newLi.appendTo(jQuery('#email-fields-list'));
-
-                    return false;
+                    newLi.appendTo(emailList);
                 });
             })
         </script>