[gnome-terminal/wip/mallard-merge: 88/225] Help: Minor changes to pref-bell.page

[Ekaterina Gerasimova <egerasimov src gnome org>]

commit 51ff018bf2c350302b255388c78645f8980c3247
Author: Sindhu S <sindhus live in>
Date:   Fri Feb 15 17:34:20 2013 +0530

    Help: Minor changes to pref-bell.page
    
    Minor changes to grammar after doing a self-review.

 help/C/pref-bell.page |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index dc2b270..2187ebc 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -22,6 +22,7 @@
   </info>
 
   <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? -->
@@ -33,6 +34,12 @@ being executed, what other events sound the bell? -->
 
 <!-- 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>