Merged reference into the bundle docs

Author: wouterj

reference/configuration/partials/persistence_phpcr_enabled.rst.inc renamed to bundles/_partials/persistence_phpcr_enabled.rst.inc

@@ -1,10 +1,9 @@
-BlockBundle Configuration
-=========================
+Configuration Reference
+=======================
 
-The BlockBundle provides integration with SonataBlockBundle and can be
-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 can be 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 the integration work seamlessly. See the
@@ -114,7 +113,7 @@ is the following configuration:
 enabled
 """""""
 
-.. include:: partials/persistence_phpcr_enabled.rst.inc
+.. include:: ../_partials/persistence_phpcr_enabled.rst.inc
 
 block_basepath
 """"""""""""""
@@ -123,13 +122,13 @@ block_basepath
 
 The basepath for blocks in the PHPCR tree.
 
-If the :doc:`CoreBundle <../../bundles/core/index>` is registered, this will default to
+If the :doc:`CoreBundle <../core/introduction` is registered, this will default to
 the value of ``%cmf_core.persistence.phpcr.basepath%/content``.
 
 manager_name
 """"""""""""
 
-.. include:: partials/persistence_phpcr_manager_name.rst.inc
+.. include:: ../_partials/persistence_phpcr_manager_name.rst.inc
 
 string_document_class
 """""""""""""""""""""
@@ -192,7 +191,7 @@ use_sonata_admin
 If ``true``, the admin classes are activated. If set to ``auto``, they are
 activated only if the SonataPhpcrAdminBundle is present.
 
-If the :doc:`CoreBundle <../../bundles/core/index>` is registered, this will default to the value
+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
@@ -417,3 +416,4 @@ token
 A unique secret key. A random one is generated by default.
 
 .. _`SonataCacheBundle`: https://github.com/sonata-project/SonataCacheBundle
+

reference/configuration/partials/persistence_phpcr_manager_name.rst.inc renamed to bundles/_partials/persistence_phpcr_manager_name.rst.inc

@@ -9,3 +9,4 @@ BlockBundle
     create_your_own_blocks
     cache
     relation_to_sonata_block_bundle
+    configuration

reference/configuration/partials/persistence_phpcr_sonata_admin_enabled.rst.inc renamed to bundles/_partials/persistence_phpcr_sonata_admin_enabled.rst.inc

@@ -390,6 +390,7 @@ Read on
 * :doc:`create_your_own_blocks`
 * :doc:`cache`
 * :doc:`relation_to_sonata_block_bundle`
+* :doc:`configuration`
 
 .. _`symfony-cmf/block-bundle`: https://packagist.org/packages/symfony-cmf/block-bundle
 .. _`with composer`: http://getcomposer.org

reference/configuration/block.rst renamed to bundles/block/configuration.rst

@@ -1,9 +1,8 @@
-ContentBundle configuration
-===========================
+Configuration Reference
+=======================
 
-The ContentBundle provides a document and controller for static content and
-can be configured under the ``cmf_content`` key in your application
-configuration. When using XML, you can use the
+The ContentBundle can be configured under the ``cmf_content`` key in your
+application configuration. When using XML, you can use the
 ``http://cmf.symfony.com/schema/dic/content`` namespace.
 
 Configuration
@@ -74,7 +73,7 @@ is the following configuration:
 enabled
 *******
 
-.. include:: partials/persistence_phpcr_enabled.rst.inc
+.. include:: ../_partials/persistence_phpcr_enabled.rst.inc
 
 admin_class
 ***********
@@ -106,5 +105,5 @@ If ``true``, the admin classes for SimpleCmsBundle pages are activated. If set
 to ``auto``, the admin services are activated only if the
 SonataPhpcrAdminBundle is present.
 
-If the :doc:`CoreBundle <../../bundles/core/index>` is registered, this will
+If the :doc:`CoreBundle <../core/introduction>` is registered, this will
 default to the value of ``cmf_core.persistence.phpcr.use_sonata_admin``.

bundles/block/index.rst

@@ -5,3 +5,4 @@ ContentBundle
     :maxdepth: 2
 
     introduction
+    configuration

bundles/block/introduction.rst

@@ -226,5 +226,10 @@ removing static content from the admin panel. To enable the admin, use the
 also provides :ref:`several useful extensions <bundles-core-persistence>` for
 SonataAdminBundle.
 
+Read On
+-------
+
+* :doc:`configuration`
+
 .. _`with composer`: http://getcomposer.org
 .. _`symfony-cmf/content-bundle`: https://packagist.org/packages/symfony-cmf/content-bundle

reference/configuration/content.rst renamed to bundles/content/configuration.rst

@@ -1,9 +1,9 @@
-CoreBundle Configuration
-========================
+Configuration Reference
+=======================
 
-The CoreBundle provides infrastructure for other CMF bundles and can be configured
-under the ``cmf_core`` key in your application configuration. When using
-XML, you can use the ``http://cmf.symfony.com/schema/dic/core`` namespace.
+The CoreBundle can be configured under the ``cmf_core`` key in your application
+configuration. When using XML, you can use the
+``http://cmf.symfony.com/schema/dic/core`` namespace.
 
 Configuration
 -------------
@@ -117,19 +117,19 @@ is the following configuration:
 enabled
 """""""
 
-.. include:: partials/persistence_phpcr_enabled.rst.inc
+.. include:: ../_partials/persistence_phpcr_enabled.rst.inc
 
 Enabling this setting will also automatically enable the equivalent setting in the following Bundles:
 
-* :doc:`BlockBundle <../../bundles/block/introduction>`
-* :doc:`ContentBundle <../../bundles/content/introduction>`
-* :doc:`CreateBundle <../../bundles/create/introduction>`
-* :doc:`MediaBundle <../../bundles/media/introduction>`
-* :doc:`MenuBundle <../..//bundles/menu/index>`
-* :doc:`RoutingBundle <../../bundles/routing/introduction>`
-* :doc:`SearchBundle <../../bundles/search/introduction>`
-* :doc:`SimpleCmsBundle <../../bundles/simple_cms/introduction>`
-* :doc:`TreeBrowserCmsBundle <../../bundles/tree_browser/introduction>`
+* :doc:`BlockBundle <../block/introduction>`
+* :doc:`ContentBundle <../content/introduction>`
+* :doc:`CreateBundle <../create/introduction>`
+* :doc:`MediaBundle <../media/introduction>`
+* :doc:`MenuBundle <../menu/introduction`
+* :doc:`RoutingBundle <../routing/introduction>`
+* :doc:`SearchBundle <../search/introduction>`
+* :doc:`SimpleCmsBundle <../simple_cms/introduction>`
+* :doc:`TreeBrowserCmsBundle <../tree_browser/introduction>`
 
 basepath
 """"""""
@@ -140,13 +140,13 @@ The basepath for CMS documents in the PHPCR tree.
 
 Enabling this setting will also automatically enable the equivalent settings in the following Bundles:
 
-* :doc:`BlockBundle <../../bundles/block/introduction>`
-* :doc:`ContentBundle <../../bundles/content/introduction>`
-* :doc:`MediaBundle <../../bundles/media/introduction>`
-* :doc:`MenuBundle <../..//bundles/menu/index>`
-* :doc:`RoutingBundle <../../bundles/routing/introduction>`
-* :doc:`SearchBundle <../../bundles/search/introduction>`
-* :doc:`SimpleCmsBundle <../../bundles/simple_cms/introduction>`
+* :doc:`BlockBundle <../block/introduction>`
+* :doc:`ContentBundle <../content/introduction>`
+* :doc:`MediaBundle <../media/introduction>`
+* :doc:`MenuBundle <../menu/introduction>`
+* :doc:`RoutingBundle <../routing/introduction>`
+* :doc:`SearchBundle <../search/introduction>`
+* :doc:`SimpleCmsBundle <../simple_cms/introduction>`
 
 manager_registry
 """"""""""""""""
