diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-12-10 01:24:17 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-10 18:54:30 +0100 |
| commit | dd43402365ac82e6f28d373ea857a38f473e9f45 (patch) | |
| tree | 8a4825ac0df9d8f1f3f3685a9e0fd5f96d5e274d /doc/kopete/index.docbook | |
| parent | 3ca6259d5b5b41ecce9759373714bdc57ff563d8 (diff) | |
| download | tdenetwork-dd43402365ac82e6f28d373ea857a38f473e9f45.tar.gz tdenetwork-dd43402365ac82e6f28d373ea857a38f473e9f45.zip | |
kopete: Restore the AIM protocol because a replacement AIM server was created.
This reverts commits 036b0229db and dc34f9c391.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 91ba38a1df42b56caa73babc90ffa4f674c000d4)
Diffstat (limited to 'doc/kopete/index.docbook')
| -rw-r--r-- | doc/kopete/index.docbook | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/kopete/index.docbook b/doc/kopete/index.docbook index 16e70890..acbaaf3e 100644 --- a/doc/kopete/index.docbook +++ b/doc/kopete/index.docbook @@ -107,6 +107,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël) <keyword>Jabber</keyword> <keyword>IRC</keyword> <keyword>ICQ</keyword> +<keyword>AIM</keyword> <keyword>Yahoo</keyword> <keyword>Gadu-Gadu</keyword> <keyword>GroupWise</keyword> @@ -689,6 +690,10 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip> <para>&kopete; calls different &im; systems 'Protocols'. When you add an account, it is specific to a single protocol. Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para> <sect1 id="protocols-list"> <title>Protocols</title> + <sect2 id="protocols-aim"> + <title>AIM</title> + <para>AIM supports chatrooms. Use the <guilabel>Join Chat...</guilabel> command on the AIM account menu to join a chatroom. Contact pictures and custom emoticons are also supported.</para> + </sect2> <sect2 id="protocols-icq"> <title>ICQ</title> <para>ICQ has an Invisibility feature which allows you to hide from selected contacts. You may also search the ICQ user directory when adding a contact. A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para> @@ -890,7 +895,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip> <question><para>I need to connect via a SOCKS proxy, but I can't find any proxy configuration options in &kopete;. How do I set up &kopete; to use SOCKS?</para> </question> <answer><itemizedlist> -<listitem><para><trademark>ICQ</trademark>, Jabber, and <trademark>Yahoo</trademark> use the &kde; network infrastructure. Their SOCKS proxy details are configured with the rest of &kde;, in <application>Control Center</application>, <menuchoice><guimenu>Internet & Network</guimenu><guimenuitem>Proxy</guimenuitem></menuchoice>.</para></listitem> +<listitem><para><trademark>ICQ</trademark>, <trademark>AIM</trademark>, Jabber, and <trademark>Yahoo</trademark> use the &kde; network infrastructure. Their SOCKS proxy details are configured with the rest of &kde;, in <application>Control Center</application>, <menuchoice><guimenu>Internet & Network</guimenu><guimenuitem>Proxy</guimenuitem></menuchoice>.</para></listitem> </itemizedlist> </answer> </qandaentry> |