Mercurial > hg > anonet-resdb
changeset 225:f983a3b6a7ab draft
Merge branch 'master' of git://git1.somerandomnick.ano
Conflicts:
doc/www.anonet2.org/public_pod/index.pod
| author | root <root@HAL2000.(none)> |
|---|---|
| date | Tue, 26 Oct 2010 18:13:42 -0500 |
| parents | cdf40c2439e9 (current diff) 74772c760d9c (diff) |
| children | abee74e3817d |
| files | doc/www.anonet2.org/public_pod/index.pod |
| diffstat | 2 files changed, 16 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/db/usr/UFO/git Tue Oct 26 16:46:27 2010 -0500 +++ b/db/usr/UFO/git Tue Oct 26 18:13:42 2010 -0500 @@ -1,1 +1,1 @@ -http://anogit.ucis.ano/.git/ \ No newline at end of file +http://anogit.ucis.ano/.git/
--- a/doc/www.anonet2.org/public_pod/index.pod Tue Oct 26 16:46:27 2010 -0500 +++ b/doc/www.anonet2.org/public_pod/index.pod Tue Oct 26 18:13:42 2010 -0500 @@ -20,7 +20,9 @@ =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 @@ -30,22 +32,20 @@ =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|telnet://ufo-net.nl:2324/> (hides your identity) +L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity) -=item IRC chat +L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity) -L<UFO|telnet://ufo-net.nl:2325/> (partly hides your identity) +L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide 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) +L<SRN|telnet://anortr.ucis.nl:8803> (hides your identity) =back @@ -57,7 +57,13 @@ =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 @@ -65,12 +71,8 @@ (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