@@ -155,8 +155,8 @@ manager_registry
 
 Enabling this setting will also automatically enable the equivalent settings in the following Bundles:
 
-* :doc:`SearchBundle <../../bundles/search/introduction>`
-* :doc:`SimpleCmsBundle <../../bundles/simple_cms/introduction>`
+* :doc:`SearchBundle <../search/introduction>`
+* :doc:`SimpleCmsBundle <../simple_cms/introduction>`
 
 manager_name
 """"""""""""
@@ -168,12 +168,12 @@ retrieve the default manager.<persistence>
 
 Enabling this setting will also automatically enable the equivalent setting in the following Bundles:
 
-* :doc:`BlockBundle <../../bundles/block/introduction>`
-* :doc:`MediaBundle <../../bundles/media/introduction>`
-* :doc:`MenuBundle <../..//bundles/menu/index>`
-* :doc:`RoutingBundle <../../bundles/routing/introduction>`
-* :doc:`SearchBundle <../../bundles/search/introduction>`
-* :doc:`SimpleCmsBundle <../../bundles/simple_cms/introduction>`
+* :doc:`BlockBundle <../block/introduction>`
+* :doc:`MediaBundle <../media/introduction>`
+* :doc:`MenuBundle <../menu/introduction>`
+* :doc:`RoutingBundle <../routing/introduction>`
+* :doc:`SearchBundle <../search/introduction>`
+* :doc:`SimpleCmsBundle <../simple_cms/introduction>`
 
 use_sonata_admin
 """"""""""""""""
@@ -186,11 +186,11 @@ SonataPhpcrAdminBundle is present.
 
 Enabling this setting will also automatically enable the equivalent setting in the following Bundles:
 
-* :doc:`BlockBundle <../../bundles/block/introduction>`
-* :doc:`ContentBundle <../../bundles/content/introduction>`
-* :doc:`MenuBundle <../..//bundles/menu/index>`
-* :doc:`RoutingBundle <../../bundles/routing/introduction>`
-* :doc:`SimpleCmsBundle <../../bundles/simple_cms/introduction>`
+* :doc:`BlockBundle <../block/introduction>`
+* :doc:`ContentBundle <../content/introduction>`
+* :doc:`MenuBundle <../menu/introduction`
+* :doc:`RoutingBundle <../routing/introduction>`
+* :doc:`SimpleCmsBundle <../simple_cms/introduction>`
 
 translation_strategy
 """"""""""""""""""""
@@ -214,8 +214,8 @@ If multilang is enabled, the ``TranslatableExtension`` for
 ``SonataAdminBundle`` is enabled and the locales will be configured on all CMF
 bundles that use this configuration:
 
-* :doc:`RoutingBundle <../../bundles/routing/introduction>`
-* :doc:`SimpleCmsBundle <../../bundles/simple_cms/introduction>`
+* :doc:`RoutingBundle <../routing/introduction>`
+* :doc:`SimpleCmsBundle <../simple_cms/introduction>`
 
 .. configuration-block::
 

bundles/content/index.rst

@@ -10,3 +10,4 @@ CoreBundle
     templating
     persistence
     forms
+    configuration

bundles/content/introduction.rst

@@ -30,6 +30,7 @@ Sections
 * :doc:`dependency_injection_tags`
 * :doc:`templating`
 * :doc:`persistence`
+* :doc:`configuration`
 
 .. _`symfony-cmf/core-bundle`: https://packagist.org/packages/symfony-cmf/core-bundle
 .. _`with composer`: http://getcomposer.org

reference/configuration/core.rst renamed to bundles/core/configuration.rst

@@ -1,9 +1,8 @@
-CreateBundle configuration
-==========================
+Configuration Reference
+=======================
 
-The CreateBundle provides front-end editing based on create.js and CreatePHP.
-It can be configured under the ``cmf_create`` key in your application
-configuration. When using XML you should use the
+The CreateBundle can be configured under the ``cmf_create`` key in your
+application configuration. When using XML you should use the
 ``http://cmf.symfony.com/schema/dic/create`` namespace.
 
 .. note::
@@ -136,18 +135,18 @@ persistence for this bundle to work.
 enabled
 """""""
 
-.. include:: partials/persistence_phpcr_enabled.rst.inc
+.. include:: ../_partials/persistence_phpcr_enabled.rst.inc
 
 manager_name
 """"""""""""
 
-.. include:: partials/persistence_phpcr_manager_name.rst.inc
+.. include:: ../_partials/persistence_phpcr_manager_name.rst.inc
 
 image
 """""
 
 These settings are only used with the optional hallo editor. The default
