diff options
| author | Nick <nick@somerandomnick.ano> | 2010-10-28 03:13:25 +0000 |
|---|---|---|
| committer | Nick <nick@somerandomnick.ano> | 2010-10-28 03:13:25 +0000 |
| commit | 38e59cad825a932352bf2e7d00a42dff9e8d4e3d (patch) | |
| tree | ab8f2f28c8b0ba7611c91104a372c168aaa4bf83 /doc/www.anonet2.org/public_pod | |
| parent | ef54a40b9775271e5c35ebcd1e0128638be38013 (diff) | |
| download | resdb-38e59cad825a932352bf2e7d00a42dff9e8d4e3d.tar.gz resdb-38e59cad825a932352bf2e7d00a42dff9e8d4e3d.zip | |
Revert "Merge branch 'master' of git://git1.somerandomnick.ano"
This reverts commit 0a745779ffd160ff77dbba359fc077ce8a83270a, reversing
changes made to 3ab900bec3253e8ccfdcba56e752da39723ee6fc.
Diffstat (limited to 'doc/www.anonet2.org/public_pod')
| -rw-r--r-- | doc/www.anonet2.org/public_pod/index.pod | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod index bbc9a33..1895d7f 100644 --- a/doc/www.anonet2.org/public_pod/index.pod +++ b/doc/www.anonet2.org/public_pod/index.pod @@ -20,9 +20,7 @@ us and chat, it's very easy: =over =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 @@ -32,20 +30,22 @@ L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (partiall =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) -L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity) +L<SRN|telnet://ufo-net.nl:2324/> (hides your identity) -L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity) +=item IRC chat + +L<UFO|telnet://ufo-net.nl:2325/> (partly hides your identity) =item telnet chat -L<SRN|telnet://anortr.ucis.nl:8803> (hides your identity) +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 @@ -57,13 +57,7 @@ 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 @@ -71,8 +65,12 @@ L<SRN|irc://irc.somerandomnick.ano:6667/RendezVous> (L<SRN|irc://1.0.27.103:6667/RendezVous>, if you don't have DNS for some reason) (automatically hides your identity) +=item IRC + L<KwaakNet|irc://1.3.3.7:6667/anonet> (doesn't automatically hide your identity) +=item IRC + L<pragmo|irc://irc.pragmo.ano:6667/atomic> (L<pragmo|irc://1.0.16.111:6667/atomic>, for the same reason as before and if you want you can use SSL on port 6697) (doesn't automatically |