Merge remote-tracking branch 'upstream/release/3.2.x' into HEAD

mrb · Apr 2, 2016 · abc66b0 · abc66b0
2 parents 916dc5a + 0ce6b0e
commit abc66b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/docs/reference/navigation.rst b/docs/reference/navigation.rst
@@ -30,8 +30,8 @@ show_menu
 The ``show_menu`` tag renders the navigation of the current page.
 You can overwrite the appearance and the HTML if you add a ``menu/menu.html``
 template to your project or edit the one provided with django CMS.
-``show_menu`` takes four optional parameters: ``start_level``, ``end_level``,
-``extra_inactive``, and ``extra_active``.
+``show_menu`` takes six optional parameters: ``start_level``, ``end_level``,
+``extra_inactive``, ``extra_active``, ``namespace`` and ``root_id``.
 
 The first two parameters, ``start_level`` (default=0) and ``end_level``
 (default=100) specify from which level the navigation should be rendered and at
@@ -45,6 +45,10 @@ descendant of the current active node.
 The fourth parameter, ``extra_active`` (default=100), specifies how
 many levels of descendants of the currently active node should be displayed.
 
+The fifth parameter,  ``namespace`` specifies the namespace of the menu. if empty will use all namespaces.
+
+The sixth parameter ``root_id`` specifies the id of the root node.
+
 You can supply a ``template`` parameter to the tag.
 
 Some Examples

diff --git a/docs/upgrade/3.2.rst b/docs/upgrade/3.2.rst
@@ -111,7 +111,7 @@ Action required
 ---------------
 
 In your own applications that use these modules, rename ``cms_app.py`` to ``cms_apps.py``,
-``cms_toolbar.py`` to ``cms_toolbars.py`` and ``menu.py`` to ``menus.py``.
+``cms_toolbar.py`` to ``cms_toolbars.py`` and ``menu.py`` to ``cms_menus.py``.
 
 
 New ``ApphookReloadMiddleware``