Merge branch '2.3' into 2.6

wouterj · wouterj · commit e7d40c35e071 · 2015-04-27T00:01:56.000+02:00
diff --git a/best_practices/configuration.rst b/best_practices/configuration.rst
@@ -126,7 +126,7 @@ everywhere in your application. When using parameters, they are only available
 from places with access to the Symfony container.
 
 Constants can be used for example in your Twig templates thanks to the
-``constant()`` function:
+`constant() function`_:
 
 .. code-block:: html+jinja
 
diff --git a/best_practices/i18n.rst b/best_practices/i18n.rst
@@ -80,7 +80,7 @@ English in the application would be:
 
 .. code-block:: xml
 
-    <!-- app/Resources/translations/messages.en.xliff -->
+    <!-- app/Resources/translations/messages.en.xlf -->
     <?xml version="1.0"?>
     <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
         <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
diff --git a/book/translation.rst b/book/translation.rst
@@ -127,7 +127,7 @@ different formats, XLIFF being the recommended format:
 
     .. code-block:: xml
 
-        <!-- messages.fr.xliff -->
+        <!-- messages.fr.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
@@ -356,18 +356,18 @@ must be named according to the following path: ``domain.locale.loader``:
 
 * **locale**: The locale that the translations are for (e.g. ``en_GB``, ``en``, etc);
 
-* **loader**: How Symfony should load and parse the file (e.g. ``xliff``,
+* **loader**: How Symfony should load and parse the file (e.g. ``xlf``,
   ``php``, ``yml``, etc).
 
 The loader can be the name of any registered loader. By default, Symfony
 provides many loaders, including:
 
-* ``xliff``: XLIFF file;
+* ``xlf``: XLIFF file;
 * ``php``: PHP file;
 * ``yml``: YAML file.
 
 The choice of which loader to use is entirely up to you and is a matter of
-taste. The recommended option is to use ``xliff`` for translations.
+taste. The recommended option is to use ``xlf`` for translations.
 For more options, see :ref:`component-translator-message-catalogs`.
 
 .. note::
@@ -397,10 +397,10 @@ key ``Symfony is great``. To find the French translation, Symfony actually
 checks translation resources for several locales:
 
 #. First, Symfony looks for the translation in a ``fr_FR`` translation resource
-   (e.g. ``messages.fr_FR.xliff``);
+   (e.g. ``messages.fr_FR.xlf``);
 
 #. If it wasn't found, Symfony looks for the translation in a ``fr`` translation
-   resource (e.g. ``messages.fr.xliff``);
+   resource (e.g. ``messages.fr.xlf``);
 
 #. If the translation still isn't found, Symfony uses the ``fallbacks`` configuration
    parameter, which defaults to ``en`` (see `Configuration`_).
@@ -662,7 +662,7 @@ bundle.
 
     .. code-block:: xml
 
-        <!-- validators.en.xliff -->
+        <!-- validators.en.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
diff --git a/components/security/introduction.rst b/components/security/introduction.rst
@@ -25,5 +25,6 @@ Sections
 * :doc:`/components/security/firewall`
 * :doc:`/components/security/authentication`
 * :doc:`/components/security/authorization`
+* :doc:`/components/security/secure_tools`
 
 .. _Packagist: https://packagist.org/packages/symfony/security
diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
@@ -186,13 +186,13 @@ organization, translations were split into three different domains:
 loaded like this::
 
     // ...
-    $translator->addLoader('xliff', new XliffFileLoader());
+    $translator->addLoader('xlf', new XliffFileLoader());
 
-    $translator->addResource('xliff', 'messages.fr.xliff', 'fr_FR');
-    $translator->addResource('xliff', 'admin.fr.xliff', 'fr_FR', 'admin');
+    $translator->addResource('xlf', 'messages.fr.xlf', 'fr_FR');
+    $translator->addResource('xlf', 'admin.fr.xlf', 'fr_FR', 'admin');
     $translator->addResource(
-        'xliff',
-        'navigation.fr.xliff',
+        'xlf',
+        'navigation.fr.xlf',
         'fr_FR',
         'navigation'
     );
diff --git a/cookbook/composer.rst b/cookbook/composer.rst
@@ -4,8 +4,12 @@
 Installing Composer
 ===================
 
-`Composer`_ is the package manager used by modern PHP applications and the
-recommended way to install Symfony2.
+`Composer`_ is the package manager used by modern PHP applications. Use Composer
+to manage dependencies in your Symfony applications and to install Symfony Components
+in your PHP projects.
+
+It's recommended to install Composer globally in your system as explained in the
+following sections.
 
 Install Composer on Linux and Mac OS X
 --------------------------------------
@@ -37,8 +41,8 @@ the instructions.
 Learn more
 ----------
 
-You can read more about Composer in `its documentation`_.
+Read the `Composer documentation`_ to learn more about its usage and features.
 
 .. _`Composer`: https://getcomposer.org/
 .. _`getcomposer.org/download`: https://getcomposer.org/download
-.. _`its documentation`: https://getcomposer.org/doc/00-intro.md
+.. _`Composer documentation`: https://getcomposer.org/doc/00-intro.md
diff --git a/cookbook/configuration/configuration_organization.rst b/cookbook/configuration/configuration_organization.rst
@@ -23,7 +23,7 @@ class::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+            $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
         }
     }
 
