diff --git a/bundles/block/cache.rst b/bundles/block/cache.rst
index 60592544..dc8c06b4 100644
--- a/bundles/block/cache.rst
+++ b/bundles/block/cache.rst
@@ -1,11 +1,11 @@
 Cache
 =====
 
-The Symfony2 CMF BlockBundle integrates with the `SonataCacheBundle`_ to
+The CmfBlockBundle integrates with the `SonataCacheBundle`_ to
 provide several caching solutions. Have a look at the available adapters in the
 `SonataCacheBundle`_ to see all options.
 
-The Symfony2 CMF BlockBundle additionally provides its own adapters for:
+The CmfBlockBundle additionally provides its own adapters for:
 
 * `ESI`_ (service: ``cmf.block.cache.varnish``)
 * `SSI`_ (service: ``cmf.block.cache.ssi``)
@@ -119,7 +119,7 @@ CmfBlockBundle and the SonataBlockBundle:
                     ),
                 ),
                 'blocks_by_class' => array(
-                    'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock' => array(
+                    Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock::class => array(
                             'cache' => 'symfony_cmf.block.cache.js_async',
                         ),
                     ),
@@ -133,8 +133,7 @@ When a block having a cache configured is rendered, the following process
 is triggered:
 
 * The document is loaded based on the name;
-* If caching is configured, the cache is checked and content is returned if
-  found.
+* The cache is checked and content is returned if found.
 
   * Cache keys are computed using:
 
diff --git a/bundles/block/configuration.rst b/bundles/block/configuration.rst
index 691c58b5..a76a7141 100644
--- a/bundles/block/configuration.rst
+++ b/bundles/block/configuration.rst
@@ -34,21 +34,6 @@ is the following configuration:
                     enabled:                  false
                     block_basepath:           /cms/content
                     manager_name:             ~
-                    string_document_class:    Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\StringBlock
-                    simple_document_class:    Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock
-                    container_document_class: Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock
-                    reference_document_class: Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock
-                    action_document_class:    Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
-                    slideshow_document_class: Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock
-                    imagine_document_class:   Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock
-                    use_sonata_admin:         auto
-                    string_admin_class:       Symfony\Cmf\Bundle\BlockBundle\Admin\StringBlockAdmin
-                    simple_admin_class:       Symfony\Cmf\Bundle\BlockBundle\Admin\SimpleBlockAdmin
-                    container_admin_class:    Symfony\Cmf\Bundle\BlockBundle\Admin\ContainerBlockAdmin
-                    reference_admin_class:    Symfony\Cmf\Bundle\BlockBundle\Admin\ReferenceBlockAdmin
-                    action_admin_class:       Symfony\Cmf\Bundle\BlockBundle\Admin\ActionBlockAdmin
-                    slideshow_admin_class:    Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\SlideshowBlockAdmin
-                    imagine_admin_class:      Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\ImagineBlockAdmin
 
     .. code-block:: xml
 
@@ -59,23 +44,8 @@ is the following configuration:
                 <persistence>
                     <phpcr
                         enabled="false"
-                        manager-name="null"
                         block-basepath="/cms/content"
-                        string-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\StringBlock"
-                        simple-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock"
-                        container-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock"
-                        reference-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock"
-                        action-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock"
-                        slideshow-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock"
-                        imagine-document-class="Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock"
-                        use-sonata-admin="auto"
-                        string-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\StringBlockAdmin"
-                        simple-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\SimpleBlockAdmin"
-                        container-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\ContainerBlockAdmin"
-                        reference-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\ReferenceBlockAdmin"
-                        action-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\ActionBlockAdmin"
-                        slideshow-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\SlideshowBlockAdmin"
-                        imagine-admin-class="Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\ImagineBlockAdmin"
+                        manager-name="null"
                     />
                 </persistence>
             </config>
@@ -90,21 +60,6 @@ is the following configuration:
                     'enabled'                  => false,
                     'block-basepath'           => '/cms/content',
                     'manager_name'             => null,
-                    'string_document_class'    => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\StringBlock',
-                    'simple_document_class'    => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock',
-                    'container_document_class' => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock',
-                    'reference_document_class' => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock',
-                    'action_document_class'    => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock',
-                    'slideshow_document_class' => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock',
-                    'imagine_document_class'   => 'Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock',
-                    'use_sonata_admin'         => 'auto',
-                    'string_admin_class'       => 'Symfony\Cmf\Bundle\BlockBundle\Admin\StringBlockAdmin',
-                    'simple_admin_class'       => 'Symfony\Cmf\Bundle\BlockBundle\Admin\SimpleBlockAdmin',
-                    'container_admin_class'    => 'Symfony\Cmf\Bundle\BlockBundle\Admin\ContainerBlockAdmin',
-                    'reference_admin_class'    => 'Symfony\Cmf\Bundle\BlockBundle\Admin\ReferenceBlockAdmin',
-                    'action_admin_class'       => 'Symfony\Cmf\Bundle\BlockBundle\Admin\ActionBlockAdmin',
-                    'slideshow_admin_class'    => 'Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\SlideshowBlockAdmin',
-                    'imagine_admin_class'      => 'Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\ImagineBlockAdmin',
                 ),
             ),
         ));
