Merge branch '2.0'

Author: weaverryan

book/internals.rst

@@ -299,7 +299,7 @@ The value returned by the Controller is accessible via the
 
     public function onKernelView(GetResponseForControllerResultEvent $event)
     {
-        $val = $event->getReturnValue();
+        $val = $event->getControllerResult();
         $response = new Response();
         // some how customize the Response from the return value
 

book/security.rst

@@ -466,7 +466,7 @@ Finally, create the corresponding template:
                 <input type="hidden" name="_target_path" value="/account" />
             #}
 
-            <input type="submit" name="login" />
+            <button type="submit">login</button>
         </form>
 
     .. code-block:: html+php
@@ -488,7 +488,7 @@ Finally, create the corresponding template:
                 <input type="hidden" name="_target_path" value="/account" />
             -->
 
-            <input type="submit" name="login" />
+            <button type="submit">login</button>
         </form>
 
 .. tip::