[gnome-terminal/wip/mallard-merge: 125/287] Help: Fixed merge conflicts in pref-bell.page.

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit ba234bd40cf73d03ab9ef955241088e26fff9728
Author: Sindhu S <sindhus live in>
Date:   Sun Feb 17 11:32:51 2013 +0530

    Help: Fixed merge conflicts in pref-bell.page.
    
    Added steps to explain how to enable the audible bell setting.

 help/C/pref-bell.page |   37 ++++++++++++++-----------------------
 1 files changed, 14 insertions(+), 23 deletions(-)
---
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index b74b0d1..85f2370 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -21,32 +21,23 @@
 
   </info>
 
-<!-- Please fix the merge conflict, which will fix the yelp validation
-error. -->
-
   <title>Set audible bell</title>
-<<<<<<< Updated upstream
 
-<!-- 'Maybe' = yes or no; 'may be' = possibly. Apart from something no longer
-being executed, what other events sound the bell? -->
+<!-- TODO: Find out apart from something no longer being executed, what other events sound the bell?-->
 
   <p><app>Terminal</app> can sound an audible bell to indicate events in
-  <app>Terminal</app> windows and tabs. These events may be a program or
-  command that has finished execution, an error or command that has ended
-  execution.</p>
-
-<!-- Use <steps> list for steps. -->
-
-=======
-  <p><app>Terminal</app> can initiate an audible bell to indicate events in
-  <app>Terminal</app> windows and tabs. These events maybe a program or command
-  having finished execution, having encountered an error or commands that have ended
-  their execution.</p>
->>>>>>> Stashed changes
-  <p>To be notified of these events, go to
-  <guiseq><gui style="menu">Edit</gui>
-  <gui style="menuitem">Profile Preferences</gui>
-  <gui style="tab">General</gui></guiseq>, select
-  <gui style="checkbox">Terminal bell</gui></p>
+  <app>Terminal</app> windows and tabs. These events may be a program or command
+  that has finished execution, an error or command that has ended execution.</p>
+
+  <p>To be notified of these events:</p>
+  <steps>
+    <item>
+      <p>Go to <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
+      Preferences</gui><gui style="tab">General</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select <gui style="checkbox">Terminal bell</gui></p>
+    </item>
+  </steps>
 
 </page>