@@ -130,123 +85,6 @@ the value of ``%cmf_core.persistence.phpcr.basepath%/content``.
 
 .. include:: ../_partials/persistence_phpcr_manager_name.rst.inc
 
-``string_document_class``
-"""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\StringBlock``
-
-The string block document class.
-
-``simple_document_class``
-"""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock``
-
-The simple block document class.
-
-``container_document_class``
-""""""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ContainerBlock``
-
-The container block document class.
-
-``reference_document_class``
-""""""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ReferenceBlock``
-
-The reference block document class.
-
-``action_document_class``
-"""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock``
-
-The action block document class.
-
-If phpcr is enabled ``use_sonata_admin`` is enabled, the class value is set in
-``Resources/config/admin.xml``.
-
-``slideshow_document_class``
-""""""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SlideshowBlock``
-
-The slideshow block document class.
-
-``imagine_document_class``
-""""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ImagineBlock``
-
-The imagine block document class. This document will only work properly if
-you set up the LiipImagineBundle.
-
-``use_sonata_admin``
-""""""""""""""""""""
-
-**type**: ``enum`` **valid values**: ``true|false|auto`` **default**: ``auto``
-
-If ``true``, the admin classes are activated. If set to ``auto``, they are
-activated only if the SonataPhpcrAdminBundle is present.
-
-If the :doc:`CoreBundle <../core/introduction>` is registered, this will default to the value
-of ``cmf_core.persistence.phpcr.use_sonata_admin``.
-
-``string_admin_class``
-""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\StringBlockAdmin``
-
-The sonata admin class of the string block.
-
-``simple_admin_class``
-""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\SimpleBlockAdmin``
-
-The sonata admin class of the simple block.
-
-``container_admin_class``
-"""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\ContainerBlockAdmin``
-
-The sonata admin class of the container block.
-
-``reference_admin_class``
-"""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\ReferenceBlockAdmin``
-
-The sonata admin class of the reference block.
-
-``action_admin_class``
-""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\ActionBlockAdmin``
-
-The sonata admin class of the action block.
-
-``slideshow_admin_class``
-"""""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\SlideshowBlockAdmin``
-
-The sonata admin class of the slideshow block.
-
-This admin will only be loaded if ``use_imagine`` is enabled.
-
-``imagine_admin_class``
-"""""""""""""""""""""""
-
-**type**: ``string`` **default**: ``Symfony\Cmf\Bundle\BlockBundle\Admin\Imagine\ImagineBlockAdmin``
-
-The sonata admin class of the imagine block.
-
-This admin will only be loaded if ``use_imagine`` is enabled.
-
 ``twig``
 ~~~~~~~~
 
