Move over doc updates from 1.5.11 branch. adium-1.5.10.3
authorRobert Vehse <robertvehse@fastmail.fm>
Tue, 21 Mar 2017 23:23:37 +0100
branchadium-1.5.10.3
changeset 5959 6ca33a583e2f
parent 5958 0a0f0222bdd4
child 5960 36b55082a824
Move over doc updates from 1.5.11 branch.
AdiumHelp/pgs/Accounts-CreatingAccounts.html
AdiumHelp/pgs/Accounts-IRC.html
AdiumHelp/pgs/Accounts-ListOfServices.html
AdiumHelp/pgs/Accounts-Twitter.html
AdiumHelp/pgs/AdiumDocumentation.html
AdiumHelp/pgs/Messaging-FontsAndColors.html
AdiumHelp/pgs/Messaging-TabbedMessaging.html
AdiumHelp/pgs/Troubleshooting-CommonProblems.html
README.md
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html	Tue Mar 21 23:23:37 2017 +0100
@@ -53,10 +53,10 @@
 			<ol>
 				<li>Free Services
 				<ul>
-					<li><a class="ext_link" href="http://new.aim.com/">AIM</a></li>
+					<li><a class="ext_link" href="https://i.aol.com/reg/signup">AIM</a></li>
 					<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 class="ext_link" href="https://icq.com/join/">ICQ</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="https://signup.live.com">MSN Messenger</a></li>
--- a/AdiumHelp/pgs/Accounts-IRC.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Accounts-IRC.html	Tue Mar 21 23:23:37 2017 +0100
@@ -44,7 +44,10 @@
 					<td></td>
 				</tr>
 			</table>
-			<p></p>
+			<p>Further information:</p>
+			<ul>
+				<li><a href="ServiceInformation-IRCSupport.html">IRC in Adium</a></li>
+			</ul>
 		</div>
 	</div>
 	<div class="taskboxline">
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html	Tue Mar 21 23:23:37 2017 +0100
@@ -17,12 +17,13 @@
 	<div id="pagetitle">
 		<h1>List of services supported and their interoperability</h1>
 	</div>
-	<p>This 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>This page lists all services which can be used in Adium. 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>Some services can be used in Adium by installing third-party plugins which are maintained by developers not directly affiliated with the Adium Project. <strong>Note:</strong> We do not offer support for these plugins. Install them at your own risk.</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>
 	<div class="taskboxline">
 		<div class="taskboxheader">
-			<h3>Supported services</h3>
+			<h3>Bundled services</h3>
 		</div>
 		<div class="taskboxtext">
 			<ul>
@@ -30,17 +31,8 @@
 				<ul>
 					<li><a href="Accounts-GoogleTalk.html">Google Talk</a></li>
 					<li><a href="Accounts-LJTalk.html">LJ (LiveJournal) Talk</a></li>
-					<li><a href="Accounts-FacebookChat.html">Facebook Chat</a></li>
 				</ul>
-				<li><a href="Accounts-MSN.html">MSN Messenger</a></li>
-				<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a>, including</li>
-				<ul>
-					<li><a href="Accounts-MobileMe.html">MobileMe</a> (formerly known as .Mac)</li>
-				</ul>
-				<li><a href="Accounts-Yahoo.html">Yahoo! Messenger</a>, including</li>
-				<ul>
-					<li><a href="Accounts-YahooJapan.html">Yahoo! Japan Messenger</a></li>
-				</ul>
+				<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a></li>
 				<li><a href="Accounts-ICQ.html">ICQ</a></li>
 				<li><a href="Accounts-Bonjour.html">Bonjour</a>, compatible with iChat</li>
 				<li><a href="Accounts-Twitter.html">Twitter</a></li>
@@ -51,19 +43,57 @@
 			</ul>
 		</div>
 	</div>
