Corrections

Author: dantleech

bundles/block/create_your_own_blocks.rst

@@ -62,12 +62,14 @@ create a service that knows how to handle ``RssBlocks``:
 * The method ``setDefaultSettings`` configures a template, title, url and the
   maximum amount of items::
 
+    
+    // src/Acme/MainBundle/Block/RssBlockService.php
     use Symfony\Component\OptionsResolver\OptionsResolverInterface;
     use Symfony\Component\HttpFoundation\Response;
     use Sonata\BlockBundle\Block\BaseBlockService;
     use Sonata\BlockBundle\Block\BlockContextInterface;
 
-    class RssBlockService extends extends BaseBlockService
+    class RssBlockService extends BaseBlockService
     {
         // ...
         public function setDefaultSettings(OptionsResolverInterface $resolver)

bundles/block/introduction.rst

@@ -25,6 +25,44 @@ You can install the bundle in 2 different ways:
 Usage
 -----
 
+The BlockBundle needs a persistence layer to be configured. This can either be
+done globally with the :ref:`Core Bundle <bundles-core-persistence>` or
+individually as follows:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        cmf_core:
+            persistence:
+                phpcr:
+                    block_basepath: /cms/content
+
+    .. code-block:: xml
+
+        <?xml version="1.0" charset="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services">
+
+            <config xmlns="http://cmf.symfony.com/schema/dic/core">
+                <persistence>
+                    <phpcr
+                        block-basepath="/cms/block"
+                    />
+                </persistence>
+            </config>
+
+        </container>
+
+    .. code-block:: php
+
+        $container->loadFromExtension('cmf_core', array(
+            'persistence' => array(
+                'phpcr' => array(
+                    'block_basepath' => '/cms/block',
+                ),
+            ),
+        ));
+
 The default settings of a block are defined in the block service. If you use a
 third party block, you might want to alter these for your application. Use the
 ``sonata_block`` key for this. You can define default settings for a block

bundles/core/index.rst

@@ -8,5 +8,5 @@ CoreBundle
     publish_workflow
     dependency_injection_tags
     templating
-    multilang
+    persistence
     forms

bundles/core/introduction.rst

@@ -31,6 +31,6 @@ Sections
 * :doc:`publish_workflow`
 * :doc:`dependency_injection_tags`
 * :doc:`templating`
-* :doc:`multilang`
+* :doc:`persistence`
 
 .. _`Packagist`: https://packagist.org/packages/symfony-cmf/core-bundle

bundles/core/multilang.rst renamed to bundles/core/persistence.rst

@@ -1,8 +1,45 @@
 .. index::
     single: Multi-Language; CoreBundle
 
-Multi-language support
-----------------------
+.. _bundles-core-persistence:
+
+Persistence
+-----------
+
+The CoreBundle lets you to centrally configure the persistence layer for all
+CMF bundles.
+
+To make the PHPCR-ODM the default persistence layer for all CMF bundles add
+the following to your main configuration file:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        cmf_core:
+            persistence:
+                phpcr: ~
+
+    .. code-block:: xml
+
+        <?xml version="1.0" charset="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services">
+
+            <config xmlns="http://cmf.symfony.com/schema/dic/core">
+                <persistence>
+                    <phpcr />
+                </persistence>
+            </config>
+
+        </container>
+
+    .. code-block:: php
+
+        $container->loadFromExtension('cmf_core', array(
+            'persistence' => array(
+                'phpcr' => array(),
+            ),
+        ));
 
 .. _bundles-core-multilang-persisting_multilang_documents:
 
@@ -52,6 +89,7 @@ enforce a single translation strategy for all documents:
         $container->loadFromExtension('cmf_core', array(
             'persistence' => array(
                 'phpcr' => array(
+                    'translation_strategy' => 'attribute',
                 ),
             ),
         ));

bundles/menu/menu_documents.rst

@@ -105,7 +105,7 @@ locale to be set via. the ``setLocale`` method::
     $menuItem = ...;
     $menuItem->setLocale('fr');
 
-See :doc:`../core/multilang`.
+See :ref:`Persisting Multilang Documents <bundles-core-multilang-persisting_multilang_documents>` for more details.
 
 Publish Workflow
 ~~~~~~~~~~~~~~~~

cookbook/create_basic_cms_auto_routing.rst

@@ -597,7 +597,7 @@ In summary:
   ``/if/this/is/a/path`` then the ``content_path``
   represents ``/if/this/is/a``;
 * Each element under ``content_path`` represents a section of the URL;
-* The first element ``block_path`` uses a *provider* which *specifies* a
+* The first element ``blog_path`` uses a *provider* which *specifies* a
   path. If that path exists then it will do nothing;
 * The second element uses the ``content_datetime`` provider, which will
   use a ``DateTime`` object returned from the specified method on the