@@ -275,14 +113,6 @@ The part before the actual path to the block.
 
 The part after the actual path to the block.
 
-``use_imagine``
-~~~~~~~~~~~~~~~
-
-**type**: ``enum`` **valid values**: ``true|false|auto`` **default**: ``auto``
-
-If ``true``, the imagine related block classes and admin classes are activated.
-If set to ``auto``, they are activated only if the LiipImagineBundle is present.
-
 ``caches``
 ~~~~~~~~~~
 
diff --git a/bundles/block/create_your_own_blocks.rst b/bundles/block/create_your_own_blocks.rst
index 2c55336f..ec88989e 100644
--- a/bundles/block/create_your_own_blocks.rst
+++ b/bundles/block/create_your_own_blocks.rst
@@ -21,13 +21,13 @@ duplication, so instead you decide to create your own block, the ``RssBlock``.
     the CmfBlockBundle, but this one is more powerful as it allows to define a
     specific feed URL per block instance.
 
-Create a block document
+Create a Block Document
 -----------------------
 
 The first thing you need is a document that contains the options and indicates
 the location where the RSS feed should be shown. The easiest way is to extend
 ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\AbstractBlock``, but you are
-free to do create your own document. At least, you have to implement
+free to do create your own document as long as it implements
 ``Sonata\BlockBundle\Model\BlockInterface``. In your document, you
 need to define the ``getType`` method which returns the type name of your block,
 for instance ``rss_block``::
@@ -292,9 +292,8 @@ on the current page:
 
     This mechanism is not recommended. For optimal load times, it is better
     to have a central assets definition for your project and aggregate them
-    into a single Stylesheet and a single JavaScript file, e.g. with Assetic_,
-    rather than having individual ``<link>`` and ``<script>`` tags for each
-    single file.
+    into a single Stylesheet and a single JavaScript file, rather than having
+    individual ``<link>`` and ``<script>`` tags for each single file.
 
 Register the Block Service
 --------------------------
@@ -345,5 +344,3 @@ handles, as per the ``getType`` method of the block. The second argument is the
             ))
             ->addTag('sonata.block')
         ;
-
-.. _Assetic: https://symfony.com/doc/current/cookbook/assetic/asset_management.html
diff --git a/bundles/block/introduction.rst b/bundles/block/introduction.rst
index d3542c0d..ba9fdca6 100644
--- a/bundles/block/introduction.rst
+++ b/bundles/block/introduction.rst
@@ -9,8 +9,8 @@ BlockBundle
     manage fragments of content, so-called blocks, that are persisted in a
     database and can be incorporated into any page layout.
 
-The CmfBlockBundle also provides a few commonly used standard blocks,
-including the ability to edit them. See :doc:`types`.
+The CmfBlockBundle also provides a few commonly used standard blocks.
+See :doc:`types`.
 
 Installation
 ------------
@@ -151,6 +151,8 @@ specific settings for one of the block classes.
     :ref:`Block Sonata Admin Extension <bundles-block-types-admin_extension>`
     that adds editing of the ``BaseBlock`` general block options.
 
+.. _bundle-block-updated-sonata-defaults:
+
 Updated SonataBlockBundle Defaults
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -193,7 +195,7 @@ your block in the repository. You can do so with the following code snippet::
 
     $dm->persist($myBlock);
 
-Note the ``sidebarBlock`` is the identifier we chose for the block. Together
+The name ``sidebarBlock`` is the identifier we chose for the block. Together
 with the parent document of the block, this defines the unique identifier of
 the block. The other properties (title and body) are specific to the
 ``Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\SimpleBlock``.
@@ -293,12 +295,11 @@ Embedding Blocks in WYSIWYG Content
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 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
-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).
+scans through a 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. This
+feature is a rather hacky solution for web editors to place blocks anywhere in
+their HTML content. If you can, render your blocks directly in the template.
+A better solution would be to build composed pages is to build it from blocks.
 
 .. configuration-block::
 
