block: classes checked + added sonata prepended config

Author: Roel Sint

bundles/block/introduction.rst

@@ -116,6 +116,29 @@ change features of one or more Admin instances. Read more about
             ),
         ));
 
+.. _bundle-block-updated-sonata-defaults:
+
+Updated SonataBlockBundle defaults
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The BlockBundle *automatically* changes some defaults and adds configuration
+to the `SonataBlockBundle`_ to make it work nicely. This is done using the
+`prepended configuration`_ option of Symfony available since version 2.2.
+See ``DependencyInjection\CmfBlockExtension::prepend``.
+
+Updated defaults:
+
+* **templates.block_base** the cmf base template wraps the block output in
+  a div and dashifies the PHPCR path as id; The base template is
+  kept compatible with the Sonata base template for non-cmf blocks;
+* **RssBlock configuration** adds the
+  :ref:`default RssBlock settings <bundle-block-rss-settings>`.
+
+.. note::
+
+    Settings are only prepended, define the settings explicitly inside
+    the ``app/config/config.yml`` to override them.
+
 .. _bundle-block-document:
 
 Block Document

cookbook/using_blockbundle_and_contentbundle.rst

@@ -371,7 +371,7 @@ sample block, so create the ``LoadBlockWithCmfParent.php`` class::
     use Symfony\Component\DependencyInjection\ContainerInterface;
     use PHPCR\Util\NodeHelper;
     use Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock;
-    use Symfony\Cmf\Bundle\ContentBundle\Document\StaticContent;
+    use Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\StaticContent;
 
     class LoadBlockWithCmfParent extends AbstractFixture implements ContainerAwareInterface
     {
@@ -389,7 +389,7 @@ sample block, so create the ``LoadBlockWithCmfParent.php`` class::
             $document->setPath($basepath . '/blocks');
             $manager->persist($document);
 
-            // Create a new SimpleBlock (see http://symfony.com/doc/master/cmf/bundles/block.html#block-types)
+            // Create a new SimpleBlock
             $myBlock = new SimpleBlock();
             $myBlock->setParentDocument($document);
             $myBlock->setName('testBlock');
@@ -411,17 +411,17 @@ This class creates an example content page using the CMF ContentBundle. It
 then loads our example block as before, using the new content page as its
 parent.
 
-By default, the base path for the content is ``/cms/content/static``. To show
-how it can be configured to any path, add the following, optional entry to
-your ``config.yml``:
+By default, the base path for the content is ``/cms/content``. To show how it
+can be configured to any path, add the following, optional entry to your
+``config.yml``:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
         # app/config/config.yml
         cmf_content:
-            static_basepath: /content
+            content_basepath: /content
 
 Now it should be possible to load in the above fixtures:
 

reference/configuration/block.rst

@@ -6,6 +6,10 @@ configured under the ``cmf_block`` key in your application configuration. When
 using XML, you can use the ``http://cmf.symfony.com/schema/dic/block``
 namespace.
 
+The BlockBundle *automatically* changes some defaults and adds configuration
+to the SonataBlockBundle to make it work nicely. See the
+:ref:`updated SonataBlockBundle defaults <bundle-block-updated-sonata-defaults>`.
+
 Configuration
 -------------