[gnome-terminal/wip/mallard-merge: 97/252] Help: Modified help in pref-menubar.page.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit c49957a95a33eb17030b631ef10e01fa50fe08ea
Author: Sindhu S <sindhus live in>
Date:   Sat Feb 16 11:07:00 2013 +0530

    Help: Modified help in pref-menubar.page.
    
    Added steps to explain how to enable or disable Menubar.
    Replaced all instances of 'menu bar' with 'Menubar'.
    Added appropriate Mallard tags.

 help/C/pref-menubar.page |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/help/C/pref-menubar.page b/help/C/pref-menubar.page
index c2b8261..ab16614 100644
--- a/help/C/pref-menubar.page
+++ b/help/C/pref-menubar.page
@@ -17,28 +17,28 @@
 
     <link type="guide" xref="index#preferences"/>
     <link type="seealso" xref="adv-keyboards-access"/>
+    <link type="seealso" xref="app-fullscreen"/>
 
-    <desc>How to hide and restore the menu bar</desc>
+    <desc>How to hide and restore the <gui>Menubar</gui></desc>
 
   </info>
 
-  <title>Menu bar visibility</title>
-
-<!-- Use <steps>! -->
-
-<<<<<<< Updated upstream
-  <p>If you want to hide the menu bar in <app>Terminal</app>, go to
-  <guiseq><gui style="menu">View</gui><gui style="menuitem">Show
-  Menubar</gui></guiseq>.  Alternatively, you can access this option by right
-  clicking anywhere inside the <app>Terminal</app> and select from the menu,
-  <gui style="menuitem">Show Menubar</gui>.</p>
-=======
- <p>If you want to hide the menu bar in <app>Terminal</app>, go to <guiseq><gui
- style="menu">View</gui><gui style="menuitem">Show Menubar</gui></guiseq>.
- Alternatively, you can access this option by right clicking anywhere inside the
- <app>Terminal</app> and select <gui style="menuitem">Show
- Menubar</gui>.</p>
->>>>>>> Stashed changes
+  <title><gui>Menubar</gui> visibility</title>
+
+  <p>You can enable or disable <gui>Menubar</gui> as desired.</p>
+
+  <steps>
+    <item>
+      <p>To disable <gui>Menubar</gui>, go to
+  <guiseq><gui style="menu">View</gui></guiseq> and select <gui style="menuitem">Show
+  Menubar</gui>.</p>
+      <note style="important"><p>The tick mark in the menu option indicates that the <gui>Menubar</gui> is 
currently set to visible.</p>
+       </note>
+    </item>
+    <item>
+      <p>To enable <gui>Menubar</gui>, right click in <app>Terminal</app> and select <gui 
style="menuitem">Show Menubar</gui>.</p>
+    </item>
+  </steps>
 
   <note style="tip">
     <p>To enable the menubar by default in all <app>Terminal</app> windows you