Merge commit 'cb98a589b212e8dda05eda0aa1110379614d7069'

Conflicts: documentation/crm/user_guide/index.rst
oroinc · Dec 16, 2016 · be074c0 · be074c0
2 parents 28d7fcd + cb98a58
commit be074c0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/cookbook/how_to_create_and_customize_application_menu.rst b/cookbook/how_to_create_and_customize_application_menu.rst
@@ -83,25 +83,26 @@ Now we need to create a ``navigation.yml`` file with the following content:
     :linenos:
 
     # src/Acme/Bundle/NewBundle/Resources/config/oro/navigation.yml
-    menu_config:
-        items:
-            acme_tab:
-                label: Acme label
-                uri:   '#'
-                extras:
-                    position: 300
-            acme_tab_link:
-                label: Acme link label
-                route: acme_link
-        tree:
-            application_menu:
-                children:
-                    acme_tab:
-                        children:
-                            acme_tab_link: ~
-
-    titles:
-        acme_link: My link page title
+    navigation:
+        menu_config:
+            items:
+                acme_tab:
+                    label: Acme label
+                    uri:   '#'
+                    extras:
+                        position: 300
+                acme_tab_link:
+                    label: Acme link label
+                    route: acme_link
+            tree:
+                application_menu:
+                    children:
+                        acme_tab:
+                            children:
+                                acme_tab_link: ~
+
+        titles:
+            acme_link: My link page title
 
 
 Then you have to reload navigation data and clear cache:

diff --git a/user_guide/index.rst b/user_guide/index.rst
@@ -31,7 +31,6 @@ If you are reading it for the first time, we recommend that you begin with :ref:
 The :ref:`OroCRM Users and Their Benefits <oro-benefits>` page will help you find out which sections of this guide are most relevant for your work duties.
 
 
-
 * :doc:`/user_guide/intro`
 
   * :doc:`/user_guide/intro_users_and_benefits`
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,7 +31,6 @@ If you are reading it for the first time, we recommend that you begin with :ref:
		The :ref:`OroCRM Users and Their Benefits <oro-benefits>` page will help you find out which sections of this guide are most relevant for your work duties.



		* :doc:`/user_guide/intro`

		* :doc:`/user_guide/intro_users_and_benefits`
Expand Down