@@ -101,7 +101,7 @@ method::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load(__DIR__.'/config/'.$this->getEnvironment().'/config.yml');
+            $loader->load($this->getRootDir().'/config/'.$this->getEnvironment().'/config.yml');
         }
     }
 
@@ -199,7 +199,7 @@ make Symfony aware of the new file organization::
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load(__DIR__.'/config/environments/'.$this->getEnvironment().'.yml');
+            $loader->load($this->getRootDir().'/config/environments/'.$this->getEnvironment().'.yml');
         }
     }
 
diff --git a/cookbook/configuration/environments.rst b/cookbook/configuration/environments.rst
@@ -45,7 +45,7 @@ class:
 
         public function registerContainerConfiguration(LoaderInterface $loader)
         {
-            $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+            $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
         }
     }
 
diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -52,7 +52,7 @@ The **minimum configuration** to get your application running under Apache is:
         # uncomment the following lines if you install assets as symlinks
         # or run into problems when compiling LESS/Sass/CoffeScript assets
         # <Directory /var/www/project>
-        #     Option FollowSymlinks
+        #     Options FollowSymlinks
         # </Directory>
 
         ErrorLog /var/log/apache2/project_error.log
@@ -90,7 +90,7 @@ and increase web server performance:
         # uncomment the following lines if you install assets as symlinks
         # or run into problems when compiling LESS/Sass/CoffeScript assets
         # <Directory /var/www/project>
-        #     Option FollowSymlinks
+        #     Options FollowSymlinks
         # </Directory>
 
         ErrorLog /var/log/apache2/project_error.log
@@ -194,7 +194,7 @@ directive to pass requests for PHP files to PHP FPM:
         # uncomment the following lines if you install assets as symlinks
         # or run into problems when compiling LESS/Sass/CoffeScript assets
         # <Directory /var/www/project>
-        #     Option FollowSymlinks
+        #     Options FollowSymlinks
         # </Directory>
 
         ErrorLog /var/log/apache2/project_error.log
@@ -230,7 +230,7 @@ should look something like this:
         # uncomment the following lines if you install assets as symlinks
         # or run into problems when compiling LESS/Sass/CoffeScript assets
         # <Directory /var/www/project>
-        #     Option FollowSymlinks
+        #     Options FollowSymlinks
         # </Directory>
 
         ErrorLog /var/log/apache2/project_error.log
