changeset 217:541a2fcacc4c draft

Merge branch 'master' of git://git1.somerandomnick.ano
author Ivo Smits <Ivo@UCIS.nl>
date Thu, 21 Oct 2010 18:00:08 +0200
parents 08fbf1b48aac (current diff) f1953ef929ec (diff)
children 59b8096adeb3
files
diffstat 2 files changed, 16 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/index.pod	Wed Oct 20 20:00:07 2010 +0200
+++ b/doc/www.anonet2.org/public_pod/index.pod	Thu Oct 21 18:00:08 2010 +0200
@@ -389,13 +389,13 @@
 =item IRC Servers
 
 IRC on AnoNet2 isn't one big network under centralized control.
-Rather, anybody who wants runs his own IRC (or other chat) server,
-and links whatever channels he wants to channels on other servers,
-using a collection of relay bots.  (Right now, UFO and pragmo field
-relays, and the scalability problems are becoming visible.  How relay
-bots may want to deal with this is still a topic for open discussion.
-Feel free to join in the discussion, or just do your own thing and let
-everyone else be damned.)
+Rather, anybody who wants runs his own IRC (or other chat) server, and
+links whatever channels he wants to channels on other servers, using a
+collection of relay bots.  (Right now, UFO, pragmo and SRN field relays,
+and the scalability problems are becoming visible.  How relay bots may
+want to deal with this is still a topic for open discussion.  Feel free
+to join in the discussion, or just do your own thing and let everyone
+else be damned.)
 
 =item Outbound HTTP Proxies
 
--- a/doc/www.anonet2.org/public_pod/intro.pod	Wed Oct 20 20:00:07 2010 +0200
+++ b/doc/www.anonet2.org/public_pod/intro.pod	Thu Oct 21 18:00:08 2010 +0200
@@ -1,20 +1,18 @@
 =head1 AnoNet2 Introduction
 
-(Note: There's now a page (L<http://www.anonet2.org/anonymity>) explaining
-a bit about anonymity in general and its place in AnoNet in particular.)
+(Note: There's now L<a page explaining a bit about anonymity in general and its place in AnoNet in particular|http://www.anonet2.org/anonymity>.)
 
-(Note: There's now a darknet comparison page
-(L<http://www.anonet2.org/darknet_comparison>), where you can compare
-and contrast the various darknet options.)
+(Note: There's now L<a darknet comparison page, where you can compare and contrast the various darknet options|http://www.anonet2.org/darknet_comparison>).)
 
-(Note: There's now a separate page (L<http://www.anonet2.org/faq>),
-to answer all your AnoNet-related questions.)
+(Note: There's now L<a separate page, to answer all your AnoNet-related questions|http://www.anonet2.org/faq>).)
 
 So, you came across anoNet and thought it sounded great, so you decided
 to join in order to check it out.
 
 ...and found the (only) client port doesn't work half the time,
 
+...and the (only) official wiki doesn't work the other half of the time,
+
 ...and most of the advertised services no longer exist,
 
 ...and most of the people have left,
@@ -64,6 +62,10 @@
 out of luck.  Of course, that doesn't prevent you from running your own
 IRC server, and those who want to hear you can still join it.)
 
+=item No centralized wiki control
+
+AnoNet2 doesn't have an official wiki, and two (L<this one|http://www.anonet2.org/> and L<some random wiki|http://www.somerandomwiki.ano/>) out of the three well-known wikis on AnoNet2 use git for their underlying storage, and are therefore very easy for anybody to proxy, mirror, fork, etc.  (The last one is L<UFO's wiki|http://wiki.ucis.ano/>, and UFO is addicted to MediaWiki.)  (BTW, we now have a fourth "well-known" wiki, L<our AnoNet1 Wiki Mirror|Http://1.82.98.27/mediawiki/>: Since AnoNet1's official wiki seems to have more downtime than uptime, we figured we might as well donate a mirror to the cause.)
+
 =item No resource mess
 
 We have one mechanism for resource management, a decentralized (not just