Merge branch '2.7' into 2.8

* 2.7:
  incorrect session short description
  Use of Setters and Getters
  Small mistype edits
  Changed text how to get button label
  Small misspelling fixes
  Small typo fix
  Edited to show more ways, to get crawler form
  Fix (sense) typo in ACL documentation

Author: weaverryan

components/dom_crawler.rst

@@ -325,10 +325,19 @@ given text. This method is especially useful because you can use it to return
 a :class:`Symfony\\Component\\DomCrawler\\Form` object that represents the
 form that the button lives in::
 
-    $form = $crawler->selectButton('validate')->form();
+    // button example: <button id="my-super-button" type="submit">My super button</button>
+    
+    // you can get button by its label
+    $form = $crawler->selectButton('My super button')->form();
+    
+    // or by button id (#my-super-button) if the button doesn't have a label
+    $form = $crawler->selectButton('my-super-button')->form();
+    
+    // or you can filter the whole form, for example a form has a class attribute: <form class="form-vertical" method="POST">
+    $crawler->filter('.form-vertical')->form();
 
     // or "fill" the form fields with data
-    $form = $crawler->selectButton('validate')->form(array(
+    $form = $crawler->selectButton('my-super-button')->form(array(
         'name' => 'Ryan',
     ));
 

controller.rst

@@ -349,8 +349,8 @@ Managing the Session
 --------------------
 
 Symfony provides a nice session object that you can use to store information
-about the user between requests. By default, Symfony stores the attributes in a
-cookie by using native PHP sessions.
+about the user between requests. By default, Symfony stores the token in a
+cookie and writes the attributes to a file by using native PHP sessions.
 
 To retrieve the session, call
 :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::getSession`

controller/upload_file.rst

@@ -239,7 +239,7 @@ logic to a separate service::
         {
             $fileName = md5(uniqid()).'.'.$file->guessExtension();
 
-            $file->move($this->targetDir, $fileName);
+            $file->move($this->getTargetDir(), $fileName);
 
             return $fileName;
         }

security/acl_advanced.rst

@@ -190,7 +190,7 @@ this request to an implementation of
 This allows you to replace the way access decisions are reached without actually
 modifying the ACL class itself.
 
-The ``PermissionGrantingStrategy`` first checks all your object-scope ACEs. If none
+The ``PermissionGrantingStrategy`` first checks all your object-scope ACEs. If one
 is applicable, the class-scope ACEs will be checked. If none is applicable,
 then the process will be repeated with the ACEs of the parent ACL. If no
 parent ACL exists, an exception will be thrown.