Merge branch '1.1' into 1.2

Conflicts:
	_exts

Author: wouterj

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "_exts"]
-	path = _exts
-	url = http://github.com/fabpot/sphinx-php

bundles/block/introduction.rst

@@ -18,6 +18,29 @@ Installation
 You can install this bundle `with composer`_ using the
 `symfony-cmf/block-bundle`_ package.
 
+As the bundle is using the `SonataBlockBundle`_, you need to instantiate some
+sonata bundles in addition to the CmfBlockBundle::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+                new Sonata\BlockBundle\SonataBlockBundle(),
+                new Sonata\CoreBundle\SonataCoreBundle(),
+                new Symfony\Cmf\Bundle\BlockBundle\CmfBlockBundle(),
+            );
+
+            // ...
+        }
+
+        // ...
+    }
+
 .. _bundle-block-configuration:
 
 Usage

bundles/media/introduction.rst

@@ -40,11 +40,13 @@ persisted using Doctrine PHPCR-ODM, Doctrine ORM or something else.
 Installation
 ------------
 
-1. You can install the bundle via Composer (``symfony-cmf/media-bundle`` on
-   `Packagist`_).
+You can install this bundle `with composer`_ using the
+`symfony-cmf/media-bundle`_ package.
 
-2. When using the file and image controller for downloading, uploading and
-   displaying, add the following lines to the end of your routing file:
+Configuration
+-------------
+When using the file and image controller for downloading, uploading and
+displaying, add the following lines to your routing file:
 
    .. configuration-block::
 
@@ -88,14 +90,14 @@ Installation
 
            return $collection;
 
-3. For now, the only supported persistence layer is PHPCR. If you enabled PHPCR
-   on the CoreBundle, you need to do nothing here. If you do not have the
-   CMF CoreBundle in your project, you need to configure
-   ``cmf_media.persistence.phpcr.enabled: true``.
+For now, the only supported persistence layer is PHPCR. If you enabled PHPCR
+on the CoreBundle, you need to do nothing here. If you do not have the
+CmfCoreBundle in your project, you need to configure
+``cmf_media.persistence.phpcr.enabled: true``.
 
-4. For PHPCR, run the ``doctrine:phpcr:repository:init`` command, to have the
-   base paths initialized, using the
-   :ref:`repository initializers <phpcr-odm-repository-initializers>`.
+Then run the ``doctrine:phpcr:repository:init`` command, to have the base paths
+initialized, using the
+:ref:`repository initializers <phpcr-odm-repository-initializers>`.
 
 Interfaces
 ----------
@@ -266,8 +268,9 @@ and Symfony bundles:
 * :doc:`adapters/elfinder`
 * :doc:`adapters/gaufrette`
 
+.. _`symfony-cmf/media-bundle`: https://packagist.org/packages/symfony-cmf/media-bundle
+.. _`with composer`: http://getcomposer.org
 .. _`MediaBundle`: https://github.com/symfony-cmf/MediaBundle#readme
-.. _`Packagist`: https://packagist.org/packages/symfony-cmf/media-bundle
 .. _`KnpLabs/Gaufrette`: https://github.com/KnpLabs/Gaufrette
 .. _`phpcr/phpcr-utils`: https://github.com/phpcr/phpcr-utils
 .. _`jms/serializer-bundle`: https://github.com/schmittjoh/JMSSerializerBundle

bundles/menu/introduction.rst

@@ -26,6 +26,28 @@ Installation
 You can install this bundle `with composer`_ using the
 `symfony-cmf/menu-bundle`_ package.
 
+As the bundle is using the `KnpMenuBundle`_, you need to instantiate that
+bundles in addition to the CmfMenuBundle::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+                new Knp\Bundle\MenuBundle\KnpMenuBundle(),
+                new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
+            );
+
+            // ...
+        }
+
+        // ...
+    }
+
 Creating a Simple Persistent Menu
 ---------------------------------
 

bundles/phpcr_odm/introduction.rst

@@ -52,9 +52,27 @@ If you want to use PHPCR-ODM, you additionally need to require
         ...
     }
 
-Besides ``Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle`` you also need to
-instantiate the ``Doctrine\Bundle\DoctrineBundle\DoctrineBundle`` in your app
-kernel.
+Besides the ``DoctrinePHPCRBundle`` you also need to instantiate the base
+``DoctrineBundle`` in your kernel::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+                new Doctrine\Bundle\PHPCRBundle\DoctrinePHPCRBundle(),
+                new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            );
+
+            // ...
+        }
+
+        // ...
+    }
 
 Configuration
 -------------

bundles/routing_auto/introduction.rst

@@ -18,6 +18,28 @@ Installation
 You can install this bundle `with composer`_ using the
 `symfony-cmf/routing-auto-bundle`_ package.
 
+This bundle is based on the :doc:`../routing/index`, and you need to
+instantiate both bundles::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+                new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
+                new Symfony\Cmf\Bundle\RoutingAutoBundle\CmfRoutingAutoBundle(),
+            );
+
+            // ...
+        }
+
+        // ...
+    }
+
 Features
 --------
 

bundles/seo/introduction.rst

@@ -10,8 +10,8 @@ Installation
 You can install this bundle `with composer`_ using the
 ``symfony-cmf/seo-content-bundle`` package on `Packagist`_.
 
-Both the CmfSeoBundle and SonataSeoBundle must be registered in the
-``AppKernel``::
+This bundle extends the SonataSeoBundle which must be registered in the
+kernel as well::
 
     // app/appKernel.php
 

bundles/simple_cms/introduction.rst

@@ -30,6 +30,30 @@ Installation
 You can install this bundle `with composer`_ using the
 ``symfony-cmf/simple-cms-bundle`` package on `Packagist`_.
 
+This bundle integrates the routing, content and menu bundles of the CMF. All of
+them and their dependencies need to be instantiated in the kernel::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+                new Knp\Bundle\MenuBundle\KnpMenuBundle(),
+                new Symfony\Cmf\Bundle\MenuBundle\CmfMenuBundle(),
+                new Symfony\Cmf\Bundle\ContentBundle\CmfContentBundle(),
+                new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
+            );
+
+            // ...
+        }
+
+        // ...
+    }
+
 Sections
 --------
 

tutorial/getting-started.rst

@@ -89,7 +89,7 @@ Now you can generate the bundle in which you will write most of your code:
 
 .. code-block:: bash
 
-    $ php app/console generate:bundle --namespace=Acme/BasicCmsBundle --dir=src --no-interaction
+    $ php app/console generate:bundle --namespace=Acme/BasicCmsBundle --dir=src --format=yml --no-interaction
 
 The Documents
 .............