Merge branch '2.8' into 3.1

xabbuh · xabbuh · commit 894fd6dbd17c · 2016-09-22T17:18:55.000+02:00
* 2.8: Several typo fixes Several typo fixes Update console.rst [#6917] some tweaks after review [Finder] document array use for locations
diff --git a/components/console/helpers/table.rst b/components/console/helpers/table.rst
@@ -222,7 +222,7 @@ This results in:
 .. tip::
 
     You can create a multiple-line page title using a header cell that spans
-    the enire table width::
+    the entire table width::
 
         $table->setHeaders(array(
             array(new TableCell('Main table title', array('colspan' => 3))),
diff --git a/components/finder.rst b/components/finder.rst
@@ -82,7 +82,11 @@ directory to use for the search::
 Search in several locations by chaining calls to
 :method:`Symfony\\Component\\Finder\\Finder::in`::
 
-    $finder->files()->in(__DIR__)->in('/elsewhere');
+    // search inside *both* directories
+    $finder->files()->in(array(__DIR__, '/elsewhere'));
+
+    // same as above
+    $finder->in(__DIR__)->in('/elsewhere');
 
 Use wildcard characters to search in the directories matching a pattern::
 
diff --git a/console.rst b/console.rst
@@ -177,7 +177,7 @@ instead::
     }
 
 Now, once you created the required services and logic, the command will execute
-the ``generate()`` method of the ``app.user_manager`` service and the user will
+the ``create()`` method of the ``app.user_manager`` service and the user will
 be created.
 
 Command Lifecycle
diff --git a/deployment/fortrabbit.rst b/deployment/fortrabbit.rst
@@ -175,7 +175,7 @@ Configuring the Environment in the Dashboard
 PHP Settings
 ~~~~~~~~~~~~
 
-The PHP version and enabled extensions are configuable under the PHP settings
+The PHP version and enabled extensions are configurable under the PHP settings
 of your App within the fortrabbit Dashboard.
 
 Environment Variables
@@ -187,7 +187,7 @@ config files get loaded. ENV vars are configuable in fortrabbit Dashboard as wel
 Document Root
 ~~~~~~~~~~~~~
 
-The document root is configuable for every custom domain you setup for your App.
+The document root is configurable for every custom domain you setup for your App.
 The default is ``/htdocs``, but for Symfony you probably want to change it to
 ``/htdocs/web``. You also do so in the fortrabbit Dashboard under ``Domain`` settings.
 
diff --git a/doctrine.rst b/doctrine.rst
@@ -887,7 +887,7 @@ Doctrine allows you to use any PHP object to hold your data and relies on
 mapping metadata information to map an object's data to a particular database
 table.
 
-Doctrine has a lot more complex features to learn, like relationshps, complex queries,
+Doctrine has a lot more complex features to learn, like relationships, complex queries,
 and event listeners.
 
 Learn more
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -162,7 +162,7 @@ to hold those associated objects.
 
 While the many-to-one mapping shown earlier was mandatory, this one-to-many
 mapping is optional. It is included here to help demonstrate Doctrine's range
-of relationship management capabailties. Plus, in the context of this application,
+of relationship management capabilities. Plus, in the context of this application,
 it will likely be convenient for each ``Category`` object to automatically
 own a collection of its related ``Product`` objects.
 
diff --git a/form/data_transformers.rst b/form/data_transformers.rst
@@ -49,7 +49,7 @@ Suppose you have a Task form with a tags ``text`` type::
     }
 
 Internally the ``tags`` are stored as an array, but displayed to the user as a
-simple comma seperated string to make them easier to edit.
+simple comma separated string to make them easier to edit.
 
 This is a *perfect* time to attach a custom data transformer to the ``tags``
 field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`
diff --git a/form/direct_submit.rst b/form/direct_submit.rst
@@ -82,4 +82,4 @@ method, pass the submitted data directly to
     When submitting a form via a "PATCH" request, you may want to update only a few
     submitted fields. To achieve this, you may pass an optional second boolean
     parameter to ``submit()``. Passing ``false`` will remove any missing fields
-    within the form object. Otherwise, the mising fields will be set to ``null``.
+    within the form object. Otherwise, the missing fields will be set to ``null``.
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -300,7 +300,7 @@ trusted_hosts
 
 A lot of different attacks have been discovered relying on inconsistencies
 in handling the ``Host`` header by various software (web servers, reverse
-proxies, web frameworks, etc.). Basically, everytime the framework is
+proxies, web frameworks, etc.). Basically, every time the framework is
 generating an absolute URL (when sending an email to reset a password for
 instance), the host might have been manipulated by an attacker.
 
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
@@ -263,7 +263,7 @@ These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`
 .. note::
 
     This option expects an array of entity objects (that's actually the same as with
-    the ``ChoiceType`` field, whichs requires an array of the preferred "values").
+    the ``ChoiceType`` field, which requires an array of the preferred "values").
 
 .. include:: /reference/forms/types/options/choice_type_translation_domain.rst.inc
 
