Updated other articles

Author: wouterj

book/structuring_content.rst

@@ -105,36 +105,29 @@ rendered by the ``MenuFactory``.
 The Factory
 ...........
 
-The ``ContentAwareFactory`` is a ``FactoryInterface`` implementation, which
-generates the full ``MenuItem`` hierarchy from the provided MenuNode. The data
-generated this way is later used to generate the actual HTML representation of
-the menu.
+Menu factories generate the full ``MenuItem`` hierarchy from the provided
+MenuNode. The data generated this way is later used to generate the actual HTML
+representation of the menu.
 
 The included implementation focuses on generating ``MenuItem`` instances from
 ``NodeInterface`` instances, as this is usually the best approach to handle
 tree-like structures typically used by a CMS. Other approaches are implemented in
-the base classes, and their respective documentation pages can be found in
+the base classes and their respective documentation pages can be found in
 KnpMenuBundle_'s page.
 
-``ContentAwareFactory`` is responsible for loading the full menu hierarchy and
-transforming the ``MenuNode`` instances from the root node it receives from
-the ``MenuProviderInterface`` implementation. It is also responsible for
-determining which (if any) menu item is currently being viewed by the user.
-It supports a voter mechanism to have custom code decide what menu item is
-the current item.
-``KnpMenu`` already includes a specific factory targeted at Symfony2's Routing
-component, which this bundle extends, to add support for:
-
-* ``Route`` instances stored in a database (refer to :ref:`RoutingBundle's
-  RouteProvider <start-routing-getting-route-object>` for more details on
-  this)
+``KnpMenu`` already includes a specific factory targeted at the Symfony Routing
+component to add support for:
+
+* ``Route`` instances stored in a database (refer to
+  :ref:`RoutingBundle's RouteProvider <start-routing-getting-route-object>` for
+  more details on this)
 * ``Route`` instances with associated content (more on this on respective
   :ref:`RoutingBundle's section <start-routing-linking-a-route-with-a-model-instance>`)
 
-As mentioned before, ``ContentAwareFactory`` is responsible for loading
-all the menu nodes from the provided root element. The actual loaded nodes can
-be of any class, even if it's different from the root's, but all must
-implement ``NodeInterface`` in order to be included in the generated menu.
+As mentioned before, the factory is responsible for loading all the menu nodes
+from the provided root element. The actual loaded nodes can be of any class,
+even if it's different from the root's, but all must implement
+``NodeInterface`` in order to be included in the generated menu.
 
 The Menu Nodes
 ..............

tutorial/getting-started.rst

@@ -32,7 +32,7 @@ all of the required packages now.
         require: {
             ...
             "symfony-cmf/routing-auto-bundle": "~1.0",
-            "symfony-cmf/menu-bundle": "~1.2",
+            "symfony-cmf/menu-bundle": "~2.0",
             "sonata-project/doctrine-phpcr-admin-bundle": "~1.2",
             "symfony-cmf/tree-browser-bundle": "~1.1",
             "doctrine/data-fixtures": "~1.0",

tutorial/the-frontend.rst

@@ -190,8 +190,6 @@ configuration:
                     - '@cmf_menu.loader.node'
                     - '@doctrine_phpcr'
                     - /cms/pages
-                calls:
-                    - [setRequest, ["@?request="]]
                 tags:
                     - { name: knp_menu.provider }
 
@@ -209,18 +207,12 @@ configuration:
                 <!-- ... -->
                 <service
                     id="acme.basic_cms.menu_provider"
-                    class="Symfony\Cmf\Bundle\MenuBundle\Provider\PhpcrMenuProvider">
+                    class="Symfony\Cmf\Bundle\MenuBundle\Provider\PhpcrMenuProvider"
+                >
                     <argument type="service" id="cmf_menu.loader.node"/>
                     <argument type="service" id="doctrine_phpcr"/>
                     <argument>/cms/pages</argument>
-                    <call method="setRequest">
-                        <argument
-                            type="service"
-                            id="request"
-                            on-invalid="null"
-                            strict="false"
-                        />
-                    </call>
+
                     <tag name="knp_menu.provider" />
                 </service>
             </services>
@@ -240,13 +232,6 @@ configuration:
             ->addArgument(new Reference('cmf_menu.loader.node'))
             ->addArgument(new Reference('doctrine_phpcr'))
             ->addArgument('/cms/pages')
-            ->addMethodCall('setRequest', array(
-                new Reference(
-                    'request',
-                    ContainerInterface::NULL_ON_INVALID_REFERENCE,
-                    false
-                )
-            ))
             ->addTag('knp_menu.provider')
         ;