Merge branch '2.7' into 2.8

wouterj · wouterj · commit 0fe105010ef9 · 2015-06-20T11:47:14.000+02:00
diff --git a/book/security.rst b/book/security.rst
@@ -128,9 +128,9 @@ A) Configuring how your Users will Authenticate
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The main job of a firewall is to configure *how* your users will authenticate.
-Will they use a login form? Http Basic? An API token? All of the above?
+Will they use a login form? HTTP basic authentication? An API token? All of the above?
 
-Let's start with Http Basic (the old-school pop-up) and work up from there.
+Let's start with HTTP basic authentication (the old-school prompt) and work up from there.
 To activate this, add the ``http_basic`` key under your firewall:
 
 .. configuration-block::
@@ -265,7 +265,7 @@ user to be logged in to access this URL:
     You'll learn more about this ``ROLE_ADMIN`` thing and denying access
     later in the :ref:`security-authorization` section.
 
-Great! Now, if you go to ``/admin``, you'll see the HTTP Basic popup:
+Great! Now, if you go to ``/admin``, you'll see the HTTP basic auth prompt:
 
 .. image:: /images/book/security_http_basic_popup.png
    :align: center
@@ -376,7 +376,7 @@ probably only need one. If you *do* have multiple, you can configure which
 Try to login using username ``admin`` and password ``kitten``. You should
 see an error!
 
-    No encoder has been configured for account "Symfony\Component\Security\Core\User\User"
+    No encoder has been configured for account "Symfony\\Component\\Security\\Core\\User\\User"
 
 To fix this, add an ``encoders`` key:
 
@@ -598,8 +598,8 @@ before inserting them into the database? Don't worry, see
 D) Configuration Done!
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Congratulations! You now have a working authentication system that uses Http
-Basic and loads users right from the ``security.yml`` file.
+Congratulations! You now have a working authentication system that uses HTTP
+basic auth and loads users right from the ``security.yml`` file.
 
 Your next steps depend on your setup:
 
diff --git a/components/class_loader/introduction.rst b/components/class_loader/introduction.rst
@@ -41,5 +41,7 @@ You can install the component in 2 different ways:
   on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/ClassLoader).
 
+.. include:: /components/require_autoload.rst.inc
+
 .. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
 .. _Packagist: https://packagist.org/packages/symfony/class-loader
diff --git a/components/config/introduction.rst b/components/config/introduction.rst
@@ -17,6 +17,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/config`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Config).
 
+.. include:: /components/require_autoload.rst.inc
+
 Sections
 --------
 
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -20,6 +20,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/console`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Console).
 
+.. include:: /components/require_autoload.rst.inc
+
 Creating a basic Command
 ------------------------
 
diff --git a/components/css_selector.rst b/components/css_selector.rst
@@ -15,6 +15,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/css-selector`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/CssSelector).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/debug/introduction.rst b/components/debug/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in many different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/debug`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Debug).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/dependency-injection`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/DependencyInjection).
 
+.. include:: /components/require_autoload.rst.inc
+
 Basic Usage
 -----------
 
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -20,6 +20,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/dom-crawler`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/DomCrawler).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -56,6 +56,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/event-dispatcher`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/EventDispatcher).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/filesystem/introduction.rst b/components/filesystem/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/filesystem`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Filesystem).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/finder.rst b/components/finder.rst
@@ -16,6 +16,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/finder`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Finder).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
@@ -302,7 +304,7 @@ The contents of returned files can be read with
 
     foreach ($finder as $file) {
         $contents = $file->getContents();
-        
+
         // ...
     }
 
diff --git a/components/form/introduction.rst b/components/form/introduction.rst
@@ -22,6 +22,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/form`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Form).
 
+.. include:: /components/require_autoload.rst.inc
+
 Configuration
 -------------
 
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -24,6 +24,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/http-foundation`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/HttpFoundation).
 
+.. include:: /components/require_autoload.rst.inc
+
 .. _component-http-foundation-request:
 
 Request
diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/http-kernel`` on Packagist_);
 * Use the official Git repository (https://github.com/symfony/HttpKernel).
 
+.. include:: /components/require_autoload.rst.inc
+
 The Workflow of a Request
 -------------------------
 
diff --git a/components/options_resolver.rst b/components/options_resolver.rst
@@ -17,6 +17,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/options-resolver`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/OptionsResolver).
 