diff --git a/security/ldap.rst b/security/ldap.rst
@@ -196,7 +196,7 @@ search_password
 
 **type**: ``string`` **default**: ``null``
 
-This is your read-only user's password, wich will be used to authenticate
+This is your read-only user's password, which will be used to authenticate
 against the LDAP server in order to fetch the user's information.
 
 default_roles
diff --git a/serializer/custom_encoders.rst b/serializer/custom_encoders.rst
@@ -6,7 +6,7 @@ How to Create your Custom Encoder
 
 The :doc:`Serializer Component </components/serializer>` uses Normalizers
 to transform any data to an array. Then, by leveraging *Encoders*, that data can
-be convereted into any data-structure (e.g. JSON).
+be converted into any data-structure (e.g. JSON).
 
 The Component provides several built-in encoders that are described
 :doc:`in their own section </serializer/encoders>` but you may want
diff --git a/service_container/definitions.rst b/service_container/definitions.rst
@@ -96,7 +96,7 @@ fetched from the container::
 .. caution::
 
     Don't use ``get()`` to get a service that you want to inject as constructor
-    argument, the service is not yet availabe. Instead, use a
+    argument, the service is not yet available. Instead, use a
     ``Reference`` instance as shown above.
 
 Method Calls
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
@@ -154,7 +154,7 @@ convention, the old ``app.mailer`` service is renamed to
 
             use Symfony\Component\DependencyInjection\Reference;
 
-            $container->register('app.decorating_mailer', 'AppBundle\DeocratingMailer')
+            $container->register('app.decorating_mailer', 'AppBundle\DecoratingMailer')
                 ->setDecoratedService('foo', 'app.decorating_mailer.wooz')
                 ->addArgument(new Reference('app.decorating_mailer.wooz'))
                 // ...
diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst
@@ -50,7 +50,7 @@ The **minimum configuration** to get your application running under Apache is:
         </Directory>
 
         # uncomment the following lines if you install assets as symlinks
-        # or run into problems when compiling LESS/Sass/CoffeScript assets
+        # or run into problems when compiling LESS/Sass/CoffeeScript assets
         # <Directory /var/www/project>
         #     Options FollowSymlinks
         # </Directory>
@@ -88,7 +88,7 @@ and increase web server performance:
         </Directory>
 
         # uncomment the following lines if you install assets as symlinks
-        # or run into problems when compiling LESS/Sass/CoffeScript assets
+        # or run into problems when compiling LESS/Sass/CoffeeScript assets
         # <Directory /var/www/project>
         #     Options FollowSymlinks
         # </Directory>
@@ -200,7 +200,7 @@ directive to pass requests for PHP files to PHP FPM:
         </Directory>
 
         # uncomment the following lines if you install assets as symlinks
-        # or run into problems when compiling LESS/Sass/CoffeScript assets
+        # or run into problems when compiling LESS/Sass/CoffeeScript assets
         # <Directory /var/www/project>
         #     Options FollowSymlinks
         # </Directory>
@@ -236,7 +236,7 @@ should look something like this:
         </Directory>
 
         # uncomment the following lines if you install assets as symlinks
-        # or run into problems when compiling LESS/Sass/CoffeScript assets
+        # or run into problems when compiling LESS/Sass/CoffeeScript assets
         # <Directory /var/www/project>
         #     Options FollowSymlinks
         # </Directory>
diff --git a/templating.rst b/templating.rst
@@ -923,7 +923,7 @@ Suppose ``description`` equals ``I <3 this product``:
 
 .. code-block:: twig
 
-    <!-- outupt escaping is on automatically -->
+    <!-- output escaping is on automatically -->
     {{ description }} <!-- I &lt3 this product -->
 
     <!-- disable output escaping with the raw filter -->

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ instead::`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`Now, once you created the required services and logic, the command will execute`
`180`		-the ``generate()`` method of the ``app.user_manager`` service and the user will
	`180`	+the ``create()`` method of the ``app.user_manager`` service and the user will
`181`	`181`	`be created.`
`182`	`182`
`183`	`183`	`Command Lifecycle`
Original file line number	Diff line number	Diff line change
@@ -49,7 +49,7 @@ Suppose you have a Task form with a tags ``text`` type::
`49`	`49`	`}`
`50`	`50`
`51`	`51`	Internally the ``tags`` are stored as an array, but displayed to the user as a
`52`		`-simple comma seperated string to make them easier to edit.`
	`52`	`+simple comma separated string to make them easier to edit.`
`53`	`53`
`54`	`54`	This is a perfect time to attach a custom data transformer to the ``tags``
`55`	`55`	field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`