Mercurial > hg > anonet-resdb

changeset 233:d38c3ed97acd draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert "Merge branch 'master' of git://git1.somerandomnick.ano" This reverts commit 0a745779ffd160ff77dbba359fc077ce8a83270a, reversing changes made to 3ab900bec3253e8ccfdcba56e752da39723ee6fc.
author Nick <nick@somerandomnick.ano>
date Thu, 28 Oct 2010 03:13:25 +0000
parents da3307e29b62
children c4cad8756f84
files db/usr/UFO/git doc/www.anonet2.org/public_pod/index.pod
diffstat 2 files changed, 14 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/db/usr/UFO/git	Thu Oct 28 03:07:14 2010 +0000
+++ b/db/usr/UFO/git	Thu Oct 28 03:13:25 2010 +0000
@@ -1,1 +1,1 @@
-http://anogit.ucis.ano/.git/
+http://anogit.ucis.ano/.git/
\ No newline at end of file
--- a/doc/www.anonet2.org/public_pod/index.pod	Thu Oct 28 03:07:14 2010 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Oct 28 03:13:25 2010 +0000
@@ -20,9 +20,7 @@
 =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 @@
 =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<SRN|telnet://ufo-net.nl:2324/> (hides your identity)
 
-L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity)
+=item IRC chat
 
-L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity)
+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 @@
 
 =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://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