@@ -317,9 +318,6 @@ might be a CMF bundle at some point for 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.
-    This feature conflicts with the front-end 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`_.
 
 When you apply the filter, your users can use this tag to embed a block in
 their content:
@@ -389,22 +387,10 @@ See also the :ref:`the configuration reference <reference-config-block-twig-cmf-
     block and returns an empty string for each failed block instead. The errors
     are logged at level WARNING.
 
-SonataAdminBundle Integration
------------------------------
-
-The BlockBundle also provides Admin classes to enable creating, editing and
-removing blocks from the admin panel. To enable the admin, use the
-``cmf_block.persistence.phpcr.use_sonata_admin`` setting. Both the
-:ref:`BlockBundle <bundles-block-types-admin_extension>` and
-:ref:`CoreBundle <bundles-core-persistence>` provide several extensions for
-SonataAdminBundle.
-
 Examples
 --------
 
 You can find example usages of this bundle in the `Symfony CMF Sandbox`_
-(have a look at the BlockBundle). It also shows you how to make blocks
-editable using the :doc:`CreateBundle <../create/introduction>`.
 
 Read on
 -------
@@ -420,4 +406,3 @@ Read on
 .. _`Symfony CMF Sandbox`: https://github.com/symfony-cmf/cmf-sandbox
 .. _`prepended configuration`: https://symfony.com/doc/current/components/dependency_injection/compilation.html#prepending-configuration-passed-to-the-extension
 .. _`SonataBlockBundle`: https://github.com/sonata-project/SonataBlockBundle
-.. _`discussion how to fix this`: https://github.com/symfony-cmf/block-bundle/issues/143
diff --git a/bundles/block/relation_to_sonata_block_bundle.rst b/bundles/block/relation_to_sonata_block_bundle.rst
index b4209e39..3ad16da9 100644
--- a/bundles/block/relation_to_sonata_block_bundle.rst
+++ b/bundles/block/relation_to_sonata_block_bundle.rst
@@ -1,7 +1,7 @@
 Relation to Sonata Block Bundle
 ===============================
 
-The Symfony2 CMF BlockBundle is based on the `SonataBlockBundle`_.  It replaces
+The Symfony CMF BlockBundle is based on the `SonataBlockBundle`_.  It replaces
 components of the SonataBlockBundle where needed to be compatible with PHPCR.
 
 Class Diagram
diff --git a/bundles/block/types.rst b/bundles/block/types.rst
index 9e001bcf..3feeea67 100644
--- a/bundles/block/types.rst
+++ b/bundles/block/types.rst
@@ -28,71 +28,8 @@ information.
 Sonata Admin
 ~~~~~~~~~~~~
 
-All block types provided by the Symfony2 CMF BlockBundle come with an admin
-classes for SonataDoctrinePHPCRAdminBundle_. To activate the admin services,
-it is enough to load the SonataDoctrinePHPCRAdminBundle in your application
-kernel and configure the sonata dashboard as desired.
-
-.. _bundles-block-types-admin_extension:
-
-Sonata Admin Extension for Basic Block Settings
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This bundle also provides a sonata admin *extension* that you can activate.
-It adds a tab to edit settings of basic block options like the time to life
-(TTL, for caching purposes).
-
-Assuming your blocks extend the ``BaseBlock`` class (as all blocks provided by
-the CMF BlockBundle do), you can add the following lines to your sonata admin
-configuration.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        sonata_admin:
-            extensions:
-                cmf_block.admin_extension.cache:
-                    extends:
-                        - Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock
-
-    .. code-block:: xml
-
-        <!-- app/config/config.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">
-
-            <config xmlns="http://sonata-project.org/schema/dic/admin">
-                <extension id="cmf_block.admin_extension.cache">
-                    <extend>Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock</extend>
-                </extension>
-            </config>
-        </container>
-
-    .. code-block:: php
-
-        // app/config/config.php
-        $container->loadFromExtension('sonata_admin', array(
-            'extensions' => array(
-                'cmf.block.admin_extension.cache' => array(
-                    'extends' => array(
-                        'Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock',
-                    ),
-                ),
-            ),
-        ));
-
-.. note::
-
-    Admin extensions are a way to configure editing of common features on several
-    ``Admin`` classes without needing them to extend each other. If you want to
-    learn more about them, please read on in `Sonata Admin Extensions`_ for more
-    details.
-
-.. _bundle-block-updated-sonata-defaults:
-
+Each block type provided by the CmfBlockBundle is supported with an admin
+service in :doc:`CmfSonataPhpcrAdminIntegrationBundle <../sonata_phpcr_admin_integration/block>`
 
 StringBlock
 -----------
