www/adium.im 592:1b82e7ea2848: Make the active links in the main...
commits at adium.im
commits at adium.im
Mon Feb 27 00:09:25 UTC 2012
details: http://hg.adium.im/www/adium.im/rev/1b82e7ea2848
revision: 592:1b82e7ea2848
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sat Feb 25 22:03:26 2012 +0000
Make the active links in the main navigation more prominent than inactive links for consistency with the sub-navigation.
Subject: www/adium.im 593:186d4d5b4125: Added page titles, meta keywords and meta descriptions for Adium Documentation. Previously the meta descriptions were very brief and resulted in them not being used by Google. This should fix it.
details: http://hg.adium.im/www/adium.im/rev/186d4d5b4125
revision: 593:186d4d5b4125
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Mon Feb 27 00:09:14 2012 +0000
Added page titles, meta keywords and meta descriptions for Adium Documentation. Previously the meta descriptions were very brief and resulted in them not being used by Google. This should fix it.
diffs (truncated from 1206 to 1000 lines):
diff -r 1cd2d492a40c -r 186d4d5b4125 assets/images/sprite.png
Binary file assets/images/sprite.png has changed
diff -r 1cd2d492a40c -r 186d4d5b4125 assets/styles/global.css
--- a/assets/styles/global.css Sat Feb 25 19:58:59 2012 +0000
+++ b/assets/styles/global.css Mon Feb 27 00:09:14 2012 +0000
@@ -109,12 +109,12 @@
nav ul, nav li {
border: 0;
- -webkit-border-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#bababa)) 1 100%;
- -webkit-border-image: -webkit-linear-gradient(top, #f5f5f5 0%, #bababa 100%) 1 100%;
- -moz-border-image: -moz-linear-gradient(top, #f5f5f5 0%, #bababa 100%) 1 100%;
- -ms-border-image: -ms-linear-gradient(top, #f5f5f5 0%, #bababa 100%) 1 100%;
- -o-border-image: -o-linear-gradient(top, #f5f5f5 0%, #bababa 100%) 1 100%;
- border-image: linear-gradient(top, #f5f5f5 0%, #bababa 100%) 1 100%;
+ -webkit-border-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f9f9f9), to(#bababa)) 1 100%;
+ -webkit-border-image: -webkit-linear-gradient(top, #f9f9f9 0%, #bababa 100%) 1 100%;
+ -moz-border-image: -moz-linear-gradient(top, #f9f9f9 0%, #bababa 100%) 1 100%;
+ -ms-border-image: -ms-linear-gradient(top, #f9f9f9 0%, #bababa 100%) 1 100%;
+ -o-border-image: -o-linear-gradient(top, #f9f9f9 0%, #bababa 100%) 1 100%;
+ border-image: linear-gradient(top, #f9f9f9 0%, #bababa 100%) 1 100%;
}
nav ul {
@@ -152,9 +152,9 @@
transition: color .2s ease, background-color .2s ease;
}
-nav li a span { color: #666; }
-nav li a span:hover { color: #444; background-color: #fff; }
-nav li a span:active, .active span, .active a:hover span { color: #999; }
+nav li a span { color: #777; }
+nav li a span:hover, .active span, .active a:hover span { color: #555; background-color: #fff; }
+nav li a span:active { color: #777; }
nav li span:before {
content: '';
@@ -169,33 +169,32 @@
.merch span:before { padding-left: 25px; }
.home a span:before { background-position: -20px -49px; }
-.home a:hover span:before { background-position: -20px -79px; }
-.home a:active span:before, .home.active a span:before { background-position: -20px -19px; }
+.home a:hover span:before, .home.active a span:before { background-position: -20px -19px; }
+.home a:active span:before { background-position: -20px -79px; }
.about a span:before { background-position: -51px -49px; }
-.about a:hover span:before { background-position: -51px -79px; }
-.about a:active span:before, .about.active a span:before { background-position: -51px -19px; }
+.about a:hover span:before, .about.active a span:before { background-position: -51px -19px; }
+.about a:active span:before { background-position: -51px -79px; }
+
+.help a span:before { background-position: -112px -49px; }
+.help a:hover span:before, .help.active a span:before { background-position: -112px -19px; }
+.help a:active span:before { background-position: -112px -79px; }
.blog a span:before { background-position: -81px -49px; }
-.blog a:hover span:before { background-position: -81px -79px; }
-.blog a:active span:before, .blog.active a span:before { background-position: -81px -19px; }
+.blog a:hover span:before, .blog.active a span:before { background-position: -81px -19px; }
+.blog a:active span:before { background-position: -81px -79px; }
-.help a span:before { background-position: -112px -49px; }
-.help a:hover span:before { background-position: -112px -79px; }
-.help a:active span:before, .help.active a span:before { background-position: -112px -19px; }
+.xtras a span:before { background-position: -205px -49px; }
+.xtras a:hover span:before, .xtras.active a span:before { background-position: -205px -19px; }
+.xtras a:active span:before { background-position: -205px -79px; }
.dev a span:before { background-position: -142px -49px; }
-.dev a:hover span:before { background-position: -142px -79px; }
-.dev a:active span:before, .dev.active a span:before { background-position: -142px -19px; }
+.dev a:hover span:before, .dev.active a span:before { background-position: -142px -19px; }
+.dev a:active span:before { background-position: -142px -79px; }
.merch a span:before { background-position: -172px -49px; }
-.merch a:hover span:before { background-position: -172px -79px; }
-.merch a:active span:before, .merch.active a span:before { background-position: -172px -19px; }
-
-.xtras a span:before { background-position: -205px -49px; }
-.xtras a:hover span:before { background-position: -205px -79px; }
-.xtras a:active span:before, .xtras.active a span:before { background-position: -205px -19px; }
-
+.merch a:hover span:before, .merch.active a span:before { background-position: -172px -19px; }
+.merch a:active span:before { background-position: -172px -79px; }
/********** Sub Navigation Container **********/
diff -r 1cd2d492a40c -r 186d4d5b4125 help/.htaccess
--- a/help/.htaccess Sat Feb 25 19:58:59 2012 +0000
+++ b/help/.htaccess Mon Feb 27 00:09:14 2012 +0000
@@ -4,7 +4,6 @@
# Redirect all the old documentation into its new location
RewriteRule ^pgs/Accounts-AIM.html /rewrite/help/documentation/accounts-aim [R=301,L]
-RewriteRule ^pgs/Accounts-AIM.html /rewrite/help/documentation/accounts-aim [R=301,L]
RewriteRule ^pgs/Accounts-Bonjour.html /rewrite/help/documentation/accounts-bonjour [R=301,L]
RewriteRule ^pgs/Accounts-ContactIcons.html /rewrite/help/documentation/accounts-contact-icons [R=301,L]
RewriteRule ^pgs/Accounts-CreatingAccounts.html /rewrite/help/documentation/accounts-creating-accounts [R=301,L]
@@ -33,8 +32,8 @@
RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-DockIcons.html /rewrite/help/documentation/advanced-features-adium-xtras-dock-icons [R=301,L]
RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-EmoticonSets.html /rewrite/help/documentation/advanced-features-adium-xtras-emoticon-sets [R=301,L]
RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-ListLayouts.html /rewrite/help/documentation/advanced-features-adium-xtras-list-layouts [R=301,L]
-RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-ListTheme.html /rewrite/help/documentation/advanced-features-adium-xtras-list-theme [R=301,L]
-RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html /rewrite/help/documentation/advanced-features-adium-xtras-menubar-icons [R=301,L]
+RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-ListTheme.html /rewrite/help/documentation/advanced-features-adium-xtras-list-themes [R=301,L]
+RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-MenuBarIcons.html /rewrite/help/documentation/advanced-features-adium-xtras-menu-bar-icons [R=301,L]
RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-ServiceIcons.html /rewrite/help/documentation/advanced-features-adium-xtras-service-icons [R=301,L]
RewriteRule ^pgs/AdvancedFeatures-AdiumXtras-SoundSets.html /rewrite/help/documentation/advanced-features-adium-xtras-sound-sets [R=301,L]
RewriteRule ^pgs/AdvancedFeatures-AdiumXtras.html /rewrite/help/documentation/advanced-features-adium-xtras [R=301,L]
@@ -45,11 +44,11 @@
RewriteRule ^pgs/AdvancedFeatures-SearchForBuddyBy* /rewrite/help/documentation/advanced-features-search-for-buddy-by-email [R=301,L]
RewriteRule ^pgs/ContactList-BlockingUnblocking.html /rewrite/help/documentation/contact-list-blocking-unblocking [R=301,L]
RewriteRule ^pgs/ContactList-CombiningContacts.html /rewrite/help/documentation/contact-list-combining-contacts [R=301,L]
-RewriteRule ^pgs/ContactList-ContactList.html /rewrite/help/documentation/contact-list-contact-list [R=301,L]
RewriteRule ^pgs/ContactList-ManagingContacts.html /rewrite/help/documentation/contact-list-managing-contacts [R=301,L]
RewriteRule ^pgs/ContactList-ManagingGroups.html /rewrite/help/documentation/contact-list-managing-groups [R=301,L]
RewriteRule ^pgs/ContactList-SortingDisplayingContacts.html /rewrite/help/documentation/contact-list-sorting-displaying-contacts [R=301,L]
RewriteRule ^pgs/ContactList-StatusIcons.html /rewrite/help/documentation/contact-list-status-icons [R=301,L]
+RewriteRule ^pgs/ContactList-ContactList.html /rewrite/help/documentation/contact-list [R=301,L]
RewriteRule ^pgs/Messaging-Focus.html /rewrite/help/documentation/messaging-focus [R=301,L]
RewriteRule ^pgs/Messaging-FontsAndColors.html /rewrite/help/documentation/messaging-fonts-and-colors [R=301,L]
RewriteRule ^pgs/Messaging-GroupChat.html /rewrite/help/documentation/messaging-group-chat [R=301,L]
@@ -58,11 +57,11 @@
RewriteRule ^pgs/Messaging-SendingMessages.html /rewrite/help/documentation/messaging-sending-messages [R=301,L]
RewriteRule ^pgs/Messaging-TabbedMessaging.html /rewrite/help/documentation/messaging-tabbed-messaging [R=301,L]
RewriteRule ^pgs/Messaging-TranscriptViewer.html /rewrite/help/documentation/messaging-transcript-viewer [R=301,L]
+RewriteRule ^pgs/Miscellaneous-LocationsAdiumFiles.html /rewrite/help/documentation/miscellaneous-adium-file-locations [R=301,L]
RewriteRule ^pgs/Miscellaneous-AVSkypeSupport.html /rewrite/help/documentation/miscellaneous-av-skype-support [R=301,L]
RewriteRule ^pgs/Miscellaneous-BackingUpAdium.html /rewrite/help/documentation/miscellaneous-backing-up-adium [R=301,L]
RewriteRule ^pgs/Miscellaneous-KeyboardShortcuts.html /rewrite/help/documentation/miscellaneous-keyboard-shortcuts [R=301,L]
-RewriteRule ^pgs/Miscellaneous-LocationsAdiumFiles.html /rewrite/help/documentation/miscellaneous-locations-adium-files [R=301,L]
-RewriteRule ^pgs/Miscellaneous-SupportOtherOS.html /rewrite/help/documentation/miscellaneous-support-other-os [R=301,L]
+RewriteRule ^pgs/Miscellaneous-SupportOtherOS.html /rewrite/help/documentation/miscellaneous-os-support [R=301,L]
RewriteRule ^pgs/Miscellaneous-Uninstalling.html /rewrite/help/documentation/miscellaneous-uninstalling [R=301,L]
RewriteRule ^pgs/ServiceInformation-IRCSupport.html /rewrite/help/documentation/service-information-irc-support [R=301,L]
RewriteRule ^pgs/ServiceInformation-TwitterSupport.html /rewrite/help/documentation/service-information-twitter-support [R=301,L]
@@ -70,7 +69,7 @@
RewriteRule ^pgs/Troubleshooting-ConnectionProblemsMSN.html /rewrite/help/documentation/troubleshooting-connection-problems-msn [R=301,L]
RewriteRule ^pgs/Troubleshooting-ConnectionProblems.html /rewrite/help/documentation/troubleshooting-connection-problems [R=301,L]
RewriteRule ^pgs/Troubleshooting-ICQTextEncoding.html /rewrite/help/documentation/troubleshooting-icq-text-encoding [R=301,L]
-RewriteRule ^pgs/Troubleshooting-PersistentPromptsForPasswords.html /rewrite/help/documentation/troubleshooting-persistent-prompts-for-passwords [R=301,L]
+RewriteRule ^pgs/Troubleshooting-PersistentPromptsForPasswords.html /rewrite/help/documentation/troubleshooting-persistent-password-prompts [R=301,L]
RewriteRule ^pgs/Troubleshooting-ProblemsWithParticularContact.html /rewrite/help/documentation/troubleshooting-problems-with-particular-contact [R=301,L]
RewriteRule ^pgs/Troubleshooting-RecoveringDeletedTranscripts.html /rewrite/help/documentation/troubleshooting-recovering-deleted-transcripts [R=301,L]
RewriteRule ^pgs/Troubleshooting-RecoveringLostPasswords.html /rewrite/help/documentation/troubleshooting-recovering-lost-passwords [R=301,L]
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-gadu-gadu.htmlfrag
--- a/help/documentation/accounts-gadu-gadu.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-gadu-gadu.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table>
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://www.gadu-gadu.pl/">http://www.gadu-gadu.pl/</a></td>
+ <td class="top"><a href="http://www.gadu-gadu.pl/">http://www.gadu-gadu.pl</a></td>
</tr>
<tr>
<td class="side">Server status</td>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-gizmo5.htmlfrag
--- a/help/documentation/accounts-gizmo5.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-gizmo5.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table>
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://gizmo5.com/">http://gizmo5.com/</a></td>
+ <td class="top"><a href="http://gizmo5.com/">http://gizmo5.com</a></td>
</tr>
<tr>
<td class="side">Type</td>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-icq.htmlfrag
--- a/help/documentation/accounts-icq.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-icq.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table>
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://www.icq.com/">http://www.icq.com/</a></td>
+ <td class="top"><a href="http://www.icq.com">http://www.icq.com</a></td>
</tr>
<tr>
<td class="side">Type</td>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-irc.htmlfrag
--- a/help/documentation/accounts-irc.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-irc.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table class="margin-fix">
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://www.irc.org/">http://www.irc.org/</a></td>
+ <td class="top"><a href="http://www.irc.org">http://www.irc.org</a></td>
</tr>
<tr>
<td class="side">Type</td>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-list-of-services.htmlfrag
--- a/help/documentation/accounts-list-of-services.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-list-of-services.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -1,5 +1,5 @@
<h1>List of services supported and their interoperability</h1>
-<p>This Adium Wiki 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 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>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>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-qq.htmlfrag
--- a/help/documentation/accounts-qq.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-qq.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table>
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://www.qq.com/">http://http://www.qq.com/</a> (China); <a href="http://www.qq.co.za/">http://www.qq.co.za/</a> (South Africa)</td>
+ <td class="top"><a href="http://www.qq.com">http://http://www.qq.com</a> (China); <a href="http://www.qq.co.za">http://www.qq.co.za</a> (South Africa)</td>
</tr>
<tr>
<td class="side">Type</td>
@@ -17,4 +17,4 @@
<td>China; South Africa</td>
</tr>
</table>
-<p>Tencent QQ is the most popular free instant messaging computer program in Mainland China. Curiously, it it also very common in South Africa.</p>
\ No newline at end of file
+<p>Tencent QQ is the most popular free instant messaging computer program in Mainland China. Curiously, it is also very common in South Africa.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-yahoo-japan.htmlfrag
--- a/help/documentation/accounts-yahoo-japan.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-yahoo-japan.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table class="margin-fix">
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://messenger.yahoo.co.jp/">http://messenger.yahoo.co.jp/</a></td>
+ <td class="top"><a href="http://messenger.yahoo.co.jp">http://messenger.yahoo.co.jp</a></td>
</tr>
<tr>
<td class="side">Type</td>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/accounts-yahoo.htmlfrag
--- a/help/documentation/accounts-yahoo.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/accounts-yahoo.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -6,7 +6,7 @@
<table>
<tr>
<td class="top side">Homepage</td>
- <td class="top"><a href="http://messenger.yahoo.com/">http://messenger.yahoo.com/</a></td>
+ <td class="top"><a href="http://messenger.yahoo.com">http://messenger.yahoo.com</a></td>
</tr>
<tr>
<td class="side">Type</td>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-adium-xtras-list-theme.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-list-theme.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<h1>List themes</h1>
-<p class="list-header">A .ListTheme AdiumXtra defines the colors and other visual information which appear in your Contact List, including but not limited to:</p>
-<ul>
- <li>Highlight color</li>
- <li>Alternating grid</li>
- <li>Window background (Normal and Borderless contact list window styles only)</li>
- <li>Status-based coloration</li>
- <li>Status text color (if extended status is displayed), such as colors displayed for Online, Away, or Idle contacts</li>
- <li>Event text color, such as colors displayed for recently signed-on contacts or contacts who are currently typing to you</li>
- <li>Group background colors</li>
-</ul>
-
-<hr>
-
-<h2>Bundled list themes</h2>
-<p class="list-header">Adium comes with several list themes preinstalled. You can customize the list layout via the Customize button in Preferences → Appearance.</p>
-<ul>
- <li>Aqualicious</li>
- <li>Bright Orange</li>
- <li>Concise</li>
- <li>Decay 2.0</li>
- <li>Pastel Pink</li>
-</ul>
-
-<hr>
-
-<h2>Installing list themes</h2>
-<p>More list themes are available at the <a href="http://xtras.adium.im">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .ListLayout file that you have already downloaded, simply double-click it. In either case, Adium will launch and put it into the correct place for you.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-adium-xtras-list-themes.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/advanced-features-adium-xtras-list-themes.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -0,0 +1,28 @@
+<h1>List themes</h1>
+<p class="list-header">A .ListTheme AdiumXtra defines the colors and other visual information which appear in your Contact List, including but not limited to:</p>
+<ul>
+ <li>Highlight color</li>
+ <li>Alternating grid</li>
+ <li>Window background (Normal and Borderless contact list window styles only)</li>
+ <li>Status-based coloration</li>
+ <li>Status text color (if extended status is displayed), such as colors displayed for Online, Away, or Idle contacts</li>
+ <li>Event text color, such as colors displayed for recently signed-on contacts or contacts who are currently typing to you</li>
+ <li>Group background colors</li>
+</ul>
+
+<hr>
+
+<h2>Bundled list themes</h2>
+<p class="list-header">Adium comes with several list themes preinstalled. You can customize the list layout via the Customize button in Preferences → Appearance.</p>
+<ul>
+ <li>Aqualicious</li>
+ <li>Bright Orange</li>
+ <li>Concise</li>
+ <li>Decay 2.0</li>
+ <li>Pastel Pink</li>
+</ul>
+
+<hr>
+
+<h2>Installing list themes</h2>
+<p>More list themes are available at the <a href="http://xtras.adium.im">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .ListLayout file that you have already downloaded, simply double-click it. In either case, Adium will launch and put it into the correct place for you.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-adium-xtras-menu-bar-icons.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/advanced-features-adium-xtras-menu-bar-icons.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -0,0 +1,21 @@
+<h1>Menu bar icons</h1>
+<p>.AdiumMenuBarIcons Xtras provide alternate menu bar icons for Adium.</p>
+
+<hr>
+
+<h2>Bundled dock icons</h2>
+<p class="list-header">By default, Adium contains two menu bar icons that can be configured from Adium's Appearance preferences pane:</p>
+<ul>
+ <li>Adiumy</li>
+ <li>Adiumy Flashy</li>
+</ul>
+
+<hr>
+
+<h2>Installing dock icons</h2>
+<p>More menu bar icons are available at the <a href="http://xtras.adium.im">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumMenuBarIcons file that you have already downloaded, simply double-click it. In either case, Adium will launch and put it into the correct place for you.</p>
+
+<hr>
+
+<h2>Creating a dock icon </h2>
+<p>Information on making custom menu bar icons is available at <a href="http://trac.adium.im/wiki/CreatingMenuBarIcons">Creating menu bar icons</a>.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-adium-xtras-menubar-icons.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-menubar-icons.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<h1>Menu bar icons</h1>
-<p>.AdiumMenuBarIcons Xtras provide alternate menu bar icons for Adium.</p>
-
-<hr>
-
-<h2>Bundled dock icons</h2>
-<p class="list-header">By default, Adium contains two menu bar icons that can be configured from Adium's Appearance preferences pane:</p>
-<ul>
- <li>Adiumy</li>
- <li>Adiumy Flashy</li>
-</ul>
-
-<hr>
-
-<h2>Installing dock icons</h2>
-<p>More menu bar icons are available at the <a href="http://xtras.adium.im">AdiumXtras website</a>, and can be installed by clicking the install link on the Xtra's page. To install an .AdiumMenuBarIcons file that you have already downloaded, simply double-click it. In either case, Adium will launch and put it into the correct place for you.</p>
-
-<hr>
-
-<h2>Creating a dock icon </h2>
-<p>Information on making custom menu bar icons is available at <a href="http://trac.adium.im/wiki/CreatingMenuBarIcons">Creating menu bar icons</a>.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-adium-xtras.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -14,7 +14,7 @@
<img src="/rewrite/assets/images/help/adium_xtras.png" title="Adium Xtras">
</figure>
<ul>
- <li>Contact List - Contact list layouts and themes (<a href="advanced-features-adium-xtras-list-layouts">.ListLayout</a>, <a href="advanced-features-adium-xtras-list-theme">.ListTheme</a>)</li>
+ <li>Contact List - Contact list layouts and themes (<a href="advanced-features-adium-xtras-list-layouts">.ListLayout</a>, <a href="advanced-features-adium-xtras-list-themes">.ListTheme</a>)</li>
<li>Dock Icons - Dock-icon packs (<a href="advanced-features-adium-xtras-dock-icons">.AdiumIcon</a>)</li>
<li>Emoticons - Emoticon packs (<a href="advanced-features-adium-xtras-emoticon-sets">.AdiumEmoticonSet</a>)</li>
<li>Menu Bar Icons - Menu bar icon packs (<a href="advanced-features-adium-xtras-menubar-icons">.AdiumMenuBarIcon</a>)</li>
@@ -26,7 +26,7 @@
<li>Status Icons - Status icon packs (<a href="contact-list-status-icons">.AdiumStatusIcon</a>)</li>
<li>...and more</li>
</ul>
-<p>The "Users" folder, also at this location, contains your preferences and message history (see <a href="miscellaneous-locations-adium-files">Locations of Adium files</a>).</p>
+<p>The "Users" folder, also at this location, contains your preferences and message history (see <a href="miscellaneous-adium-file-locations">Locations of Adium files</a>).</p>
<hr>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-direct-connect.htmlfrag
--- a/help/documentation/advanced-features-direct-connect.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/advanced-features-direct-connect.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -1,4 +1,4 @@
-<h1>AIM: DirectConnect</h1>
+<h1>AIM: Direct Connect</h1>
<hr>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/advanced-features-search-for-buddy-by-email.htmlfrag
--- a/help/documentation/advanced-features-search-for-buddy-by-email.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/advanced-features-search-for-buddy-by-email.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -3,4 +3,4 @@
<hr>
<h2>Searching for a contact by their email address</h2>
-<p>If you want to find one of your AIM contacts by their email address, just select select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
\ No newline at end of file
+<p>If you want to find one of your AIM contacts by their email address, just select "Search for Buddy by Email" from the submenu of the AIM account in the File menu.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/contact-list-blocking-unblocking.htmlfrag
--- a/help/documentation/contact-list-blocking-unblocking.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/contact-list-blocking-unblocking.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -2,7 +2,7 @@
<p class="list-header">Blocking is used to prevent communication from a specific contact. Once a contact has been blocked, you will appear offline to them and they will be unable to send messages to you. For all services except MSN, they also will appear offline to you, and you will be unable to see their status.</p>
<ul class="list-type-image">
<li class="status-blocked">
- Blocked contacts appear in your <a href="contact-list-contact-list">Contact List</a> with this status icon.
+ Blocked contacts appear in your <a href="contact-list">Contact List</a> with this status icon.
</li>
</ul>
<p>though some Adium Status Icons packs may have a different icon for blocked contacts.</p>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/contact-list-combining-contacts.htmlfrag
--- a/help/documentation/contact-list-combining-contacts.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/contact-list-combining-contacts.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -1,5 +1,5 @@
<h1>Combining contacts</h1>
-<p>Adium allows you to combine multiple contacts into one entry (a "Combined Contact," called a 'metacontact' by our developers) on your contact list,. This is extremely useful when one of your contacts has multiple user names or a user name on multiple services.</p>
+<p>Adium allows you to combine multiple contacts into one entry (a "Combined Contact," called a 'metacontact' by our developers) on your contact list. This is extremely useful when one of your contacts has multiple user names or a user name on multiple services.</p>
<p class="list-header">For instance, if you have the following user names on your contact list:</p>
<ul>
<li>adiumuser</li>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/contact-list-contact-list.htmlfrag
--- a/help/documentation/contact-list-contact-list.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<h1>The contact list</h1>
-<p>The contact list lets you see the status of your contacts at a glance.</p>
-
-<hr>
-
-<h2>Searching for a contact in the contact list</h2>
-<p>With the contact list in focus, you can access a contact search field by pressing ⌘+F or by simply typing into the contact list. The search field works like filter, narrowing down the results as you type.</p>
-
-<hr>
-
-<h2>Sending messages</h2>
-<p>You can double-click contacts in the list to open (or switch to) a messaging tab with them. See <a href="messaging-sending-messages">Sending messages</a> for more information.</p>
-
-<hr>
-
-<h2>Getting more information on contacts in your lists</h2>
-<p>Hover your mouse cursor over a contact without moving it for a moment to reveal an informational tooltip about that person. You can then move over other contacts to see their information. More info can be found via the Get Info window -- click a contact, then select Get Info from the Contact menu.</p>
-
-<hr>
-
-<h2>Arranging your contact list</h2>
-<p>The contact list can be arranged in groups. See <a href="contact-list-managing-contacts">Managing contacts</a> for information on adding, moving, deleting, and combining contacts.</p>
-
-<hr>
-
-<h2>Changing the appearance of your contact list</h2>
-<p>The contact list shows <a href="contact-list-status-icons">status icons</a> by default. Its appearance -- including what is displayed in it -- can be configured in many different ways via the Appearance Preferences. Select from built-in list layouts and color themes, download user-created ones from <a href="http://xtras.adium.im">AdiumXtras.com</a>, or create your own by clicking the Customize buttons there.</p>
-
-<hr>
-
-<h2>Sorting/displaying contacts</h2>
-<p>See the <strong>View</strong> menu for other ways to control the contact list, such as sorting or showing/hiding offline contacts. <a href="contact-list-sorting-displaying-contacts">Sorting and displaying contacts</a> has more details.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/contact-list.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/contact-list.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -0,0 +1,32 @@
+<h1>The contact list</h1>
+<p>The contact list lets you see the status of your contacts at a glance.</p>
+
+<hr>
+
+<h2>Searching for a contact in the contact list</h2>
+<p>With the contact list in focus, you can access a contact search field by pressing ⌘+F or by simply typing into the contact list. The search field works like filter, narrowing down the results as you type.</p>
+
+<hr>
+
+<h2>Sending messages</h2>
+<p>You can double-click contacts in the list to open (or switch to) a messaging tab with them. See <a href="messaging-sending-messages">Sending messages</a> for more information.</p>
+
+<hr>
+
+<h2>Getting more information on contacts in your lists</h2>
+<p>Hover your mouse cursor over a contact without moving it for a moment to reveal an informational tooltip about that person. You can then move over other contacts to see their information. More info can be found via the Get Info window -- click a contact, then select Get Info from the Contact menu.</p>
+
+<hr>
+
+<h2>Arranging your contact list</h2>
+<p>The contact list can be arranged in groups. See <a href="contact-list-managing-contacts">Managing contacts</a> for information on adding, moving, deleting, and combining contacts.</p>
+
+<hr>
+
+<h2>Changing the appearance of your contact list</h2>
+<p>The contact list shows <a href="contact-list-status-icons">status icons</a> by default. Its appearance -- including what is displayed in it -- can be configured in many different ways via the Appearance Preferences. Select from built-in list layouts and color themes, download user-created ones from <a href="http://xtras.adium.im">AdiumXtras.com</a>, or create your own by clicking the Customize buttons there.</p>
+
+<hr>
+
+<h2>Sorting/displaying contacts</h2>
+<p>See the <strong>View</strong> menu for other ways to control the contact list, such as sorting or showing/hiding offline contacts. <a href="contact-list-sorting-displaying-contacts">Sorting and displaying contacts</a> has more details.</p>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/documentation-headers.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/documentation-headers.php Mon Feb 27 00:09:14 2012 +0000
@@ -0,0 +1,372 @@
+<?php $meta = array(
+ /* 'page-url' => array( // Page URL as displayed in the address bar
+ 'title' => 'page-title', // Page title to be displayed in the title bar and in search results
+ 'key' => 'keywords', // Meta keywords for SEO, not widely supported these days
+ 'desc' => 'description' // Meta description as displayed in search engine results - Use 155 chars or less for Google readability
+ ), */
+ 'accounts-aim' => array(
+ 'title' => 'AOL Instant Messenger',
+ 'key' => 'AOL, AIM',
+ 'desc' => 'Being the second modern client after ICQ, AIM was initially released in 1997.'
+ ),
+ 'accounts-bonjour' => array(
+ 'title' => 'Bonjour',
+ 'key' => 'Bonjour, Rendezvous',
+ 'desc' => 'Formerly known as "Rendezvous", Bonjour is a local-network service that uses XMPP for chat.'
+ ),
+ 'accounts-contact-icons' => array(
+ 'title' => 'Contact icons',
+ 'key' => 'buddy, contact, icon, avatar, picture',
+ 'desc' => 'A contact icon, called an Avatar on some services, is an image which represents a person.'
+ ),
+ 'accounts-creating-accounts' => array(
+ 'title' => 'Creating an account',
+ 'key' => 'account, create, sign, up',
+ 'desc' => 'To use Adium, you\'ll need an account on one or more of the IM services that it supports.'
+ ),
+ 'accounts-facebook-chat' => array(
+ 'title' => 'Facebook Chat',
+ 'key' => 'Facebook, Facebook Chat, FB',
+ 'desc' => 'Facebook is a social networking website. It offers an in-browser "Facebook Chat" service.'
+ ),
+ 'accounts-gadu-gadu' => array(
+ 'title' => 'Gadu-Gadu',
+ 'key' => 'Gadu-Gadu',
+ 'desc' => 'Gadu-Gadu is the most popular IM service in Poland.'
+ ),
+ 'accounts-gizmo5' => array(
+ 'title' => 'Gizmo5',
+ 'key' => 'Gizmo5, Gizmo',
+ 'desc' => 'Gizmo\'s chat system is simply XMPP, so all you need to do is add the account as a Jabber account.'
+ ),
+ 'accounts-google-talk' => array(
+ 'title' => 'Google Talk',
+ 'key' => 'Google Talk, Gtalk',
+ 'desc' => 'Google\'s answer to IM. A Google Talk or AOL account is required to use this protocol.'
+ ),
+ 'accounts-groupwise' => array(
+ 'title' => 'Novell GroupWise',
+ 'key' => 'Novell GroupWise',
+ 'desc' => 'GroupWise is a Novell messenger service used in corporate environments.'
+ ),
+ 'accounts-icq' => array(
+ 'title' => 'ICQ',
+ 'key' => 'ICQ',
+ 'desc' => 'When it was released in 1996 by a company called Mirabilis, ICQ was the first real popular Instant Messaging service.'
+ ),
+ 'accounts-irc' => array(
+ 'title' => 'IRC',
+ 'key' => 'IRC, Internet Relay Chat',
+ 'desc' => 'To join an IRC channel select File -> Join Group Chat, or just type /join #channelname into any IRC chat window.'
+ ),
+ 'accounts-itunes-integration' => array(
+ 'title' => 'iTunes integration',
+ 'key' => 'status, itunes, music, integration',
+ 'desc' => 'You can display live information in your status, profile, or messages about the song currently playing in iTunes.'
+ ),
+ 'accounts-list-of-services' => array(
+ 'title' => 'List of services supported',
+ 'key' => 'services, interoperability, compatibility',
+ 'desc' => '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.'
+ ),
+ 'accounts-lj-talk' => array(
+ 'title' => 'LiveJournal Talk',
+ 'key' => 'LJ, LJ Talk, LiveJournal',
+ 'desc' => 'LiveJournal is Six Apart\'s blogging service. Its XMPP-based instant-messaging service is called "LJ Talk".'
+ ),
+ 'accounts-mobileme' => array(
+ 'title' => 'MobileMe',
+ 'key' => 'MobileMe',
+ 'desc' => 'Formerly known as ".Mac", MobileMe is Apple\'s bundle of online services, including AIM-compatible instant-messaging.'
+ ),
+ 'accounts-msn' => array(
+ 'title' => 'MSN Messenger',
+ 'key' => 'MSN, WLM, MSN Messenger, Windows Live',
+ 'desc' => 'MSN Messenger, now called Windows Live Messenger, is a freeware instant messaging client developed and distributed by Microsoft.'
+ ),
+ 'accounts-myspace' => array(
+ 'title' => 'MySpace IM',
+ 'key' => 'MySpace, MySpace IM',
+ 'desc' => 'MySpace is a social networking website. Its "MySpace IM" chat service is supported in Adium 1.1.3 and later.'
+ ),
+ 'accounts-qq' => array(
+ 'title' => 'Tencent QQ',
+ 'key' => 'QQ, Tencent',
+ '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',
+ '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.'
+ ),
+ 'accounts-sametime' => array(
+ 'title' => 'IBM Lotus Sametime',
+ 'key' => 'IBM, lotus, Sametime',
+ 'desc' => 'IBM Lotus Sametime is a messaging protocol used primarily in corporate environments.'
+ ),
+ 'accounts-setting-your-status' => array(
+ 'title' => 'Setting your status',
+ 'key' => 'status, setting status',
+ 'desc' => 'There are several ways to set the status of your account. Status includes available and away, available messages and away messages on compatible protocols.'
+ ),
+ 'accounts-twitter' => array(
+ 'title' => 'Twitter',
+ 'key' => 'twitter, social networking',
+ 'desc' => 'Twitter is an online social networking service and microblogging service that enables its users to send and read text-based posts.'
+ ),
+ 'accounts-xmpp' => array(
+ 'title' => 'XMPP',
+ 'key' => 'XMPP, Jabber',
+ 'desc' => 'Note that XMPP is special, due to being an open protocol. There is no central XMPP server, the structure is like e-mail.'
+ ),
+ 'accounts-yahoo-japan' => array(
+ 'title' => 'Yahoo! Japan Messenger',
+ 'key' => 'Yahoo, Yahoo messsenger, Yahoo Japan',
+ 'desc' => 'Yahoo! Messenger was first released in 1998.'
+ ),
+ 'accounts-yahoo' => array(
+ 'title' => 'Yahoo! Messenger',
+ 'key' => 'Yahoo, Yahoo messenger',
+ 'desc' => 'Yahoo! Messenger was first released in 1998.'
+ ),
+ 'advanced-features-address-book-integration' => array(
+ 'title' => 'Address Book integration',
+ 'key' => 'Address Book integration, Address Book',
+ 'desc' => 'Adium can use information in your Mac OS X Address Book ("AB") to enhance the display of the Contact List.'
+ ),
+ 'advanced-features-adium-xtras-dock-icons' => array(
+ 'title' => 'Dock icons',
+ 'key' => 'Adium Xtras, Xtras, Dock icons',
+ 'desc' => '.AdiumIcon Xtras provide alternate dock icons for Adium.'
+ ),
+ 'advanced-features-adium-xtras-emoticon-sets' => array(
+ 'title' => 'Emoticon sets',
+ 'key' => 'Adium Xtras, Xtras, Emoticons',
+ 'desc' => '.AdiumEmoticonSet Xtras define a set of emoticons for display when particular character combinations occur.'
+ ),
+ 'advanced-features-adium-xtras-list-layouts' => array(
+ 'title' => 'List layouts',
+ 'key' => 'Adium Xtras, Xtras, List layouts',
+ 'desc' => 'A .ListLayout AdiumXtra defines the appearance of your Contact List.'
+ ),
+ 'advanced-features-adium-xtras-list-themes' => array(
+ 'title' => 'List themes',
+ 'key' => 'Adium Xtras, Xtras, List themes',
+ 'desc' => 'A .ListTheme AdiumXtra defines the colors and other visual information which appear in your Contact List.'
+ ),
+ 'advanced-features-adium-xtras-menu-bar-icons' => array(
+ 'title' => 'Menu bar icons',
+ 'key' => 'Adium Xtras, Xtras, Menu bar icons',
+ 'desc' => '.AdiumMenuBarIcons Xtras provide alternate menu bar icons for Adium.'
+ ),
+ 'advanced-features-adium-xtras-service-icons' => array(
+ 'title' => 'Service icons',
+ 'key' => 'Adium Xtras, Xtras, Service icons',
+ 'desc' => '.AdiumServiceIcons Xtras provide alternate service icons for Adium.'
+ ),
+ 'advanced-features-adium-xtras-sound-sets' => array(
+ 'title' => 'Sound sets',
+ 'key' => 'Adium Xtras, Xtras, Sound set',
+ 'desc' => '.AdiumSoundSet Xtras define a set of sounds for use when particular events occur.'
+ ),
+ 'advanced-features-adium-xtras' => array(
+ 'title' => 'Adium Xtras',
+ 'key' => 'Adium Xtras, Xtras',
+ 'desc' => 'Adium Xtras add new sounds, images, and more to Adium, allowing you to fully customize your Adium experience.'
+ ),
+ 'advanced-features-direct-connect' => array(
+ 'title' => 'Direct Connect',
+ 'key' => 'account, AIM, AOL, direct connect',
+ 'desc' => 'When using the AIM and MobileMe services, you can "directly connect" to send a contact inline pictures and large blocks of text.'
+ ),
+ '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.'
+ ),
+ 'advanced-features-growl-support' => array(
+ 'title' => 'Growl support',
+ 'key' => 'growl, notification',
+ 'desc' => 'Growl lets Mac OS X applications unobtrusively tell you when things happen.'
+ ),
+ 'advanced-features-nudge-buzz' => array(
+ 'title' => 'MSN: Nudge / Yahoo: Buzz',
+ 'key' => 'nudge, buzz, MSN, Yahoo',
+ 'desc' => 'Adium calls it simply “notificationâ€, and enables you to send and receive it.'
+ ),
+ 'advanced-features-search-for-buddy-by-email' => array(
+ 'title' => 'AIM: search for buddy by email address',
+ 'key' => 'account, AIM, AOL, search, email',
+ 'desc' => 'If you want to find one of your AIM contacts by their email address...'
+ ),
+ 'contact-list-blocking-unblocking' => array(
+ 'title' => 'Blocking and unblocking contacts',
+ 'key' => 'blocking, privacy, block, allow, unblock',
+ 'desc' => 'Blocking is used to prevent communication from a specific contact.'
+ ),
+ 'contact-list-combining-contacts' => array(
+ 'title' => 'Combining contacts',
+ 'key' => 'contacts, meta, metacontacts, combine',
+ 'desc' => 'Adium allows you to combine multiple contacts into one entry (a "Combined Contact," called a \'metacontact\' by our developers) on your contact list.'
+ ),
+ 'contact-list-managing-contacts' => array(
+ 'title' => 'Managing groups',
+ 'key' => 'managing, organising, organizing, groups',
+ 'desc' => 'Most group management in Adium occurs directly on the contact list or via menu items in the Contacts menu.'
+ ),
+ 'contact-list-managing-groups' => array(
+ 'title' => 'Managing contacts',
+ 'key' => 'contacts, manage, add, delete, move',
+ 'desc' => 'Most contact management in Adium occurs directly on the contact list or via menu items in the Contacts menu.'
+ ),
+ 'contact-list-sorting-displaying-contacts' => array(
+ 'title' => 'Sorting and displaying contacts',
+ 'key' => 'contacts, manage, sort, status, alphabetically, manage',
+ 'desc' => 'Adium allows you to determine how contacts are displayed and sorted in the contact list in the View menu.'
+ ),
+ 'contact-list-status-icons' => array(
+ 'title' => 'Status icons',
+ 'key' => 'status, icons, Xtras, has entered text, typing',
+ 'desc' => 'Status icons are small images displayed to the left of each contact on the Contact List and message tabs.'
+ ),
+ 'contact-list' => array(
+ 'title' => 'The contact list',
+ 'key' => 'contact, list',
+ 'desc' => 'The contact list lets you see the status of your contacts at a glance.'
+ ),
+ 'messaging-focus' => array(
+ 'title' => 'Focus',
+ 'key' => 'focus, unread, new, message',
+ 'desc' => 'Adium provides indication when a new message has been received in a group chat after your tab/window loses focus.'
+ ),
+ 'messaging-fonts-and-colors' => array(
+ 'title' => 'Fonts and colors',
+ 'key' => 'font, color, style, default',
+ 'desc' => 'You can set the default font of the message view in the Messages pane of Adium\'s Preferences. Your contacts can override that font for their own...'
+ ),
+ 'messaging-group-chat' => array(
+ 'title' => 'Group chat',
+ 'key' => 'group, chat, ranks',
+ 'desc' => 'Group chats, also called conferences or multiuser chats ("MUC"), allow you to chat with multiple contacts simultaneously.'
+ ),
+ 'messaging-mentions' => array(
+ 'title' => 'Mentions',
+ 'key' => 'mention, highlight, notification',
+ 'desc' => 'Adium provides indication of when your user name (and some other text you possibly specified - see below) has been mentioned in a group chat.'
+ ),
+ 'messaging-message-view' => array(
+ 'title' => 'The message view',
+ 'key' => 'messages, view, webkit, WKMV, chat window',
+ 'desc' => 'Adium\'s message display, "WebKit Message View" (WKMV) is powered by WebKit, the same layout engine which drives Apple\'s Safari web browser.'
+ ),
+ 'messaging-sending-messages' => array(
+ 'title' => 'Sending messages',
+ 'key' => 'sending, send, message',
+ 'desc' => 'Type a message, then press Enter or Return. You can control whether Enter or Return inserts a new line instead of sending...'
+ ),
+ 'messaging-tabbed-messaging' => array(
+ 'title' => 'Tabbed messaging',
+ 'key' => 'tab, tabbed, message, window',
+ 'desc' => 'Tabbed messaging allows the flexible combination of multiple chats into any combination of windows to maximize efficiency and screen real estate.'
+ ),
+ 'messaging-transcript-viewer' => array(
+ 'title' => 'Chat Transcript Viewer',
+ 'key' => 'message, transcript, history, log',
+ 'desc' => 'Adium\'s storage of past messages consists of two components: full chat logs and most recent messages in the chat window, called message history.'
+ ),
+ 'miscellaneous-adium-file-locations' => array(
+ 'title' => 'Location of Adium files',
+ 'key' => 'application, preferences, settings, plist, directory, location',
+ 'desc' => 'This page lists the location of all Adium related files.'
+ ),
+ 'miscellaneous-av-skype-support' => array(
+ 'title' => 'Audio/video chat and Skype support',
+ 'key' => 'audio, video, voice, webcam, skype',
+ 'desc' => 'Adium currently does not support Audio Chatting or Video Conferencing. Adium\'s developers understand that these are highly demanded additions to Adium...'
+ ),
+ 'miscellaneous-backing-up-adium' => array(
+ 'title' => 'Backing up Adium',
+ 'key' => 'save, backup, back up',
+ 'desc' => 'Adium stores your preferences, AdiumXtras, and Message History and chat transcripts (logs) in: (Your home folder)/Library/Application Support/Adium 2.0.'
+ ),
+ 'miscellaneous-keyboard-shortcuts' => array(
+ 'title' => 'Keyboard shortcuts',
+ 'key' => 'keyboard, shortcuts, access',
+ 'desc' => 'Keyboard shortcuts in Adium are a great way to save time and navigate through various windows and aspects of Adium.'
+ ),
+ 'miscellaneous-os-support' => array(
+ 'title' => 'Support for other operating systems',
+ 'key' => 'Windows, Linux, OS 9, OS X',
+ 'desc' => 'Adium is only available on Mac OS X. Adium is written with very Mac specific code—mostly, but not entirely, Cocoa. Porting it to another platform would...'
+ ),
+ 'service-information-irc-support' => array(
+ 'title' => 'IRC in Adium',
+ 'key' => 'IRC, Internet Relay Chat',
+ 'desc' => 'Many widely-used IRC commands like /join and /msg work in Adium too, but for ease of use these are accessible from...'
+ ),
+ 'service-information-twitter-support' => array(
+ 'title' => 'Twitter in Adium',
+ 'key' => 'uninstall, remove, delete',
+ 'desc' => 'Starting with version 1.4 Adium features Twitter support. To configure Adium to connect to your Twitter account...'
+ ),
+ 'troubleshooting-broken-transcript-search' => array(
+ 'title' => 'Broken transcript search',
+ 'key' => 'transcript, log, message, search, find, show',
+ 'desc' => 'In cases where searching transcripts works unreliably, re-indexing often helps. To re-index, select "File → Import → Reindex Adium Logs".'
+ ),
+ 'troubleshooting-connection-problems-msn' => array(
+ 'title' => 'MSN-specific connection problems',
+ 'key' => 'connection, connecting, disconnect, login, logout, MSN, HTTP',
+ 'desc' => '"Retrieving Contact List 100%" / "Reading error" - This is caused by "incorrect" contacts in the contact list. If you\'re running into this error...'
+ ),
+ 'troubleshooting-connection-problems' => array(
+ 'title' => 'Connection problems',
+ 'key' => 'connection, connecting, disconnect, login, logout, MSN, HTTP, proxy',
+ 'desc' => 'If you are behind a proxy server, you should double-check that the information you have set up in the account setting\'s "Proxy" tab is correct...'
+ ),
+ 'troubleshooting-icq-text-encoding' => array(
+ 'title' => 'ICQ text encoding',
+ 'key' => 'icq, text, encoding, utf8, iso, character, Cyrillic, gibberish',
+ 'desc' => 'By default Adium always uses UTF8 encoding given that both sides support it. You can tell Adium which encoding to expect...'
+ ),
+ 'troubleshooting-persistent-password-prompts' => array(
+ 'title' => 'Persistent prompts for passwords',
+ 'key' => 'password, remembered, forget, prompt, slimmer',
+ 'desc' => 'If Adium prompts you for your password every time you connect, and checking the "remember my password" box does not work, open the Keychain Access app...'
+ ),
+ 'troubleshooting-problems-with-particular-contact' => array(
+ 'title' => 'Problems with a particular contact',
+ 'key' => 'contact, status, authorisation, authorization',
+ 'desc' => 'Try removing the contact and re-adding them to the account. Make sure you allow time for the contact to re-authorize you before you attempt to contact...'
+ ),
+ 'troubleshooting-recovering-deleted-transcripts' => array(
+ 'title' => 'Recovering deleted transcripts',
+ 'key' => 'recover, lost, deleted, transcripts, logs',
+ 'desc' => 'First: Don\'t panic! - The Delete button just moves the transcripts to the Trash, so look there first. You may still have them.'
+ ),
+ 'troubleshooting-recovering-lost-passwords' => array(
+ 'title' => 'Recovering lost passwords',
+ 'key' => 'recover, lost, password',
+ 'desc' => 'Remember that Adium is not an instant-messaging service. Contacting us won\'t help, because we don\'t have access to your password...'
+ ),
+ 'troubleshooting-sleepmode' => array(
+ 'title' => 'Adium and Mac OS X sleep mode',
+ 'key' => 'sleep mode, disconnects, wake',
+ 'desc' => 'Mac OS X automatically disconnects all network connections when you put your Macintosh to sleep. As a result, Adium can\'t stay connected...'
+ ),
+ 'troubleshooting-tips' => array(
+ 'title' => 'Troubleshooting tips',
+ 'key' => 'troubleshooting, problem, issue',
+ 'desc' => 'Make sure you\'re using the newest Adium release - If you\'re using an older version, the newest release of Adium may already fix your problem...'
+ ),
+ 'troubleshooting' => array(
+ 'title' => 'Troubleshooting',
+ 'key' => 'troubleshooting, problems, common, errors, disconnect, connection, support',
+ 'desc' => 'Having trouble with Adium? Common problems and solutions, MSN-specific, ICQ text encoding, Transcript search working unreliably...'
+ ),
+ '' => array(
+ 'title' => 'Adium Documentation',
+ 'key' => 'documentation',
+ 'desc' => 'Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility.'
+ ),
+) ?>
\ No newline at end of file
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/index.htmlfrag
--- a/help/documentation/index.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/index.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -28,7 +28,7 @@
<img src="../gfx/Default contact list.png" alt="Exemplary default contact list">
<p class="list-header">The contact list shows which contacts are online, their status and the protocol that they are on. Maintain all your contacts from different accounts in a single list and organize them in groups and combine contacts with multiple accounts into one entity.</p>
<ul class="arrow">
- <li><a href="contact-list-contact-list">The contact list</a></li>
+ <li><a href="contact-list">The contact list</a></li>
<li><a href="contact-list-status-icons">Status icons</a></li>
<li><a href="contact-list-managing-contacts">Managing contacts</a></li>
<li><a href="contact-list-managing-groups">Managing groups</a></li>
@@ -74,9 +74,9 @@
<li><a href="miscellaneous-keyboard-shortcuts">Keyboard shortcuts</a></li>
<li><a href="miscellaneous-backing-up-adium">Backing up Adium</a></li>
<li><a href="miscellaneous-uninstalling">Uninstalling Adium</a></li>
- <li><a href="miscellaneous-locations-adium-files">Locations of Adium files</a></li>
+ <li><a href="miscellaneous-adium-file-locations">Locations of Adium files</a></li>
<li><a href="miscellaneous-av-skype-support">Audio/Video chat and Skype support</a></li>
- <li><a href="miscellaneous-support-other-os">Support for other operating systems</a></li>
+ <li><a href="miscellaneous-os-support">Support for other operating systems</a></li>
</ul>
<hr>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/index.php
--- a/help/documentation/index.php Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/index.php Mon Feb 27 00:09:14 2012 +0000
@@ -1,9 +1,17 @@
+<?php
+// Includes all page titles, meta keywords and meta descriptions
+// $meta is an array contained within the file
+include('documentation-headers.php');
+
+$doc = isset($_GET['doc']) ? strtolower($_GET['doc']) : ''; ?>
<!DOCTYPE html>
<html>
<head>
- <title>Adium - Documentation</title>
+ <title><?php echo $meta[$doc]['title']; ?> - Adium Documentation</title>
<meta charset="utf-8">
+ <meta name="description" content="<?php echo $meta[$doc]['desc']; ?>">
+ <meta name="keywords" content="<?php echo $meta[$doc]['key']; ?>">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="stylesheet" href="/rewrite/assets/styles/global.css">
@@ -55,8 +63,8 @@
<section>
<article>
<?php // If the file exists include it, otherwise default back to the landing page
- if (isset($_GET['doc']) && file_exists($_GET['doc'] . '.htmlfrag'))
- include($_GET['doc'] . '.htmlfrag');
+ if (file_exists($doc . '.htmlfrag'))
+ include($doc . '.htmlfrag');
else
include('index.htmlfrag');
?>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/messaging-focus.htmlfrag
--- a/help/documentation/messaging-focus.htmlfrag Sat Feb 25 19:58:59 2012 +0000
+++ b/help/documentation/messaging-focus.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -1,5 +1,5 @@
<h1>Focus</h1>
-<p>Adium provides indication when a new message has been received in a <a href="messaging-group-chat">group chat</a> after your tab/window lost focus. Primarily it does so by displaying a red line in the scrollbar (not customizable) but Adium also provides a way for message styles to apply custom styling to messages that were received while focus was lost.</p>
+<p>Adium provides indication when a new message has been received in a <a href="messaging-group-chat">group chat</a> after your tab/window loses focus. Primarily it does so by displaying a red line in the scrollbar (not customizable) but Adium also provides a way for message styles to apply custom styling to messages that were received while focus was lost.</p>
<hr>
diff -r 1cd2d492a40c -r 186d4d5b4125 help/documentation/miscellaneous-adium-file-locations.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/miscellaneous-adium-file-locations.htmlfrag Mon Feb 27 00:09:14 2012 +0000
@@ -0,0 +1,50 @@
+<h1>Locations of Adium files</h1>
+<p>This page lists the locations of all Adium-related files.</p>
+
+<hr>
+
+<h2>Location of the application</h2>
+<p class="list-header">Normally, your Adium should be placed in the following location:</p>
+<ul>
+ <li>Home Folder <strong>→</strong> Applications <strong>→</strong> Adium.app</li>
+</ul>
+
+<hr>
+
+<h2>Location of preferences</h2>
+<p class="list-header">Adium places the majority of its preferences here:</p>
+<ul>
+ <li>Home Folder <strong>→</strong> Library <strong>→</strong> Application Support <strong>→</strong> Adium 2.0</li>
+</ul>
+<p class="list-header">There is also a preference file at:</p>
+<ul>
+ <li>Home Folder <strong>→</strong> Library <strong>→</strong> Preferences <strong>→</strong> com.adiumX.adiumX.plist</li>
+</ul>
+
+<hr>
+
+<h2>Location of saved transcripts</h2>
+<p class="list-header">Message transcripts can be found in this directory:</p>
+<ul>
+ <li>Home Folder <strong>→</strong> Library <strong>→</strong> Application Support <strong>→</strong> Adium 2.0 <strong>→</strong> Users <strong>→</strong> Default <strong>→</strong> Logs</li>
+</ul>
+
+<hr>
+
+<h2>Location of non-standard, installed Xtras</h2>
+<p class="list-header">The Adium Xtras you have installed are stored in subfolder of the "Adium 2.0" folder mentioned above:</p>
+<ul>
+ <li>Home Folder <strong>→</strong> Library <strong>→</strong> Application Support <strong>→</strong> Adium 2.0
+ <ul>
+ <li><strong>→</strong> Contact List - Contact list layouts and themes (.ListLayout, .ListTheme)</li>
+ <li><strong>→</strong> Emoticons - Emoticon packs (.AdiumEmoticonSet)</li>
+ <li><strong>→</strong> Menu Bar Icons - Menu bar icon packs (.AdiumMenuBarIcons)</li>
+ <li><strong>→</strong> Message Styles - Message styles (.AdiumMessageStyle)</li>
+ <li><strong>→</strong> PlugIns - Plugins (.AdiumPlugin)</li>
+ <li><strong>→</strong> Scripts - Scripts (.AdiumScript)</li>
+ <li><strong>→</strong> Service Icons - Service icon packs (.AdiumServiceIcons)</li>
+ <li><strong>→</strong> Sounds - Sound packs (.AdiumSoundSet)</li>
+ <li><strong>→</strong> Status Icons - Status icon packs (.AdiumStatusIcons)</li>
+ </ul>
+ </li>
More information about the commits
mailing list