changeset 263:5120c3bf578e draft

Merge branch 'master' of git://git1.somerandomnick.ano
author Ivo Smits <Ivo@UCIS.nl>
date Fri, 29 Oct 2010 11:30:04 +0200
parents 3dc19203f35f (current diff) 1d8ab38d7823 (diff)
children 97fdbcf826f0
files
diffstat 1 files changed, 18 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/index.pod	Fri Oct 29 10:30:05 2010 +0200
+++ b/doc/www.anonet2.org/public_pod/index.pod	Fri Oct 29 11:30:04 2010 +0200
@@ -17,8 +17,24 @@
 There are many ways to join AnoNet.  If you just want to hang out with
 us and chat, it's very easy:
 
-If you need some assistance in joining, we have an Internet accesable 
-webIRC client up at L<http://anonet.serveirc.com/>.
+=begin xhtml
+
+Z<><table>
+ <tr><th>Protocol</th><th>Service</th><th>Anonymity</th></tr>
+ <tr><td>HTTPZ<></td><td>L<KwaakNet|http://anonet.serveirc.com/></td><td>????</td></tr>
+ <tr><td>HTTPZ<></td><td>L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous></td><td>a?y?</td></tr>
+ <tr><td>HTTPZ<></td><td>L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet></td><td>n???</td></tr>
+ <tr><td>IRCZ<></td><td>L<SRN|irc://anortr.ucis.nl:8804/RendezVous></td><td>aaoa</td></tr>
+ <tr><td>IRCZ<></td><td>L<UFO|irc://anortr.ucis.nl:8805/anonet></td><td>a?oo</td></tr>
+ <tr><td>IRCZ<></td><td>L<UFO|irc://irc.kwaaknet.org:6667/anonet></td><td>nooo</td></tr>
+ <tr><td>telnetZ<></td><td>L<SRN|telnet://anortr.ucis.nl:8803/></td><td>aaya</td></tr>
+</table>
+
+=end xhtml
+
+If you're feeling adventurous enough to connect at the IP level, L<UFO has a client port|http://ix.ucis.nl/clientport.php>.
+
+Once you're online, you can reconnect to IRC from inside AnoNet:
 
 =over
 
@@ -28,38 +44,6 @@
 
 =item webchat
 
-L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
-
-=item webchat
-
-L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity)
-
-=item IRC chat
-
-L<SRN|telnet://ufo-net.nl:2324/> (hides your identity)
-
-=item IRC chat
-
-L<UFO|telnet://ufo-net.nl:2325/> (partly hides your identity)
-
-=item telnet chat
-
-L<SRN|telnet://ufo-net.nl:2323/> (hides your identity)
-
-=item IRC chat
-
-L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity)
-
-=back
-
-If you're feeling adventurous enough to connect at the IP level, L<UFO has a client port|http://ix.ucis.nl/clientport.php>.
-
-Once you're online, you can reconnect to IRC from inside AnoNet:
-
-=over
-
-=item webchat
-
 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
 
 =item IRC