[GNUnet-SVN] r3801 - GNUnet-docs/WWW

[grothoff]

Author: grothoff
Date: 2006-11-19 21:55:22 -0800 (Sun, 19 Nov 2006)
New Revision: 3801

Modified:
   GNUnet-docs/WWW/user_afs.php3
   GNUnet-docs/WWW/user_gnunet.php3
Log:
fixes

Modified: GNUnet-docs/WWW/user_afs.php3
===================================================================
--- GNUnet-docs/WWW/user_afs.php3       2006-11-20 05:44:39 UTC (rev 3800)
+++ GNUnet-docs/WWW/user_afs.php3       2006-11-20 05:55:22 UTC (rev 3801)
@@ -132,7 +132,7 @@
 W("Most options are in the configuration file for the gnunetd daemon, the 
others are specfically marked as client options.");
 EP();
 
-ANCHOR("gnunet.conf.diskquota");H4("FS: DISKQUOTA");
+ANCHOR("gnunet.conf.diskquota");H4("FS: QUOTA");
 
 BP();
 W("Use this option to specify how much space GNUnet is allowed to use on the 
drive.");
@@ -167,17 +167,6 @@
 W("Note that in either case, your anonymity would have to be broken first 
(which may be possible depending on the size of the GNUnet network and the 
strength of the adversary).");
 
 EP();
-ANCHOR("gnunet.conf.searchtimeout");H4("FS: SEARCHTIMEOUT");
-
-BP();
-W("This is a client option respected by <tt>gnunet-search</tt> and 
<tt>gnunet-gtk</tt>.");
-w("After how many seconds should <tt>gnunet-search</tt> give up searching?");
-W("<tt>gnunet-search</tt> will exit after this period of time.");
-W("The option does not specify how long the individual search query lives in 
the network.");
-W("For typical values <tt>gnunet-search</tt> will retransmit the search query 
multiple times in the given search interval.");
-W("The default is 300 seconds.");
-
-EP();
 ANCHOR("gnunet.conf.extractors");H4("FS: EXTRACTORS");
 
 BP();

Modified: GNUnet-docs/WWW/user_gnunet.php3
===================================================================
--- GNUnet-docs/WWW/user_gnunet.php3    2006-11-20 05:44:39 UTC (rev 3800)
+++ GNUnet-docs/WWW/user_gnunet.php3    2006-11-20 05:55:22 UTC (rev 3801)
@@ -124,23 +124,23 @@
 W("The rationale is that typcially the system administrator will setup 
<tt>gnunetd</tt> while ordinary users are executing the clients.");
 P();
 W("The default location for the configuration of <tt>gnunetd</tt> is 
<tt>/etc/gnunetd.conf</tt>.");
-W("If <tt>gnunetd</tt> is run as an ordinary user and cannot access a 
configuration in <tt>/etc/gnunetd.conf</tt> it will automatically fall back to 
<tt>\$HOME/.gnunet/gnunetd.conf</tt>.");
 W("A few tools that help setup and diagnose the daemon (like 
<tt>gnunet-transport-check</tt>) also use this configuration file.");
-W("A template for this configuration is in <tt>contrib/gnunet.root</tt>.");
+W("A template for this configuration is in <tt>contrib/gnunetd.conf</tt>.");
+W("You should use <tt>gnunet-setup -d</tt> to create or modify 
<tt>/etc/gnunetd.conf</tt>.");
 P();
 W("The GNUnet clients (like <tt>gnunet-insert</tt> or <tt>gnunet-gtk</tt>) use 
a different configuration file.");
 W("All GNUnet clients expect this file to reside by default in 
<tt>\$HOME/.gnunet/gnunet.conf</tt>.");
-W("A template for this file is in <tt>contrib/gnunet.user</tt>.");
-W("If the configuration file is not found, all GNUnet tools will use the 
default configuration file and write that configuration to the location where 
the configuration file was expected.");
-W("So you can always revert to the default configuration file by deleting or 
renaming the existing file.");
-
+W("A template for this file is in <tt>contrib/gnunet.conf</tt>.");
+W("You should use <tt>gnunet-setup</tt> (without the <tt>-d</tt> option) to 
create or modify <tt>~/.gnunet/gnunet.conf</tt>.");
+W("If the configuration file is not found, all GNUnet tools will use default 
options for the various settings.");
 EP();
 
 ANCHOR("serveroptions"); H3("Server options");
 
 BP();
 W("All of the options described here refer to the server configuration.");
-W("This section describes the most important options to setup 
<tt>gnunetd</tt>.");
+W("This section describes the most important options to setup 
<tt>gnunetd</tt>.");
+W("The <tt>gnunet-setup</tt> tool gives more detailed descriptions for each 
option.");
 W("If you are on dialup, look at %s and probably %s.",
   ARRAY(extlink_("#gnunet.conf.helloexpires", "HELLOEXPIRES"),
        extlink_("#gnunet.conf.interfaces", "INTERFACES")));
@@ -352,11 +352,11 @@
 W("The largest acceptable value is 14400 (10 days).");
 
 EP();
-ANCHOR("gnunet.conf.loglevel");H4("GNUNETD: LOGLEVEL");
+ANCHOR("gnunet.conf.loglevel");H4("LOGGING: USER-LEVEL and ADMIN-LEVEL");
 
 BP();
 W("Loglevel, how much should be logged?");
-W("You can use NOTHING, FATAL, ERROR, FAILURE, WARNING, MESSAGE INFO, DEBUG, 
CRON or EVERYTHING (which log more and more messages in this order).");
+W("You can use NOTHING, FATAL, ERROR, WARNING, INFO, STATUS or DEBUG (which 
log more and more messages in this order).");
 W("Default is WARNING.");
 W("You can override this option at the commandline with the <tt>-L</tt> 
switch.");