adium 5761:d3612f3a1cac: XMPP doc updates, especially for regist...
commits at adium.im
commits at adium.im
Mon Nov 11 20:02:10 UTC 2013
details: http://hg.adium.im/adium/rev/d3612f3a1cac
revision: 5761:d3612f3a1cac
branch: adium-1.5.9
author: Robert Vehse <robertvehse at fastmail.fm>
date: Mon Nov 11 21:01:43 2013 +0100
XMPP doc updates, especially for registering an account including recommendations for choosing servers and referral to xmpp.net?s server list.
Also renamed some files for consistency.
diffs (482 lines):
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/Account-RegisteringXMPPAccount.html
--- a/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Mon Nov 11 13:00:20 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="account, xmpp, jabber, ID, register, set up, sign up" />
-<meta name="description" content="Registering an XMPP Account" />
-<title>Registering an XMPP (Jabber) account</title>
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-</head>
-<body>
-<div id="banner"> <a name="account" id="account"></a><a name="jabber" id="jabber"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>Registering an XMPP (Jabber) account</h1>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Setting up an account via Adium</h3>
- </div>
- <div class="taskboxtext">
- <p>On most XMPP (previously known as "Jabber") servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="Accounts-CreatingAccounts.html">Creating Accounts</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Username constraints</h3>
- </div>
- <div class="taskboxtext">
- <ul>
- <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>
- <li>In addition, certain characters are not allowed in your username:
- <ul>
- <li>@ ('at' sign)</li>
- <li>: (colon)</li>
- <li>' (single quote)</li>
- <li>" (double quote)</li>
- <li>< (open angle bracket)</li>
- <li>> (close angle bracket)</li>
- <li>& (ampersand)</li>
- <li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li>
- <li>ASCII control characters</li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>How to specify an XMPP server</h3>
- </div>
- <div class="taskboxtext">
- <p>Jabber IDs are in the form <i>name at server</i>.</p>
- <p>The name <i>adiumuser</i> on <i>jabber.org</i> would be <i>adiumuser at jabber.org</i>. <i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser at jabber-fr.net</i>.</p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/Account-XMPP-RegisteringAccount.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Account-XMPP-RegisteringAccount.html Mon Nov 11 21:01:43 2013 +0100
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="account, xmpp, jabber, ID, register, create, set, sign, up" />
+<meta name="description" content="Registering an XMPP ("Jabber") Account" />
+<title>Registering an XMPP ("Jabber") account</title>
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="XMPP" id="XMPP"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Registering an XMPP ("Jabber") account</h1>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Setting up an account via Adium</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>On most <a href="Accounts-XMPP.html">XMPP</a> servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="Accounts-CreatingAccounts.html">Creating Accounts</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Choosing an XMPP server</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Unlike traditional and proprietary instant messaging services, with XMPP there is no central server. Similar to email, users can choose a server and communicate with users connected to a different XMPP server.</p>
+ <p>There are many public XMPP servers to choose from, <a class="ext_link" href="http://xmpp.net/directory.php">xmpp.net has a list</a>. We recommend selecting a server which</p>
+ <ul>
+ <li>has an A/A security rating (according to xmpp.net),</li>
+ <li>has a trusted certificate (according to xmpp.net),</li>
+ <li>is reliable, has a high uptime percentage,</li>
+ <li>is in a country near you.</li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Jabber IDs: username and server</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Jabber IDs are in the form <i>username at server</i>. The name <i>adiumuser</i> on <i>jabber.org</i> would be <i>adiumuser at jabber.org</i>. <i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser at jabber-fr.net</i>.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Username constraints</h3>
+ </div>
+ <div class="taskboxtext">
+ <ul>
+ <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>
+ <li>In addition, certain characters are not allowed in your username:
+ <ul>
+ <li>@ ('at' sign)</li>
+ <li>: (colon)</li>
+ <li>' (single quote)</li>
+ <li>" (double quote)</li>
+ <li>< (open angle bracket)</li>
+ <li>> (close angle bracket)</li>
+ <li>& (ampersand)</li>
+ <li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li>
+ <li>ASCII control characters</li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/Accounts-CreatingAccounts.html
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Mon Nov 11 13:00:20 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Mon Nov 11 21:01:43 2013 +0100
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="account, create, sign, up" />
+<meta name="keywords" content="account, register, create, set, sign, up" />
<meta name="description" content="Creating an account" />
<title>Creating an account</title>
<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
@@ -17,7 +17,7 @@
<div id="pagetitle">
<h1>Creating accounts</h1>
</div>
- <p>To use Adium, you'll need an account on one or more of the IM services that it supports. Before proceeding, you should either have an existing name and password, or you need to sign up for an account on the service of your choice. Note that Adium will offer to <a href="Account-RegisteringXMPPAccount.html">register your account on the XMPP ("Jabber") service</a> when setting up a XMPP ("Jabber") account.</p>
+ <p>To use Adium, you'll need an account on one or more of the IM services that it supports. Before proceeding, you should either have an existing name and password, or you need to sign up for an account on the service of your choice. Note that Adium will offer to <a href="Account-XMPP-RegisteringAccount.html">register your account on the XMPP ("Jabber") service</a> when setting up a XMPP ("Jabber") account.</p>
<p>You'll only be able to communicate with contacts (also called 'buddies' or 'users') on a service if you have an account on that service. In other words, you'll need an AIM account to talk to AIM contacts, an MSN account to talk to MSN contacts, etc. You can have as many accounts, on as many services, as you want, and they can all be signed on with Adium simultaneously.</p>
<div class="taskboxline">
<div class="taskboxheader">
@@ -57,7 +57,7 @@
<li><a class="ext_link" href="http://www.apple.com/support/bonjour/">Bonjour</a> No Signup Needed.</li>
<li><a class="ext_link" href="http://talk.google.com/">Google Talk</a></li>
<li><a class="ext_link" href="http://www.icq.com/register/">ICQ</a></li>
- <li><a href="Account-RegisteringJabberAccount.html">XMPP ("Jabber")</a></li>
+ <li><a href="Account-XMPP-RegisteringAccount.html">XMPP ("Jabber")</a></li>
<li><a class="ext_link" href="http://www.livejournal.com/chat/">LiveJournal</a></li>
<li><a class="ext_link" href="http://www.passport.com/">MSN Messenger</a></li>
<li><a class="ext_link" href="http://edit.yahoo.com/">Yahoo!Messenger</a></li>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/Accounts-XMPP.html
--- a/AdiumHelp/pgs/Accounts-XMPP.html Mon Nov 11 13:00:20 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-XMPP.html Mon Nov 11 21:01:43 2013 +0100
@@ -40,10 +40,13 @@
<td>Google Talk, LiveJournal</td>
</tr>
</table>
- <p>Unlike traditional and proprietary instant messaging services, with XMPP there is no central server. Similar to email, users can choose a server and they will be able to communicate with users connected to a different XMPP server. In fact, everybody (with a static IP) can host an XMPP server of their own, optionally linking it up to the global XMPP network (otherwise, only local users on the same server are accessible).</p>
+ <p>Unlike traditional and proprietary instant messaging services, with XMPP (previously known as "Jabber") there is no central server. Similar to email, users can choose a server and they will be able to communicate with users connected to a different XMPP server. In fact, everybody (with a static IP) can host an XMPP server of their own, optionally linking it up to the global XMPP network (otherwise, only local users on the same server are accessible).</p>
<p>There are already several larger XMPP installations, like Google Talk and LiveJournal.</p>
- <p>This openness also means that unless you want to install your own server (not recommended), you also have to choose a hoster for your account (just like for email). Besides the three mentioned in the previous paragraph, the community portal jabber.org also has a <a class="ext_link" href="http://www.jabber.org/web/Services">list</a>.</p>
- <p>More technical information can be found at <a class="ext_link" href="http://www.xmpp.org/">the XMPP Standards Foundation</a>.</p>
+ <p>Further information:</p>
+ <ul>
+ <li><a href="ServiceInformation-XMPPSupport.html">XMPP ("Jabber") in Adium</a></li>
+ <li><a href="Account-RegisteringXMPPAccount.html">Registering an XMPP ("Jabber") account</a></li>
+ </ul>
</div>
</div>
<div class="taskboxline">
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html Mon Nov 11 13:00:20 2013 +0100
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Mon Nov 11 21:01:43 2013 +0100
@@ -136,9 +136,9 @@
<li><a href="AdvancedFeatures-OTREncryption.html">OTR encryption â–¸</a></li>
<li>Service-specific information</li>
<ul>
- <li><a href="AdvancedFeatures-DirectConnect.html">AIM: Direct Connect â–¸</a></li>
- <li><a href="AdvancedFeatures-SearchForBuddyBy Email.html">AIM: Search for buddy by email address â–¸</a></li>
- <li><a href="AdvancedFeatures-NudgeBuzz.html">MSN: Nudge / Yahoo: Buzz â–¸</a></li>
+ <li><a href="AdvancedFeatures-AIM-DirectConnect.html">AIM: Direct Connect â–¸</a></li>
+ <li><a href="AdvancedFeatures-AIM-SearchForBuddyByEmail.html">AIM: Search for buddy by email address â–¸</a></li>
+ <li><a href="AdvancedFeatures-MSNYahoo-NudgeBuzz.html">MSN: Nudge / Yahoo: Buzz â–¸</a></li>
</ul>
</ul></td>
</tr>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdvancedFeatures-AIM-DirectConnect.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-AIM-DirectConnect.html Mon Nov 11 21:01:43 2013 +0100
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+<title>AIM: DirectConnect</title>
+<meta name="keywords" content="account, aim, aol, direct connect" />
+<meta name="description" content="Supplemental information about your AOL IM account." />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>AIM: DirectConnect</h1>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Using Direct Connect</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>When using the AIM and Mobile Me services (including when talking to contacts using iChat), you can "directly connect" to send a contact inline pictures and large blocks of text. Images dragged and dropped – or pasted – into a chat which is directly connected are sent and displayed inside that window rather than via a separate file transfer.</p>
+
+ <p>To initiate a Direct Connect, simply drag or paste an image into the text entry area. Adium will invite the remote user to accept a direct connection (iChat automatically accepts such invitations) and then display the picture inline in both your message window and the other user's message window.</p>
+ <p>Direct Connect faces the same difficulties as <a href="AdvancedFeatures-FileTransfer.html">file transfer</a> (e.g. NAT traversal).
+ <p>Direct Connect is also called “direct messagingâ€, “direct IMâ€, or “direct chatâ€.</p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdvancedFeatures-AIM-SearchForBuddyByEmail.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-AIM-SearchForBuddyByEmail.html Mon Nov 11 21:01:43 2013 +0100
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+<title>AIM: search for buddy by email address</title>
+<meta name="keywords" content="account, aim, aol, search, email" />
+<meta name="description" content="Supplemental information about your AOL IM account." />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>AIM: search for buddy by email address</h1>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Searching for a contact by their email address</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>If you want to find one of your AIM contacts by their email address, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdvancedFeatures-DirectConnect.html
--- a/AdiumHelp/pgs/AdvancedFeatures-DirectConnect.html Mon Nov 11 13:00:20 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-<title>AIM: DirectConnect</title>
-<meta name="keywords" content="account, aim, aol, direct connect" />
-<meta name="description" content="Supplemental information about your AOL IM account." />
-</head>
-<body>
-<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>AIM: DirectConnect</h1>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Using Direct Connect</h3>
- </div>
- <div class="taskboxtext">
- <p>When using the AIM and Mobile Me services (including when talking to contacts using iChat), you can "directly connect" to send a contact inline pictures and large blocks of text. Images dragged and dropped – or pasted – into a chat which is directly connected are sent and displayed inside that window rather than via a separate file transfer.</p>
-
- <p>To initiate a Direct Connect, simply drag or paste an image into the text entry area. Adium will invite the remote user to accept a direct connection (iChat automatically accepts such invitations) and then display the picture inline in both your message window and the other user's message window.</p>
- <p>Direct Connect faces the same difficulties as <a href="AdvancedFeatures-FileTransfer.html">file transfer</a> (e.g. NAT traversal).
- <p>Direct Connect is also called “direct messagingâ€, “direct IMâ€, or “direct chatâ€.</p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdvancedFeatures-MSNYahoo-NudgeBuzz.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-MSNYahoo-NudgeBuzz.html Mon Nov 11 21:01:43 2013 +0100
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+<title>MSN: Nudge / Yahoo: Buzz</title>
+<meta name="keywords" content="nudge, buzz, msn, yahoo" />
+<meta name="description" content="Buzz/Nudge in Adium." />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <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>Presenting notifications you receive</h3>
+ </div>
+ <div class="taskboxtext">
+ <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>
+ <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†/ "/buzz" into the inputline and press Return or Enter.</li>
+ <li>The menu: Choose “Request Attention†from the Contact menu.</li>
+ <li>The toolbar: The “Request Attention†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 “Request Attention†button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Request Attention†(or the shaking-emoticon icon if you're using Icon Only mode).</li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdvancedFeatures-NudgeBuzz.html
--- a/AdiumHelp/pgs/AdvancedFeatures-NudgeBuzz.html Mon Nov 11 13:00:20 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-<title>MSN: Nudge / Yahoo: Buzz</title>
-<meta name="keywords" content="nudge, buzz, msn, yahoo" />
-<meta name="description" content="Buzz/Nudge in Adium." />
-</head>
-<body>
-<div id="banner"> <a name="account" id="account"></a><a name="aim" id="aim"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <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>Presenting notifications you receive</h3>
- </div>
- <div class="taskboxtext">
- <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>
- <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†/ "/buzz" into the inputline and press Return or Enter.</li>
- <li>The menu: Choose “Request Attention†from the Contact menu.</li>
- <li>The toolbar: The “Request Attention†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 “Request Attention†button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Request Attention†(or the shaking-emoticon icon if you're using Icon Only mode).</li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html
--- a/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html Mon Nov 11 13:00:20 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-<title>AIM: search for buddy by email address</title>
-<meta name="keywords" content="account, aim, aol, search, email" />
-<meta name="description" content="Supplemental information about your AOL IM account." />
-</head>
-<body>
-<div id="banner"> <a name="account" id="account"></a><a name="msn" id="msn"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>AIM: search for buddy by email address</h1>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Searching for a contact by their email address</h3>
- </div>
- <div class="taskboxtext">
- <p>If you want to find one of your AIM contacts by their email address, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r e3bee5fff1c7 -r d3612f3a1cac AdiumHelp/pgs/ServiceInformation-XMPPSupport.html
--- a/AdiumHelp/pgs/ServiceInformation-XMPPSupport.html Mon Nov 11 13:00:20 2013 +0100
+++ b/AdiumHelp/pgs/ServiceInformation-XMPPSupport.html Mon Nov 11 21:01:43 2013 +0100
@@ -17,7 +17,7 @@
<div id="pagetitle">
<h1>XMPP ("Jabber") in Adium</h1>
</div>
- <p>This page deals with XMPP (historically known as "Jabber") specialities.</p>
+ <p>This page deals with <a href="Accounts-XMPP.html">XMPP</a> features.</p>
<div class="taskboxline">
<div class="taskboxheader">
<h3>Commands in multi-user chats (MUCs)</h3>
More information about the commits
mailing list