-	<div id="signing_up_for_an_account" class="taskboxline">
+	<div class="taskboxline">
+		<div class="taskboxheader">
+			<h3>Third-party plugins for services</h3>
+		</div>
+		<center>
+			<table class="list" cellspacing="0">
+			<tr>
+			<th width="160">Name</th>
+			<th>Website</th>
+			<th>Service(s) supported</th>
+			</tr>
+			<tr>
+			<td>SIPE</td>
+			<td><a href="http://sipe.sourceforge.net">Click</a></td>
+			<td>Skype for Business, Microsoft Office 365, Microsoft Business Productivity Online Suite (BPOS), Microsoft Lync Server, Microsoft Office Communications Server (OCS 2007/2007 R2), Microsoft Live Communications Server (LCS 2003/2005), Reuters Messaging</td>
+			</tr>
+			<tr>
+			<td>Telegram-Purple</td>
+			<td><a href="https://github.com/majn/telegram-purple">Click</a></td>
+			<td>Telegram</td>
+			</tr>
+			<tr>
+			<td>skypeweb4adium</td>
+			<td><a href="https://github.com/tripplet/skypeweb4adium">Click</a></td>
+			<td>Skype</td>
+			</tr>
+			<tr>
+			<td>Adium-Steam-IM</td>
+			<td><a href="https://github.com/tripplet/Adium-Steam-IM">Click</a></td>
+			<td>Steam</td>
+			</tr>
+			<tr>
+			<td>Adium WhatsApp Plugin</td>
+			<td><a href="https://bitbucket.org/ThYpHo0n/adium-whatsapp-plugin/overview">Click</a></td>
+			<td>WhatsApp</td>
+			</tr>
+			</table>
+		</center>
+	</div>
+	<div class="taskboxline">
 		<div class="taskboxheader">
 			<h3>Service interoperability</h3>
 		</div>
 		<div class="taskboxtext">
 			<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 AIM or ICQ you can chat with anybody who uses AIM, ICQ, or SMS.</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>
-			<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>
+			<p>Some XMPP ("Jabber") servers (mostly private ones) allow chats with proprietary services such as AIM 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>
--- a/AdiumHelp/pgs/Accounts-Twitter.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Accounts-Twitter.html	Tue Mar 21 23:23:37 2017 +0100
@@ -44,7 +44,10 @@
 					<td></td>
 				</tr>
 			</table>
-			<p></p>
+			<p>Further information:</p>
+			<ul>
+				<li><a href="ServiceInformation-TwitterSupport.html">Twitter in Adium</a></li>
+			</ul>
 		</div>
 	</div>
 	<div class="taskboxline">
--- a/AdiumHelp/pgs/AdiumDocumentation.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/AdiumDocumentation.html	Tue Mar 21 23:23:37 2017 +0100
@@ -138,7 +138,6 @@
 							<ul>
 								<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>
@@ -189,17 +188,8 @@
 							<ul>
 								<li><a href="Accounts-GoogleTalk.html">Google Talk</a></li>
 								<li><a href="Accounts-LJTalk.html">LJ (LiveJournal) Talk</a></li>
-								<li><a href="Accounts-FacebookChat.html">Facebook Chat</a></li>
 							</ul>
-							<li><a href="Accounts-MSN.html">MSN Messenger</a></li>
 							<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a>, including</li>
-							<ul>
-								<li><a href="Accounts-MobileMe.html">MobileMe</a> (formerly known as .Mac)</li>
-							</ul>
-							<li><a href="Accounts-Yahoo.html">Yahoo! Messenger</a>, including</li>
-							<ul>
-								<li><a href="Accounts-YahooJapan.html">Yahoo! Japan Messenger</a></li>
-							</ul>
 							<li><a href="Accounts-ICQ.html">ICQ</a></li>
 							<li><a href="Accounts-Bonjour.html">Bonjour</a>, compatible with iChat</li>
 							<li><a href="Accounts-Twitter.html">Twitter</a></li>
