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.pod26
1 files changed, 26 insertions, 0 deletions
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod
index 6fef6d2..f9ee5d5 100644
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -22,7 +22,23 @@ us and chat, it's very easy:
=item webchat
L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
+<<<<<<< HEAD
+<<<<<<< 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
+=======
L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
+>>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
=item IRC chat
L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
@@ -45,9 +61,19 @@ Once you're online, you can reconnect to IRC from inside AnoNet:
=item webchat
+<<<<<<< HEAD
+<<<<<<< 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
+=======
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)
+>>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
=item IRC