Merge branch '2.7' into 2.8

wouterj · wouterj · commit f7ba37a1a47a · 2016-08-28T18:08:47.000+02:00
Conflicts:
	form/create_custom_field_type.rst
diff --git a/components/filesystem.rst b/components/filesystem.rst
@@ -252,8 +252,6 @@ complete new file (but never a partially-written file)::
 
 The ``file.txt`` file contains ``Hello World`` now.
 
-A desired file mode can be passed as the third argument.
-
 Error Handling
 --------------
 
diff --git a/components/options_resolver.rst b/components/options_resolver.rst
@@ -505,7 +505,7 @@ the closure::
         {
             parent::configureOptions($resolver);
 
-            $options->setDefault('host', function (Options $options, $previousValue) {
+            $resolver->setDefault('host', function (Options $options, $previousValue) {
                 if ('ssl' === $options['encryption']) {
                     return 'secure.example.org'
                 }
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
@@ -61,7 +61,7 @@ current PHP SAPI:
 .. note::
 
     If you want to catch the dump output as a string, please read the
-    `advanced documentation <advanced>`_ which contains examples of it.
+    :doc:`advanced documentation </components/var_dumper/advanced>` which contains examples of it.
     You'll also learn how to change the format or redirect the output to
     wherever you want.
 
diff --git a/configuration.rst b/configuration.rst
@@ -244,7 +244,7 @@ key:
         $container->setParameter('locale', 'en');
 
         $container->loadFromExtension('framework', array(
-            'default_locale' => '%en%',
+            'default_locale' => '%locale%',
             // ...
         ));
 
diff --git a/controller.rst b/controller.rst
@@ -93,7 +93,7 @@ This controller is pretty straightforward:
 
 * *line 12*: Each action method in a controller class is suffixed with ``Action``
   (again, this isn't *required*, but some shortcuts rely on this). This method
-  is allowed to have a ``$name`` argument thanks to the ``{name}``
+  is allowed to have a ``$max`` argument thanks to the ``{max}``
   :doc:`wildcard in the route </routing>`.
 
 * *line 16*: The controller creates and returns a ``Response`` object.
@@ -324,7 +324,7 @@ The Request object as a Controller Argument
 What if you need to read query parameters, grab a request header or get access
 to an uploaded file? All of that information is stored in Symfony's ``Request``
 object. To get it in your controller, just add it as an argument and
-**type-hint it with the ``Request`` class**::
+**type-hint it with the Request class**::
 
     use Symfony\Component\HttpFoundation\Request;
 

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ the closure::`
`505`	`505`	`{`
`506`	`506`	`parent::configureOptions($resolver);`
`507`	`507`
`508`		`- $options->setDefault('host', function (Options $options, $previousValue) {`
	`508`	`+ $resolver->setDefault('host', function (Options $options, $previousValue) {`
`509`	`509`	`if ('ssl' === $options['encryption']) {`
`510`	`510`	`return 'secure.example.org'`
`511`	`511`	`}`