Merge branch 'phiamo-master' into dev

Author: wouterj

bundles/block/types.rst

@@ -136,6 +136,19 @@ block mapped by the persistence layer as argument. If you set this to
 something that is not a valid block, the problem is only detected when
 rendering the block.
 
+.. _bundles-block-menu:
+
+MenuBlock
+---------
+
+This block has no content of its own, but points to a target menu or
+menu entry. When rendered, this block renders the target menu just as
+if the target menu was directly used in that place. If pointing to a
+menu entry, the menu gets rendered from this point.
+
+This block simply has the method ``setMenuNode`` that accepts any
+menu mapped by the persistence layer as argument.
+
 ActionBlock
 -----------
 

bundles/menu/introduction.rst

@@ -1,4 +1,4 @@
-.. index::
+.. index::
     single: Menu; Bundles
     single: MenuBundle
 
@@ -129,6 +129,12 @@ example is specified. This will render an unordered list as follows:
 
             echo $view['knp_menu']->render('/cms/some/path/my-menu');
 
+.. tip::
+
+    When using the :doc:`BlockBundle <../block/introduction>`, you can also use the
+    ``MenuBlock``. Read more about that in the
+    :ref:`BlockBundle documentation <bundles-block-menu>`
+
 .. note::
 
      It is the ``PhpcrMenuProvider`` class which allows us to specify a