adium 5760:e3bee5fff1c7: Refer to XMPP consistently as "XMPP ("J...
commits at adium.im
commits at adium.im
Mon Nov 11 12:00:35 UTC 2013
details: http://hg.adium.im/adium/rev/e3bee5fff1c7
revision: 5760:e3bee5fff1c7
branch: adium-1.5.9
author: Robert Vehse <robertvehse at fastmail.fm>
date: Mon Nov 11 13:00:20 2013 +0100
Refer to XMPP consistently as "XMPP ("Jabber")".
diffs (186 lines):
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Account-RegisteringXMPPAccount.html
--- a/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Mon Nov 11 13:00:20 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, xmpp, jabber, jabber naming" />
+<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" />
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Accounts-ContactIcons.html
--- a/AdiumHelp/pgs/Accounts-ContactIcons.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-ContactIcons.html Mon Nov 11 13:00:20 2013 +0100
@@ -71,8 +71,8 @@
<h3>Setting your own animated contact icon</h3>
</div>
<div class="taskboxtext">
- <p>When using AIM and Jabber, Adium supports animated contact icons in the form of .gif files. To set an animated contact 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 contact 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 contact icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
+ <p>When using AIM and XMPP ("Jabber"), Adium supports animated contact icons in the form of .gif files. To set an animated contact 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 contact icons must be between 48x48 and 50x50 pixels, XMPP ("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 contact icons therefore can not be more than 50x50 pixels, XMPP ("Jabber") animated icons no more than 96x96.</p>
</div>
</div>
<div class="taskboxline">
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Accounts-CreatingAccounts.html
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Mon Nov 11 13:00:20 2013 +0100
@@ -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 Jabber service</a> when setting up a 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-RegisteringXMPPAccount.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">Jabber</a></li>
+ <li><a href="Account-RegisteringJabberAccount.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 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Accounts-ListOfServices.html
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html Mon Nov 11 13:00:20 2013 +0100
@@ -64,7 +64,7 @@
<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>
+ <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 XMPP ("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>
</div>
</div>
</div>
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Accounts-SettingYourStatus.html
--- a/AdiumHelp/pgs/Accounts-SettingYourStatus.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-SettingYourStatus.html Mon Nov 11 13:00:20 2013 +0100
@@ -38,7 +38,7 @@
<h3>Status messages</h3>
</div>
<div class="taskboxtext">
- <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, ICQ, XMPP ("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>
@@ -49,7 +49,7 @@
<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>AIM, XMPP ("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>
@@ -93,7 +93,7 @@
</div>
<div class="taskboxtext">
<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>
+ <p>AIM, ICQ, and XMPP ("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>
</div>
</div>
<div class="taskboxline">
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Accounts-XMPP.html
--- a/AdiumHelp/pgs/Accounts-XMPP.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-XMPP.html Mon Nov 11 13:00:20 2013 +0100
@@ -40,7 +40,7 @@
<td>Google Talk, LiveJournal</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>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>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>
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Accounts-iTunesIntegration.html
--- a/AdiumHelp/pgs/Accounts-iTunesIntegration.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-iTunesIntegration.html Mon Nov 11 13:00:20 2013 +0100
@@ -47,10 +47,10 @@
</div>
<div class="taskboxline">
<div class="taskboxheader">
- <h3>MSN & Jabber</h3>
+ <h3>MSN & XMPP ("Jabber")</h3>
</div>
<div class="taskboxtext">
- <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>
+ <p>Apart from your status, MSN and XMPP ("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>
</div>
</div>
<div class="taskboxline">
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html
--- a/AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-FileTransfer.html Mon Nov 11 13:00:20 2013 +0100
@@ -17,7 +17,7 @@
<div id="pagetitle">
<h1>File transfer</h1>
</div>
- <p>Adium supports file transfers over AIM, Jabber, MSN, and Yahoo protocols.</p>
+ <p>Adium supports file transfers over AIM, XMPP ("Jabber"), MSN, and Yahoo protocols.</p>
<div class="taskboxline">
<div class="taskboxheader">
<h3>Which protocols support file transfer?</h3>
@@ -31,7 +31,7 @@
<li>MSN</li>
<li>SILC (not yet in Adium)</li>
<li>Yahoo when not using an HTTP proxy (is relayed via a file transfer server).</li>
- <li>XMPP (Jabber) when neither side is behind a NAT device.</li>
+ <li>XMPP ("Jabber") when neither side is behind a NAT device.</li>
<li>Bonjour</li>
</ul>
</div>
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Messaging-GroupChat.html
--- a/AdiumHelp/pgs/Messaging-GroupChat.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Messaging-GroupChat.html Mon Nov 11 13:00:20 2013 +0100
@@ -24,7 +24,7 @@
<h3>Initiating/joining a group chat</h3>
</div>
<div class="taskboxtext">
- <p><b>AIM, Jabber, SameTime, Yahoo</b></p>
+ <p><b>AIM, XMPP ("Jabber"), SameTime, Yahoo</b></p>
<p>Choose <b>File</b> → <b>Join Group</b> Chat and enter the details for the chat. You may invite contacts to join you in the chat immediately via the Join Group Chat window, and you may invite them later by:</p>
<ul>
<li>Selecting them in the contact list and choosing <b>Contact</b> → <b>Invite to Chat</b> and selecting the chat, or</li>
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/Messaging-SendingMessages.html
--- a/AdiumHelp/pgs/Messaging-SendingMessages.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/Messaging-SendingMessages.html Mon Nov 11 13:00:20 2013 +0100
@@ -37,7 +37,7 @@
</div>
<div class="taskboxtext">
<p>Type a message, then press Enter or Return. You can control whether Enter or Return inserts a new line instead of sending a message in the General Preferences. Option+Enter always inserts a new line. If the contact is online, the message will be sent immediately.</p>
- <p>If the contact is offline, the behavior depends on the instant messaging service you are using. In Yahoo, AIM/ICQ, and Jabber, the message is sent to the server and will be immediately received by the contact when next she signs online. On other services, Adium will give you the option to "Send Later". This will send the message the next time you are online with Adium and the contact is also online.</p>
+ <p>If the contact is offline, the behavior depends on the instant messaging service you are using. In Yahoo, AIM/ICQ, and XMPP ("Jabber"), the message is sent to the server and will be immediately received by the contact when next she signs online. On other services, Adium will give you the option to "Send Later". This will send the message the next time you are online with Adium and the contact is also online.</p>
<p>You can specify your <a href="Messaging-FontsAndColors.html">font or color</a> if you like.</p>
</div>
</div>
diff -r 27f88e069f25 -r e3bee5fff1c7 AdiumHelp/pgs/ServiceInformation-XMPPSupport.html
--- a/AdiumHelp/pgs/ServiceInformation-XMPPSupport.html Mon Nov 11 12:30:56 2013 +0100
+++ b/AdiumHelp/pgs/ServiceInformation-XMPPSupport.html Mon Nov 11 13:00:20 2013 +0100
@@ -4,9 +4,9 @@
<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>XMPP (Jabber) in Adium</title>
+<title>XMPP ("Jabber") in Adium</title>
<meta name="keywords" content="xmpp, jabber" />
-<meta name="description" content="XMPP (Jabber) in Adium" />
+<meta name="description" content="XMPP ("Jabber") in Adium" />
</head>
<body>
<div id="banner"> <a name="tabs" id="tabs"></a>
@@ -15,7 +15,7 @@
<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>XMPP (Jabber) in Adium</h1>
+ <h1>XMPP ("Jabber") in Adium</h1>
</div>
<p>This page deals with XMPP (historically known as "Jabber") specialities.</p>
<div class="taskboxline">
More information about the commits
mailing list