www/adium.im 794:efab2c5f29ac: Updated help to match 535565efb1e2.

commits at adium.im commits at adium.im
Sun Jul 7 19:02:39 UTC 2013 

details:	http://hg.adium.im/www/adium.im/rev/efab2c5f29ac
revision:	794:efab2c5f29ac
branch:		adiumx.com
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Sun Jul 07 21:00:24 2013 +0200

Updated help to match 535565efb1e2.

diffs (120 lines):

diff -r 3658f6c4190b -r efab2c5f29ac help/gfx/IRC from account selection.png
Binary file help/gfx/IRC from account selection.png has changed
diff -r 3658f6c4190b -r efab2c5f29ac help/gfx/Twitter from account selection.png
Binary file help/gfx/Twitter from account selection.png has changed
diff -r 3658f6c4190b -r efab2c5f29ac help/pgs/AdiumDocumentation.html
--- a/help/pgs/AdiumDocumentation.html	Sun Jul 07 20:21:43 2013 +0200
+++ b/help/pgs/AdiumDocumentation.html	Sun Jul 07 21:00:24 2013 +0200
@@ -96,7 +96,7 @@
 			<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
 				<tr>
 					<td width="150" rowspan="2" valign="top"><img src="../gfx/Message-sm.png" height="auto" width="150" border="0" alt="Message window screenshot" /> </td>
-					<td valign="top" colspan="3"><p>The Messaging window lets you communicate with your contacts. There are various features of this window from choosing which account of your contact you're talking to or want to talk to, adding files and emoticons to conversations and past chat history with the contact.</p></td>
+					<td valign="top" colspan="3"><p>The chat window lets you communicate with your contacts. There are various features of this window from choosing which account of your contact you're talking to or want to talk to, adding files and emoticons to conversations and past chat history with the contact.</p></td>
 				</tr>
 				<tr>
 					<td><ul>
@@ -113,21 +113,39 @@
 	</div>
 	<div class="taskboxline">
 		<div class="taskboxheader">
+			<h3>Events and notifications</h3>
+		</div>
+		<div class="taskboxtable">
+			<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
+				<tr>
+					<td width="150" rowspan="2" valign="top"><img src="../gfx/GrowlNotification1.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
+					<td valign="top" colspan="3"><p>Adium features a highly-customisable "Events" system which enables you to set up different kinds of notifications and other actions for events.</p></td>
+				</tr>
+				<tr>
+					<td><ul>
+							<li><a href="AdvancedFeatures-Events.html">Events â–¸</a></li>
+								<ul>
+									<li><a href="AdvancedFeatures-VisualNotifications.html">Visual notifications â–¸</a></li>
+									<li><a href="AdvancedFeatures-EmailNotification.html">Email notification â–¸</a></li>
+								</ul>
+						</ul></td>
+				</tr>
+			</table>
+		</div>
+	</div>
+	<div class="taskboxline">
+		<div class="taskboxheader">
 			<h3>Advanced features</h3>
 		</div>
 		<div class="taskboxtable">
 			<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
 				<tr>
-					<td width="150" rowspan="2" valign="top"><img src="../gfx/GrowlNotification1.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
+					<td width="150" rowspan="2" valign="top"><img src="../gfx/Adium-Xtras.png" height="auto" width="150" border="0" alt="Example Growl Notification" /> </td>
 					<td valign="top" colspan="3"><p>Adium sports a variety of advanced features.</p></td>
 				</tr>
 				<tr>
 					<td><ul>
 							<li><a href="AdvancedFeatures-AdiumXtras.html">Adium Xtras â–¸</a></li>
-							<li><a href="AdvancedFeatures-Events.html">Events â–¸</a></li>
-								<ul>
-									<li><a href="AdvancedFeatures-VisualNotifications.html">Visual notifications â–¸</a></li>
-								</ul>
 							<li><a href="AdvancedFeatures-FileTransfer.html">File transfer â–¸</a></li>
 							<li><a href="AdvancedFeatures-AddressBookIntegration.html">Address Book integration â–¸</a></li>
 							<li><a href="AdvancedFeatures-OTREncryption.html">OTR encryption â–¸</a></li>
@@ -155,11 +173,16 @@
 				<tr>
 					<td><ul>
 							<li><a href="Miscellaneous-KeyboardShortcuts.html">Keyboard shortcuts â–¸</a></li>
+							<li><a href="Miscellaneous-PasswordProtection.html">Password-protecting Adium â–¸</a></li>
 							<li><a href="Miscellaneous-BackingUpAdium.html">Backing up Adium â–¸</a></li>
 							<li><a href="Miscellaneous-Uninstalling.html">Uninstalling Adium â–¸</a></li>
 							<li><a href="Miscellaneous-LocationsAdiumFiles.html">Locations of Adium files â–¸</a></li>
 							<li><a href="Miscellaneous-AVSkypeSupport.html">Audio/Video chat and Skype support â–¸</a></li>
