Merge branch '2.5' into 2.6

* 2.5:
  Remove 'acme'
  Update introduction.rst
  [Book][Translation] Added tip for routing params
  Remove trailing whitespace
  [BestPractices] fix minor typo
  Remove horizontal scrollbar
  [Components][Debug] fix DebugClassLoader namespace
  Update override.rst
  Update override.rst

Conflicts:
	cookbook/form/dynamic_form_modification.rst

Author: weaverryan

best_practices/security.rst

@@ -245,7 +245,7 @@ Security Voters
 
 If your security logic is complex and can't be centralized into a method
 like ``isAuthor()``, you should leverage custom voters. These are an order
-of magnitude easier than :doc:`ACL's </cookbook/security/acl>` and will give
+of magnitude easier than :doc:`ACLs </cookbook/security/acl>` and will give
 you the flexibility you need in almost all cases.
 
 First, create a voter class. The following example shows a voter that implements

book/controller.rst

@@ -559,7 +559,7 @@ Symfony will automatically return a 500 HTTP response code.
     throw new \Exception('Something went wrong!');
 
 In every case, an error page is shown to the end user and a full debug
-error page is shown to the developer (i.e. when you're using ``app_dev.php`` - 
+error page is shown to the developer (i.e. when you're using ``app_dev.php`` -
 see :ref:`page-creation-environments`).
 
 You'll want to customize the error page your user sees. To do that, see the

book/from_flat_php_to_symfony2.rst

@@ -244,7 +244,7 @@ the layout:
 
     <?php include 'layout.php' ?>
 
-You now have a setup that will allow you to reuse the layout. 
+You now have a setup that will allow you to reuse the layout.
 Unfortunately, to accomplish this, you're forced to use a few ugly
 PHP functions (``ob_start()``, ``ob_get_clean()``) in the template. Symfony
 uses a Templating component that allows this to be accomplished cleanly

book/http_cache.rst

@@ -538,8 +538,8 @@ won't be asked to return the updated response until the cache finally becomes
 stale.
 
 The validation model addresses this issue. Under this model, the cache continues
-to store responses. The difference is that, for each request, the cache asks the 
-application if the cached response is still valid or if it needs to be regenerated. 
+to store responses. The difference is that, for each request, the cache asks the
+application if the cached response is still valid or if it needs to be regenerated.
 If the cache *is* still valid, your application should return a 304 status code
 and no content. This tells the cache that it's ok to return the cached response.
 

book/service_container.rst

@@ -569,7 +569,7 @@ the service container gives you a much more appealing option:
         services:
             my_mailer:
                 # ...
-            
+
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
                 arguments: ["@my_mailer"]
@@ -762,7 +762,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
         services:
             my_mailer:
                 # ...
-            
+
             newsletter_manager:
                 class:     Acme\HelloBundle\Newsletter\NewsletterManager
                 calls:
@@ -797,7 +797,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
         use Symfony\Component\DependencyInjection\Reference;
 
         $container->setDefinition('my_mailer', ...);
-        
+
         $container->setDefinition('newsletter_manager', new Definition(
             'Acme\HelloBundle\Newsletter\NewsletterManager'
         ))->addMethodCall('setMailer', array(
@@ -938,7 +938,7 @@ it exists and do nothing if it doesn't:
                 <service id="my_mailer">
                 <!-- ... -->
                 </service>
-                
+
                 <service id="newsletter_manager" class="Acme\HelloBundle\Newsletter\NewsletterManager">
                     <argument type="service" id="my_mailer" on-invalid="ignore" />
                 </service>
@@ -953,7 +953,7 @@ it exists and do nothing if it doesn't:
         use Symfony\Component\DependencyInjection\ContainerInterface;
 
         $container->setDefinition('my_mailer', ...);
-        
+
         $container->setDefinition('newsletter_manager', new Definition(
             'Acme\HelloBundle\Newsletter\NewsletterManager',
             array(

book/translation.rst

@@ -428,7 +428,7 @@ via the ``request`` object::
 
 .. tip::
 
-    Read :doc:`/cookbook/session/locale_sticky_session` to learn, how to store
+    Read :doc:`/cookbook/session/locale_sticky_session` to learn how to store
     the user's locale in the session.
 
 .. index::
@@ -508,6 +508,11 @@ as the locale for the current request.
 You can now use the locale to create routes to other translated pages
 in your application.
 
+.. tip::
+
+    Read :doc:`/cookbook/routing/service_container_parameters` to learn how to
+    avoid hardcoding the ``_locale`` requirement in all your routes.
+
 Setting a default Locale
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

components/class_loader/cache_class_loader.rst

@@ -4,7 +4,7 @@
     single: ClassLoader; Cache
     single: ClassLoader; XcacheClassLoader
     single: XCache; XcacheClassLoader
-    
+
 Cache a Class Loader
 ====================
 
@@ -30,16 +30,16 @@ ApcClassLoader
 ``findFile()`` method using `APC`_::
 
     require_once '/path/to/src/Symfony/Component/ClassLoader/ApcClassLoader.php';
-    
+
     // instance of a class that implements a findFile() method, like the ClassLoader
     $loader = ...;
-    
+
     // sha1(__FILE__) generates an APC namespace prefix
     $cachedLoader = new ApcClassLoader(sha1(__FILE__), $loader);
-    
+
     // register the cached class loader
     $cachedLoader->register();
-    
+
     // deactivate the original, non-cached loader if it was registered previously
     $loader->unregister();
 
@@ -50,16 +50,16 @@ XcacheClassLoader
 it is straightforward::
 
     require_once '/path/to/src/Symfony/Component/ClassLoader/XcacheClassLoader.php';
-    
+
     // instance of a class that implements a findFile() method, like the ClassLoader
     $loader = ...;
-    
+
     // sha1(__FILE__) generates an XCache namespace prefix
     $cachedLoader = new XcacheClassLoader(sha1(__FILE__), $loader);
-    
+
     // register the cached class loader
     $cachedLoader->register();
-    
+
     // deactivate the original, non-cached loader if it was registered previously
     $loader->unregister();
 

components/class_loader/map_class_loader.rst

@@ -1,6 +1,6 @@
 .. index::
     single: ClassLoader; MapClassLoader
-    
+
 MapClassLoader
 ==============
 
@@ -26,14 +26,14 @@ Using it is as easy as passing your mapping to its constructor when creating
 an instance of the ``MapClassLoader`` class::
 
     require_once '/path/to/src/Symfony/Component/ClassLoader/MapClassLoader';
-    
+
     $mapping = array(
         'Foo' => '/path/to/Foo',
         'Bar' => '/path/to/Bar',
     );
-    
+
     $loader = new MapClassLoader($mapping);
-    
+
     $loader->register();
 
 .. _PSR-0: http://www.php-fig.org/psr/psr-0/

components/console/introduction.rst

@@ -404,7 +404,6 @@ tools capable of helping you with different tasks:
 * :doc:`/components/console/helpers/formatterhelper`: customize the output colorization
 * :doc:`/components/console/helpers/progressbar`: shows a progress bar
 * :doc:`/components/console/helpers/table`: displays tabular data as a table
-* :doc:`/components/console/helpers/questionhelper`: interactively ask the user for information
 
 .. _component-console-testing-commands:
 

components/css_selector.rst

@@ -76,7 +76,7 @@ web-browser.
 
 * link-state selectors: ``:link``, ``:visited``, ``:target``
 * selectors based on user action: ``:hover``, ``:focus``, ``:active``
-* UI-state selectors: ``:invalid``, ``:indeterminate`` (however, ``:enabled``, 
+* UI-state selectors: ``:invalid``, ``:indeterminate`` (however, ``:enabled``,
   ``:disabled``, ``:checked`` and ``:unchecked`` are available)
 
 Pseudo-elements (``:before``, ``:after``, ``:first-line``,

components/debug/class_loader.rst

@@ -13,6 +13,6 @@ with a ``DebugClassLoader`` wrapper.
 Using the ``DebugClassLoader`` is as easy as calling its static
 :method:`Symfony\\Component\\Debug\\DebugClassLoader::enable` method::
 
-    use Symfony\Component\ClassLoader\DebugClassLoader;
+    use Symfony\Component\Debug\DebugClassLoader;
 
     DebugClassLoader::enable();

components/dependency_injection/advanced.rst

@@ -17,7 +17,7 @@ using the ``get()`` method::
 
 In some cases, a service *only* exists to be injected into another service
 and is *not* intended to be fetched directly from the container as shown
-above. 
+above.
 
 .. _inlined-private-services:
 

components/security/authentication.rst

@@ -263,7 +263,7 @@ in) is correct, you can use::
 
     // fetch the Acme\Entity\LegacyUser
     $user = ...;
-    
+
     // the submitted password, e.g. from the login form
     $plainPassword = ...;
 

components/templating/helpers/assetshelper.rst

@@ -105,7 +105,7 @@ Asset path generation is handled internally by packages. The component provides
 You can also use multiple packages::
 
     use Symfony\Component\Templating\Asset\PathPackage;
-    
+
     // ...
     $templateEngine->set(new AssetsHelper());
 

components/templating/introduction.rst

@@ -135,7 +135,7 @@ escaper using the
 Helpers
 -------
 
-The Templating component can be easily extended via helpers. Helpers are PHP objects that 
+The Templating component can be easily extended via helpers. Helpers are PHP objects that
 provide features useful in a template context. The component has
 2 built-in helpers:
 

contributing/code/standards.rst

@@ -79,7 +79,7 @@ example containing most features described below:
 
             throw new \RuntimeException(sprintf('Unrecognized dummy option "%s"', $dummy));
         }
-        
+
         private function reverseBoolean($value = null, $theSwitch = false)
         {
             if (!$theSwitch) {
@@ -95,7 +95,7 @@ Structure
 
 * Add a single space after each comma delimiter;
 
-* Add a single space around binary operators (``==``, ``&&``, ...), with 
+* Add a single space around binary operators (``==``, ``&&``, ...), with
   the exception of the concatenation (``.``) operator;
 
 * Place unary operators (``!``, ``--``, ...) adjacent to the affected variable;

cookbook/bundles/override.rst

@@ -23,7 +23,7 @@ the routes from any bundle, then they must be manually imported from somewhere
 in your application (e.g. ``app/config/routing.yml``).
 
 The easiest way to "override" a bundle's routing is to never import it at
-all. Instead of importing a third-party bundle's routing, simply copying
+all. Instead of importing a third-party bundle's routing, simply copy
 that routing file into your application, modify it, and import it instead.
 
 Controllers
@@ -68,7 +68,7 @@ in the core FrameworkBundle:
         $container->setParameter('translator.class', 'Acme\HelloBundle\Translation\Translator');
 
 Secondly, if the class is not available as a parameter, you want to make sure the
-class is always overridden when your bundle is used, or you need to modify
+class is always overridden when your bundle is used or if you need to modify
 something beyond just the class name, you should use a compiler pass::
 
     // src/Acme/DemoBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
@@ -106,7 +106,7 @@ Forms
 -----
 
 In order to override a form type, it has to be registered as a service (meaning
-it is tagged as "form.type"). You can then override it as you would override any
+it is tagged as ``form.type``). You can then override it as you would override any
 service as explained in `Services & Configuration`_. This, of course, will only
 work if the type is referred to by its alias rather than being instantiated,
 e.g.::
@@ -136,7 +136,7 @@ the constraints to a new validation group:
     .. code-block:: yaml
 
         # src/Acme/UserBundle/Resources/config/validation.yml
-        Fos\UserBundle\Model\User:
+        FOS\UserBundle\Model\User:
             properties:
                 plainPassword:
                     - NotBlank:
@@ -152,10 +152,17 @@ the constraints to a new validation group:
         <?xml version="1.0" encoding="UTF-8" ?>
         <constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+            xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+            <class name="FOS\UserBundle\Model\User">
+                <property name="plainPassword">
+                    <constraint name="NotBlank">
+                        <option name="groups">
+                            <value>AcmeValidation</value>
+                        </option>
+                    </constraint>
 
-            <class name="Fos\UserBundle\Model\User">
-                <property name="password">
                     <constraint name="Length">
                         <option name="min">6</option>
                         <option name="minMessage">fos_user.password.short</option>

cookbook/configuration/external_parameters.rst

@@ -14,12 +14,12 @@ Environment Variables
 ---------------------
 
 Symfony will grab any environment variable prefixed with ``SYMFONY__`` and
-set it as a parameter in the service container. Some transformations are 
+set it as a parameter in the service container. Some transformations are
 applied to the resulting parameter name:
 
 * ``SYMFONY__`` prefix is removed;
 * Parameter name is lowercased;
-* Double underscores are replaced with a period, as a period is not 
+* Double underscores are replaced with a period, as a period is not
   a valid character in an environment variable name.
 
 For example, if you're using Apache, environment variables can be set using

cookbook/configuration/override_dir_structure.rst

@@ -151,7 +151,7 @@ file:
     work:
 
     .. code-block:: bash
-    
+
         $ php app/console cache:clear --env=prod
         $ php app/console assetic:dump --env=prod --no-debug
 

cookbook/console/console_command.rst

@@ -33,8 +33,17 @@ want to extend the AppBundle to greet you from the command line, create
             $this
                 ->setName('demo:greet')
                 ->setDescription('Greet someone')
-                ->addArgument('name', InputArgument::OPTIONAL, 'Who do you want to greet?')
-                ->addOption('yell', null, InputOption::VALUE_NONE, 'If set, the task will yell in uppercase letters')
+                ->addArgument(
+                    'name',
+                    InputArgument::OPTIONAL,
+                    'Who do you want to greet?'
+                )
+                ->addOption(
+                    'yell',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'If set, the task will yell in uppercase letters'
+                )
             ;
         }
 
@@ -103,7 +112,9 @@ translate some contents using a console command::
         $name = $input->getArgument('name');
         $translator = $this->getContainer()->get('translator');
         if ($name) {
-            $output->writeln($translator->trans('Hello %name%!', array('%name%' => $name)));
+            $output->writeln(
+                $translator->trans('Hello %name%!', array('%name%' => $name))
+            );
         } else {
             $output->writeln($translator->trans('Hello!'));
         }
@@ -137,7 +148,9 @@ before translating contents::
         $translator->setLocale($locale);
 
         if ($name) {
-            $output->writeln($translator->trans('Hello %name%!', array('%name%' => $name)));
+            $output->writeln(
+                $translator->trans('Hello %name%!', array('%name%' => $name))
+            );
         } else {
             $output->writeln($translator->trans('Hello!'));
         }