changeset 411:8e98fd637f25 draft

Merge branch 'master' of git://1.3.9.1
author Ivo Smits <Ivo@UCIS.nl>
date Thu, 17 Feb 2011 01:30:10 +0100
parents fac089efa5b4 (diff) 2caed99f743c (current diff)
children 374a14c13643
files
diffstat 6 files changed, 37 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/170/owner	Thu Feb 17 01:30:10 2011 +0100
@@ -0,0 +1,1 @@
+harald
--- a/db/dom/ano/pdp/ns/ns.pdp.ano	Thu Feb 17 03:28:25 2011 +0300
+++ b/db/dom/ano/pdp/ns/ns.pdp.ano	Thu Feb 17 01:30:10 2011 +0100
@@ -1,1 +1,1 @@
-1.33.92.1
+1.33.92.3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/AA/cidr	Thu Feb 17 01:30:10 2011 +0100
@@ -0,0 +1,1 @@
+1.0.170.0/24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/00/AA/owner	Thu Feb 17 01:30:10 2011 +0100
@@ -0,0 +1,1 @@
+harald
--- a/db/usr/harald/git	Thu Feb 17 03:28:25 2011 +0300
+++ b/db/usr/harald/git	Thu Feb 17 01:30:10 2011 +0100
@@ -1,1 +1,1 @@
-git://1.0.169.1/ano2.git
+git://1.0.169.14/ano.git
--- a/doc/www.anonet2.org/public_pod/index.pod	Thu Feb 17 03:28:25 2011 +0300
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Feb 17 01:30:10 2011 +0100
@@ -4,20 +4,6 @@
 
 You can read more information about AnoNet below, or on L<http://wiki.ucis.nl/Anonet>.
 
-=head2 Urgent Appeal
-
-As you may already know, Egypt cut nearly all international Internet
-access last night.  However, phone lines still work.  SRN would like to
-encourage someone who doesn't care about his own anonymity to run pppd
-on a phone line, as a dialup AnoNet ISP for Egyptians who can't access
-AnoNet by the regular methods.  All you need is a Unix (GNU/Linux,
-*BSD, etc. - anything that can run pppd) computer with a fax/modem and
-an available telephone line (incoming calls only).  If you can help,
-please find SRN on IRC (no technical knowledge necessary).
-
-Well, we are too late.  L<Egypt is back online
-again.|http://www.bbc.co.uk/news/technology-12346929>
-
 =head2 Theory
 
 =over
@@ -128,10 +114,41 @@
 
 For more information about anonimity on IRC, see L<this page|http://www.anonet2.org/irc_anonymity>.
 
-Note that if your only aim in joining AnoNet is to search Google anonymously, you can save yourself the hassle L<by just heading over to Scroogle|http://www.scroogle.org/>.  If you're looking to browse the rest of the public Internet anonymously, though, we now have outbound proxies, which you're more than welcome to use.  (L<Here's a service that tries to show you what you're likely to be leaking, right now.|http://what-is-my-ip-address.anonymous-proxy-servers.net/>)
+=head2 IRC Channels
+
+The activity level on #anonet got a bit too high (especially with all the bots), so some new channels have been added.  Here are the currently known channels:
+
+=over
+
+=item #anonet (chat/anonet)
+
+This is the main channel for AnoNet-related discussion.  All AnoNet2 IRC servers carry this channel.
+
+=item #talk (chat/talk)
+
+This is a new channel for general talk, and at least for now it is the home of most of our bots.  Only sevil and SRN IRC servers carry this channel.
+
+=item #1984 (chat/1984)
+
+This is a channel that BrainBox requested.  Some SRN IRC servers carry it.
+
+=back
+
+Creating a new channel is done the traditional way (just /join it),
+but linking the channel through the udpmsg3 cloud requires a little
+bit of configuration for all current udpmsg3 clients.  SRN is happy to
+reconfigure his stuff for any new channel.
 
 =head2 Why to Join
 
+Note that if your only aim in joining AnoNet is to search Google
+anonymously, you can save yourself the hassle L<by just heading over
+to Scroogle|http://www.scroogle.org/>.  If you're looking to browse
+the rest of the public Internet anonymously, though, we now have
+outbound proxies, which you're more than welcome to use.  (L<Here's a
+service that tries to show you what you're likely to be leaking, right
+now.|http://what-is-my-ip-address.anonymous-proxy-servers.net/>)
+
 (Note: There's now L<a separate page with links to many more reasons to
 join AnoNet|http://www.anonet2.org/links>.)