-CKEditor uses the :doc:`ELfinder plugin <../../bundles/media/adapters/elfinder>`
+CKEditor uses the :doc:`ELfinder plugin <../media/adapters/elfinder>`
 provided by the MediaBundle.
 
 If you need different image handling, you can either overwrite

bundles/core/index.rst

@@ -5,5 +5,6 @@ CreateBundle
     :maxdepth: 2
 
     introduction
+    configuration
     other-editors
     developing-hallo

bundles/core/introduction.rst

@@ -513,6 +513,13 @@ configure the ``cmf_create.object_mapper_service_id``.
 CreatePHP would support specific mappers per RDFa type. If you need that, dig
 into the CreatePHP and CreateBundle and do a pull request to enable this feature.
 
+Read On
+-------
+
+* :doc:`developing-hallo`
+* :doc:`other-editors`
+* :doc:`configuration`
+
 
 .. _`create.js`: http://createjs.org
 .. _`hallo.js`: http://hallojs.org

reference/configuration/create.rst renamed to bundles/create/configuration.rst

@@ -11,6 +11,7 @@ library or they introduce a complete new concept.
   * :doc:`block/create_your_own_blocks`
   * :doc:`block/cache`
   * :doc:`block/relation_to_sonata_block_bundle`
+  * :doc:`block/configuration`
 
 * :doc:`core/index`
 