diff --git a/cookbook/routing/slash_in_parameter.rst b/cookbook/routing/slash_in_parameter.rst
@@ -31,9 +31,9 @@ a more permissive regex path.
         class DemoController
         {
             /**
-             * @Route("/hello/{name}", name="_hello", requirements={"name"=".+"})
+             * @Route("/hello/{username}", name="_hello", requirements={"username"=".+"})
              */
-            public function helloAction($name)
+            public function helloAction($username)
             {
                 // ...
             }
diff --git a/cookbook/security/entity_provider.rst b/cookbook/security/entity_provider.rst
@@ -297,11 +297,11 @@ and password ``admin`` (which has been encoded).
 .. code-block:: bash
 
     $ mysql> SELECT * FROM app_users;
-    +----+----------+------------------------------------------+--------------------+-----------+
-    | id | username | password                                 | email              | is_active |
-    +----+----------+------------------------------------------+--------------------+-----------+
-    |  1 | admin    | d033e22ae348aeb5660fc2140aec35850c4da997 | admin@example.com  |         1 |
-    +----+----------+------------------------------------------+--------------------+-----------+
+    +----+----------+--------------------------------------------------------------+--------------------+-----------+
+    | id | username | password                                                     | email              | is_active |
+    +----+----------+--------------------------------------------------------------+--------------------+-----------+
+    |  1 | admin    | $2a$08$jHZj/wJfcVKlIwr5AvR78euJxYK7Ku5kURNhNx.7.CSIJ3Pq6LEPC | admin@example.com  |         1 |
+    +----+----------+--------------------------------------------------------------+--------------------+-----------+
 
 .. sidebar:: Do you need to a Salt property?
 
diff --git a/cookbook/serializer.rst b/cookbook/serializer.rst
@@ -77,7 +77,7 @@ Here is an example on how to load the
         # app/config/services.yml
         services:
             get_set_method_normalizer:
-            class: Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer
+                class: Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer
                 tags:
                     - { name: serializer.normalizer }
 
diff --git a/cookbook/service_container/event_listener.rst b/cookbook/service_container/event_listener.rst
@@ -96,9 +96,8 @@ using a special "tag":
 .. note::
 
     There is an additional tag option ``priority`` that is optional and defaults
-    to 0. This value can be from -255 to 255, and the listeners will be executed
-    in the order of their priority (highest to lowest). This is useful when
-    you need to guarantee that one listener is executed before another.
+    to 0. The listeners will be executed in the order of their priority (highest to lowest).
+    This is useful when you need to guarantee that one listener is executed before another.
 
 Request Events, Checking Types
 ------------------------------
diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
diff --git a/quick_tour/the_controller.rst b/quick_tour/the_controller.rst
diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class::`
`23`	`23`
`24`	`24`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`25`	`25`	`{`
`26`		`- $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');`
	`26`	`+ $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -101,7 +101,7 @@ method::`
`101`	`101`
`102`	`102`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`103`	`103`	`{`
`104`		`- $loader->load(__DIR__.'/config/'.$this->getEnvironment().'/config.yml');`
	`104`	`+ $loader->load($this->getRootDir().'/config/'.$this->getEnvironment().'/config.yml');`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`@@ -199,7 +199,7 @@ make Symfony aware of the new file organization::`
`199`	`199`
`200`	`200`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`201`	`201`	`{`
`202`		`- $loader->load(__DIR__.'/config/environments/'.$this->getEnvironment().'.yml');`
	`202`	`+ $loader->load($this->getRootDir().'/config/environments/'.$this->getEnvironment().'.yml');`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class:`
`45`	`45`
`46`	`46`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`47`	`47`	`{`
`48`		`- $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');`
	`48`	`+ $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ a more permissive regex path.`
`31`	`31`	`class DemoController`
`32`	`32`	`{`
`33`	`33`	`/**`
`34`		`- * @Route("/hello/{name}", name="_hello", requirements={"name"=".+"})`
	`34`	`+ * @Route("/hello/{username}", name="_hello", requirements={"username"=".+"})`
`35`	`35`	`*/`
`36`		`- public function helloAction($name)`
	`36`	`+ public function helloAction($username)`
`37`	`37`	`{`
`38`	`38`	`// ...`
`39`	`39`	`}`