adium-1.4 3668:d7d87818caa9: Merge "Nudge"/"Buzz" documentation....

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/d7d87818caa9
revision:	3668:d7d87818caa9
branch:		(none)
author:		Robert Vehse
date:		Sun Feb 26 22:34:59 2012 +0100

Merge "Nudge"/"Buzz" documentation. References #15869. (1.4)

diffs (60 lines):

diff -r 9baa9f29c126 -r d7d87818caa9 AdiumHelp/pgs/AdvancedFeatures-NudgeBuzz.html
--- a/AdiumHelp/pgs/AdvancedFeatures-NudgeBuzz.html	Sun Feb 19 18:29:03 2012 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-NudgeBuzz.html	Sun Feb 26 22:34:59 2012 +0100
@@ -17,46 +17,24 @@
 	<div id="pagetitle">
 		<h1>MSN: Nudge / Yahoo: Buzz</h1>
 	</div>
+	<p>Adium calls it simply “notification”, and enables you to send and receive it.</p>
+	<p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p>
 	<div class="taskboxline">
 		<div class="taskboxheader">
-			<h3>MSN: Nudge</h3>
+			<h3>Presenting notifications you receive</h3>
 		</div>
 		<div class="taskboxtext">
-			<p>Adium calls it simply “notification”, and enables you to send and receive it.</p>
-			<p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p>
-			<p><strong>Presenting notifications you receive</strong></p>
-			<p>When somebody nudges you, the official clients will shake the window and play a sound.</p>
+			<p>When somebody nudges/buzzes you, the official clients will shake the window and play a sound.</p>
 			<p>We don't offer the window-shaking action, but we do provide our entire usual suite of event actions. You see, receiving a notification is in Adium as one of the events in the Preferences. You determine what Adium will do when one comes in.</p>
 			<p>In the <strong>Events</strong> pane of Adium's Preferences simply select the “Notification received” event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>
-			<p><strong>Sending notifications</strong></p>
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Sending notifications</h3>
+		</div>
+		<div class="taskboxtext">
 			<p>There are three ways to send a notification to one of your contacts:</p>
 				<ul>
-					<li>The keyboard: Type “/nudge” into the inputline and press Return or Enter.</li>
-					<li>The menu: Choose “Send Notification” from the Contact menu.</li>
-					<li>The toolbar: The “Send Notification” button is not on the chat window toolbar by default, so you need to add it.
-						<ul>
-							<li>First, right-click on the chat window toolbar and choose “Customize Toolbar…”.</li>
-							<li>Drag the “Send Notification” button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Send Notification” (or the shaking-emoticon icon if you're using Icon Only mode).</li>
-						</ul>
-					</li>
-				</ul>
-		</div>
-	</div>
-	<div class="taskboxline">
-		<div class="taskboxheader">
-			<h3>Yahoo: Buzz</h3>
-		</div>
-		<div class="taskboxtext">
-			<p>Adium calls it simply “notification”, and enables you to send and receive it. You need Adium 1.1 or later.</p>
-			<p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p>
-			<p><strong>Presenting notifications you receive</strong></p>
-			<p>When somebody buzzes you, the official clients will shake the window and play a sound.</p>
-			<p>We don't offer the window-shaking action, but we do provide our entire usual suite of event actions. You see, receiving a notification is in Adium as one of the events in the Preferences. You determine what Adium will do when one comes in.</p>
-			<p>In the <strong>Events</strong> pane of Adium's Preferences simply select the “Notification received” event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>
-			<p><strong>Sending notifications</strong></p>
-			<p>There are three ways to send a notification to one of your contacts:</p>
-				<ul>
-					<li>The keyboard: Type “/buzz” into the inputline and press Return or Enter.</li>
+					<li>The keyboard: Type “/nudge” / "/buzz" into the inputline and press Return or Enter.</li>
 					<li>The menu: Choose “Send Notification” from the Contact menu.</li>
 					<li>The toolbar: The “Send Notification” button is not on the chat window toolbar by default, so you need to add it.
 						<ul>