+.. include:: /components/require_autoload.rst.inc
+
 Notes on Previous Versions
 --------------------------
 
diff --git a/components/process.rst b/components/process.rst
@@ -15,6 +15,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/process`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Process).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst
@@ -16,6 +16,8 @@ You can install the component in two different ways:
 * :doc:`Install it via Composer</components/using_components>` (``symfony/property-access`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/PropertyAccess).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/require_autoload.rst.inc b/components/require_autoload.rst.inc
@@ -0,0 +1,3 @@
+Then, require the ``vendor/autoload.php`` file to enable the autoloading mechanism
+provided by Composer. Otherwise, your application won't be able to find the classes
+of this Symfony component.
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
@@ -16,6 +16,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/routing`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Routing).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/security/introduction.rst b/components/security/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/security`` on Packagist_);
 * Use the official Git repository (https://github.com/symfony/Security).
 
+.. include:: /components/require_autoload.rst.inc
+
 Sections
 --------
 
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -33,6 +33,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Serializer).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
@@ -185,7 +187,7 @@ like the following::
 
     use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
     // For annotations
-    usr Doctrine\Common\Annotations\AnnotationReader;
+    use Doctrine\Common\Annotations\AnnotationReader;
     use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
     // For XML
     // use Symfony\Component\Serializer\Mapping\Loader\XmlFileLoader;
diff --git a/components/stopwatch.rst b/components/stopwatch.rst
@@ -15,6 +15,8 @@ You can install the component in two different ways:
 * :doc:`Install it via Composer</components/using_components>` (``symfony/stopwatch`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Stopwatch).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/templating/introduction.rst b/components/templating/introduction.rst
@@ -21,6 +21,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/templating`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Templating).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
@@ -16,6 +16,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/translation`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Translation).
 
+.. include:: /components/require_autoload.rst.inc
+
 Constructing the Translator
 ---------------------------
 
diff --git a/components/yaml/introduction.rst b/components/yaml/introduction.rst
@@ -34,6 +34,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/yaml`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Yaml).
 
+.. include:: /components/require_autoload.rst.inc
+
 Why?
 ----
 
diff --git a/components/yaml/yaml_format.rst b/components/yaml/yaml_format.rst
@@ -223,7 +223,7 @@ YAML uses indentation with one or more spaces to describe nested collections:
       PHP:    5.2
       Propel: 1.3
 
-The following YAML is equivalent to the following PHP code:
+The above YAML is equivalent to the following PHP code:
 
 .. code-block:: php
 
@@ -240,7 +240,7 @@ The following YAML is equivalent to the following PHP code:
 
 There is one important thing you need to remember when using indentation in a
 YAML file: *Indentation must be done with one or more spaces, but never with
-tabulations*.
+tabulators*.
 
 You can nest sequences and mappings as you like:
 
diff --git a/cookbook/bundles/installation.rst b/cookbook/bundles/installation.rst
@@ -73,7 +73,7 @@ The only thing you need to do now is register the bundle in ``AppKernel``::
 
 In a few rare cases, you may want a bundle to be *only* enabled in the development
 :doc:`environment </cookbook/configuration/environments>`. For example,
-the DoctrineFixturesBundle helps load dummy data - something you probably
+the DoctrineFixturesBundle helps to load dummy data - something you probably
 only want to do while developing. To only load this bundle in the ``dev``
 and ``test`` environments, register the bundle in this way::
 
diff --git a/cookbook/controller/index.rst b/cookbook/controller/index.rst
@@ -6,3 +6,4 @@ Controller
 
     error_pages
     service
+    upload_file
diff --git a/cookbook/controller/upload_file.rst b/cookbook/controller/upload_file.rst
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
diff --git a/cookbook/validation/custom_constraint.rst b/cookbook/validation/custom_constraint.rst

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Then, require the ``vendor/autoload.php`` file to enable the autoloading mechanism
	`2`	`+provided by Composer. Otherwise, your application won't be able to find the classes`
	`3`	`+of this Symfony component.`
Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@ Controller`
`6`	`6`
`7`	`7`	`error_pages`
`8`	`8`	`service`
	`9`	`+ upload_file`