@@ -20,18 +21,21 @@ library or they introduce a complete new concept.
   * :doc:`core/templating`
   * :doc:`core/persistence`
   * :doc:`core/forms`
+  * :doc:`core/configuration`
 
 * :doc:`create/index`
 
   * :doc:`create/introduction`
   * :doc:`create/other-editors`
   * :doc:`create/developing-hallo`
+  * :doc:`create/configuration`
 
 * :doc:`media/index`
 
   * :doc:`media/introduction`
   * :doc:`media/form_types`
   * :doc:`media/adapters/index`
+  * :doc:`media/configuration`
 
 * :doc:`menu/index`
 
@@ -40,12 +44,14 @@ library or they introduce a complete new concept.
   * :doc:`menu/menu_factory`
   * :doc:`menu/menu_provider`
   * :doc:`menu/voters`
+  * :doc:`menu/configuration`
 
 * :doc:`routing/index`
 
   * :doc:`routing/introduction`
   * :doc:`routing/dynamic`
   * :doc:`routing/dynamic_customize`
+  * :doc:`routing/configuration`
 
 * :doc:`routing_auto/index` (in development)
 
@@ -57,16 +63,19 @@ library or they introduce a complete new concept.
 * :doc:`search/index`
 
   * :doc:`search/introduction`
+  * :doc:`search/configuration`
 
 * :doc:`seo/index`
 
   * :doc:`seo/introduction`
   * :doc:`seo/seo_aware`
   * :doc:`seo/extractors`
+  * :doc:`seo/configuration`
 
 * :doc:`tree_browser/index`
 
   * :doc:`tree_browser/introduction`
+  * :doc:`tree_browser/configuration`
 
 Showcase Bundles
 ~~~~~~~~~~~~~~~~
@@ -83,6 +92,7 @@ bundle based on the key bundles.
 * :doc:`content/index`
 
   * :doc:`content/introduction`
+  * :doc:`content/configuration`
 
 * :doc:`simple_cms/index`
 
@@ -91,6 +101,7 @@ bundle based on the key bundles.
   * :doc:`simple_cms/rendering`
   * :doc:`simple_cms/menus`
   * :doc:`simple_cms/extending_page_class`
+  * :doc:`simple_cms/configuration`
 
 Contributed Bundles
 ~~~~~~~~~~~~~~~~~~~
@@ -106,6 +117,7 @@ help with integrating PHPCR concepts into the Symfony Framework.
   * :doc:`phpcr_odm/fixtures_initializers`
   * :doc:`phpcr_odm/multilang`
   * :doc:`phpcr_odm/multiple_sessions`
+  * :doc:`phpcr_odm/configuration`
 
 * SonataDoctrinePHPCRAdminBundle_