Updated outdated references

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
 ~~~~~~~~~~~~~

bundles/block/configuration.rst

@@ -122,7 +122,7 @@ block_basepath
 
 The basepath for blocks in the PHPCR tree.
 
-If the :doc:`CoreBundle <../core/introduction` 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
@@ -191,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 <../core/introduction` 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

bundles/core/configuration.rst

@@ -125,7 +125,7 @@ Enabling this setting will also automatically enable the equivalent setting in t
 * :doc:`ContentBundle <../content/introduction>`
 * :doc:`CreateBundle <../create/introduction>`
 * :doc:`MediaBundle <../media/introduction>`
-* :doc:`MenuBundle <../menu/introduction`
+* :doc:`MenuBundle <../menu/introduction>`
 * :doc:`RoutingBundle <../routing/introduction>`
 * :doc:`SearchBundle <../search/introduction>`
 * :doc:`SimpleCmsBundle <../simple_cms/introduction>`
@@ -188,7 +188,7 @@ Enabling this setting will also automatically enable the equivalent setting in t
 
 * :doc:`BlockBundle <../block/introduction>`
 * :doc:`ContentBundle <../content/introduction>`
-* :doc:`MenuBundle <../menu/introduction`
+* :doc:`MenuBundle <../menu/introduction>`
 * :doc:`RoutingBundle <../routing/introduction>`
 * :doc:`SimpleCmsBundle <../simple_cms/introduction>`
 

bundles/media/configuration.rst

@@ -99,7 +99,7 @@ media_basepath
 
 The basepath for CMS media documents in the PHPCR tree.
 
-If the :doc:`CoreBundle <../core/introduction` is registered, this will default
+If the :doc:`CoreBundle <../core/introduction>` is registered, this will default
 to the value of ``%cmf_core.persistence.phpcr.basepath%/media``.
 
 manager_name

bundles/phpcr_odm/index.rst

@@ -10,3 +10,4 @@ DoctrinePHPCRBundle
     fixtures_initializers
     multilang
     multiple_sessions
+    configuration

bundles/phpcr_odm/introduction.rst

@@ -65,8 +65,7 @@ PHPCR Session Configuration
 The session needs a PHPCR implementation specified in the ``backend`` section
 by the ``type`` field, along with configuration options to bootstrap the
 implementation. The examples here assume that you are using Jackalope Doctrine
-DBAL. The full documentation is in the
-:doc:`reference section <../../reference/configuration/phpcr_odm>`.
+DBAL. The full documentation is in the :doc:`configuration reference <configuration>`.
 
 To use Jackalope Doctrine DBAL, you need to configure a database connection
 with the DoctrineBundle. For detailed information, see the
@@ -488,6 +487,7 @@ Read On
 * :doc:`fixtures_initializers`
 * :doc:`multilang`
 * :doc:`multiple_sessions`
+* :doc:`configuration`
 
 .. _`DoctrinePHPCRBundle`: https://github.com/doctrine/DoctrinePHPCRBundle
 .. _`Symfony2 Doctrine documentation`: http://symfony.com/doc/current/book/doctrine.html

cookbook/editions/cmf_core.rst

@@ -156,7 +156,6 @@ If you want to support multiple languages, have a look at
 :doc:`../../book/handling_multilang`.
 
 Then have a look at the individual :doc:`bundles <../../bundles/index>` you are
-interested in, and find the details on the configuration in the
-:doc:`bundles configuration reference <../../reference/index>`.
+interested in.
 
 .. _`Installation of Symfony2`: http://symfony.com/doc/current/book/installation.html

index.rst

@@ -5,13 +5,6 @@ The Symfony2 Content Management Framework (CMF) project is organized by the Symf
 community and has several sponsoring companies and prominent open source leaders
 implementing the philosophy of the `decoupled CMS`_.
 
-.. caution::
-
-    This documentation is still in development. The bundles and reference sections
-    are updated for the 1.1 release, but the book is still a bit sparse. Want to
-    help? Thank you, all help greatly appreciated! The source of the
-    `documentation is hosted on github`_.
-
 .. toctree::
     :hidden:
 
@@ -20,7 +13,6 @@ implementing the philosophy of the `decoupled CMS`_.
     bundles/index
     components/index
     contributing/index
-    reference/index
     cookbook/index
     tutorial/index
 
@@ -91,15 +83,6 @@ project, even when they are not using Symfony.
 
 :doc:`Browse the components <components/index>`
 
-Reference
----------
-
-Ever wondered what configuration options you have available to you in files
-such as ``app/config/config.yml``? In this section, all available
-configuration is broken down per bundle.
-
-:doc:`Browse the reference <reference/index>`
-
 Cookbook
 --------
 

tutorial/the-frontend.rst

@@ -12,7 +12,7 @@ Ensure that you installed the ``symfony-cmf/menu-bundle`` package as detailed
 in the :ref:`gettingstarted_installadditionbundles` section.
 
 Add the CMF :doc:`MenuBundle <../bundles/menu/introduction>` and its
-dependency, :doc:`CoreBundle <../bundles/core/introduction`_, to your kernel::
+dependency, :doc:`CoreBundle <../bundles/core/introduction>`, to your kernel::
 
     // app/AppKernel.php
     class AppKernel extends Kernel