summaryrefslogtreecommitdiff
path: root/doc/www.anonet2.org
diff options
context:
space:
mode:
Diffstat (limited to 'doc/www.anonet2.org')
-rw-r--r--doc/www.anonet2.org/public_pod/index.pod21
1 files changed, 19 insertions, 2 deletions
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod
index 9fc7733..bbc9a33 100644
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -22,7 +22,19 @@ us and chat, it's very easy:
=item webchat
L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
+<<<<<<< HEAD
+L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity)
+
+=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)
+=======
L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
+>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
=item IRC chat
L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
@@ -45,9 +57,13 @@ Once you're online, you can reconnect to IRC from inside AnoNet:
=item webchat
+<<<<<<< HEAD
+L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
+=======
L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
+>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
=item IRC
@@ -318,8 +334,9 @@ L<AnoNet1 Wiki Mirror|http://1.82.98.27/mediawiki> (You got that right: AnoNet1
=item *
-Webchat (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>)
-Webchat (L<http://www.sevilnatas.ano/chat.html>)
+IRC Webchat Client (L<http://www.sevilnatas.ano/chat.html>)
+IRC-Like Chat Rooms [NO ACTIVATION OR VALID EMAILS REQUIRED (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>)]
+
=item *