www/adium.im 546:5c7dc5c672f6: A lot of documentation cleanup an...
commits at adium.im
commits at adium.im
Sun Feb 12 16:48:13 UTC 2012
details: http://hg.adium.im/www/adium.im/rev/5c7dc5c672f6
revision: 546:5c7dc5c672f6
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Sun Feb 12 16:48:03 2012 +0000
A lot of documentation cleanup and styling, about half of them are now finished
diffs (truncated from 1682 to 1000 lines):
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 about/index.php
--- a/about/index.php Sun Feb 12 05:56:52 2012 +0000
+++ b/about/index.php Sun Feb 12 16:48:03 2012 +0000
@@ -60,7 +60,7 @@
<hr>
- <h1>Notable Features</h1>
+ <h2>Notable Features</h2>
<span class="features">
<ul>
<li>Open Source, so everyone can see how Adium works and <a href="http://trac.adium.im/wiki/Development">help improve it</a></li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 assets/styles/style.css
--- a/assets/styles/style.css Sun Feb 12 05:56:52 2012 +0000
+++ b/assets/styles/style.css Sun Feb 12 16:48:03 2012 +0000
@@ -43,21 +43,21 @@
/********** Font sizes **********/
-.banner h1, #menu-logo { font-size: 2em; line-height: 1.1em; }
+.content h1 { font-size: 2em; line-height: 1.1em; }
-.content h1 { font-size: 1.8em; }
+.banner h1, #menu-logo { font-size: 1.8em; }
-footer h3 { font-size: 1.6em; }
+.content h2, footer h3 { font-size: 1.6em; }
-.content p, figcaption, .content ol, .content ul {
+.content p, .content h3, figcaption, .content ol, .content ul, pre {
font-size: 1.4em;
}
-.content p, figcaption {
+.content p, .content h3, figcaption, pre {
line-height: 1.4em;
}
-.content ul ul, .content ol ol {
+.content ul ul, .content ol ol, .content ol ul, .content li ol {
font-size: 1em;
}
@@ -91,7 +91,7 @@
#menu-logo span {
display: block;
color: #839972;
- padding: 10px 35px;
+ padding: 12px 35px;
}
#menu-logo a:hover span { color: #698751; }
@@ -293,32 +293,46 @@
article.two-column { width: 47%; }
aside.two-column { width: 48.9%; }
-h1 {
+h1, h2, h3 {
padding-bottom: 15px;
font-weight: 500;
line-height: 1.1em;
color: #333;
}
+h3 { color: #777; font-weight: 600; }
+
/* Notice: Declare padding-fix to titles that are not wrapped inside an <article> */
h1.padding-fix { padding: 10px 0 5px 10px; }
.half { width: 50%; float: left; }
-.content p, .content ol, .content ul {
+.content p, pre, .content ol, .content ul {
color: #777;
padding-bottom: 1em;
}
-.content ul ul, .content ol ol {
- color: #777;
+.content ol, .content ul {
padding-bottom: 0;
}
+/* Text above ul/ol */
+.list-header { padding-bottom: .8em; }
+
+pre {
+ color: #555;
+ font-family: Courier, sans-serif;
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ white-space: -pre-wrap;
+ white-space: -o-pre-wrap;
+ word-wrap: break-word;
+}
+
.content ol, .content ul { padding-left: 20px; }
.content ol { list-style-type: decimal; }
.content ul { list-style-type: disc; }
-.content li { line-height: 2em; }
+.content li { padding: 0 0 10px; line-height: 1.4em; }
.content strong { font-weight: 600; }
.content a { color: #555; font-weight: 500; text-decoration: none; }
.content a:hover { color: #333; text-decoration: underline; }
@@ -577,7 +591,7 @@
@media (max-width: 700px) {
/* Navigation*/
#menu-logo { float: none; }
- #menu-logo span { text-align: center; font-size: .8em; }
+ #menu-logo span { text-align: center; font-size: 1em; }
#menu-logo a:hover span { background: #fff; }
nav li.home { display: none; }
nav ul, nav li {
@@ -593,7 +607,7 @@
nav ul, nav li { border: 0; }
nav li { float: left; width: 33.19%; border-top: 1px solid #d5d5d5; border-right: 1px solid #d5d5d5; }
nav li.blog, nav li.merch { border-right: 0; }
- nav .active { background: none; background-color: #e9e9e9; }
+ nav .active { background: none; background-color: #eee; }
}
@media (max-width: 560px) {
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-aim.htmlfrag
--- a/help/documentation/accounts-aim.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-aim.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -40,6 +40,6 @@
<h2>Censorship</h2>
<p>AIM servers filter strings containing <em><img</em> and <em><script</em>, which are tags in the Hypertext Markup Language (HTML) AIM uses to encode messages (so as to support fonts, colors, etc.).</p>
-<p>HTML tags that you put into the inputline are “escaped†by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM server drops messages containing even escaped HTML (but only those two tags—other tags work fine).</p>
+<p>HTML tags that you put into the inputline are "escaped" by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM server drops messages containing even escaped HTML (but only those two tags—other tags work fine).</p>
<p>AIM will also drop any message containing a link to a file: address. These addresses are intended to refer to files on the sender's or your computer. (The file need not actually exist on one end or the other. A perfectly valid file: link can refer to a path that does not exist on anyone's machine, such as this one.)</p>
-<p>On the other hand, it will allow the message if the address is plain text instead of a link. So, for example, “Check out what I just wrote: file:///Users/me/Documents/Why-Adium-is-awesome.txt†will go through, but “Check out <a href="file:///Users/me/Documents/Why-Adium-is-awesome.txt">what I just wrote</a>†will not.</p>
\ No newline at end of file
+<p>On the other hand, it will allow the message if the address is plain text instead of a link. So, for example, "Check out what I just wrote: file:///Users/me/Documents/Why-Adium-is-awesome.txt" will go through, but "Check out <a href="file:///Users/me/Documents/Why-Adium-is-awesome.txt">what I just wrote</a>" will not.</p>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-contact-icons.htmlfrag
--- a/help/documentation/accounts-contact-icons.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-contact-icons.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -13,30 +13,33 @@
<h2>Setting your own buddy icon</h2>
<p>Adium supports a buddy icon on most services.</p>
-<p>If you want to set an icon on all your accounts (a global icon):</p>
+<p class="list-header">If you want to set an icon on all your accounts (a global icon):</p>
<ol>
<li>Choose Preferences from the Adium menu.</li>
<li>Click on the <strong>Personal</strong> tab.</li>
<li>Set the icon.</li>
</ol>
-<p>If you want to set a different icon for a specific account:</p>
+<p class="list-header">If you want to set a different icon for a specific account:</p>
<ol>
<li>Choose <strong>Preferences</strong> from the <strong>Adium</strong> menu.</li>
<li>Click on Accounts.</li>
<li>Double-click on the account.</li>
<li>Click on the <strong>Personal</strong> tab.</li>
- <li>Click on “Use this icon:â€.</li>
+ <li>Click on "Use this icon:".</li>
<li>Set the icon.</li>
</ol>
-<p><strong>Note:</strong> Changing the global icon won't change any accounts to which you've assigned their own icon. If you'd like those accounts to use the global icon instead, you'll need to edit each one as described above and set it back to “Use global iconâ€.</p>
+<p><strong>Note:</strong> Changing the global icon won't change any accounts to which you've assigned their own icon. If you'd like those accounts to use the global icon instead, you'll need to edit each one as described above and set it back to "Use global icon".</p>
<p>There are two ways to set the icon:</p>
-<p><strong>Drag-and-drop</strong></p>
-<p>Drag an image or image file into the image well above the "Choose Icon..." button.</p>
+<h3>Drag-and-drop</h3>
+<p>Drag an image or image file into the image well above the "Choose Icon.." button.</p>
<p>Drag-and-drop is the only way to set animated buddy icons ("animated GIFs") and keep the animation.</p>
-<p><strong>Image Picker</strong></p>
+<h3 class="list-header">Image Picker</h3>
<ol>
- <li>Click on "Choose Icon...".</li>
- <li>Drag a file into the Image Picker, or click "Choose..." and open an image file.</li> OR
+ <li>Click on "Choose Icon...".</li>
+ <li>Drag a file into the Image Picker, or click "Choose..." and open an image file.</li>
+</ol>
+<p class="list-header">or</p>
+<ol>
<li>Click the camera icon to take a picture (available only if your Mac has a webcam)</li>
<li>The image may then be cropped or panned within the image picker.</li>
<li>Click OK.</li>
@@ -52,7 +55,7 @@
<hr>
<h2>Setting an icon for a contact</h2>
-<p>If you set an icon for a contact, it will override any icon they may have chosen.</p>
+<p class="list-header">If you set an icon for a contact, it will override any icon they may have chosen.</p>
<ul>
<li>Get Info on the contact by selecting the contact then choosing <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
<li>Double click the icon space in the top-lefthand corner of the window.</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-creating-accounts.htmlfrag
--- a/help/documentation/accounts-creating-accounts.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-creating-accounts.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -5,7 +5,7 @@
<hr>
<h2>Adding your account to Adium</h2>
-<p>To add your account to Adium (once you have <a href="#signing_up_for_an_account">signed up for it</a>):</p>
+<p class="list-header">To add your account to Adium (once you have <a href="#signing_up_for_an_account">signed up for it</a>):</p>
<ol>
<li>Choose <strong>Preferences</strong> from the <strong>Adium</strong> menu (This will be opened for you automatically the first time Adium runs).</li>
<li>Select the <strong>Accounts</strong> preferences pane (This is the first pane, already selected the first time Adium runs).</li>
@@ -13,8 +13,7 @@
<li>Select the service you want to use.</li>
<li id="password_explanation">Enter your account name (the specific identifier for which varies by service, e.g. "screen name," "GTalk ID," or "username") and password (as well, as if required by the panel, the server and port) in the <strong>Account</strong> panel. If you enter a password here, it will be stored securely in the Mac OS X keychain, and Adium will continue to use it for future connections. If you do not enter a password, you will be prompted each time you connect.</li>
<li>Enter your alias and choose an icon in the <strong>Personal</strong> panel. See <a href="accounts-contact-icons">Contact icons</a> for more information.</li>
- <li>
- Service-specific:
+ <li>Service-specific:
<ul>
<li>In the <strong>Options</strong> panel check the appropriate boxes, enter your resource and your available/away priority for XMPP,</li>
<li>In the <strong>Privacy</strong> panel, choose whether you would like to send typing notices and choose your preferred encryption level.</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-icq.htmlfrag
--- a/help/documentation/accounts-icq.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-icq.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -30,6 +30,8 @@
</tr>
</table>
+<hr>
+
<h2>History</h2>
<p>When it was released in 1996 by a company called Mirabilis, ICQ was the first real popular Instant Messaging service. In 1998, AOL bought Mirabilis and later made the ICQ protocol more similar to the AIM protocol.</p>
<p>In 2010, AOL sold ICQ to the proprietors of Mail.ru. The new owners changed the login server address to login.icq.com; 1.4.1 is the first version of Adium to use the new address by default, but older versions can be reconfigured by double-clicking on each ICQ account in the Preferences window and changing each account's Login Server in the Options tab.</p>
@@ -38,4 +40,4 @@
<h2>Censorship</h2>
<p>ICQ servers filter strings containing <script, a tag in the Hypertext Markup Language (HTML), which AIM and ICQ use to encode messages (so as to support fonts, colors, etc.).</p>
-<p>HTML tags that you put into the inputline are “escaped†by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM/ICQ server drops messages containing even escaped HTML (but only that tag — other tags work fine).</p>
\ No newline at end of file
+<p>HTML tags that you put into the inputline are "escaped" by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM/ICQ server drops messages containing even escaped HTML (but only that tag — other tags work fine).</p>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-list-of-services.htmlfrag
--- a/help/documentation/accounts-list-of-services.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-list-of-services.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -36,11 +36,11 @@
<hr>
<h2 id="signing_up_for_an_account">Service interoperability</h2>
-<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>
+<p class="list-header">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>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>
+<h3>XMPP transports</h3>
<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 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>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-msn.htmlfrag
--- a/help/documentation/accounts-msn.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-msn.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -34,6 +34,8 @@
</tr>
</table>
+<hr>
+
<h2>History</h2>
<p>MSN Messenger, now called Windows Live Messenger, is a freeware instant messaging client that was developed and distributed by Microsoft in 1999 to 2005 and in 2007 for computers running the Microsoft Windows operating system (except Windows Vista), and aimed towards home users. It was renamed Windows Live Messenger in February 2006 as part of Microsoft's Windows Live series of online services and software.</p>
@@ -41,8 +43,8 @@
<h2>Censorship</h2>
<p>MSN censors messages containing particular fragments of URLs. Previously, the message would simply be dropped with no indication to either side that it went away; now, at least, you get an error message (inline in the message view).</p>
-<p><strong>Pieces of text that are known to cause MSN to throw a message into the <a href="http://en.wikipedia.org/wiki/Memory_hole">memory hole</a></strong></p>
-<p>The most common ones that we know of are:</p>
+<p><strong>Pieces of text that are known to cause MSN to throw a message into the <a href="http://en.wikipedia.org/wiki/Memory_hole">memory hole</a></strong>.</p>
+<p class="list-header">The most common ones that we know of are:</p>
<ul>
<li>.info</li>
<li>profile.php? (including ‘?’)</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-registering-jabber-account.htmlfrag
--- a/help/documentation/accounts-registering-jabber-account.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-registering-jabber-account.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -9,13 +9,13 @@
<h2>Username constraints</h2>
<ul>
- <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>
+ <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>
<li>In addition, certain characters are not allowed in your username:
<ul>
<li>@ ('at' sign)</li>
<li>: (colon)</li>
<li>' (single quote)</li>
- <li>" (double quote)</li>
+ <li>" (double quote)</li>
<li>< (open angle bracket)</li>
<li>> (close angle bracket)</li>
<li>& (ampersand)</li>
@@ -25,6 +25,8 @@
</li>
</ul>
+<hr>
+
<h2>How to specify an XMPP server</h2>
<p>Jabber IDs are in the form <em>name at server</em>.</p>
<p>The name <em>adiumuser</em> on <em>jabber.org</em> would be <em>adiumuser at jabber.org</em>.</p>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-setting-your-status.htmlfrag
--- a/help/documentation/accounts-setting-your-status.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-setting-your-status.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,7 +4,7 @@
<hr>
<h2>Automatically connecting accounts</h2>
-<p>To have an account automatically connect when Adium is launched:</p>
+<p class="list-header">To have an account automatically connect when Adium is launched:</p>
<ol>
<li>Open Adium's <strong>Preferences</strong> from the <strong>Adium</strong> menu.</li>
<li>Select <strong>Accounts</strong>.</li>
@@ -16,8 +16,8 @@
<hr>
<h2>Status messages</h2>
-<p>AIM, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. AIM and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p>
-<p>AIM available messages are limited to approximately 60 characters by the AIM server. Messages longer than this will be truncated automatically.</p>
+<p>AIM, ICQ, Jabber, Sametime, and Yahoo allow you to set a status message. AIM and Yahoo available messages are "Plain Text" which means they can not support formatting such as bold or italic, nor can they support links. If you set such attributes, it will be stripped before the available message is set.</p>
+<p class="list-header">AIM available messages are limited to approximately 60 characters by the AIM server. Messages longer than this will be truncated automatically.</p>
<ol>
<li>Available</li>
<li>iTunes
@@ -28,8 +28,8 @@
<li>Away</li>
<li>Invisible/Stealth
<ul>
- <li>AIM, Jabber, MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li>
- <li>In versions prior to 1.0, there is no Invisible status in Adium by default. You have to create such a status by choosing either of the two “Custom…†menu items in the Status menu, and changing the custom status's state to Invisible. Remember to choose “Save Custom Status†if you want to keep the Invisible status around.</li>
+ <li>AIM, Jabber, MSN, and Yahoo support invisibility. Simply choose "Invisible" from the State menu in the Custom... status window. If you use Invisible often, we suggest checking "Save Custom Status" so the Invisible state will be in your Status menus</li>
+ <li>In versions prior to 1.0, there is no Invisible status in Adium by default. You have to create such a status by choosing either of the two "Custom…" menu items in the Status menu, and changing the custom status's state to Invisible. Remember to choose "Save Custom Status" if you want to keep the Invisible status around.</li>
</ul>
</li>
<li>Offline</li>
@@ -38,7 +38,7 @@
<hr>
<h2>Changing your status for all accounts</h2>
-<p>There are four ways to change your status for all accounts:</p>
+<p class="list-header">There are four ways to change your status for all accounts:</p>
<ul>
<li>The <strong>Status</strong> menu</li>
<li>Adium status menu item (Menu Bar Icon)</li>
@@ -60,7 +60,7 @@
<hr>
<h2>Autoreply messages</h2>
-<p>Any status can have an "autoreply" which is sent in response to the first incoming message you receive from a contact. By default, Custom Away messages have an autoreply and other statuses do not. This can be controlled in the Custom Status dialogue box by toggling the Autoreply checkbox. Unless you specify otherwise, the autoreply is the same as your Status Message.</p>
+<p>Any status can have an "autoreply" which is sent in response to the first incoming message you receive from a contact. By default, Custom Away messages have an autoreply and other statuses do not. This can be controlled in the Custom Status dialogue box by toggling the Autoreply checkbox. Unless you specify otherwise, the autoreply is the same as your Status Message.</p>
<p>AIM, ICQ, and Jabber contacts will be informed seamlessly that the message is an autoreply; on other services, Adium will add the "(Autoreply) " before your message so that the other side can tell the message's origin.</p>
<hr>
@@ -68,7 +68,7 @@
<h2>The Status Window</h2>
<p>Adium can show you a window that tells you your current status on every account. This window, called the Status window, can be enabled from the Status preferences.</p>
<p>The Status Window should not be confused with the Status Editor, which is a panel that appears whenever you go to edit a status. It also should not be confused with the status indicator at the top of the ContactList.</p>
-<p><strong>What it does</strong></p>
+<h3 class="list-header">What it does</h3>
<ul>
<li>When you're Available on all accounts, the Status window is hidden, as it would not indicate anything useful.</li>
<li>When you're Away on some accounts, but not others, the Status window shows you a list of all accounts that are Away. Each account has its current status message (away message) below it; this is useful when you have different accounts set to different custom Away statuses.</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/accounts-yahoo.htmlfrag
--- a/help/documentation/accounts-yahoo.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/accounts-yahoo.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -22,5 +22,7 @@
</tr>
</table>
+<hr>
+
<h2>History</h2>
<p>Yahoo! Messenger was first released in 1998.</p>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/adium-documentation.htmlfrag
--- a/help/documentation/adium-documentation.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/adium-documentation.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -8,25 +8,25 @@
<h2>Accounts</h2>
<img src="../gfx/accounts-sm.png" alt="Image of Adium account types">
-<p>Adium supports 21 different IM protocols from AIM to Yahoo. It lets you connect as many names on as many different services as you want all at the same time and gives you the flexibility to maintain all your contacts on a single contact list.</p>
+<p class="list-header">Adium supports 21 different IM protocols from AIM to Yahoo. It lets you connect as many names on as many different services as you want all at the same time and gives you the flexibility to maintain all your contacts on a single contact list.</p>
<ul>
<li><a href="accounts-list-of-services">List of services supported and their interoperability â–¸</a></li>
<li><a href="accounts-creating-accounts">Creating accounts â–¸</a></li>
<li><a href="accounts-contact-icons">Contact icons â–¸</a></li>
<li><a href="accounts-setting-your-status">Setting your status â–¸</a></li>
<li>Specific account use
- <ul>
- <li><a href="service-information-irc-support">IRC â–¸</a></li>
- <li><a href="service-information-twitter-support">Twitter â–¸</a></li>
-</ul>
-</li>
+ <ul>
+ <li><a href="service-information-irc-support">IRC â–¸</a></li>
+ <li><a href="service-information-twitter-support">Twitter â–¸</a></li>
+ </ul>
+ </li>
</ul>
<hr>
<h2>The contact list</h2>
<img src="../gfx/Default contact list.png" alt="Exemplary default contact list">
-<p>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>
+<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>
<li><a href="contact-list-contact-list">The contact list â–¸</a></li>
<li><a href="contact-list-status-icons">Status icons â–¸</a></li>
@@ -41,7 +41,7 @@
<h2>Messaging</h2>
<img src="../gfx/Message-sm.png" alt="Message window screenshot">
-<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>
+<p class="list-header">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>
<ul>
<li><a href="messaging-message-view">The message view â–¸</a></li>
<li><a href="messaging-sending-messages">Sending messages â–¸</a></li>
@@ -55,7 +55,7 @@
<h2>Advanced features</h2>
<img src="../gfx/Growl notification.png" alt="Example Growl Notification">
-<p>Adium sports a variety of advanced features.</p>
+<p class="list-header">Adium sports a variety of advanced features.</p>
<ul>
<li><a href="advanced-features-adium-xtras">Adium Xtras â–¸</a></li>
<li><a href="advanced-features-growl-support">Growl support â–¸</a></li>
@@ -69,7 +69,7 @@
<hr>
<h2>Miscellaneous</h2>
-<p>This section covers a few topics that do not fit in the other sections.</p></td>
+<p class="list-header">This section covers a few topics that do not fit in the other sections.</p>
<ul>
<li><a href="miscellaneous-keyboard-shortcuts">Keyboard shortcuts â–¸</a></li>
<li><a href="miscellaneous-backing-up-adium">Backing up Adium â–¸</a></li>
@@ -82,9 +82,9 @@
<hr>
<h2>Information about the services supported</h2>
-<p>On the following pages you can find some information on the different service supported, e.g. history and censorship.</p>
+<p class="list-header">On the following pages you can find some information on the different service supported, e.g. history and censorship.</p>
<ul>
- <li><a href="accounts-xmpp">XMPP ("Jabber")</a>, including</li>
+ <li><a href="accounts-xmpp">XMPP ("Jabber")</a>, including:</li>
<ul>
<li><a href="accounts-google-talk">Google Talk</a></li>
<li><a href="accounts-lj-talk">LJ (LiveJournal) Talk</a></li>
@@ -92,11 +92,11 @@
<li><a href="accounts-gizmo5">Gizmo5</a></li>
</ul>
<li><a href="accounts-msn">MSN Messenger</a></li>
- <li><a href="accounts-aim">AOL Instant Messenger (AIM)</a>, including</li>
+ <li><a href="accounts-aim">AOL Instant Messenger (AIM)</a>, including:</li>
<ul>
<li><a href="accounts-mobileme">MobileMe</a> (formerly known as .Mac)</li>
</ul>
- <li><a href="accounts-yahoo">Yahoo! Messenger</a>, including</li>
+ <li><a href="accounts-yahoo">Yahoo! Messenger</a>, including:</li>
<ul>
<li><a href="accounts-yahoo-japan">Yahoo! Japan Messenger</a></li>
</ul>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-address-book-integration.htmlfrag
--- a/help/documentation/advanced-features-address-book-integration.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-address-book-integration.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -5,14 +5,14 @@
<h2>Names</h2>
<p>By default, Adium will import contacts' names from the Address Book. It does this using the IM usernames listed on each AB card; if a username in your Contact List is found on one of the Address Book cards, the name on that card will be shown on that contact's row in the contact list in place of their username (unless you have the Contact List explicitly set to display usernames rather than display names).</p>
-<p>For example, if you have user “jdoe†on your AIM contact list, and a card for John Doe in your Address Book that has jdoe listed as his AIM screen name, then Adium will display John Doe rather than jdoe on that row of its Contact List.</p>
+<p>For example, if you have user "jdoe" on your AIM contact list, and a card for John Doe in your Address Book that has jdoe listed as his AIM screen name, then Adium will display John Doe rather than jdoe on that row of its Contact List.</p>
<p>By default, Adium imports nicknames and does not import middle names. You can change these settings, as well as the order in which names are displayed (First Last or Last First), via the Address Book Preferences.</p>
<hr>
<h2>Images</h2>
<p>Adium can import photos from the Address Book and use them as your Adium contacts' contact icons, or it can export contact icons from the contact list to the cards in the Address Book. Again, the matching of cards is determined by IM usernames. All of this is turned off by default.</p>
-<p>In the Preferences, you can set whether to import images from the Address Book (“Use Address Book as contacts' iconsâ€) or export images to the Address Book (“Overwrite Address Book images with contacts' iconsâ€). If you have Adium set to import, you can also allow it to override the Adium contact's icon using the Address Book photo.</p>
+<p>In the Preferences, you can set whether to import images from the Address Book ("Use Address Book as contacts' icons") or export images to the Address Book ("Overwrite Address Book images with contacts' icons"). If you have Adium set to import, you can also allow it to override the Adium contact's icon using the Address Book photo.</p>
<p>If you enable both, your Address Book will be populated with the icons your contacts set for themselves, when possible; contacts who do not set their own icons will be displayed with any icon you set within the Address Book.</p>
<hr>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-dock-icons.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-dock-icons.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras-dock-icons.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,7 +4,7 @@
<hr>
<h2>Bundled dock icons</h2>
-<p>By default, Adium contains six dock icons that can be configured from Adium's Appearance preferences pane:</p>
+<p class="list-header">By default, Adium contains six dock icons that can be configured from Adium's Appearance preferences pane:</p>
<ul>
<li>Adiumy Black</li>
<li>Adiumy Blue</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-emoticon-sets.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-emoticon-sets.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras-emoticon-sets.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -5,7 +5,7 @@
<hr>
<h2>Bundled emoticon sets</h2>
-<p>By default, Adium contains five emoticon sets that can be configured from Adium's Appearance preferences pane:</p>
+<p class="list-header">By default, Adium contains five emoticon sets that can be configured from Adium's Appearance preferences pane:</p>
<ul>
<li>Adiumy</li>
<li>Default</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-list-layouts.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-list-layouts.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras-list-layouts.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -1,5 +1,5 @@
<h1>List layouts</h1>
-<p>A .ListLayout AdiumXtra defines the appearance of your Contact List, including but not limited to:</p>
+<p class="list-header">A .ListLayout AdiumXtra defines the appearance of your Contact List, including but not limited to:</p>
<ul>
<li>Font</li>
<li>Contact icon presence, size, and location</li>
@@ -11,7 +11,7 @@
<hr>
<h2>Bundled list layouts</h2>
-<p>Adium comes with several list layouts preinstalled. You can customize the list layout via the Customize button in Preferences → Appearance.</p>
+<p class="list-header">Adium comes with several list layouts preinstalled. You can customize the list layout via the Customize button in Preferences → Appearance.</p>
<ul>
<li>Aqualicious</li>
<li>Decay 2.0</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-list-theme.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-list-theme.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras-list-theme.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -1,22 +1,22 @@
<h1>List themes</h1>
-<p>A .ListTheme AdiumXtra defines the colors and other visual information which appear in your Contact List, including but not limited to:</p>
+<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>Wvent text color, such as colors displayed for recently signed-on contacts or contacts who are currently typing to you</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>Adium comes with several list themes preinstalled. You can customize the list layout via the Customize button in Preferences → Appearance.</p>
+<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>Bright Orange</li>
<li>Concise</li>
<li>Decay 2.0</li>
<li>Pastel Pink</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-menu-bar-icons.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-menu-bar-icons.htmlfrag Sun Feb 12 05:56:52 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>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 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-menubar-icons.htmlfrag
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/help/documentation/advanced-features-adium-xtras-menubar-icons.htmlfrag Sun Feb 12 16:48:03 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 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-service-icons.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-service-icons.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras-service-icons.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,7 +4,7 @@
<hr>
<h2>Bundled service icons</h2>
-<p>By default, Adium contains only a single set of service icons that can be configured from Adium's Appearance preferences pane:</p>
+<p class="list-header">By default, Adium contains only a single set of service icons that can be configured from Adium's Appearance preferences pane:</p>
<ul>
<li>Aqua</li>
</ul>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras-sound-sets.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras-sound-sets.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras-sound-sets.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,7 +4,7 @@
<hr>
<h2>Bundled sound sets</h2>
-<p>By default, Adium contains five soundsets that can be configured from Adium's Events preferences pane:</p>
+<p class="list-header">By default, Adium contains five soundsets that can be configured from Adium's Events preferences pane:</p>
<ul>
<li>Adium</li>
<li>AIM</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-adium-xtras.htmlfrag
--- a/help/documentation/advanced-features-adium-xtras.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-adium-xtras.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -21,7 +21,7 @@
<li>Scripts - Scripts (.AdiumScript)</li>
<li>Service Icons - Service icon packs (<a href="advanced-features-adium-xtras-service-icons">.AdiumServiceIcon</a>)</li>
<li>Sounds - Sound packs (<a href="advanced-features-adium-xtras-sound-sets">.AdiumSoundSet</a>)</li>
- <li>Status Icons - Status icon packs (<a href="contactL-list-status-icons">.AdiumStatusIcon</a>)</li>
+ <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>
@@ -29,7 +29,7 @@
<hr>
<h2>Removing Adium Xtras</h2>
-<p>To remove an Xtra:</p>
+<p class="list-header">To remove an Xtra:</p>
<ol>
<li>Open the <strong>Xtras Manager</strong> from the <strong>Adium</strong> menu.</li>
<li>Navigate to the correct category.</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-direct-connect.htmlfrag
--- a/help/documentation/advanced-features-direct-connect.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-direct-connect.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -7,4 +7,4 @@
<p>To initiate a Direct Connect, simply drag or paste an image into the text entry area. Adium will invite the remote user to accept a direct connection (iChat automatically accepts such invitations) and then display the picture inline in both your message window and the other user's message window.</p>
<p>Direct Connect faces the same difficulties as <a href="advanced-features-file-transfer">file transfer</a> (e.g. NAT traversal).
-<p>Direct Connect is also called “direct messagingâ€, “direct IMâ€, or “direct chatâ€.</p>
\ No newline at end of file
+<p>Direct Connect is also called "direct messaging", "direct IM", or "direct chat".</p>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-file-transfer.htmlfrag
--- a/help/documentation/advanced-features-file-transfer.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-file-transfer.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,7 +4,7 @@
<hr>
<h2>Which protocols support file transfer?</h2>
-<p>Sending and receiving files is currently supported on:</p>
+<p class="list-header">Sending and receiving files is currently supported on:</p>
<ul>
<li>AIM (hard limit of 4 GB)</li>
<li>ICQ (hard limit of 4 GB)</li>
@@ -19,7 +19,7 @@
<hr>
<h2>Initiating a file transfer</h2>
-<p>There are a variety of ways to initiate a file transfer with another user:</p>
+<p class="list-header">There are a variety of ways to initiate a file transfer with another user:</p>
<ul>
<li>Click the <strong>File Transfer icon</strong> (Document with a green arrow icon), located in the message view's toolbar.</li>
<li>Select the destination user in the contact list then click <strong>Contact → Send File...</strong></li>
@@ -29,7 +29,7 @@
<hr>
<h2>AIM/ICQ file transfer ports</h2>
-<p>Users behind a router or a firewall may have better luck with AIM file transfer after forwarding ports <strong>5190 - 5200</strong> to their machine.</p>
+<p class="list-header">Users behind a router or a firewall may have better luck with AIM file transfer after forwarding ports <strong>5190 - 5200</strong> to their machine.</p>
<ul>
<li>Mac OS X 10.5 users: Add Adium to the allowed programs list in the software firewall. Go to <strong>System Preferences → Security → Firewall</strong>. If <strong>Allow all incoming connections</strong> is not selected, choose <strong>Set access for specific services and applications</strong>, click the <strong>+</strong> button, and select <strong>Adium</strong> from your Applications folder.</li>
<li>Mac OS X 10.4 users: The OS X software firewall can be controlled via <strong>System Preferences → Sharing → Firewall</strong>. Click on <strong>New</strong>, change Port Name to <strong>Other</strong>, then <strong>enter 5190-5200 for TCP port</strong> and "AIM" for the description.)</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-growl-support.htmlfrag
--- a/help/documentation/advanced-features-growl-support.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-growl-support.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,7 +4,7 @@
<hr>
<h2>Installing Growl</h2>
-<p>Growl is separate from Adium, but if you choose to do so Adium can install Growl for you.</p>
+<p class="list-header">Growl is separate from Adium, but if you choose to do so Adium can install Growl for you.</p>
<ul>
<li>If Growl isn't installed, then the first time Adium tries to post a Growl notification, it will ask to install Growl.</li>
<li>If Growl is installed but isn't working, open the Growl pane within the System Preferences, ensure Adium is listed on the Applications tab, and check that notifications from it are enabled. Adium will be listed and enabled by default.</li>
@@ -13,7 +13,7 @@
<hr>
<h2>Default Growl notifications</h2>
-<p>The following events notify you via Growl by default:</p>
+<p class="list-header">The following events notify you via Growl by default:</p>
<ul>
<li>Contact signs on</li>
<li>Message received (Background Chat)</li>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/advanced-features-nudge-buzz.htmlfrag
--- a/help/documentation/advanced-features-nudge-buzz.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/advanced-features-nudge-buzz.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -3,21 +3,21 @@
<hr>
<h2>MSN: Nudge</h2>
-<p>Adium calls it simply “notificationâ€, and enables you to send and receive it.</p>
+<p>Adium calls it simply "notification", and enables you to send and receive it.</p>
<p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p>
-<p><strong>Presenting notifications you receive</strong></p>
+<h3>Presenting notifications you receive</h3>
<p>When somebody nudges you, the official clients will shake the window and play a sound.</p>
<p>We don't offer the window-shaking action, but we do provide our entire usual suite of event actions. You see, receiving a notification is in Adium as one of the events in the Preferences. You determine what Adium will do when one comes in.</p>
-<p>In the <strong>Events</strong> pane of Adium's Preferences simply select the “Notification received†event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>
-<p><strong>Sending notifications</strong></p>
-<p>There are three ways to send a notification to one of your contacts:</p>
+<p>In the <strong>Events</strong> pane of Adium's Preferences simply select the "Notification received" event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>
+<h3>Sending notifications</h3>
+<p class="list-header">There are three ways to send a notification to one of your contacts:</p>
<ul>
- <li>The keyboard: Type “/nudge†into the inputline and press Return or Enter.</li>
- <li>The menu: Choose “Send Notification†from the Contact menu.</li>
- <li>The toolbar: The “Send Notification†button is not on the chat window toolbar by default, so you need to add it.
+ <li>The keyboard: Type "/nudge" into the inputline and press Return or Enter.</li>
+ <li>The menu: Choose "Send Notification" from the Contact menu.</li>
+ <li>The toolbar: The "Send Notification" button is not on the chat window toolbar by default, so you need to add it.
<ul>
- <li>First, right-click on the chat window toolbar and choose “Customize Toolbar…â€.</li>
- <li>Drag the “Send Notification†button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Send Notification†(or the shaking-emoticon icon if you're using Icon Only mode).</li>
+ <li>First, right-click on the chat window toolbar and choose "Customize Toolbar…".</li>
+ <li>Drag the "Send Notification" button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click "Send Notification" (or the shaking-emoticon icon if you're using Icon Only mode).</li>
</ul>
</li>
</ul>
@@ -25,21 +25,21 @@
<hr>
<h2>Yahoo: Buzz</h2>
-<p>Adium calls it simply “notificationâ€, and enables you to send and receive it. You need Adium 1.1 or later.</p>
+<p>Adium calls it simply "notification", and enables you to send and receive it. You need Adium 1.1 or later.</p>
<p>The same information on this page is also presented in <a href="http://adium.im/screencasts/?video=5">an Adium screencast</a> on our website, which shows the feature in action.</p>
-<p><strong>Presenting notifications you receive</strong></p>
+<h3>Presenting notifications you receive</h3>
<p>When somebody buzzes you, the official clients will shake the window and play a sound.</p>
<p>We don't offer the window-shaking action, but we do provide our entire usual suite of event actions. You see, receiving a notification is in Adium as one of the events in the Preferences. You determine what Adium will do when one comes in.</p>
-<p>In the <strong>Events</strong> pane of Adium's Preferences simply select the “Notification received†event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>
-<p><strong>Sending notifications</strong></p>
+<p>In the <strong>Events</strong> pane of Adium's Preferences simply select the "Notification received" event in the list, click the <strong>+</strong> button, and choose the action you want Adium to perform. You can add as many actions as you want.</p>
+<h3>Sending notifications</h3>
<p>There are three ways to send a notification to one of your contacts:</p>
-<ul>
- <li>The keyboard: Type “/buzz†into the inputline and press Return or Enter.</li>
- <li>The menu: Choose “Send Notification†from the Contact menu.</li>
- <li>The toolbar: The “Send Notification†button is not on the chat window toolbar by default, so you need to add it.
+<ul class="list-header">
+ <li>The keyboard: Type "/buzz" into the input line and press Return or Enter.</li>
+ <li>The menu: Choose "Send Notification" from the Contact menu.</li>
+ <li>The toolbar: The "Send Notification" button is not on the chat window toolbar by default, so you need to add it.
<ul>
- <li>First, right-click on the chat window toolbar and choose “Customize Toolbar…â€.</li>
- <li>Drag the “Send Notification†button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click “Send Notification†(or the shaking-emoticon icon if you're using Icon Only mode).</li>
+ <li>First, right-click on the chat window toolbar and choose "Customize Toolbar…".</li>
+ <li>Drag the "Send Notification" button to the toolbar. Finally, click OK. From then on, when you want to send a notification, click "Send Notification" (or the shaking-emoticon icon if you're using Icon Only mode).</li>
</ul>
</li>
</ul>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/contact-list-blocking-unblocking.htmlfrag
--- a/help/documentation/contact-list-blocking-unblocking.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/contact-list-blocking-unblocking.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -1,22 +1,22 @@
<h1>Blocking and unblocking contacts</h1>
<p>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>
-<p>Blocked contacts appear in your ContactList with this status icon:</p>
+<p>Blocked contacts appear in your <a href="contact-list-contact-list">Contact List</a> with this status icon:</p>
<img src="../gfx/StatusIcons-blocked.png" alt="Blocked status bubble">
-<p>though some AdiumStatusIcons packs may have a different icon for blocked contacts.</p>
+<p>though some Adium Status Icons packs may have a different icon for blocked contacts.</p>
<hr>
<h2>Blocking a contact in chat</h2>
-<p>There are two ways:</p>
-<ul>
+<p class="list-header">There are two ways:</p>
+<ol>
<li>Click on the "Block" icon on the toolbar of the chat window (Clicking this symbol again will unblock the contact) or</li>
- <li>Right-click on the chat tab containing the spam and click “Blockâ€</li>
-</ul>
+ <li>Right-click on the chat tab containing the spam and click "Block"</li>
+</ol>
<hr>
<h2>Blocking a contact in the contact list</h2>
-<p>Select the Contact in the Contact List.</p>
+<p class="list-header">Select the Contact in the Contact List.</p>
<ul>
<li>From the <strong>Contact</strong> menu, select <strong>Block</strong> or</li>
<li>Right-click the contact and select <strong>Block</strong>.</li>
@@ -34,12 +34,12 @@
<hr>
<h2>Setting up Privacy Settings</h2>
-<p>From version 1.0 onwards:</p>
+<p class="list-header">From version 1.0 onwards:</p>
<ol>
<li>Choose <strong>Privacy Settings...</strong> from the<strong> Adium </strong>menu.</li>
<li>A window will appear.</li>
</ol>
-<p>The menu can utilize different privacy levels and manipulate allow and block lists for each account. Adjust your privacy level to an appropriate one, and add or remove contacts using the "+" and "-" buttons.</p>
+<p class="list-header">The menu can utilize different privacy levels and manipulate allow and block lists for each account. Adjust your privacy level to an appropriate one, and add or remove contacts using the "+" and "-" buttons.</p>
<ol>
<li><strong>Allow lists</strong>
<ul>
@@ -59,26 +59,22 @@
<hr>
<h2>Services and the Privacy Settings they support</h2>
-<p><strong>AIM</strong></p>
+<h3 class="list-header">AIM</h3>
<ul>
<li>Supports: All privacy settings displayed by Adium.</li>
</ul>
-<p><strong>MSN</strong></p>
+<h3 class="list-header">MSN</h3>
<ul>
- <li>Supports "Allow certain contacts" and "Block certain contacts".</li>
-</ul>
-<ul>
+ <li>Supports: <strong>Allow certain contacts</strong> and <strong>Block certain contacts</strong>.</li>
<li><strong>Allow only users on my contact list</strong> setting actually adds all contacts currently on your list to the allow list and sets <strong>Allow certain contacts</strong>. (Restart Adium if the change is not reflected)</li>
<li>It should also be noted that <strong>Allow all contacts</strong> is the same as <strong>Block certain contacts</strong>, so selecting <strong>Allow all contacts</strong> won't remove the block list stored on the server.</li>
</ul>
-<p><strong>Yahoo</strong></p>
+<h3 class="list-header">Yahoo</h3>
<ul>
<li>Supports: <strong>Allow All Contacts</strong> and <strong>Block certain contacts</strong>.</li>
-</ul>
-<ul>
<li>All settings except <strong>Allow All Contacts</strong> will enable your Block list and block only those contacts. (Restart Adium if the change is not reflected)</li>
</ul>
-<p><strong>ICQ</strong></p>
+<h3 class="list-header">ICQ</h3>
<ul>
- <li>Supports: <strong>Block certain contacts</strong> except that they aren't really blocked and are still able to send you messages, they just can't see if you are online or not. So this privacy option resembles ICQ's "invisible lists".</li>
+ <li>Supports: <strong>Block certain contacts</strong> except that they aren't really blocked and are still able to send you messages, they just can't see if you are online or not. So this privacy option resembles ICQ's "invisible lists".</li>
</ul>
\ No newline at end of file
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/contact-list-combining-contacts.htmlfrag
--- a/help/documentation/contact-list-combining-contacts.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/contact-list-combining-contacts.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -1,12 +1,12 @@
<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>For instance, if you have the following user names on your contact list:</p>
+<p class="list-header">For instance, if you have the following user names on your contact list:</p>
<ul>
<li>adiumuser</li>
<li>adiumuser at hotmail.com</li>
<li>adiumuser34</li>
</ul>
-<p>all belonging to the same individual, you can combine them into a single entry so that all you see is:</p>
+<p class="list-header">all belonging to the same individual, you can combine them into a single entry so that all you see is:</p>
<ul>
<li>Adium User</li>
</ul>
@@ -16,16 +16,16 @@
<h2>Combining contacts automatically</h2>
<p>Your Mac OS X Address Book is the easiest way to combine contacts. Adium will look for a card with at least one of your contacts' usernames on it; if it finds such a card, any other usernames that are on both your contact list and the AB card will be combined into a metacontact automatically.</p>
-<p>This is turned on by default, and it works without your intervention. If, for some reason, you don't want Address Book integration, you can turn it off in the Advanced pane of Adium's Preferences.</p>
+<p class="list-header">This is turned on by default, and it works without your intervention. If, for some reason, you don't want Address Book integration, you can turn it off in the Advanced pane of Adium's Preferences.</p>
<ul>
- <li><em><strong>Note:</strong></em> Automatic combining based on the Address Book doesn't preclude manual combining. You can always combine contacts manually if you want; this is described in the next section.</li>
+ <li><strong>Note:</strong> Automatic combining based on the Address Book doesn't preclude manual combining. You can always combine contacts manually if you want; this is described in the next section.</li>
</ul>
<p>See <a href="advanced-features-address-book-integration">Address Book integration</a> for details.</p>
<hr>
<h2>Combining contacts manually</h2>
-<p>To combine two or more contacts, simply drag one onto the other. If you have a "borderless" contact list, you'll need to hold down <strong>Command (⌘)</strong> in order to initiate the drag.</p>
+<p>To combine two or more contacts, simply drag one onto the other. If you have a "borderless" contact list, you'll need to hold down <strong>Command (⌘)</strong> in order to initiate the drag.</p>
<hr>
@@ -34,10 +34,10 @@
<li>Select the combined contact in your <strong>Contact List</strong>.</li>
<li>Choose <strong>Get Info</strong> from the <strong>Contact</strong> menu.</li>
<li>Select the desired contact from the expanded meta-contact in the contact list.</li>
- <li>Drag the contact outside of the meta and into another group. (Again, if you have a "borderless" contact list, you'll need to hold down <strong>Command (⌘)</strong> in order to initiate the drag.)</li>
+ <li>Drag the contact outside of the meta and into another group. (Again, if you have a "borderless" contact list, you'll need to hold down <strong>Command (⌘)</strong> in order to initiate the drag.)</li>
</ol>
<ul>
- <li><em><strong>Note:</strong></em> If a single Apple Address Book card has the contacts listed together, this process will only remain in effect until Adium is restarted. This occurs because Adium automatically creates combined contacts based on this Address Book information.</li>
+ <li><strong>Note:</strong> If a single Apple Address Book card has the contacts listed together, this process will only remain in effect until Adium is restarted. This occurs because Adium automatically creates combined contacts based on this Address Book information.</li>
</ul>
<hr>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/contact-list-contact-list.htmlfrag
--- a/help/documentation/contact-list-contact-list.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/contact-list-contact-list.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -4,9 +4,7 @@
<hr>
<h2>Searching for a contact in the contact list</h2>
-<ul>
- <li>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.</li>
-</ul>
+<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>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/contact-list-managing-contacts.htmlfrag
--- a/help/documentation/contact-list-managing-contacts.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/contact-list-managing-contacts.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -24,15 +24,12 @@
<hr>
<h2>Moving contacts</h2>
-<p>To move a contact to a new group, simply drag it. If you have a "borderless" contact (which includes all of the “Bubbles†window styles) list, you'll need to hold down <strong>command</strong> in order to initiate the drag.</p>
-<ul>
- <li><em><strong>Note:</strong></em> You can not manually reorder contacts if:
- <ol>
- <li>You are sorting alphabetically (<strong>View → Sort Alphabetically</strong>)</li>
- <li>You are sorting by status (<strong>View → Sort by Status</strong>) and <strong>View → Configure Status Sort</strong> has "Sort within status groups: Alphabetically" selected.</li>
- </ol>
- </li>
-</ul>
+<p>To move a contact to a new group, simply drag it. If you have a "borderless" contact (which includes all of the "Bubbles" window styles) list, you'll need to hold down <strong>command</strong> in order to initiate the drag.</p>
+<p class="list-header"><strong>Note:</strong> You can not manually reorder contacts if:</p>
+<ol>
+ <li>You are sorting alphabetically (<strong>View → Sort Alphabetically</strong>)</li>
+ <li>You are sorting by status (<strong>View → Sort by Status</strong>) and <strong>View → Configure Status Sort</strong> has "Sort within status groups: Alphabetically" selected.</li>
+</ol>
<hr>
diff -r 6a58ca6bf449 -r 5c7dc5c672f6 help/documentation/contact-list-managing-groups.htmlfrag
--- a/help/documentation/contact-list-managing-groups.htmlfrag Sun Feb 12 05:56:52 2012 +0000
+++ b/help/documentation/contact-list-managing-groups.htmlfrag Sun Feb 12 16:48:03 2012 +0000
@@ -5,7 +5,7 @@
<h2>Adding a group</h2>
<ol>
- <li>Choose “Add Group†from the <strong>Contact</strong> menu, or press ⌘D.</li>
+ <li>Choose "Add Group" from the <strong>Contact</strong> menu, or press ⌘D.</li>
<li>Enter the name you wish to assign to the group.</li>
<li>Click OK.</li>
</ol>
@@ -16,29 +16,26 @@
<p>Note that removing a group also deletes all the contacts in that group. If you want to keep some of them, you'll need to move those contacts to another group first. Remember to show offline contacts first, so that you don't forget anybody.</p>
<ol>
<li>Click on the group you want to delete.</li>
- <li>Choose “Delete Contact†from the Contact menu, or press ⌘⌫ (where ⌫ is the delete key on your keyboard).</li>
+ <li>Choose "Delete Contact" from the Contact menu, or press ⌘⌫ (where ⌫ is the delete key on your keyboard).</li>
<li>Adium will tell you the group you're about to delete and how many contacts will be deleted along with it. If that information is correct, click OK.</li>
</ol>
<hr>
<h2>Reordering groups</h2>
-<p>To move a group to a new position in the list, simply drag it. If you have a "borderless" contact list (which includes all of the “Bubbles†window styles), you'll need to hold down <strong>command</strong> in order to initiate the drag.</p>
-<ul>
- <li><em><strong>Note:</strong></em> You can not manually reorder contacts if:
- <ol>
- <li>You are sorting alphabetically (<strong>View → Sort Alphabetically</strong>)</li>
- <li>You are sorting by status (<strong>View → Sort by Status</strong>) and <strong>View → Configure Status Sort</strong> has "Sort within status groups: Alphabetically" selected.</li>
- </ol>
- </li>
-</ul>
-<p>Note that if you drag the group too far out of the list in any direction, it may pop out of the list (see “Disassociating Groups†below). This is a feature, and is easy to fix when you don't intend it (see “Re-associating Groupsâ€).</p>
+<p>To move a group to a new position in the list, simply drag it. If you have a "borderless" contact list (which includes all of the "Bubbles" window styles), you'll need to hold down <strong>command</strong> in order to initiate the drag.</p>
+<p class="list-header"><strong>Note:</strong> You can not manually reorder contacts if:</p>
+<ol>
+ <li>You are sorting alphabetically (<strong>View → Sort Alphabetically</strong>)</li>
+ <li>You are sorting by status (<strong>View → Sort by Status</strong>) and <strong>View → Configure Status Sort</strong> has "Sort within status groups: Alphabetically" selected.</li>
+</ol>
+<p>Note that if you drag the group too far out of the list in any direction, it may pop out of the list (see "Disassociating Groups" below). This is a feature, and is easy to fix when you don't intend it (see "Re-associating Groups").</p>
<hr>
More information about the commits
mailing list