@@ -138,9 +75,6 @@ rendering the block.
 
 .. _bundles-block-menu:
 
-.. versionadded:: 1.1
-    The MenuBlock was introduced in CmfBlockBundle 1.1.
-
 MenuBlock
 ---------
 
@@ -366,65 +300,7 @@ your slideshow code to work, you can override
 ``BlockBundle:Block:block_slideshow.html.twig`` and/or the templates of the
 blocks you use as slideshow items and adapt them to your needs.
 
-Use the Sonata admin class
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The BlockBundle comes with a sonata admin class for managing slideshow blocks.
-All you need to do to administrate slideshows in your project is to add the
-following line to your sonata admin configuration:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        sonata_admin:
-            dashboard:
-                groups:
-                    blocks:
-                        label: Blocks
-                        items:
-                            - cmf_block.imagine.slideshow_admin
-
-    .. code-block:: xml
-
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services">
-
-            <config xmlns="http://example.org/schema/dic/sonata_admin">
-                <dashboard>
-                    <group id="blocks"
-                        label="Blocks">
-                        <item>cmf_block.imagine.slideshow_admin</item>
-                    </group>
-                </dashboard>
-            </config>
-
-        </container>
-
-    .. code-block:: php
-
-        $container->loadFromExtension('sonata_admin', array(
-            'dashboard' => array(
-                'groups' => array(
-                    'blocks' => array(
-                        'label' => 'Blocks',
-                        'items' => array(
-                            'cmf_block.imagine.slideshow_admin',
-                        ),
-                    ),
-                ),
-            ),
-        ));
-
-However, you can also embed the slideshow administration directly into
-other admin classes using the ``sonata_type_admin`` form type. The admin
-service to use in that case is ``cmf_block.slideshow_admin``.
-Please refer to the `Sonata Admin documentation`_
-for further information.
-
 .. _`Symfony CMF Sandbox`: https://github.com/symfony-cmf/cmf-sandbox
-.. _`Sonata Admin documentation`: https://sonata-project.org/bundles/admin/master/doc/reference/form_types.html
-.. _`Sonata Admin Extensions`: https://sonata-project.org/bundles/admin/master/doc/reference/extensions.html
 .. _`LiipImagineBundle`: https://github.com/liip/LiipImagineBundle
 .. _`LiipImagineBundle documentation`: https://github.com/liip/LiipImagineBundle/tree/master/Resources/doc
 .. _`sub-request`: https://symfony.com/doc/current/components/http_kernel/introduction.html#http-kernel-sub-requests
