Merge branch '2.3' into 2.5

* 2.3:
  Remove 'acme'
  [Book][Translation] Added tip for routing params
  Remove trailing whitespace
  [BestPractices] fix minor typo
  Remove horizontal scrollbar
  Update override.rst
  Update override.rst

Conflicts:
	components/class_loader/debug_class_loader.rst
	cookbook/form/unit_testing.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

@@ -556,7 +556,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"]
@@ -765,7 +765,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:
@@ -800,7 +800,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(
@@ -944,7 +944,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>
@@ -959,7 +959,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

@@ -419,7 +419,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::
@@ -499,6 +499,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/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/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: