Merge pull request #551 from symfony-cmf/revisiting_structure

[WIP] Revisiting structure part 1

Author: wouterj

book/handling_multilang.rst

@@ -152,8 +152,8 @@ Sonata PHPCR-ODM Admin
 
     Using sonata admin is one way to make your content editable. A book
     chapter on sonata admin is planned. Meanwhile, read
-    :doc:`Sonata Admin <../cookbook/creating_a_cms/sonata-admin>` in the
-    "Creating a CMS" tutorial.
+    :doc:`Sonata Admin <../tutorial/sonata-admin>` in the "Creating a CMS"
+    tutorial.
 
 The first step is to configure sonata admin. You should place the
 LuneticsLocaleBundle language switcher in the ``topnav`` bar.  To do this,

book/installation.rst

@@ -215,7 +215,7 @@ Adding new pages
 
 Symfony CMF SE does not provide any admin tools to create new pages. If you
 are interested in adding an admin UI one solution can be found in
-:doc:`../cookbook/creating_a_cms/sonata-admin`. However, if all you want
+:doc:`../tutorial/sonata-admin`. However, if all you want
 is a simple way to add new pages that you can then edit via the inline
 editing, then you can use the SimpleCmsBundle ``page`` migrator. For example,
 to add a page called "Testing", creating a file called

book/static_content.rst

@@ -60,7 +60,7 @@ SonataDoctrinePHPCRAdminBundle_, a back office generation tool.
 In ContentBundle, the required administration panels are already declared in
 the ``Admin`` folder and configured in ``Resources/config/admin.xml``, and
 will automatically be loaded if you install the SonataDoctrinePHPCRAdminBundle
-(refer to :doc:`../cookbook/creating_a_cms/sonata-admin` for
+(refer to :doc:`../tutorial/sonata-admin` for
 instructions on that).
 
 Configuration

book/structuring_content.rst

@@ -164,8 +164,8 @@ SonataDoctrinePHPCRAdminBundle_.
 
 The included administration panels are automatically available but need to
 be explicitly put on the dashboard if you want to use them. See
-:doc:`../cookbook/creating_a_cms/sonata-admin` for instructions on how
-to install SonataDoctrinePHPCRAdminBundle.
+:doc:`../tutorial/sonata-admin` for instructions on how to install
+SonataDoctrinePHPCRAdminBundle.
 
 Configuration
 ~~~~~~~~~~~~~

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