Merge branch '4.2'

* 4.2:
  remove space before self closing tag
  [Cache] Fixed typos

Author: wouterj

cache.rst

@@ -37,7 +37,7 @@ these at the :doc:`component documentation </components/cache>`.
 Configuring Cache with FrameworkBundle
 --------------------------------------
 
-When configuring the the cache component there are a few concepts you should know
+When configuring the cache component there are a few concepts you should know
 of:
 
 **Pool**
@@ -215,9 +215,9 @@ You can also create more customized pools. All you need is an adapter:
 
             <framework:config>
                 <framework:cache default_memcached_provider="memcached://localhost">
-                  <framework:pool name="my_cache_pool" adapter="cache.adapter.array" />
-                  <framework:pool name="cache.acme" adapter="cache.adapter.memcached" />
-                  <framework:pool name="cache.foobar" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com" />
+                  <framework:pool name="my_cache_pool" adapter="cache.adapter.array"/>
+                  <framework:pool name="cache.acme" adapter="cache.adapter.memcached"/>
+                  <framework:pool name="cache.foobar" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
                 </framework:cache>
             </framework:config>
         </container>
@@ -282,9 +282,9 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
 
             <framework:config>
                 <framework:cache>
-                  <framework:pool name="my_cache_pool" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com" />
-                  <framework:pool name="cache.short_cache" adapter="my_cache_pool" default_lifetime="604800" />
-                  <framework:pool name="cache.long_cache" adapter="my_cache_pool" default_lifetime="604800" />
+                  <framework:pool name="my_cache_pool" adapter="cache.adapter.memcached" provider="memcached://user:password@example.com"/>
+                  <framework:pool name="cache.short_cache" adapter="my_cache_pool" default_lifetime="604800"/>
+                  <framework:pool name="cache.long_cache" adapter="my_cache_pool" default_lifetime="604800"/>
                 </framework:cache>
             </framework:config>
         </container>
@@ -355,17 +355,17 @@ case the value needs to be recalculated.
 
             <framework:config>
                 <framework:cache default_memcached_provider="memcached://localhost">
-                  <framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter" />
-                  <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com" />
+                  <framework:pool name="my_cache_pool" adapter="app.my_cache_chain_adapter"/>
+                  <framework:pool name="cache.my_redis" adapter="cache.adapter.redis" provider="redis://user:password@example.com"/>
                 </framework:cache>
             </framework:config>
 
             <services>
                 <service id="app.my_cache_chain_adapter" class="Symfony\Component\Cache\Adapter\ChainAdapter">
                     <argument type="collection">
-                        <argument type="service" value="cache.adapter.array" />
-                        <argument type="service" value="cache.my_redis" />
-                        <argument type="service" value="cache.adapter.file" />
+                        <argument type="service" value="cache.adapter.array"/>
+                        <argument type="service" value="cache.my_redis"/>
+                        <argument type="service" value="cache.adapter.file"/>
                     </argument>
                     <argument>31536000</argument>
                 </service>
@@ -407,9 +407,9 @@ Clearing the Cache
 ------------------
 
 To clear the cache you can use the ``bin/console cache:pool:clear [pool]`` command.
-That will remove all the entries from your storage and you wil have to recalcuate
+That will remove all the entries from your storage and you wil have to recalculate
 all values. You can also group your pools into "cache clearers". There are 3 cache
-clearer by default:
+clearers by default:
 
 * ``cache.global_clearer``
 * ``cache.system_clearer``