--- a/AdiumHelp/pgs/Messaging-FontsAndColors.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Messaging-FontsAndColors.html	Tue Mar 21 23:23:37 2017 +0100
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="font, color, style, default" />
+<meta name="description" content="Changing how you meesages are formatted." />
 <link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
 <title>Fonts and colors</title>
-<meta name="keywords" content="font, color, style, default" />
-<meta name="description" content="Changing how you meesages are formatted." />
 </head>
 <body>
 <div id="banner"> <a name="fonts-colors" id="fonts-colors"></a>
--- a/AdiumHelp/pgs/Messaging-TabbedMessaging.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Messaging-TabbedMessaging.html	Tue Mar 21 23:23:37 2017 +0100
@@ -56,7 +56,7 @@
 			<h3>Tab location</h3>
 		</div>
 		<div class="taskboxtext">
-			<p>As of version 1.1, you can now choose the location of tabs in message windows.  You can choose between Top, Bottom, Left or Right.</p>
+			<p>You can choose the location of tabs in message windows.  You can choose between Top, Bottom, Left or Right.</p>
 			<p>To select the location of tabs, follow these steps:</p>
 			<ul>
 				<li>Select Preferences in the Adium Menu (or press ⌘,).</li>
--- a/AdiumHelp/pgs/Troubleshooting-CommonProblems.html	Tue Mar 21 21:26:27 2017 +0100
+++ b/AdiumHelp/pgs/Troubleshooting-CommonProblems.html	Tue Mar 21 23:23:37 2017 +0100
@@ -5,7 +5,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <meta name="keywords" content="troubleshooting, problem, issue" />
 <meta name="description" content="Troubleshooting" />
-<title>Troubleshooting: common problems and solutions - Adium Documentation</title>
+<title>Troubleshooting: common problems and solutions</title>
 <link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
 </head>
 <body>
@@ -48,16 +48,5 @@
 	</div>
 </div>
 <script type="text/javascript" src="../js/help.js"></script>
