[gnome-terminal/wip/mallard-merge: 108/225] help: update pref-bell.page
- From: Ekaterina Gerasimova <egerasimov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal/wip/mallard-merge: 108/225] help: update pref-bell.page
- Date: Sat, 2 Mar 2013 00:07:23 +0000 (UTC)
commit 56eeec5c0756b029656155cd09c55ec070e97d72
Author: Sindhu S <sindhus live in>
Date: Sun Feb 17 11:32:51 2013 +0530
help: update pref-bell.page
Fixed merge conflicts.
Added steps to explain how to enable the audible bell setting.
Added one more scenario where Terminal bell is given, warning.
Added a note on how to preview Terminal bell on demand.
Added a scenario where Terminal bell is initiated.
help/C/pref-bell.page | 44 ++++++++++++++++++--------------------------
1 files changed, 18 insertions(+), 26 deletions(-)
---
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index b74b0d1..aa8db3a 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -21,32 +21,24 @@
</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? -->
<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>
-
-</page>
+ <app>Terminal</app> windows and tabs. These events may be when tab key has been pressed for command
completion options, a command has finished execution, a warning, error or notification that a 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>
+
+ <note style="tip">
+ <p>To preview your system's bell sound, press <keyseq><key>Ctrl</key><key>G</key></keyseq>.</p>
+ </note>
+
+</page>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]