www/adium.im 420:7ece48d411f7: Updated the GTalk help with the d...

[commits at adium.im]

details:	http://hg.adium.im/www/adium.im/rev/7ece48d411f7
revision:	420:7ece48d411f7
branch:		adiumx.com
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Wed Jul 13 22:45:14 2011 +0200

Updated the GTalk help with the details of the AIM federation.
(transplanted from 76a1c0d1249d64537c7a68186e399ab2a84e96e1)

diffs (15 lines):

diff -r 3da2791d0540 -r 7ece48d411f7 help/pgs/Accounts-GoogleTalk.html
--- a/help/pgs/Accounts-GoogleTalk.html	Tue Jul 12 17:06:11 2011 +0200
+++ b/help/pgs/Accounts-GoogleTalk.html	Wed Jul 13 22:45:14 2011 +0200
@@ -53,9 +53,10 @@
 				</tr>
 				<tr>
 					<td><strong>Interoperability:</strong></td>
-					<td>XMPP, LiveJournal, Gizmo</td>
+					<td>XMPP, LiveJournal, Gizmo, AIM</td>
 				</tr>
 			</table>
+			<p>To add someone using AIM to your GTalk account, add <strong><screenname>@aol.com</strong>. If their screen name is an email, add <strong><username>(<domain>)@aol.com</strong>. For example, to add bob at me.com use bob(me.com)@aol.com. Note that if your GTalk address and AIM screen name are the same, messages from your AIM contacts will be received by both.</p>
 			<p>Apart from using and being compatible with <a href="Accounts-XMPP.html">XMPP</a>, Google Talk also has proprietary elements.</p>
 			<p>Note that "a Gmail account is required to use Google Talk or other download clients" (<a  class="ext_link" href="http://google.com/support/chat/bin/answer.py?hl=en&answer=159495">says Google</a>).</p>
 		</div>