diff --git a/bundles/sonata_phpcr_admin_integration/block.rst b/bundles/sonata_phpcr_admin_integration/block.rst
new file mode 100644
index 00000000..9c7d218e
--- /dev/null
+++ b/bundles/sonata_phpcr_admin_integration/block.rst
@@ -0,0 +1,202 @@
+BlockBundle
+===========
+
+This bundle provides Admin classes for all block types. Additionally, it
+provides an admin extension to generically edit block options.
+
+Configuration
+-------------
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        cmf_sonata_phpcr_admin_integration:
+            bundles:
+                block:
+                    enabled: false
+                    basepath: ~
+                    enable_menu: auto
+                    menu_basepath: ~
+
+    .. 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/sonata-phpcr-admin-integration">
+                <bundles>
+                    <block
+                        enabled="false"
+                        basepath="null"
+                        enable-menu="auto"
+                        menu-basepath="null"
+                    />
+                </bundles>
+            </config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('cmf_sonata_phpcr_admin_integration', [
+            'bundles' => [
+                'block' => [
+                    'enabled' => false,
+                    'basepath' => null,
+                    'enable_menu' => 'auto',
+                    'menu_basepath' => null,
+                ],
+            ],
+        ];
+
+.. include:: ../_partials/sonata_admin_enabled.rst.inc
+
+Each admin service name follows the naming pattern
+``cmf_sonata_phpcr_admin_integration.block.<type>_admin``. For example, the
+slideshow admin service is called ``cmf_sonata_phpcr_admin_integration.block.slideshow_admin``.
+
+``basepath``
+************
+
+**type**: ``string`` **default**: first value of ``cmf_block.persistence.phpcr.block_basepaths``
+
+The path at which to create blocks with Sonata admin when you don't attach them to documents.
+
+``menu_enabled``
+****************
+
+**type**: ``enum`` **valid values**: ``true|false|auto`` **default**: ``auto``
+
+Whether to enable the menu block. This requires the CmfMenuBundle to be
+available in your application. When left at ``auto``, the menu block is
+automatically enabled if the CmfMenuBundle is available.
+
+``menu_basepath``
+*****************
+
+**type**: ``string`` **default**: ``cmf_menu.persistence.phpcr.menu_basepath``
+
+The basepath to select the menu subtree for a menu block. Only useful if
+``menu_enabled`` is not false.
+
+.. _bundles-block-types-admin_extension:
+
+Sonata Admin Extension for Basic Block Settings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This bundle provides an extension to edit basic settings of block options like
+the time to life (TTL, for caching purposes).
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        cmf_sonata_phpcr_admin_integration:
+            bundles:
+                block:
+                    extensions:
+                        block_cache:
+                            form_group: form.group_metadata
+                            form_tab:   form.tab_general
+
+    .. 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/sonata-phpcr-admin-integration">
+                <bundles>
+                    <block>
+                        <extensions>
+                            <block-cache form-group="form.group_metadata" form-tab="form.tab_general"/>
+                        </extensions>
+                    </block>
+                </bundles>
+            </config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('cmf_sonata_phpcr_admin_integration', [
+            'bundles' => [
+                'block' => [
+                    'extensions' => [
+                        'block_cache' => [
+                            'form_group' => 'form.group_metadata',
+                            'form_tab' => 'form.tab_general',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+
+``form_group``
+**************
+
+**type**: ``string`` **default**: ``form.group_metadata``
+
+.. include:: ../_partials/sonata_admin_form_group.rst.inc
+
+``form_tab``
+************
+
+**type**: ``string`` **default**: ``form.tab_general``
+
+.. include:: ../_partials/sonata_admin_form_tab.rst.inc
+
+Using the extension
+~~~~~~~~~~~~~~~~~~~
+
+To activate the extension in your admin classes, define the extension
+configuration in the ``sonata_admin`` section of your project configuration.
+
+Assuming your blocks extend the ``BaseBlock`` class (as all blocks provided by
+the CMF BlockBundle do), you can add the following lines to your sonata admin
+configuration:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        sonata_admin:
+            extensions:
+                cmf_block.admin_extension.cache:
+                    extends:
+                        - Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock
+
+    .. code-block:: xml
+
+        <!-- app/config/config.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">
+
+            <config xmlns="http://sonata-project.org/schema/dic/admin">
+                <extension id="cmf_block.admin_extension.cache">
+                    <extend>Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock</extend>
+                </extension>
+            </config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('sonata_admin', array(
+            'extensions' => array(
+                'cmf.block.admin_extension.cache' => array(
+                    'extends' => array(
+                        Symfony\Cmf\Bundle\BlockBundle\Model\AbstractBlock::class,
+                    ),
+                ),
+            ),
+        ));
+
+See the `Sonata Admin extensions documentation`_ for more information.
+
+.. _`Sonata Admin extensions documentation`: https://sonata-project.org/bundles/admin/master/doc/reference/extensions.html
diff --git a/bundles/sonata_phpcr_admin_integration/index.rst b/bundles/sonata_phpcr_admin_integration/index.rst
index 2db7f92a..c4149cf7 100644
--- a/bundles/sonata_phpcr_admin_integration/index.rst
+++ b/bundles/sonata_phpcr_admin_integration/index.rst
@@ -8,6 +8,7 @@ SonataPhpcrAdminIntegrationBundle
     core
     content
     menu
+    block
     routing
     routing_auto
     seo
diff --git a/bundles/sonata_phpcr_admin_integration/introduction.rst b/bundles/sonata_phpcr_admin_integration/introduction.rst
index 87f18903..a41394fe 100644
--- a/bundles/sonata_phpcr_admin_integration/introduction.rst
+++ b/bundles/sonata_phpcr_admin_integration/introduction.rst
@@ -97,6 +97,59 @@ config:
             ],
         ]);
 
+Adding Admins to the Dashboard
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To see an admin on the dashboard, configure the Sonata Admin accordingly. For
+example, to add the routing admin, you would add the following configuration:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        sonata_admin:
+            dashboard:
+                groups:
+                    blocks:
+                        label: URLs
+                        items:
+                            - cmf_sonata_phpcr_admin_integration.routing.route_admin
+
+    .. code-block:: xml
+
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services">
+
+            <config xmlns="http://example.org/schema/dic/sonata_admin">
+                <dashboard>
+                    <group id="blocks"
+                        label="URLs">
+                        <item>cmf_sonata_phpcr_admin_integration.routing.route_admin</item>
+                    </group>
+                </dashboard>
+            </config>
+
+        </container>
+
+    .. code-block:: php
+
+        $container->loadFromExtension('sonata_admin', array(
+            'dashboard' => array(
+                'groups' => array(
+                    'blocks' => array(
+                        'label' => 'URLs',
+                        'items' => array(
+                            'cmf_sonata_phpcr_admin_integration.routing.route_admin',
+                        ),
+                    ),
+                ),
+            ),
+        ));
+
+You can also embed an admin directly into other admin classes using the
+``sonata_type_admin`` form type. Please refer to the `Sonata Admin documentation`_
+for further information.
+
 Configuration
 -------------
 
@@ -125,3 +178,4 @@ Learn More
 .. _SonataDoctrinePhpcrAdminBundle: https://sonata-project.org/bundles/doctrine-phpcr-admin/1-x/doc/index.html
 .. _its official installation guide: https://sonata-project.org/bundles/doctrine-phpcr-admin/1-x/doc/reference/installation.html
 .. _SonataAdminBundle: https://sonata-project.org/bundles/admin/3-x/doc/index.html
+.. _`Sonata Admin documentation`: https://sonata-project.org/bundles/admin/master/doc/reference/form_types.html
diff --git a/bundles/sonata_phpcr_admin_integration/routing.rst b/bundles/sonata_phpcr_admin_integration/routing.rst
index 68cf56c2..5b148356 100644
--- a/bundles/sonata_phpcr_admin_integration/routing.rst
+++ b/bundles/sonata_phpcr_admin_integration/routing.rst
@@ -91,7 +91,6 @@ RouteReferrersInterface Admin Extension
 This bundle provides an extension to edit referring routes for content that
 implements the ``RouteReferrersInterface``.
 
-
 You can define the form group and tab to be used by the field this extension
 adds: