[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    www/sites/kdetalk
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2012-02-13 10:24:36
Message-ID: 20120213102436.6F3DFAC894 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1279818 by ogoffart:

small update of kdetalk.net page

Change Jabber to XMPP and update the URLs

(Contribution by Neustradamus)




 M  +2 -6      howtoregister.php  
 M  +11 -21    index.php  
 AM            xmpp_logo.png  


--- trunk/www/sites/kdetalk/howtoregister.php #1279817:1279818
@@ -6,9 +6,8 @@
   include("header.inc");
 ?>
 
-<p>You can register with any Jabber client.  Here are instructions how to \
register with <a href="http://kopete.kde.org">Kopete</a> the official KDE \
instant messenger client. It is included in the kdenetwork package since \
                KDE 3.2.<br />
-If you are using Microsoft Windows, you can use <a \
href="http://psi.affinix.com/">Psi</a> which is a Qt based client which \
                shares some code with Kopete.
-
+<p>You can register with any XMPP client. Here are instructions how to \
register with <a href="http://kopete.kde.org/">Kopete</a> the official KDE \
instant messenger client. It is included in the kdenetwork package since \
KDE 3.2.<br /> +If you are using Microsoft Windows, you can use <a \
href="http://psi-im.org/">Psi</a> which is a Qt based client which shares \
some code with Kopete.  <ol>
 <li>Open <a href="http://kopete.kde.org">Kopete</a> <!--, it's by default \
in the "Internet" submenu of the K menu --><img src="kopete_logo_32.png" \
alt="kopete logo"  width="32" height="32"/></li>  <li>Open the Kopete \
configuration window. (the <em>Configure</em> entry in the \
<em>settings</em> menu). <!--If it is the first time you open kopete, the \
configuration window appears automatically. --></li> @@ -23,11 +22,8 @@
 <li>Once you registered, the account wizard should be already filled, you \
can verify all is correct, click on <em>Next</em> to finish the wizard</li> \
<li>If all gone fine, you should be connected, and have received the \
welcome message. Congratulations.  You can now add contacts and give you \
new JID to your friends</li>  </ol>
-
 </p>
 
-
-
 <?php
   include("footer.inc");
 ?>
--- trunk/www/sites/kdetalk/index.php #1279817:1279818
@@ -6,38 +6,28 @@
   include("header.inc");
 ?>
 
-<img src="jabber_logo.png" alt="Jabber Logo"  style="float:right; \
margin-left: 1em; margin-bottom: 1ex;" width="180" height="75"/> +<img \
src="xmpp_logo.png" alt="XMPP Logo" style="float:right; margin-left: 1em; \
margin-bottom: 1ex;" width="180" height="75"/> +<p>Welcome to KDETalk.net. \
This is an open XMPP server for KDE users and contributors. +Anyone with an \
XMPP client such as <a href="http://kopete.kde.org">Kopete</a> can join \
it.</p>  
-<p>Welcome to KDETalk.net. This is an open Jabber server for KDE users and \
                contributors.
-Anyone with a Jabber client such as <a \
href="http://kopete.kde.org">Kopete</a> can join it.</p> +<h2>What is \
XMPP?</h2>  
-
-<h2>What is Jabber ?</h2>
-
-
-<p>Jabber is an open decentralised instant messaging network.  Unlike \
usual proprietary systems like MSN or ICQ, there is not a central server \
owned by a company, but a lot of different interconnected servers. \
                KDETalk.net is one of them.</p>
-<p>Jabber aims to be to instant messaging what SMTP and POP are for \
emails.  Its protocol (XMPP) is a standard accepted by the <a \
                href="http://www.ietf.org/">IETF</a>.</p>
-
+<p>XMPP (formerly named Jabber) is an open decentralised instant messaging \
network. Unlike usual proprietary systems like MSN or ICQ, there is not a \
central server owned by a company, but a lot of different interconnected \
servers. KDETalk.net is one of them.</p>  <h3>See also:</h3>
 <ul>
-<li><a href="http://www.jabber.org">Jabber.org</a> - The Jabber foundation \
                website</li>
-<li><a href="http://en.wikipedia.org/wiki/Jabber">Jabber on \
Wikipedia</a></li> +<li><a href="http://xmpp.org">XMPP.org</a> - The XMPP \
Standards Foundation website</li> +<li><a \
href="http://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol">XMPP \
on Wikipedia</a></li>  </ul>
-
 <h2>How to Register ?</h2>
+<p>If you are a user, you can register a kdetalk.net address with any XMPP \
client. Here are instructions <a href="howtoregister.php">how to register \
with Kopete</a>.</p> +<p>If you are a contributor of the KDE project, you \
may <a href="mailto:sysadmin@kde.org">ask by mail</a> to obtain the Jabber \
ID which match with your @kde.org address.</p>  
-<p>If you are a user, you can register a kdetalk.net address with any \
Jabber client. Here are instructions <a href="howtoregister.php">how to \
                register with Kopete</a>.</p>
-<p>If you are a contributor of the KDE project, you may <a \
href="mailto:sysadmin@kde.org">ask by mail</a> to obtain the JID which \
match with your @kde.org address</p>  
-
-
 <h2>Contacts</h2>
-<p>If you encounter problems, or simply have questions, you can send a \
mail to <a href="mailto:sysadmin@kde.org">sysadmin@kde.org</a> </p> +<p>If \
you encounter problems, or simply have questions, you can send a mail to <a \
href="mailto:sysadmin@kde.org">sysadmin@kde.org</a>.</p> +<p \
style="text-align:right"> <a href="http://ejabberd.im/"><img \
src="powered-by-ejabberd.png" alt="Powered by ejabberd" width="101" \
height="31"/></a> </p>  
-<p style="text-align:right"> <a href="http://www.jabberpowered.org/"><img \
src="jabber_powered_20.png" alt="Jabber Powered"   width="136" \
height="20"/></a>   <a href="http://ejabberd.jabber.ru/"><img \
src="powered-by-ejabberd.png" alt="Powered by ejabberd"   width="101" \
height="31"/></a> </p>  
-
-
 <?php
   include("footer.inc");
 ?>


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic