adjusted to feedback and fixed some other glitches

Author: dbu

bundles/block/introduction.rst

@@ -33,7 +33,7 @@ individually as follows:
 
     .. code-block:: yaml
 
-        cmf_core:
+        cmf_block:
             persistence:
                 phpcr:
                     block_basepath: /cms/content
@@ -43,7 +43,7 @@ individually as follows:
         <?xml version="1.0" charset="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services">
 
-            <config xmlns="http://cmf.symfony.com/schema/dic/core">
+            <config xmlns="http://cmf.symfony.com/schema/dic/block">
                 <persistence>
                     <phpcr
                         block-basepath="/cms/block"
@@ -55,7 +55,7 @@ individually as follows:
 
     .. code-block:: php
 
-        $container->loadFromExtension('cmf_core', array(
+        $container->loadFromExtension('cmf_block', array(
             'persistence' => array(
                 'phpcr' => array(
                     'block_basepath' => '/cms/block',
@@ -382,45 +382,51 @@ receives the block object (equivalent to a Request object) and a ``Response``
 object. The purpose of the ``execute`` method to set the content of the
 response object - typically by rendering a Twig template.
 
-You can also :ref:`embed blocks in WYSIWYG content <tutorial-block-embed>`
-using the ``cmf_embed_blocks`` filter.
+.. _bundle-block-embed:
 
 Embedding Blocks in WYSIWYG Content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. note::
-
-    This feature conflicts with the frontend editing provided by CreateBundle,
-    editing the rendered content will store the rendered block HTML into the
-    database. There is `discussion going on to fix this`_
-
 The CmfBlockBundle provides a twig filter ``cmf_embed_blocks`` that
 looks through the content and looks for special tags to render blocks. To use
-the tag, you need to apply the ``cmf_embed_blocks`` filter to your output.  If
+the tag, you need to apply the ``cmf_embed_blocks`` filter to your output. If
 you can, render your blocks directly in the template. This feature is only a
 cheap solution for web editors to place blocks anywhere in their HTML content.
 A better solution to build composed pages is to build it from blocks (there
 might be a CMF bundle at some point for this).
 
-.. code-block:: jinja
+.. configuration-block::
+
+    .. code-block:: jinja
+
+        {{ page.content|cmf_embed_blocks }}
+
+    .. code-block:: html+php
+
+        <?php echo $view['blocks']->embedBlocks(
+            $page->getContent()
+        ) ?>
 
-    {# template.twig.html #}
-    {{ page.content|cmf_embed_blocks }}
+.. caution::
+
+    Make sure to only place this filter where you display the content and not
+    where editing it, as otherwise your users would start to edit the rendered
+    output of their blocks.
+    This feature conflicts with the frontend editing provided by CreateBundle,
+    as create.js operates on the rendered content as displayed to the user.
+    There is an ongoing `discussion how to fix this`_.
 
-Make sure to only place this filter where you display the content and not where
-editing it, as otherwise your users would start to edit the rendered output of
-their blocks. When you apply the filter, your users can use this tag to embed a
-block in their HTML content:
+When you apply the filter, your users can use this tag to embed a block in
+their content:
 
-.. code-block:: html
+.. code-block:: text
 
     %embed-block|/absolute/path/to/block|end%
 
     %embed-block|local-block|end%
 
 The path to the block is either absolute or relative to the current main
-content. The actual path to the block must be enclosed with double quotes
-``"``. But the prefix and postfix are configurable. The default prefix is
+content. The prefix and postfix are configurable. The default prefix is
 ``%embed-block|`` and the default postfix is ``|end%``. Say you want
 to use ``%%%block:"/absolute/path"%%%`` then you do:
 
@@ -432,11 +438,38 @@ to use ``%%%block:"/absolute/path"%%%`` then you do:
         cmf_block:
             twig:
                 cmf_embed_blocks:
-                    prefix: %%%block:"
-                    postfix: "%%%
+                    prefix: '%%%block:"'
+                    postfix: '"%%%'
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services">
+
+            <config xmlns="http://cmf.symfony.com/schema/dic/block">
+                <twig>
+                    <cmf-embed-blocks
+                        prefix="%%%block:&quot;"
+                        postfix="&quot;%%%"
+                    />
+                </twig>
+            </config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('cmf_block', array(
+            'twig' => array(
+                'cmf_embed_blocks' => array(
+                    'prefix' => '%%%block:"',
+                    'postfix' => '"%%%',
+                ),
+            ),
+        );
 
-See also the :ref:`the configuration reference
-    <reference-config-block-twig-cmf-embed-blocks>`.
+See also the :ref:`the configuration reference <reference-config-block-twig-cmf-embed-blocks>`.
 
 .. caution::
 
@@ -470,4 +503,4 @@ Read on
 .. _`Symfony CMF Sandbox`: https://github.com/symfony-cmf/cmf-sandbox
 .. _`prepended configuration`: http://symfony.com/doc/current/components/dependency_injection/compilation.html#prepending-configuration-passed-to-the-extension
 .. _`SonataBlockBundle`: https://github.com/sonata-project/SonataBlockBundle
-.. _`discussion going on to fix this`: https://github.com/symfony-cmf/BlockBundle/issues/143
+.. _`discussion how to fix this`: https://github.com/symfony-cmf/BlockBundle/issues/143

cookbook/creating_cms_using_cmf_and_sonata.rst

@@ -210,8 +210,8 @@ Tree Problems
 -------------
 
 If you have not yet added anything to the content repository, the tree view
-will not load as it cannot find a root node. To fix this, load some data as
-fixtures by following ":doc:`using_blockbundle_and_contentbundle`"
+will not load as it cannot find a root node. Create some content to get the
+tree working.
 
 Further Reading
 ---------------

cookbook/index.rst

@@ -11,7 +11,6 @@ The Cookbook
     editions/cmf_core
     installing_configuring_doctrine_phpcr_odm
     creating_cms_using_cmf_and_sonata
-    using_blockbundle_and_contentbundle
     handling_multilang_documents
     exposing_content_via_rest
 

cookbook/map.rst.inc

@@ -11,6 +11,5 @@
 * :doc:`create_basic_cms_auto_routing`
 * :doc:`installing_configuring_doctrine_phpcr_odm`
 * :doc:`creating_cms_using_cmf_and_sonata`
-* :doc:`using_blockbundle_and_contentbundle`
 * :doc:`handling_multilang_documents`
 * :doc:`exposing_content_via_rest`

reference/configuration/block.rst

@@ -259,7 +259,7 @@ cmf_embed_blocks
 The BlockBundle provides a twig filter ``cmf_embed_blocks`` that
 looks through the content and looks for special tags to render blocks.
 
-See :ref:`embed blocks in content <tutorial-block-embed>` for using the
+See :ref:`embed blocks in content <bundle-block-embed>` for using the
 ``cmf_embed_blocks`` filter.
 
 prefix