# HG changeset patch
# User icann <icann@icann.ano>
# Date 1344870706 0
# Node ID 335e48445b40ce088ea296d11fab041660d5f879
# Parent  0aa847a79036ecdb9aac593785d67e82e6483ce4# Parent  62cb855e4f764bd4a35c032ca5ec7dd48225bb52
Merge branch 'master' of git://git1.srn.ano

diff -r 0aa847a79036 -r 335e48445b40 db/udpmsg4/anonpr/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonpr/@/.gitignore	Mon Aug 13 15:11:46 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 0aa847a79036 -r 335e48445b40 db/udpmsg4/anonpr/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonpr/@/default.key	Mon Aug 13 15:11:46 2012 +0000
@@ -0,0 +1,1 @@
+0855f46c48219a2bdecd8f07c8703bd9ef604fdfa68649492d480981fef9ca01
diff -r 0aa847a79036 -r 335e48445b40 db/udpmsg4/anonpr/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonpr/@/owner	Mon Aug 13 15:11:46 2012 +0000
@@ -0,0 +1,1 @@
+somerandomnick
diff -r 0aa847a79036 -r 335e48445b40 db/udpmsg4/anonpr/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/anonpr/@/path	Mon Aug 13 15:11:46 2012 +0000
@@ -0,0 +1,1 @@
+/anonpr
diff -r 0aa847a79036 -r 335e48445b40 doc/www.anonet2.org/public_pod/Makefile
--- a/doc/www.anonet2.org/public_pod/Makefile	Fri Aug 03 08:20:42 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/Makefile	Mon Aug 13 15:11:46 2012 +0000
@@ -1,4 +1,4 @@
-all: index.html links.html faq.html darknet_comparison.html anonymity.html intro.html irc_anonymity.html services.html assholes.html thejetset_clientport.html icann.html
+all: index.html links.html faq.html darknet_comparison.html anonymity.html intro.html irc_anonymity.html services.html assholes.html thejetset_clientport.html icann.html about.html
 
 %.html: %.pod
 	pod2xhtml --noindex < $< 2>/dev/null > $@.tmp
diff -r 0aa847a79036 -r 335e48445b40 doc/www.anonet2.org/public_pod/about.pod
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/www.anonet2.org/public_pod/about.pod	Mon Aug 13 15:11:46 2012 +0000
@@ -0,0 +1,25 @@
+=head1 About
+
+=head2 /OnionNet/katmagic in #public
+
+=over
+
+ /OnionNet/katmagic> TriPh0rce: Anonet is this project to create an internet that is not governed by ICAAN regulations.
+ /OnionNet/katmagic> (Of course, it is run on networks governed by ICAAN regulations.)
+ /OnionNet/katmagic> It is about as secure as the regular internet, but they make grandiose and clearly false claims.
+ /OnionNet/katmagic> It's filled with people who can't speak English, and are generally uninformed.
+ /OnionNet/katmagic> Oh, and it's not anonymous, despite its claims.
+ /OnionNet/katmagic> Sounds great, right?
+ /OnionNet/katmagic> And it has no users.
+ /sfor/SeekingFor>  /OnionNet/katmagic> Oh, and it's not anonymous, despite its claims.
+ /sfor/SeekingFor> it can be, some peerings are established trough hidden services only
+ /OnionNet/TriPh0rce> sounds like something i'd really love
+ /OnionNet/katmagic> And everyone who uses it quotes things in a super annoying way.
+ /OnionNet/katmagic> And its maintainer runs an incredibly annoying bot that everyone hates.
+ /OnionNet/katmagic> I think that pretty much summarizes it.
+ /sfor/SeekingFor>  /OnionNet/katmagic> And everyone who uses it quotes things in a super annoying way.
+ /sfor/SeekingFor> what do you mean?
+ /OnionNet/katmagic> You just did it!
+ /NTMA/talamon> who is mad
+
+=back
diff -r 0aa847a79036 -r 335e48445b40 doc/www.anonet2.org/public_pod/index.pod
--- a/doc/www.anonet2.org/public_pod/index.pod	Fri Aug 03 08:20:42 2012 +0000
+++ b/doc/www.anonet2.org/public_pod/index.pod	Mon Aug 13 15:11:46 2012 +0000
@@ -1,6 +1,6 @@
 =head1 AnoNet, Take 2!
 
-Welcome to AnoNet! AnoNet is a highly decentralized darknet, aiming to create a censorship resistant network free from government influence and restrictions. AnoNet uses an IP network to accomplish this, as an alternative to the existing internet.
+Welcome to AnoNet! AnoNet is a highly decentralized darknet, aiming to create a censorship resistant network free from government influence and restrictions. AnoNet uses an IP network to accomplish this, as an alternative to the existing internet.  L<more informations|http://www.anonet2.org/about>
 
 =for comment
 You can read more information about AnoNet below, or on L<http://wiki.ucis.nl/Anonet>.
@@ -13,6 +13,10 @@
 
 =item *
 
+L<about|http://www.anonet2.org/about>
+
+=item *
+
 L<anonymity in general and its place in AnoNet in particular|http://www.anonet2.org/anonymity>
 
 =item *