Differences

This shows you the differences between two versions of the page.

--- en:jingle_bots [2010/10/19 19:03] – z_god
+++ en:jingle_bots [2019/04/28 13:51] (current) – external edit 127.0.0.1
@@ Line 12: / Line 12: @@
 Here is a list of currently known public Jingle bots:
 || JID                          || notes               || Works with (tested with)  ||
-|| echo@haar.student.utwente.nl || A simple echo test  || Psi, Psi+, Pidgin, Google Talk, QIP, Nokia N900, SIP ||
+|| echo@haar.student.utwente.nl || A simple echo test  || Psi, Psi+, Pidgin, <del>Google Talk, QIP,</del> Nokia N900, SIP ||
-|| psi-dev@haar.student.utwente.nl || A conference room to talk about Psi+ (psi+ and psiplus@haar.student.utwente.nl work too) || Psi, Psi+, Pidgin, Google Talk, QIP, Nokia N900, SIP ||
+|| psi-dev@haar.student.utwente.nl || A conference room to talk about Psi+ (psi+ and psiplus@haar.student.utwente.nl work too) || Psi, Psi+, Pidgin, <del>Google Talk, QIP,</del> Nokia N900, SIP ||
-|| tellme@haar.student.utwente.nl || A SIP bridge to the Tell Me service (hint, say Black Jack from the main menu) || Psi, Psi+, Pidgin, Google Talk, QIP, Nokia N900 ||
+|| tellme@haar.student.utwente.nl || A SIP bridge to the Tell Me service (hint, say Black Jack from the main menu) || Psi, Psi+, Pidgin, <del>Google Talk, QIP,</del> Nokia N900 ||
 || echo@test.collabora.co.uk || A test bot by [[http://www.collabora.co.uk/|Collabora]] with several tests including an echo and a video test || Psi, Psi+ ||
@@ Line 63: / Line 63: @@
-  * Register a Jabber account (using Psi for example, you can remove it from Psi afterwards)
+  * Register a XMPP account (using Psi for example, you can remove it from Psi afterwards)
   * Edit /etc/asterisk/jabber.conf and add the new account:
@@ Line 78: / Line 78: @@
 </code>
-Note that in the above case, Asterisk is running on the same server as the Jabber daemon.
+Note that in the above case, Asterisk is running on the same server as the XMPP daemon.