adium 5759:27f88e069f25: Link fixes, remove some more Gizmo ment...
commits at adium.im
commits at adium.im
Mon Nov 11 11:31:07 UTC 2013
details: http://hg.adium.im/adium/rev/27f88e069f25
revision: 5759:27f88e069f25
branch: adium-1.5.9
author: Robert Vehse <robertvehse at fastmail.fm>
date: Mon Nov 11 12:30:56 2013 +0100
Link fixes, remove some more Gizmo mentions.
diffs (99 lines):
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/Account-RegisteringXMPPAccount.html
--- a/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Mon Nov 11 12:30:56 2013 +0100
@@ -22,7 +22,7 @@
<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 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>
+ <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">
@@ -54,8 +54,7 @@
</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>.</p>
- <p><i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser at jabber-fr.net</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>
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/Accounts-CreatingAccounts.html
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Mon Nov 11 12:30:56 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-RegisteringJabberAccount.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 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>
<div class="taskboxline">
<div class="taskboxheader">
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/Accounts-GoogleTalk.html
--- a/AdiumHelp/pgs/Accounts-GoogleTalk.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-GoogleTalk.html Mon Nov 11 12:30:56 2013 +0100
@@ -37,7 +37,7 @@
</tr>
<tr>
<td><strong>Interoperability:</strong></td>
- <td>XMPP, LiveJournal, Gizmo, AIM</td>
+ <td>XMPP, LiveJournal, 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>
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/Accounts-LJTalk.html
--- a/AdiumHelp/pgs/Accounts-LJTalk.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-LJTalk.html Mon Nov 11 12:30:56 2013 +0100
@@ -37,7 +37,7 @@
</tr>
<tr>
<td><strong>Interoperability:</strong></td>
- <td>Google Talk, LiveJournal, Gizmo</td>
+ <td>Google Talk, LiveJournal</td>
</tr>
</table>
<p>LiveJournal is Six Apart's blogging service. Its XMPP-based instant-messaging service is called "LJ Talk".</p>
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/Accounts-ListOfServices.html
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html Mon Nov 11 12:30:56 2013 +0100
@@ -60,7 +60,7 @@
<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>If you have an account on XMPP ("Jabber"), Google Talk or LiveJournal, you can chat with anybody who uses XMPP ("Jabber"), Google Talk or LiveJournal.</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>
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/Accounts-XMPP.html
--- a/AdiumHelp/pgs/Accounts-XMPP.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-XMPP.html Mon Nov 11 12:30:56 2013 +0100
@@ -37,11 +37,11 @@
</tr>
<tr>
<td><strong>Interoperability:</strong></td>
- <td>Google Talk, LiveJournal, Gizmo</td>
+ <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>There are already several larger XMPP installations, like Google Talk, LiveJournal and Gizmo.</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>
</div>
diff -r 97630d5f105a -r 27f88e069f25 AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html Thu Nov 07 01:48:42 2013 +0100
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Mon Nov 11 12:30:56 2013 +0100
@@ -18,7 +18,7 @@
<h1>Adium Documentation</h1>
</div>
<p>Welcome to the Documentation!</p>
- <p>Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility. This documentation should help to answer most any question you may have; if you have a concern or request not covered here, please visit <a href=" /">Adium Help</a>.</p>
+ <p>Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility. This documentation should help to answer most any question you may have; if you have a concern or request not covered here, please visit <a href="https://adium.im/help/">Adium Help</a>.</p>
<p>The articles below cover a wide range of topics from initial setup and messaging to advanced contact list management and customization.</p>
<p>So don't hesitate – jump right in! :)</p>
<div class="taskboxline">
More information about the commits
mailing list