www/adium.im 541:8ec694efca92: Remove all of the old documentati...
commits at adium.im
commits at adium.im
Sun Feb 12 05:44:00 UTC 2012
details: http://hg.adium.im/www/adium.im/rev/8ec694efca92
revision: 541:8ec694efca92
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sun Feb 12 01:15:41 2012 +0000
Remove all of the old documentation files
Subject: www/adium.im 542:a4d2e2bf0245: Cleaned up all documentation files, styling still required.
details: http://hg.adium.im/www/adium.im/rev/a4d2e2bf0245
revision: 542:a4d2e2bf0245
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sun Feb 12 05:38:23 2012 +0000
Cleaned up all documentation files, styling still required.
Subject: www/adium.im 543:5dd05da3e1e4: Move this into the main .htaccess file
details: http://hg.adium.im/www/adium.im/rev/5dd05da3e1e4
revision: 543:5dd05da3e1e4
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sun Feb 12 05:41:34 2012 +0000
Move this into the main .htaccess file
Subject: www/adium.im 544:8335dfde4b79: Remove unneeded files and move help.js into assets
details: http://hg.adium.im/www/adium.im/rev/8335dfde4b79
revision: 544:8335dfde4b79
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sun Feb 12 05:43:29 2012 +0000
Remove unneeded files and move help.js into assets
diffs (truncated from 11329 to 1000 lines):
diff -r 984f38231ad0 -r 8335dfde4b79 .htaccess
--- a/.htaccess Sun Feb 12 01:02:47 2012 +0000
+++ b/.htaccess Sun Feb 12 05:43:29 2012 +0000
@@ -37,6 +37,8 @@
RewriteRule ^documentation$ http://trac.adium.im/doxygen [L,R=301]
RewriteRule ^documentation/ http://trac.adium.im/doxygen [L,R=301]
+RewriteRule ^help/documentation/([a-zA-Z0-9\-]+)/?$ help/documentation/index.php?doc=$1 [L]
+
RewriteRule ^faq/(.+) http://trac.adium.im/wiki/$1 [L]
RewriteRule ^screenshot_tutorial http://docs.info.apple.com/article.html?path=Mac/10.5/en/cdb_scrshtfky.html [L]
@@ -54,4 +56,4 @@
RewriteRule ^(.*)$ http://www.sourceforge.net/projects/adium [R=301,L]
RewriteCond %{HTTP_HOST} ^team.adium.im$
-RewriteRule ^(.*)$ http://trac.adium.im/wiki/AdiumDevelopers [R=301,L]
+RewriteRule ^(.*)$ http://trac.adium.im/wiki/AdiumTeam [R=301,L]
diff -r 984f38231ad0 -r 8335dfde4b79 assets/scripts/help.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/assets/scripts/help.js Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,23 @@
+// List Hot Issues
+$(document).ready(function() {
+ for (var i in hotIssues) {
+ var li = $('<li></li>').addClass("li_" + hotIssues[i].protocol);
+ var p = $('<p></p>').append(hotIssues[i].description);
+
+ if (hotIssues[i].ticket) {
+ p.append(" (");
+ var a = $('<a></a>').append("#" + hotIssues[i].ticket).addClass("ticket");
+ a.attr("href", "http://trac.adium.im/ticket/" + hotIssues[i].ticket);
+
+ if (hotIssues[i].closed) {
+ a.addClass("closed");
+ }
+
+ p.append(a, ")");
+ }
+
+ li.append(p);
+
+ $('#hotlist').append(li);
+ }
+});
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/.htaccess
--- a/help/.htaccess Sun Feb 12 01:02:47 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Header unset ETag
-FileETag None
-
-RewriteEngine on
-
-RewriteRule ^documentation/([a-zA-Z0-9\-]+)/?$ documentation/index.php?doc=$1 [NC,QSA,L]
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-aim.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-aim.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,45 @@
+<h1>AOL Instant Messenger</h1>
+
+<hr>
+
+<h2>Description</h2>
+
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.aim.com">http://www.aim.com</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>user name (called "screen name" by AOL)</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>MobileMe, ICQ</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>USA</td>
+ </tr>
+ <tr>
+ <td><strong>Default server; port:</strong></td>
+ <td>login.oscar.aol.com; 5190</td>
+ </tr>
+</table>
+
+<hr>
+
+<h2>History</h2>
+<p>Being the second modern client after ICQ, AIM was initially released in 1997.</p>
+
+<hr>
+
+<h2>Censorship</h2>
+<p>AIM servers filter strings containing <em><img</em> and <em><script</em>, which are tags in the Hypertext Markup Language (HTML) AIM uses to encode messages (so as to support fonts, colors, etc.).</p>
+<p>HTML tags that you put into the inputline are “escaped†by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM server drops messages containing even escaped HTML (but only those two tags—other tags work fine).</p>
+<p>AIM will also drop any message containing a link to a file: address. These addresses are intended to refer to files on the sender's or your computer. (The file need not actually exist on one end or the other. A perfectly valid file: link can refer to a path that does not exist on anyone's machine, such as this one.)</p>
+<p>On the other hand, it will allow the message if the address is plain text instead of a link. So, for example, “Check out what I just wrote: file:///Users/me/Documents/Why-Adium-is-awesome.txt†will go through, but “Check out <a href="file:///Users/me/Documents/Why-Adium-is-awesome.txt">what I just wrote</a>†will not.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-bonjour.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-bonjour.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,21 @@
+<h1>Bonjour</h1>
+
+<hr>
+
+<h2>Description</h2>
+
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.apple.com/support/bonjour/">http://www.apple.com/support/bonjour/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary; portions under the Apache license</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>None</td>
+ </tr>
+</table>
+<p>Formerly known as "Rendezvous", Bonjour is a local-network service that uses XMPP for chat. Unlike most services, you don't need to sign up anywhere to use Bonjour messaging; you only need a local network.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-contact-icons.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-contact-icons.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,77 @@
+<h1>Buddy icons</h1>
+<p>A buddy icon, called an Avatar on some services, is an image which represents a person; while some people use their actual picture, others use something else entirely. You can specify your own, and it will be sent to your contacts. Your contacts' icons are sent to you, though you can choose to override their image with one of your choice.</p>
+
+<hr>
+
+<h2>Buddy icons and the Apple Address Book</h2>
+<p>If you specify contacts' instant messaging information within their Address Book Cards in the Apple Address Book, the icon you set for that will be used automatically if they do not choose one of their own to send you and you don't override it within Adium.</p>
+<p>If you have a <em>Me</em> card, the icon set for it will be sent by default to your contacts, unless you override it within Adium.</p>
+<p>You can change these behaviors via Adium → Preferences → Advanced → Address Book.</p>
+<p>For more details, see <a href="advanced-features-addressbook-integration">Address Book Integration</a>.</p>
+
+<hr>
+
+<h2>Setting your own buddy icon</h2>
+<p>Adium supports a buddy icon on most services.</p>
+<p>If you want to set an icon on all your accounts (a global icon):</p>
+<ol>
+ <li>Choose Preferences from the Adium menu.</li>
+ <li>Click on the <strong>Personal</strong> tab.</li>
+ <li>Set the icon.</li>
+</ol>
+<p>If you want to set a different icon for a specific account:</p>
+<ol>
+ <li>Choose <strong>Preferences</strong> from the <strong>Adium</strong> menu.</li>
+ <li>Click on Accounts.</li>
+ <li>Double-click on the account.</li>
+ <li>Click on the <strong>Personal</strong> tab.</li>
+ <li>Click on “Use this icon:â€.</li>
+ <li>Set the icon.</li>
+</ol>
+<p><strong>Note:</strong> Changing the global icon won't change any accounts to which you've assigned their own icon. If you'd like those accounts to use the global icon instead, you'll need to edit each one as described above and set it back to “Use global iconâ€.</p>
+<p>There are two ways to set the icon:</p>
+<p><strong>Drag-and-drop</strong></p>
+<p>Drag an image or image file into the image well above the "Choose Icon..." button.</p>
+<p>Drag-and-drop is the only way to set animated buddy icons ("animated GIFs") and keep the animation.</p>
+<p><strong>Image Picker</strong></p>
+<ol>
+ <li>Click on "Choose Icon...".</li>
+ <li>Drag a file into the Image Picker, or click "Choose..." and open an image file.</li> OR
+ <li>Click the camera icon to take a picture (available only if your Mac has a webcam)</li>
+ <li>The image may then be cropped or panned within the image picker.</li>
+ <li>Click OK.</li>
+</ol>
+<p>You cannot use the Image Picker to set animated buddy icons. The animation will be removed.</p>
+
+<hr>
+
+<h2>Setting your own animated buddy icon</h2>
+<p>When using AIM and Jabber, Adium supports animated buddy icons in the form of .gif files. To set an animated buddy icon, drag the .gif file from the Finder into the image well in the Personal tab of your account's settings. Note that you must drag the file into the image well; you will not be able to use the animation of the icon if you use the Image Picker or press the Choose Icon button to select it.</p>
+<p>AIM buddy icons must be between 48x48 and 50x50 pixels, Jabber icons have a size limit of 96x96. When an image is resized, its animation is lost, so if Adium has to resize your image, you will lose its animation. AIM animated buddy icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
+
+<hr>
+
+<h2>Setting an icon for a contact</h2>
+<p>If you set an icon for a contact, it will override any icon they may have chosen.</p>
+<ul>
+ <li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
+ <li>Double click the icon space in the top-lefthand corner of the window.</li>
+ <li>Select an icon.</li>
+ <li>Preserving transparency of an icon follows the same rules as setting animated buddy icons.</li>
+</ul>
+
+<hr>
+
+<h2>Removing a set icon for a contact</h2>
+<ul>
+ <li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
+ <li>Click the contact's icon.</li>
+ <li>Press Delete / Backspace.</li>
+</ul>
+
+<hr>
+
+<h2>Where icons are saved</h2>
+<p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default.</p>
+<p>Recent icons set via the icon picker (both for contacts and for yourself) are cached at ~/Library/Images/iChat Recent Pictures, and such recent icons are shared with iChat.</p>
+<p>Icons should be retrieved automatically from your contacts when you sign on and when contacts change icons. In AIM, exchanging two messages with a contact may be necessary for the icon to be retrieved, depending upon what messaging client the contact is using. On some services getting info on a contact via Get Info may trigger an icon retrieval.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-creating-accounts.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-creating-accounts.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,64 @@
+<h1>Creating accounts</h1>
+<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-registering-jabber-account">register your account on the Jabber service</a> when setting up a 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>
+
+<hr>
+
+<h2>Adding your account to Adium</h2>
+<p>To add your account to Adium (once you have <a href="#signing_up_for_an_account">signed up for it</a>):</p>
+<ol>
+ <li>Choose <strong>Preferences</strong> from the <strong>Adium</strong> menu (This will be opened for you automatically the first time Adium runs).</li>
+ <li>Select the <strong>Accounts</strong> preferences pane (This is the first pane, already selected the first time Adium runs).</li>
+ <li>Click the plus <strong>(+)</strong> button.</li>
+ <li>Select the service you want to use.</li>
+ <li id="password_explanation">Enter your account name (the specific identifier for which varies by service, e.g. "screen name," "GTalk ID," or "username") and password (as well, as if required by the panel, the server and port) in the <strong>Account</strong> panel. If you enter a password here, it will be stored securely in the Mac OS X keychain, and Adium will continue to use it for future connections. If you do not enter a password, you will be prompted each time you connect.</li>
+ <li>Enter your alias and choose an icon in the <strong>Personal</strong> panel. See <a href="accounts-contact-icons">Contact icons</a> for more information.</li>
+ <li>
+ Service-specific:
+ <ul>
+ <li>In the <strong>Options</strong> panel check the appropriate boxes, enter your resource and your available/away priority for XMPP,</li>
+ <li>In the <strong>Privacy</strong> panel, choose whether you would like to send typing notices and choose your preferred encryption level.</li>
+ <li>In the <strong>Proxy</strong> panel, setup your proxy configuration if you need to (if you don't know what proxy configuration details to enter you don't need to enter any).</li>
+ </ul>
+ </li>
+ <li>Click <strong>OK.</strong></li>
+</ol>
+<p>Adium will automatically connect the account for you, prompting for a password if needed (as described <a href="#password_explanation">above</a>). In the future, the account will be connected when Adium loads. To find how to change this behaviour and more information on setting your status see <a href="accounts-setting-your-status">Setting your status</a>.</p>
+
+<hr>
+
+<h2 id="signing_up_for_an_account">Signing up for an account</h2>
+<p>(Some of the following are external links)</p>
+<ol>
+ <li>Free Services
+ <ul>
+ <li><a href="http://products.aim.com/">AIM</a></li>
+ <li><a href="http://www.apple.com/support/bonjour/">Bonjour</a> No Signup Needed.</li>
+ <li><a href="http://talk.google.com/">Google Talk</a></li>
+ <li><a href="http://www.icq.com/register/">ICQ</a></li>
+ <li><a href="account-registering-jabber-account">Jabber</a></li>
+ <li><a href="http://www.livejournal.com/chat/">LiveJournal</a></li>
+ <li><a href="http://www.passport.com/">MSN Messenger</a></li>
+ <li><a href="http://edit.yahoo.com/">Yahoo!Messenger</a></li>
+ <li><a href="http://trac.adium.im/wiki/Zephyr">Zephyr</a></li>
+ </ul>
+ </li>
+ <li>Paid Services
+ <ul>
+ <li><a href="http://www.aol.com/">AOL</a> - compatible with AIM, ICQ</li>
+ <li><a href="http://www.me.com/">MobileMe</a> (formerly known as .Mac), compatible with AIM, ICQ</li>
+ </ul>
+ </li>
+ <li>Non-English Free Services
+ <ul>
+ <li><a href="http://www.gadu-gadu.pl/">Gadu-Gadu</a> - Polish</li>
+ <li><a href="http://messenger.yahoo.co.jp/">Yahoo! Japan</a> - Japanese</li>
+ </ul>
+ </li>
+ <li>Corporate Services
+ <ul>
+ <li><a href="http://www.novell.com/products/groupwise/">Novell Groupwise</a></li>
+ <li><a href="http://www.lotus.com/">Lotus Sametime</a></li>
+ </ul>
+ </li>
+</ol>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-facebook-chat.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-facebook-chat.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,27 @@
+<h1>Facebook Chat</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.facebook.com">http://www.facebook.com</a></td>
+ </tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary, XMPP-based</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>yourusername at chat.facebook.com</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>None</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>Facebook site: 400 million active users, Facebook Chat: unknown</td>
+ </tr>
+</table>
+<p>Facebook is a social networking website. It offers an in-browser "Facebook Chat" service.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-gadu-gadu.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-gadu-gadu.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,27 @@
+<h1>Gadu-Gadu</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td> <a href="http://www.gadu-gadu.pl/">http://www.gadu-gadu.pl/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Server status:</strong></td>
+ <td> <a href="http://kadu.net/monitor/">http://kadu.net/monitor/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>None</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>Poland</td>
+ </tr>
+</table>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-gizmo5.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-gizmo5.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,25 @@
+<h1>Gizmo5</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td> <a href="http://gizmo5.com/">http://gizmo5.com/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>XMPP-based, proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>Jabber ID (JID), e.g. username at chat.gizmoproject.com</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>XMPP, LiveJournal, Google Talk</td>
+ </tr>
+</table>
+<p>Apart from using and being compatible with XMPP, Gizmo5 also has proprietary elements.</p>
+<p>Gizmo's chat system is simply XMPP, so all you need to do is add the account as a Jabber account. For example, if your Gizmo Project username is "jdoe", your Jabber ID is "jdoe at chat.gizmoproject.com".</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-google-talk.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-google-talk.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,26 @@
+<h1>Google Talk</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.google.com/talk/">http://www.google.com/talk/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>XMPP-based, proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>Jabber ID (JID), e.g. usr at a.b.c/home with "home" being a "resource", which distinguishes the same user when logged in from multiple locations (simultaneously)</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></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">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 href="http://google.com/support/chat/bin/answer.py?hl=en&answer=159495">says Google</a>).</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-groupwise.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-groupwise.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,16 @@
+<h1>Novell GroupWise</h1>
+
+<hr>
+
+<h2>Description</h2>
+ <table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.novell.com/products/groupwise/">http://www.novell.com/products/groupwise/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+</table>
+<p>GroupWise is a Novell messenger service used in corporate environments.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-icq.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-icq.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,41 @@
+<h1>ICQ</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.icq.com/">http://www.icq.com/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>Universal Internet Number / Unified Identification Number / Unique Identification Number (UIN), e.g. 12345678</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>AIM, MobileMe (formerly known as .Mac)</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>Germany, Eastern Europe</td>
+ </tr>
+ <tr>
+ <td><strong>Default server; port:</strong></td>
+ <td>login.icq.com (formerly login.oscar.aol.com, which no longer works for ICQ); 5190</td>
+ </tr>
+</table>
+
+<h2>History</h2>
+<p>When it was released in 1996 by a company called Mirabilis, ICQ was the first real popular Instant Messaging service. In 1998, AOL bought Mirabilis and later made the ICQ protocol more similar to the AIM protocol.</p>
+<p>In 2010, AOL sold ICQ to the proprietors of Mail.ru. The new owners changed the login server address to login.icq.com; 1.4.1 is the first version of Adium to use the new address by default, but older versions can be reconfigured by double-clicking on each ICQ account in the Preferences window and changing each account's Login Server in the Options tab.</p>
+
+<hr>
+
+<h2>Censorship</h2>
+<p>ICQ servers filter strings containing <script, a tag in the Hypertext Markup Language (HTML), which AIM and ICQ use to encode messages (so as to support fonts, colors, etc.).</p>
+<p>HTML tags that you put into the inputline are “escaped†by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM/ICQ server drops messages containing even escaped HTML (but only that tag — other tags work fine).</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-irc.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-irc.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,15 @@
+<h1>IRC</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.irc.org/">http://www.irc.org/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Open Standard</td>
+ </tr>
+</table>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-itunes-integration.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-itunes-integration.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,71 @@
+<h1>iTunes integration</h1>
+<p>You can display live information in your status, profile, or messages about the song currently playing in iTunes.</p>
+
+<hr>
+
+<h2>Status</h2>
+<p>Choose the "♫ iTunes" status from the Status menu to be marked as 'Available' with information about the current song as the message.</p>
+<p>To show the currently playing song in iTunes in your custom Available and Away statuses, include one of the 'tokens' listed below in your status; you can also choose these directly from the "Insert Script" submenu of the "Edit" menu.</p>
+<p>In either case, the information will be automatically updated when the song changes.</p>
+
+<hr>
+
+<h2>Messages</h2>
+<p>The tokens listed below, or found in the the "Insert Script" submenu of the "Edit" menu, can also be used anywhere else you enter text in Adium, including your messages.</p>
+
+<hr>
+
+<h2>Profiles</h2>
+<p>You can also add the current playing song in iTunes in your AOL Instant Messenger or MobileMe (formerly known as .Mac) profile by editing your profile and then selecting your choice of iTunes script from the "Insert Script" submenu of the "Edit" menu.</p>
+
+<hr>
+
+<h2>MSN & Jabber</h2>
+<p>Apart from your status, MSN and Jabber show a separate "Now Playing" field in other people's clients. You can turn this on or off in the account's preferences → Privacy → "Let others know what iTunes is playing".</p>
+
+<hr>
+
+<h2>Tokens</h2>
+<table>
+ <tr>
+ <th>Token name</th>
+ <th>Text replacement</th>
+ </tr>
+ <tr>
+ <td>%_iTunes</td>
+ <td>A pre-formatted entry in the form: %_track - %_artist</td>
+ </tr>
+ <tr>
+ <td>%_music</td>
+ <td>A pre-formatted entry in the form: /me is listening to %_track by %_artist</td>
+ </tr>
+ <tr>
+ <td>%_status</td>
+ <td>Specifies the status if iTunes (i.e., Playing or Paused)</td>
+ </tr>
+ <tr>
+ <td>%_artist</td>
+ <td>The artist of the current song.</td>
+ </tr>
+ <tr>
+ <td>%_album</td>
+ <td>The album of the current song.</td>
+ </tr>
+ <tr>
+ <td>%_genre</td>
+ <td>The genre of the current song.</td>
+ </tr>
+ <tr>
+ <td>%_track</td>
+ <td>The track name of the current song.</td>
+ </tr>
+ <tr>
+ <td>%_composer</td>
+ <td>The composer of the current song.</td>
+ </tr>
+ <tr>
+ <td>%_iTMS</td>
+ <td>A link to the iTunes Music Store for the current song.</td>
+ </tr>
+</table>
+<p>A shortcut for "Track - Artist" is the token %_iTunes.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-list-of-services.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-list-of-services.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,46 @@
+<h1>List of services supported and their interoperability</h1>
+<p>This Adium Wiki page lists all services Adium supports. Clicking on a service will lead you to a dedicated page with more information on the specific service, e.g. history and censorship.</p>
+<p>Further down, you can find out which services interoperate ("which service can talk to which") as most services don't interoperate with most other services—this is not an Adium thing.</p>
+<p><strong>Note:</strong> We do not host any IM services ourselves. Adium is a third-party client for connecting to services run by other people (mostly companies).</p>
+
+<hr>
+
+<h2>Supported services</h2>
+<ul>
+ <li><a href="accounts-xmpp">XMPP ("Jabber")</a>, including</li>
+ <ul>
+ <li><a href="accounts-google-talk">Google Talk</a></li>
+ <li><a href="accounts-lj-talk">LJ (LiveJournal) Talk</a></li>
+ <li><a href="accounts-facebook-chat">Facebook Chat</a></li>
+ <li><a href="accounts-gizmo5">Gizmo5</a></li>
+ </ul>
+ <li><a href="accounts-msn">MSN Messenger</a></li>
+ <li><a href="accounts-aim">AOL Instant Messenger (AIM)</a>, including</li>
+ <ul>
+ <li><a href="accounts-mobileme">MobileMe</a> (formerly known as .Mac)</li>
+ </ul>
+ <li><a href="accounts-yahoo">Yahoo! Messenger</a>, including</li>
+ <ul>
+ <li><a href="accounts-yahoo-japan">Yahoo! Japan Messenger</a></li>
+ </ul>
+ <li><a href="accounts-icq">ICQ</a></li>
+ <li><a href="accounts-bonjour">Bonjour</a>, compatible with iChat</li>
+ <li><a href="accounts-twitter">Twitter</a></li>
+ <li><a href="accounts-irc">IRC</a></li>
+ <li><a href="accounts-myspace">MySpaceIM</a></li>
+ <li><a href="accounts-gadu-gadu">Gadu-Gadu</a></li>
+ <li><a href="accounts-sametime">IBM Lotus Sametime</a></li>
+ <li><a href="accounts-groupwise">Novell GroupWise</a></li>
+</ul>
+
+<hr>
+
+<h2 id="signing_up_for_an_account">Service interoperability</h2>
+<p>No service can talk to all services. This means in order to talk to contact X, you must have an account on the same service as contact X, or on any compatible service.</p>
+<ul>
+ <li>If you have an account on AIM, ICQ, or MobileMe, you can chat with anybody who uses AIM, ICQ, MobileMe, or SMS.</li>
+ <li>If you have an account on Google Talk, XMPP ("Jabber"), LiveJournal, or Gizmo, you can chat with anybody who uses Google Talk, XMPP ("Jabber"), LiveJournal, or Gizmo.</li>
+ <li>In the official clients, MSN users can chat with Yahoo! users but this is not yet supported by Adium.</li>
+</ul>
+<p><strong>XMPP transports</strong></p>
+<p>Some XMPP ("Jabber") servers (mostly private ones) allow chats with proprietary services such as AIM, MSN, and Yahoo! via a mechanism called "XMPP transports". In Adium, you should be able to chat through transports transparently (that is, it should work just like chatting with users who actually are on the same server). However, you will need to contact the administrator of your Jabber server to find out what services it has transports for. The public servers for Jabber.org and Google Talk do not support transports.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-lj-talk.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-lj-talk.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,24 @@
+<h1>LJ Talk</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.livejournal.com/chat/">http://www.livejournal.com/chat/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Open standard (XMPP)</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>Jabber ID (JID), e.g. LJ-usr at livejournal.com/home with "home" being a "resource", which distinguishes the same user when logged in from multiple locations (simultaneously)</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>Google Talk, LiveJournal, Gizmo</td>
+ </tr>
+</table>
+<p>LiveJournal is Six Apart's blogging service. Its XMPP-based instant-messaging service is called "LJ Talk".</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-mobileme.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-mobileme.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,42 @@
+<h1>MobileMe</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.apple.com/mobileme/">http://www.apple.com/mobileme/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>user name (called "screen name" by AOL)</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>AIM, ICQ</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>USA</td>
+ </tr>
+ <tr>
+ <td><strong>Default server; port:</strong></td>
+ <td>login.oscar.aol.com; 5190</td>
+ </tr>
+</table>
+<p>Formerly known as ".Mac", MobileMe is Apple's bundle of online services, including AIM-compatible instant-messaging.</p>
+
+<hr>
+
+<h2>History</h2>
+<p>Being the second modern client after ICQ, AIM was initially released in 1997.</p>
+
+<hr>
+
+<h2>Censorship</h2>
+<p>See <a href="accounts-aim">AOL Instant Messenger</a>.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-msn.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-msn.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,56 @@
+<h1>MSN Messenger</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.msn.com">http://www.msn.com</a></td>
+ </tr>
+ <tr>
+ <td><strong>Server status:</strong></td>
+ <td><a href="http://status.live.com/detail/messenger">http://status.live.com/detail/messenger</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>Windows Live ID associated with an email address, e.g. user at hotmail.com</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>Yahoo</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>Europe</td>
+ </tr>
+ <tr>
+ <td><strong>Default server; port:</strong></td>
+ <td>messenger.hotmail.com; 1863</td>
+ </tr>
+</table>
+
+<h2>History</h2>
+<p>MSN Messenger, now called Windows Live Messenger, is a freeware instant messaging client that was developed and distributed by Microsoft in 1999 to 2005 and in 2007 for computers running the Microsoft Windows operating system (except Windows Vista), and aimed towards home users. It was renamed Windows Live Messenger in February 2006 as part of Microsoft's Windows Live series of online services and software.</p>
+
+<hr>
+
+<h2>Censorship</h2>
+<p>MSN censors messages containing particular fragments of URLs. Previously, the message would simply be dropped with no indication to either side that it went away; now, at least, you get an error message (inline in the message view).</p>
+<p><strong>Pieces of text that are known to cause MSN to throw a message into the <a href="http://en.wikipedia.org/wiki/Memory_hole">memory hole</a></strong></p>
+<p>The most common ones that we know of are:</p>
+<ul>
+ <li>.info</li>
+ <li>profile.php? (including ‘?’)</li>
+ <li>download.php? (including ‘?’)</li>
+ <li>gallery.php</li>
+ <li>pics.php</li>
+ <li>ListAllTopics.php</li>
+ <li>.scr (<a href="http://forums.worsethanfailure.com/forums/thread/126976.aspx">source</a>)</li>
+</ul>
+<p><a href="http://www.allocinit.net/blog/msn-blocked-phrases/">Andrew Wellington has a much longer list.</a></p>
+<p>See <a href="http://virtuelvis.com/archives/2006/02/microsoft-censoring-msn-messenger">Microsoft censoring MSN Messenger conversations</a> for more information.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-myspace.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-myspace.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,20 @@
+<h1>MySpaceIM</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.myspace.com/guide/im">http://www.myspace.com/guide/im</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>None</td>
+ </tr>
+</table>
+<p>MySpace is a social networking website. Its "MySpaceIM" chat service is supported in Adium 1.1.3 and later.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-qq.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-qq.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,20 @@
+<h1>Tencent QQ</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.qq.com/">http://http://www.qq.com/</a> (China); <a href="http://www.qq.co.za/">http://www.qq.co.za/</a> (South Africa)</td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+ <tr>
+ <td><strong>Popularity:</strong></td>
+ <td>China; South Africa</td>
+ </tr>
+</table>
+<p>Tencent QQ is the most popular free instant messaging computer program in Mainland China. Curiously, it it also very common in South Africa.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-registering-jabber-account.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-registering-jabber-account.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,31 @@
+<h1>Registering a Jabber (XMPP) account</h1>
+
+<hr>
+
+<h2>Setting up an account via Adium</h2>
+<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-creating-accounts">Creating An Account</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>
+
+<hr>
+
+<h2>Username constraints</h2>
+<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>
+
+<h2>How to specify an XMPP server</h2>
+<p>Jabber IDs are in the form <em>name at server</em>.</p>
+<p>The name <em>adiumuser</em> on <em>jabber.org</em> would be <em>adiumuser at jabber.org</em>.</p>
+<p><em>adiumuser</em> on <em>jabber-fr.net</em> would be <em>adiumuser at jabber-fr.net</em>.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-sametime.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-sametime.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,18 @@
+<h1>IBM Lotus Sametime</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www-01.ibm.com/software/lotus/sametime/">http://www-01.ibm.com/software/lotus/sametime/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+</table>
+<p>IBM Lotus Sametime is a messaging protocol used primarily in corporate environments.
+<p>Adium's Sametime support is provided via the <a href="http://meanwhile.sf.net/">Meanwhile</a> library and Pidgin plugin, an open re-implementation of the protocol developed by Christopher (siege) O'Brien. Sametime-specific issues and requests are best directed to the appropriate <a href="http://sf.net/tracker/?group_id=110565">Meanwhile project trackers</a>. Questions regarding the Meanwhile library and Pidgin plugin may be answered on the <a href="http://meanwhile.sourceforge.net/faq/">Meanwhile FAQ</a> page.
+<p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your IT department to enable access for the Meanwhile client ID. Alternately, in Adium 1.0 or later, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-setting-your-status.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-setting-your-status.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,77 @@
+<h1>Setting your status</h1>
+<p>There are several ways to set the status of your account. Status includes available and away, available messages and away messages on compatible protocols, and specific available and away states on compatible protocols.</p>
+
+<hr>
+
+<h2>Automatically connecting accounts</h2>
+<p>To have an account automatically connect when Adium is launched:</p>
+<ol>
+ <li>Open Adium's <strong>Preferences</strong> from the <strong>Adium</strong> menu.</li>
+ <li>Select <strong>Accounts</strong>.</li>
+ <li>Double-click the account from the list.</li>
+ <li>Check <strong>Connect when Adium opens</strong>.</li>
+ <li>Click <strong>OK</strong>.</li>
+</ol>
+
+<hr>
+
+<h2>Status messages</h2>
+<p>AIM, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. AIM and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p>
+<p>AIM available messages are limited to approximately 60 characters by the AIM server. Messages longer than this will be truncated automatically.</p>
+<ol>
+ <li>Available</li>
+ <li>iTunes
+ <ul>
+ <li>See <a href="accounts-itunes-integration">iTunes Integration</a> for how to integrate the track you are currently listening to into your status message.</li>
+ </ul>
+ </li>
+ <li>Away</li>
+ <li>Invisible/Stealth
+ <ul>
+ <li>AIM, Jabber, MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li>
+ <li>In versions prior to 1.0, there is no Invisible status in Adium by default. You have to create such a status by choosing either of the two “Custom…†menu items in the Status menu, and changing the custom status's state to Invisible. Remember to choose “Save Custom Status†if you want to keep the Invisible status around.</li>
+ </ul>
+ </li>
+ <li>Offline</li>
+</ol>
+
+<hr>
+
+<h2>Changing your status for all accounts</h2>
+<p>There are four ways to change your status for all accounts:</p>
+<ul>
+ <li>The <strong>Status</strong> menu</li>
+ <li>Adium status menu item (Menu Bar Icon)</li>
+ <li>The Dock menu</li>
+ <li>The top of the contact list (when using the default Regular Window contact list style)</li>
+</ul>
+<p>In each case all you need to do is select status you would like from the list.</p>
+
+<hr>
+
+<h2>Changing your status for a specific account</h2>
+<p>Select the status or Custom... from the submenu of the account's item in the Status menu or the Adium status menu item (Menu Bar Icon).</p>
+
+<hr>
+
+<h2>Connecting with a specific status</h2>
+<p>To connect with a specific status, simply set it on the account's submenu while the account is offline. The account will be connected and put in the status of your choice immediately.</p>
+
+<hr>
+
+<h2>Autoreply messages</h2>
+<p>Any status can have an "autoreply" which is sent in response to the first incoming message you receive from a contact. By default, Custom Away messages have an autoreply and other statuses do not. This can be controlled in the Custom Status dialogue box by toggling the Autoreply checkbox. Unless you specify otherwise, the autoreply is the same as your Status Message.</p>
+<p>AIM, ICQ, and Jabber contacts will be informed seamlessly that the message is an autoreply; on other services, Adium will add the "(Autoreply) " before your message so that the other side can tell the message's origin.</p>
+
+<hr>
+
+<h2>The Status Window</h2>
+<p>Adium can show you a window that tells you your current status on every account. This window, called the Status window, can be enabled from the Status preferences.</p>
+<p>The Status Window should not be confused with the Status Editor, which is a panel that appears whenever you go to edit a status. It also should not be confused with the status indicator at the top of the ContactList.</p>
+<p><strong>What it does</strong></p>
+<ul>
+ <li>When you're Available on all accounts, the Status window is hidden, as it would not indicate anything useful.</li>
+ <li>When you're Away on some accounts, but not others, the Status window shows you a list of all accounts that are Away. Each account has its current status message (away message) below it; this is useful when you have different accounts set to different custom Away statuses.</li>
+ <li>The same thing happens when you're Away on all accounts, but with some accounts having different custom Away statuses from others.</li>
+ <li>When you're Away on all accounts (with the same Away status on all of them), the Status window shows only the Away status that you're using; it doesn't list the accounts.</li>
+</ul>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-twitter.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-twitter.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,15 @@
+<h1>Twitter</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://www.twitter.com">http://www.twitter.com</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Proprietary</td>
+ </tr>
+</table>
\ No newline at end of file
diff -r 984f38231ad0 -r 8335dfde4b79 help/documentation/accounts-xmpp.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-xmpp.htmlfrag Sun Feb 12 05:43:29 2012 +0000
@@ -0,0 +1,27 @@
+<h1>XMPP</h1>
+
+<hr>
+
+<h2>Description</h2>
+<table>
+ <tr>
+ <td><strong>Homepage:</strong></td>
+ <td><a href="http://xmpp.org/about/">http://xmpp.org/about/</a></td>
+ </tr>
+ <tr>
+ <td><strong>Type:</strong></td>
+ <td>Open standard</td>
+ </tr>
+ <tr>
+ <td><strong>Identity:</strong></td>
+ <td>Jabber ID (JID), e.g. usr at a.b.c/home with "home" being a "resource", which distinguishes the same user when logged in from multiple locations (simultaneously)</td>
+ </tr>
+ <tr>
+ <td><strong>Interoperability:</strong></td>
+ <td>Google Talk, LiveJournal, Gizmo</td>
+ </tr>
+</table>
+<p>Note that XMPP is special, due to being an open protocol. There is no central XMPP server, the structure is like e-mail. Everybody (with a static IP) can host an XMPP server, 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, LiveJournal and Gizmo.</p>
More information about the commits
mailing list