-	<div id="footer">					<div class="donate">
-									<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick</body>amp;submit.x=57</body>amp;submit.y=8</body>amp;encrypted=-----BEGIN+PKCS7-----%0D%0AMIIHFgYJKoZIhvcNAQcEoIIHBzCCBwMCAQExggEwMIIBLAIBADCBlDCBjjELMAkG%0D%0AA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw%0D%0AEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UE%0D%0AAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJ%0D%0AKoZIhvcNAQEBBQAEgYAFR5tF%2BRKUV3BS49vJraDG%2BIoWDoZMieUT%2FJJ1Fzjsr511%0D%0Au7hS1F2piJuHuqmm%2F0r8Kf8oaycOo74K3zLmUQ6T6hUS6%2Bh6lZAoIlhI3A1YmqIP%0D%0AdrdY%2FtfKRbWfolDumJ9Mdv%2FzJxPnpdQiTN5K1PMrPYE6GgPWE9WC4V9lqstSmTEL%0D%0AMAkGBSsOAwIaBQAwgZMGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjtd%2BN9o4ZB6A%0D%0AcIbH8ZjOLmE35xBQ%2F93chtzIcRXHhIQJVpBRCkyJkdTD3libP3F7TgkrLij1DBxg%0D%0AfFlE0V%2FGTk29Ys%2FwsPO7hNs3YSNuSz0HT5F6sa8aXwFtMCE%2FgB1Ha4qdtYY%2BNETJ%0D%0AEETwNMLefjhaBfI%2BnRxl2K2gggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0B%0D%0AAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3Vu%0D%0AdGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9j%0D%0AZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBh%0D%0AbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UE%0D%0ABhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYD%0D%0AVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQI%0D%0AbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZI%0D%0AhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS%2BNdl72T7oKJ4u4uw%2B6aw%0D%0AntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe%2FhJl66%2FRGqrj%0D%0A5rFb08sAABNTzDTiqqNpJeBsYs%2Fc2aiGozptX2RlnBktH%2BSUNpAajW724Nv2Wvhi%0D%0Af6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7%0D%0ABgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYD%0D%0AVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS%0D%0ABgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQD%0D%0AFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsLmNvbYIBADAMBgNV%0D%0AHRMEBTADAQH%2FMA0GCSqGSIb3DQEBBQUAA4GBAIFfOlaagFrl71%2Bjq6OKidbWFSE%2B%0D%0AQ4FqROvdgIONth%2B8kSK%2F%2FY%2F4ihuE4Ymvzn5ceE3S%2FiBSQQMjyvb%2Bs2TWbQYDwcp1%0D%0A29OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa%2Bu4qect%0D%0AsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYD%0D%0AVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFs%0D%0AIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRww%0D%0AGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkq%0D%0AhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNDAzMjUwNDQ0%0D%0AMzRaMCMGCSqGSIb3DQEJBDEWBBRzTAS6zk5cmMeC49IorY8CM%2BkX0TANBgkqhkiG%0D%0A9w0BAQEFAASBgBsyRfMv9mSyoYq00wIB7BmUHFGq5x%2Ffnr8M24XbKjhkyeULk2NC%0D%0As4jbCgaWNg6grvccJtjbvmDskMKt%2BdS%2BEAkeWwm1Zf%2F%2B5u1fMyb5vo1NNcRIs5oq%0D%0A7SvXiLTPRzVqzQdhVs7PoZG0i0RRIb0tMeo1IssZeB2GE5Nsg0D8PwpB%0D%0A-----END+PKCS7-----">
-									Donate to Adium</a>
-									</div>
-								<div id="powered" style="opacity: 100%">
-									<a href="https://developer.apple.com/wwdc/events/awards/"><img class="libgaim" src="../../images/ada.png" alt="Apple design awards 05 special mention"></a>
-									<a href="https://www.pidgin.im"><img class="libgaim" src="../../images/powered_by_libpurple.png" alt="Adium is powered by libpurple"></a>
-									<a class="cachefly" href="https://www.cachefly.com"><img src="../../images/cachefly.png" alt="CacheFly Logo"></a>
-									<a class="networkredux" href="http://www.networkredux.com"><img src="../../images/network_redux.png" alt="Network Redux Logo"></a>
-								</div>
-							</div>
-			</body>
+</body>
 </html>
--- a/README.md	Tue Mar 21 21:26:27 2017 +0100
+++ b/README.md	Tue Mar 21 23:23:37 2017 +0100
@@ -1,9 +1,9 @@
 [Adium](https://adium.im)
 ========================
 
-[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)
+[![Adiumy](https://adium.im/images/logo.png)](https://adiumx.cachefly.net/Adium_1.5.10.2.dmg)
 
-[Download Adium 1.5.10](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)
+[Download Adium 1.5.10.2](https://adiumx.cachefly.net/Adium_1.5.10.2.dmg)
 
 ## About Adium ##
 
@@ -19,7 +19,7 @@
 	* [WebKit Message View](https://adium.im/help/pgs/Messaging-MessageView.html):  Theme your chat windows
 * [Combined Contacts](https://adium.im/help/pgs/ContactList-CombiningContacts.html): Merge your contacts so that each one represents a person, not an account
 * A sophisticated events system (including [Growl notifications](https://adium.im/help/pgs/AdvancedFeatures-GrowlSupport.html))
-* [OTR Encryption](https://trac.adium.im/wiki/OTREncryption)
+* [OTR Encryption](https://adium.im/help/pgs/AdvancedFeatures-OTREncryption.html)
 * [File Transfer](https://adium.im/help/pgs/AdvancedFeatures-FileTransfer.html)
 * [Xtras](https://adium.im/help/pgs/AdvancedFeatures-AdiumXtras.html) and many, many other customization options
 * A beautiful icon, the "[Adiumy](https://trac.adium.im/wiki/Adiumy)" duck