www/adium.im 625:5bc5f448dbac: Transplant 13e664ba47ba.
commits at adium.im
commits at adium.im
Sat Mar 17 22:06:43 UTC 2012
details: http://hg.adium.im/www/adium.im/rev/5bc5f448dbac
revision: 625:5bc5f448dbac
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sat Mar 17 21:57:39 2012 +0000
Transplant 13e664ba47ba.
Subject: www/adium.im 626:645b1cca9a9f: Use "XMPP" instead of "Jabber" in most cases.
details: http://hg.adium.im/www/adium.im/rev/645b1cca9a9f
revision: 626:645b1cca9a9f
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sat Mar 17 22:06:35 2012 +0000
Use "XMPP" instead of "Jabber" in most cases.
diffs (208 lines):
diff -r ec9cf6992d85 -r 645b1cca9a9f help/.htaccess
--- a/help/.htaccess Sat Mar 17 18:10:16 2012 +0000
+++ b/help/.htaccess Sat Mar 17 22:06:35 2012 +0000
@@ -21,7 +21,7 @@
RewriteRule ^pgs/Accounts-MSN.html /rewrite/help/documentation/accounts-msn [R=301,L]
RewriteRule ^pgs/Accounts-MySpace.html /rewrite/help/documentation/accounts-myspace [R=301,L]
RewriteRule ^pgs/Accounts-QQ.html /rewrite/help/documentation/accounts-qq [R=301,L]
-RewriteRule ^pgs/Account-RegisteringJabberAccount.html /rewrite/help/documentation/accounts-registering-jabber-account [R=301,L]
+RewriteRule ^pgs/Account-RegisteringJabberAccount.html /rewrite/help/documentation/accounts-registering-xmpp-account [R=301,L]
RewriteRule ^pgs/Accounts-Sametime.html /rewrite/help/documentation/accounts-sametime [R=301,L]
RewriteRule ^pgs/Accounts-SettingYourStatus.html /rewrite/help/documentation/accounts-setting-your-status [R=301,L]
RewriteRule ^pgs/Accounts-Twitter.html /rewrite/help/documentation/accounts-twitter [R=301,L]
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/accounts-contact-icons.htmlfrag
--- a/help/documentation/accounts-contact-icons.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/accounts-contact-icons.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -1,5 +1,5 @@
<h1>Contact icons</h1>
-<p>A contact 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>
+<p>A contact 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>
@@ -49,8 +49,8 @@
<hr>
<h2>Setting your own animated contact icon</h2>
-<p>When using <attr title="AOL Instant Messenger">AIM</attr> 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><attr title="AOL Instant Messenger">AIM</attr> 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. <attr title="AOL Instant Messenger">AIM</attr> animated contact icons therefore can not be more than 50x50 pixels, Jabber animated icons no more than 96x96.</p>
+<p>When using <attr title="AOL Instant Messenger">AIM</attr> and <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, 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><attr title="AOL Instant Messenger">AIM</attr> buddy icons must be between 48x48 and 50x50 pixels, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> 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. <attr title="AOL Instant Messenger">AIM</attr> animated contact icons therefore can not be more than 50x50 pixels, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> animated icons no more than 96x96.</p>
<hr>
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/accounts-itunes-integration.htmlfrag
--- a/help/documentation/accounts-itunes-integration.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/accounts-itunes-integration.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -20,8 +20,8 @@
<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>
+<h2>MSN & XMPP</h2>
+<p>Apart from your status, MSN and <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> 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>
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/accounts-registering-jabber-account.htmlfrag
--- a/help/documentation/accounts-registering-jabber-account.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<h1>Registering a Jabber (<attr title="Extensible Messaging and Presence Protocol">XMPP</attr>) account</h1>
-
-<hr>
-
-<h2>Setting up an account via Adium</h2>
-<p>On most <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> (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><attr title="American Standard Code for Information Interchange">ASCII</attr> control characters</li>
- </ul>
- </li>
-</ul>
-
-<hr>
-
-<h2>How to specify an <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> 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 ec9cf6992d85 -r 645b1cca9a9f help/documentation/accounts-registering-xmpp-account.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/accounts-registering-xmpp-account.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -0,0 +1,33 @@
+<h1>Registering a <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> (Jabber) account</h1>
+
+<hr>
+
+<h2>Setting up an account via Adium</h2>
+<p>On most <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> (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><attr title="American Standard Code for Information Interchange">ASCII</attr> control characters</li>
+ </ul>
+ </li>
+</ul>
+
+<hr>
+
+<h2>How to specify an <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> 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 ec9cf6992d85 -r 645b1cca9a9f help/documentation/accounts-setting-your-status.htmlfrag
--- a/help/documentation/accounts-setting-your-status.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/accounts-setting-your-status.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -16,7 +16,7 @@
<hr>
<h2>Status messages</h2>
-<p><attr title="AOL Instant Messenger">AIM</attr>, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. <attr title="AOL Instant Messenger">AIM</attr> 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><attr title="AOL Instant Messenger">AIM</attr>, ICQ, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, Sametime, and Yahoo allow you to set a status message. <attr title="AOL Instant Messenger">AIM</attr> 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 class="list-header"><attr title="AOL Instant Messenger">AIM</attr> available messages are limited to approximately 60 characters by the <attr title="AOL Instant Messenger">AIM</attr> server. Messages longer than this will be truncated automatically.</p>
<ol>
<li>Available</li>
@@ -28,7 +28,7 @@
<li>Away</li>
<li>Invisible/Stealth
<ul>
- <li><attr title="AOL Instant Messenger">AIM</attr>, 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><attr title="AOL Instant Messenger">AIM</attr>, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, 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>
@@ -61,7 +61,7 @@
<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><attr title="AOL Instant Messenger">AIM</attr>, 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><attr title="AOL Instant Messenger">AIM</attr>, ICQ, and <attr title="Extensible Messaging and Presence Protocol">XMPP</attr> 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>
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/advanced-features-file-transfer.htmlfrag
--- a/help/documentation/advanced-features-file-transfer.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/advanced-features-file-transfer.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -1,5 +1,5 @@
<h1>File transfer</h1>
-<p>Adium supports file transfers over <attr title="AOL Instant Messenger">AIM</attr>, Jabber, MSN, and Yahoo protocols.</p>
+<p>Adium supports file transfers over <attr title="AOL Instant Messenger">AIM</attr>, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, MSN, and Yahoo protocols.</p>
<hr>
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/documentation-headers.php
--- a/help/documentation/documentation-headers.php Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/documentation-headers.php Sat Mar 17 22:06:35 2012 +0000
@@ -95,7 +95,7 @@
'desc' => 'Tencent QQ is the most popular free instant messaging computer program in Mainland China. Curiously, it is also very common in South Africa.'
),
'accounts-registering-jabber-account' => array(
- 'title' => 'Registering a Jabber (XMPP) account',
+ 'title' => 'Registering a XMPP (Jabber) account',
'key' => 'account, jabber, xmpp, jabber naming',
'desc' => 'On most XMPP (previously known as "Jabber") servers, Adium can register your account with the server for you.'
),
@@ -182,7 +182,7 @@
'advanced-features-file-transfer' => array(
'title' => 'File transfer',
'key' => 'file, transfer, ft, cancelled transfer',
- 'desc' => 'Adium supports file transfers over AIM, Jabber, MSN, and Yahoo protocols.'
+ 'desc' => 'Adium supports file transfers over AIM, XMPP, MSN, and Yahoo protocols.'
),
'advanced-features-growl-support' => array(
'title' => 'Growl support',
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/messaging-group-chat.htmlfrag
--- a/help/documentation/messaging-group-chat.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/messaging-group-chat.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -5,7 +5,7 @@
<hr>
<h2>Initiating/joining a group chat</h2>
-<h3><attr title="AOL Instant Messenger">AIM</attr>, Jabber, SameTime, Yahoo, Zephyr</h3>
+<h3><attr title="AOL Instant Messenger">AIM</attr>, <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, SameTime, Yahoo, Zephyr</h3>
<p>Choose <strong>File</strong> → <strong>Join Group</strong> 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 <strong>Contact</strong> → <strong>Invite to Chat</strong> and selecting the chat, or</li>
diff -r ec9cf6992d85 -r 645b1cca9a9f help/documentation/messaging-sending-messages.htmlfrag
--- a/help/documentation/messaging-sending-messages.htmlfrag Sat Mar 17 18:10:16 2012 +0000
+++ b/help/documentation/messaging-sending-messages.htmlfrag Sat Mar 17 22:06:35 2012 +0000
@@ -15,7 +15,7 @@
<h2>Sending messages</h2>
<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, <attr title="AOL Instant Messenger">AIM</attr>/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, <attr title="AOL Instant Messenger">AIM</attr>/ICQ, and <attr title="Extensible Messaging and Presence Protocol">XMPP</attr>, 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-fonts-and-colors">font or color</a> if you like.</p>
<hr>
More information about the commits
mailing list