Merge branch '1.0' into 1.1

Conflicts:
	bundles/routing/dynamic_customize.rst
	quick_tour/the_model.rst

Author: wouterj

bundles/block/types.rst

@@ -53,9 +53,9 @@ configuration.
         # app/config/config.yml
         sonata_admin:
             extensions:
-                cmf.block.admin.base.extension:
+                cmf_block.admin_extension.cache:
                     extends:
-                        - Symfony\Cmf\Bundle\BlockBundle\Model\BaseBlock
+                        - Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock
 
     .. code-block:: xml
 
@@ -65,8 +65,8 @@ configuration.
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
             <config xmlns="http://sonata-project.org/schema/dic/admin">
-                <extension id="cmf.block.admin.base.extension">
-                    <extend>Symfony\Cmf\Bundle\BlockBundle\Model\BaseBlock</extend>
+                <extension id="cmf_block.admin_extension.cache">
+                    <extend>Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock</extend>
                 </extension>
             </config>
         </container>
@@ -76,9 +76,9 @@ configuration.
         // app/config/config.php
         $container->loadFromExtension('sonata_admin', array(
             'extensions' => array(
-                'cmf.block.admin.base.extension' => array(
+                'cmf.block.admin_extension.cache' => array(
                     'extends' => array(
-                        'Symfony\Cmf\Bundle\BlockBundle\Model\BaseBlock',
+                        'Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock',
                     ),
                 ),
             ),

bundles/map.rst.inc

@@ -47,7 +47,7 @@ library or they introduce a complete new concept.
   * :doc:`routing/dynamic`
   * :doc:`routing/dynamic_customize`
 
-* :doc:`routing_auto/index`
+* :doc:`routing_auto/index` (in development)
 
   * :doc:`routing_auto/introduction`
   * :doc:`routing_auto/providers`
@@ -77,7 +77,7 @@ show a different way of implementing a concept. You can use these bundles in
 your project, but you can also get ideas from these bundles to create your own
 bundle based on the key bundles.
 
-* **BlogBundle**
+* **BlogBundle** (in development)
 
   * :doc:`blog`
 

bundles/routing/dynamic_customize.rst

@@ -22,13 +22,69 @@ Writing your own Route Enhancers
 
 You can add your own :ref:`RouteEnhancerInterface <bundles-routing-dynamic_router-enhancer>`
 implementations if you have a case not handled by the
-:ref:`provided enhancers <component-routing-enhancers>`. Simply define services
-for your enhancers and tag them with ``dynamic_router_route_enhancer`` to have
-them added to the routing. You can specify an optional ``priority`` parameter
-on the tag to control the order in which enhancers are executed. The higher the
-priority, the earlier the enhancer is executed.
+:ref:`provided enhancers <component-routing-enhancers>`.
+
+.. code-block:: php
+
+    // src/AppBundle/Routing/Enhancer/SimpleEnhancer.php
+    namespace AppBundle\Routing\Enhancer;
+
+    use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
+    use Symfony\Component\HttpFoundation\Request;
+
+    class SimpleEnhancer implements RouteEnhancerInterface
+    {
+        public function enhance(array $defaults, Request $request)
+        {
+            // ... customize the $defaults array
+
+            return $defaults;
+        }
+    }
+
+Simply define services for your enhancers and tag them with
+``dynamic_router_route_enhancer`` to have them added to the routing. You can
+specify an optional ``priority`` parameter on the tag to control the order in
+which enhancers are executed. The higher the priority, the earlier the enhancer
+is executed.
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        services:
+            app.routing.simple_enhancer:
+                class: AppBundle\Routing\Enhancer\SimpleEnhancer
+                tags:
+                    -  { name: dynamic_router_route_enhancer, priority: 10 }
+
+    .. code-block:: xml
+
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+            <services>
+                <service id="app.routing.simple_enhancer" class="AppBundle\Routing\Enhancer\SimpleEnhancer">
+                    <tag name="dynamic_router_route_enhancer" priority="10" />
+                </service>
+            </services>
+        </container>
+
+    .. code-block:: php
+
+        use Symfony\Component\DependencyInjection\Definition;
+
+        $definition = new Definition('AppBundle\Routing\Enhancer\SimpleEnhancer');
+        $definition->addTag('dynamic_router_route_enhancer', array(
+            'priority' => 10,
+        ));
+
+        $container->setDefinition('app.routing.simple_enhancer', $definition);
 
 .. index:: Route Provider
+
 .. _bundle-routing-custom_provider:
 
 Using a Custom Route Provider

bundles/tree_browser/introduction.rst

@@ -18,7 +18,7 @@ Installation
 ------------
 
 You can install this bundle `with composer`_ using the
-``symfony-cmf/seo-content-bundle`` package on `Packagist`_.
+``symfony-cmf/tree-browser-bundle`` package on `Packagist`_.
 
 Both the CmfTreeBrowserBundle and FOSJsRoutingBundle_ must be registered in the
 ``AppKernel``::

quick_tour/the_model.rst

@@ -63,7 +63,7 @@ dump command.
 .. note::
 
     Previously, the PHPCR tree was compared with a Filesystem. While this
-    gives you a good imagine of what happends, it's not the truth. You can
+    gives you a good image of what happens, it's not the truth. You can
     better compare it to an XML file, where each node is an element and its
     properties are attributes.