-							<li><a href="Miscellaneous-SupportOtherOS.html">Support for other operating systems â–¸</a></li>
+							<li>Support for other operating systems</a></li>
+							<ul>
+								<li><a href="Miscellaneous-SupportWindowsLinuxMacOS9.html">Support for Windows, Linux and Mac OS 9 â–¸</a></li>
+								<li><a href="https://trac.adium.im/wiki/AdiumForiPhone">Support for iOS (iPhone, iPad) â–¸</li>
+							</ul>
 						</ul></td>
 				</tr>
 			</table>
diff -r 3658f6c4190b -r efab2c5f29ac help/pgs/Troubleshooting-RecoveringDeletedTranscripts.html
--- a/help/pgs/Troubleshooting-RecoveringDeletedTranscripts.html	Sun Jul 07 20:21:43 2013 +0200
+++ b/help/pgs/Troubleshooting-RecoveringDeletedTranscripts.html	Sun Jul 07 21:00:24 2013 +0200
@@ -45,6 +45,7 @@
 					<li>Press ⇧⌘H. This opens your Home folder.</li>
 					<li>Navigate to Library/Application Support/Adium 2.0/Users/Default/Logs.</li>
 					<li>The contents of that folder are subfolders, one per account; the contents of each subfolder are more subfolders, one per contact. So, for example, if your AIM username is jdoe and you have a contact named jsmith, the logs folder will contain a folder named “AIM.jdoe” that contains a subfolder named “jsmith”.</li>
+					<p align="center"> <img src="../gfx/RecoveringDeletedTranscripts-AdiumLogsFolder.png" width="400" " alt="" /></p>
 					<li>Move each chatlog file from the Trash to the appropriate subfolder of the Logs folder. (It is important that you put it in the right folder. Otherwise, Adium won't be able to find those transcripts correctly in the Transcript Viewer window.)</li>
 				</ol>
 		</div>
diff -r 3658f6c4190b -r efab2c5f29ac help/pgs/WhatsNew1.4.html
--- a/help/pgs/WhatsNew1.4.html	Sun Jul 07 20:21:43 2013 +0200
+++ b/help/pgs/WhatsNew1.4.html	Sun Jul 07 21:00:24 2013 +0200
@@ -25,7 +25,7 @@
 			<a class="navtab" href="http://adium.spreadshirt.com">Merchandise</a> 
 			<a class="navtab" href="http://www.adiumxtras.com/">Xtras</a> 
 		</div>
-<div id="banner"> <a name="whatsnew.html" id="WhatsNew.html"></a><a name="ax-whatsnew" id="ax-whatsnew"></a>
+<div id="banner"> <a name="whatsnew1.4.html" id="WhatsNew1.4.html"></a><a name="ax-whatsnew" id="ax-whatsnew"></a>
 	<div id="navleft"><a class="navleftsty" href="../">Adium Help</a> <a class="navleftsty" href="http://adium.im/screencasts/">Adium Videos</a> <a class="navleftsty active" href="AdiumDocumentation.html">Adium Documentation</a></div>
 </div>
 <div id="mainbox">
@@ -41,7 +41,7 @@
 		<div class="taskboxtable">
 			<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
 				<tr>
-					<td width="150" rowspan="2" valign="top"><img src="../gfx/IRC from account selection.png" alt="Image of Adium account types with IRC selected" height="auto" width="150" border="0" /> </td>
+					<td width="150" rowspan="2" valign="top"><img src="../gfx/Twitter from account selection.png" alt="Image of Adium account types with IRC selected" height="auto" width="150" border="0" /> </td>
 					<td><ul>
 							<li>Timeline messages appear in a group chat.</li>
 							<li>Direct messages as a one-on-one chat with a contact</li>
@@ -59,7 +59,7 @@
 		<div class="taskboxtable">
 			<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
 				<tr>
-					<td width="150" rowspan="2" valign="top"><img src="../gfx/Twitter from account selection.png" alt="Image of Adium account types with Twitter selected" height="auto" width="150" border="0" /> </td>
+					<td width="150" rowspan="2" valign="top"><img src="../gfx/IRC from account selection.png" alt="Image of Adium account types with Twitter selected" height="auto" width="150" border="0" /> </td>
 					<td><ul>
 							<li>Execute commands on connect.</li>
 							<li>Display of operator status in chats, as well as user's /away status</li>

More information about the commits mailing list