comparison doc/www.anonet2.org/public_pod/index.pod @ 232:da3307e29b62 draft

Revert "Merge branch 'master' of git://git1.somerandomnick.ano" This reverts commit ba3a6ce7443f675177d6e2cbc7e777b99120da79, reversing changes made to 0a745779ffd160ff77dbba359fc077ce8a83270a.
author Nick <nick@somerandomnick.ano>
date Thu, 28 Oct 2010 03:07:14 +0000
parents abee74e3817d
children d38c3ed97acd
comparison
equal deleted inserted replaced
230:13b137e470cb 232:da3307e29b62
20 =over 20 =over
21 21
22 =item webchat 22 =item webchat
23 L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous) 23 L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous)
24 24
25 <<<<<<< HEAD
26 <<<<<<< HEAD 25 <<<<<<< HEAD
27 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity) 26 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity)
28 27
29 =item webchat 28 =item webchat
30 29
34 33
35 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity) 34 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity)
36 ======= 35 =======
37 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) 36 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
38 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 37 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
39 =======
40 L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous)
41 >>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
42 38
43 =item IRC chat 39 =item IRC chat
44 L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity) 40 L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity)
45 41
46 L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity) 42 L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity)
59 55
60 =over 56 =over
61 57
62 =item webchat 58 =item webchat
63 59
64 <<<<<<< HEAD
65 <<<<<<< HEAD 60 <<<<<<< HEAD
66 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity) 61 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity)
67 ======= 62 =======
68 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity) 63 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
69 64
70 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity) 65 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
71 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 66 >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313
72 =======
73 L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity)
74
75 L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity)
76 >>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333
77 67
78 =item IRC 68 =item IRC
79 69
80 L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous> 70 L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous>
81 (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some 71 (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some