[gnome-terminal/wip/mallard-merge: 89/276] Help: Recommit of changes.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit b3e3dec6d01365128b1dd3815a7bf38f0298a199
Author: Sindhu S <sindhus live in>
Date:   Fri Feb 15 17:38:09 2013 +0530

    Help: Recommit of changes.
    
    Includes changes from both Ekaterina Gerasimova and Sindhu S.

 help/C/pref-menubar.page |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/help/C/pref-menubar.page b/help/C/pref-menubar.page
index 4b3fc6d..c2b8261 100644
--- a/help/C/pref-menubar.page
+++ b/help/C/pref-menubar.page
@@ -16,7 +16,7 @@
     </credit>
 
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="adv-keyboardshortcuts"/>
+    <link type="seealso" xref="adv-keyboards-access"/>
 
     <desc>How to hide and restore the menu bar</desc>
 
@@ -26,11 +26,19 @@
 
 <!-- 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
 
   <note style="tip">
     <p>To enable the menubar by default in all <app>Terminal</app> windows you