[GNUnet-SVN] r3689 - in GNUnet: . doc/man src/applications/fs/tools src/include src/server src/setup src/util/getopt

[grothoff]

Author: grothoff
Date: 2006-11-10 19:27:40 -0800 (Fri, 10 Nov 2006)
New Revision: 3689

Modified:
   GNUnet/doc/man/gnunet-directory.1
   GNUnet/doc/man/gnunet-download.1
   GNUnet/doc/man/gnunet-insert.1
   GNUnet/doc/man/gnunet-search.1
   GNUnet/doc/man/gnunet-setup.1
   GNUnet/doc/man/gnunet-unindex.1
   GNUnet/doc/man/gnunet.conf.5
   GNUnet/doc/man/gnunetd.1
   GNUnet/doc/man/gnunetd.conf.5
   GNUnet/src/applications/fs/tools/gnunet-download.c
   GNUnet/src/include/gnunet_util_getopt.h
   GNUnet/src/server/gnunetd.c
   GNUnet/src/setup/gnunet-setup.c
   GNUnet/src/util/getopt/getopt.c
   GNUnet/src/util/getopt/printhelp.c
   GNUnet/todo
Log:
minor fixes and man page updates


Modified: GNUnet/doc/man/gnunet-directory.1
===================================================================
--- GNUnet/doc/man/gnunet-directory.1   2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet-directory.1   2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,4 +1,4 @@
-.TH gnunet-directory "1" "15 Dec 2004" "GNUnet"
+.TH gnunet-directory "1" "11 Nov 2006" "GNUnet"
 .SH NAME
 gnunet\-directory \- display directories and show or delete lists of 
encountered file identifiers
 
@@ -14,6 +14,9 @@
 Manipulating the file identifier database is done by passing additional 
options to gnunet\-directory.  Note that by default GNUnet does not build the 
file identifier database and the database will thus always be empty.  You need 
to run gnunet\-directory with the -\t option to enable tracking of file 
identifiers.  The reason is that storing file identifiers in plaintext in the 
database can compromise your privacy if your machine should fall under the 
control of an adversary.
 
 .TP
+\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+use config file (defaults: ~/.gnunet/gnunet.conf)
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 print help page
 .TP
@@ -24,10 +27,16 @@
 display entries from the file identifier database
 .TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON and EVERYTHING.
+change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
WARNING, STATUS, INFO and DEBUG.
 .TP
 \fB\-t, \fB\-\-track\fR
 start tracking file identifiers
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+print the version number
+.TP
+\fB\-V\fR, \fB\-\-verbose\fR
+be verbose; prints progress information
 .SH NOTES
 
 The options are evaluated in the order \-l, \-k and then \-t.  Thus specifying 
\-klt will first list all identifiers that were in the database previously, 
then delete all of those identifiers from the database and then continue (or 
start to) collect identifiers.  The order in which the options are specified on 
the command line is not important.

Modified: GNUnet/doc/man/gnunet-download.1
===================================================================
--- GNUnet/doc/man/gnunet-download.1    2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet-download.1    2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,6 +1,6 @@
-.TH GNUNET-DOWNLOAD "1" "20 May 2006" "GNUnet"
+.TH GNUNET-DOWNLOAD "1" "11 Nov 2006" "GNUnet"
 .SH NAME
-gnunet-download \- a command line interface for downloading files from GNUnet
+gnunet\-download \- a command line interface for downloading files from GNUnet
 .SH SYNOPSIS
 .B gnunet\-download
 [\fIOPTIONS\fR] \-\- GNUNET_URI
@@ -21,13 +21,13 @@
 on which host is gnunetd running (default: localhost).  You can also specify a 
port using the syntax HOSTNAME:PORT.  The default port is 2087.
 .TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON and EVERYTHING.
+change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
WARNING, INFO, STATUS and DEBUG.
 .TP
 \fB\-o \fIFILENAME\fR, \fB\-\-output=FILENAME\fR
-write the file to FILENAME.  Otherwise gnunet\-download constructs a temporary 
ID from the URI of the file.  The final filename is constructed based on 
meta-data extracted using libextractor (if available).
+write the file to FILENAME.  Hint: when recursively downloading a directory, 
append a '/' to the end of the FILENAME to create a directory of that name.  If 
no FILENAME is specified, gnunet\-download constructs a temporary ID from the 
URI of the file.  The final filename is constructed based on meta\-data 
extracted using libextractor (if available).
 .TP
 \fB\-R\fR, \fB\-\-recursive\fR
-download directories recursively and in parallel
+download directories recursively (and in parallel)
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number

Modified: GNUnet/doc/man/gnunet-insert.1
===================================================================
--- GNUnet/doc/man/gnunet-insert.1      2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet-insert.1      2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,4 +1,4 @@
-.TH GNUNET-INSERT "1" "29 Apr 2006" "GNUnet"
+.TH GNUNET-INSERT "1" "11 Nov 2006" "GNUnet"
 .SH NAME
 gnunet\-insert \- a command line interface for inserting new content into 
GNUnet
 .SH SYNOPSIS
@@ -11,15 +11,16 @@
 certain directory.  In fact, even files that are downloaded are not 
automatically shared.
 .PP
 In order to start sharing files, the files must be added either using
-gnunet\-insert or gnunet\-gtk.  The command line tool gnunet-insert is more
-useful if many files are supposed to be added.  gnunet-insert can
+gnunet\-insert or gnunet\-gtk.  The command line tool gnunet\-insert is more
+useful if many files are supposed to be added.  gnunet\-insert can
 automatically insert batches of files, recursively insert directories, create
 directories that can be browsed within GNUnet and publish file lists
-in a namespace.
+in a namespace.  When run on a directory, gnunet\-insert will always 
recursively
+publish all of the files in the directory.
 .PP
-gnunet-insert can automatically extract keywords from the files that are 
shared.  Users that
+gnunet\-insert can automatically extract keywords from the files that are 
shared.  Users that
 want to download files from GNUnet use keywords to search for the appropriate
-content.  You can disable keyword extraction with the \-n option.  You can
+content.  You can disable keyword extraction with the \-D option.  You can
 manually add keywords using the \-k and \-K options.
 .PP
 In addition to searching for files by keyword, GNUnet allows organizing
@@ -91,8 +92,8 @@
 Even if using links to the .gnunet directory is generally permitted, make a 
copy of the file (disables symlinking even if it is possible).  When indexing a 
file, gnunet\-insert will create a copy of the file in the "share" directory of 
gnunetd.  If that directory happens to be on the local machine (i.e. gnunetd 
runs on localhost) then gnunet\-insert can instead just use a link.  This will 
not work over the network, if the file\-permissions do not allow gnunetd to 
read the file or if the file maybe changed afterwards.  Hence the default is to 
be inefficient and to make a copy.  With this option you can force 
gnunet\-insert to not make a link.  gnunet\-insert will fall back to creating a 
copy.
 
 .TP
-\fB\-D\fR, \fB\-\-direct\fR
-For a recursive upload, also create direct indexing information that will 
refer to files inside of directories immediately.  Without \-D, contents of 
directories can only be found via the directory itself.
+\fB\-D\fR, \fB\-\-disable\-direct\fR
+Disable direct indexing information that would otherwise refer to files inside 
of directories directly.  Without \-D, contents can be found directly using 
keywords extracted with libextractor.  Use \-D if you index directories with 
many similar files that are adequately described using keywords for the 
directory and for which individual references would unduely pollte the global 
keyword search space.  Also use \-D to disable libextractor for individual file 
uploads.  This way you can ensure that a file will only be referenced using the 
keywords that you are specifying explicitly.
 
 .TP
 \fB\-e\fR, \fB\-\-extract\fR
@@ -125,7 +126,7 @@
 
 .TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=\fILOGLEVEL\fR
-Change the loglevel.  Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON and EVERYTHING.
+Change the loglevel.  Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
WARNING, INFO, STATUS and DEBUG.
 
 .TP
 \fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR
@@ -154,10 +155,6 @@
 For the top\-level directory or file, create an SBlock that places the file 
into the namespace specified by the pseudonym NAME.
 
 .TP
-\fB\-R\fR, \fB\-\-recursive\fR
-Process directories recursively.  Without this option, directories are 
ignored.  With this option, gnunet-insert will process files in directories 
recursively.
-
-.TP
 \fB\-S\fR, \fB\-\-sporadic\fR
 This option specifies that the file will be updated sporadically but not 
periodically.  It is only valid in conjunction with the \-P option.  It is 
implied if  \-N is specified but not \-i.  It cannot be used together with the 
\-i option.  Use \-S if you intend to publish an update at an unknown point in 
the future and if you want gnunet\-insert to pick a random  identifier for that 
future content.
 
@@ -183,7 +180,7 @@
 
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
-Be verbose.  Using this option causes gnunet-insert to print progress 
information and at the end the file identification that can be used to  
download the file from GNUnet.
+Be verbose.  Using this option causes gnunet\-insert to print progress 
information and at the end the file identification that can be used to  
download the file from GNUnet.
 
 
 .SH EXAMPLES
@@ -211,16 +208,19 @@
 
 Index the files COPYING and AUTHORS with keyword \fBtest\fR and
 build a directory containing the two files.
-Make the directory itself available under keyword \fBgnu\fR:
+Make the directory itself available under keyword \fBgnu\fR
+and disable keyword extraction using libextractor:
 
-# gnunet\-insert \-K test \-k gnu \-b COPYING AUTHORS
+# mkdir gnu
+# mv COPYING AUTHORS gnu/
+# gnunet\-insert \-K test \-k gnu \-D gnu/
 
 Neatly publish an image gallery in \fBkittendir/\fR and its
 subdirs with keyword \fBkittens\fR for the directory but no
 keywords for the individual files or subdirs (\-Rn).
 Force description for all files:
 
-# gnunet\-insert \-Rn \-m "description:Kitten collection" \-k kittens kittendir
+# gnunet\-insert \-Rn \-m "description:Kitten collection" \-k kittens 
kittendir/
 
 \fBSecure publishing with namespaces\fR
 

Modified: GNUnet/doc/man/gnunet-search.1
===================================================================
--- GNUnet/doc/man/gnunet-search.1      2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet-search.1      2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,4 +1,4 @@
-.TH GNUNET-SEARCH "1" "20 May 2006" "GNUnet"
+.TH GNUNET-SEARCH "1" "11 Sep 2006" "GNUnet"
 .SH NAME
 gnunet\-search \- a command line interface to search for content on GNUnet
 .SH SYNOPSIS
@@ -28,7 +28,7 @@
 on which host is gnunetd running (default: localhost).  You can also specify a 
port using the syntax HOSTNAME:PORT.  The default port is 2087.
 .TP
 \fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON and EVERYTHING.
+change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
WARNING, STATUS, INFO and DEBUG.
 .TP
 \fB\-m\fR \fIMAXRESULTS\fR
 exit after finding MAXRESULTS results.
@@ -55,7 +55,7 @@
 Search results are printed by gnunet\-search like this:
 
 .P
-       gnunet-download -o "COPYING" gnunet://ecrs/chk/HASH1.HASH2.SIZE
+       gnunet\-download \-o "COPYING" gnunet://ecrs/chk/HASH1.HASH2.SIZE
 
                Description: The GNU Public License
 

Modified: GNUnet/doc/man/gnunet-setup.1
===================================================================
--- GNUnet/doc/man/gnunet-setup.1       2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet-setup.1       2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,12 +1,12 @@
-.TH GNUNET-SETUP "1" "27 Aug 2005" "GNUnet"
+.TH GNUNET-SETUP "1" "11 Nov 2006" "GNUnet"
 .SH NAME
 gnunet\-setup \- configuring GNUnet
 .SH SYNOPSIS
-.B gnunet-setup
+.B gnunet\-setup
 [\fIOPTIONS\fR] MODE
 .SH DESCRIPTION
 .PP
-gnunet\-setup can be used to generate and edit the configuration files 
(gnunetd.conf and gnunet.conf) for GNUnet.  gnunet\-setup runs in two basic 
modes, one for editing gnunet.conf and one for editing gnunetd.conf.  Depending 
on which libraries were available when gnunet\-setup was build, gnunet\-setup 
will have a curses or GTK user interface.  A text\-only interface is always 
available.  For a quick initial configuration gnunet\-setup offers a wizard 
(curses or GTK only) that can be used to quickly generate a working 
gnunetd.conf file.
+gnunet\-setup can be used to generate and edit the configuration files 
(gnunetd.conf and gnunet.conf) for GNUnet.  gnunet\-setup runs in two basic 
modes, one for editing gnunet.conf and one for editing gnunetd.conf.  Depending 
on which libraries were available when gnunet\-setup was build, gnunet\-setup 
will have a curses or GTK user interface.  A text\-only interface is always 
available.  For a quick initial configuration gnunet\-setup offers a wizard 
(GTK only) that can be used to quickly generate a working gnunetd.conf file.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 print help page
@@ -28,7 +28,7 @@
 .SH NOTES
 Before you can use any GNUnet application you must run gnunet\-setup to 
generate the configuration.  First, run gnunet\-setup with the \-d option to 
generate a configuration for gnunetd.  Later, each user of the system should 
run gnunet\-setup without \-d to generate his personal configuration.
 .TP
-Depending on your system, gnunet\-setup will have a subset of the following 
modes: config (text), menuconfig (curses), gconfig (GTK), wizard-curses (curses 
wizard) and wizard\-gtk (GTK wizard).  The wizards can currently only be used 
in conjunction with the \-d option to configure gnunetd.
+Depending on your system, gnunet\-setup will have a subset of the following 
modes: config (text), menuconfig (curses), gconfig (GTK), and wizard\-gtk (GTK 
wizard).  The wizards can currently only be used in conjunction with the \-d 
option to configure gnunetd.
 .SH FILES
 .TP
 /etc/gnunetd.conf

Modified: GNUnet/doc/man/gnunet-unindex.1
===================================================================
--- GNUnet/doc/man/gnunet-unindex.1     2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet-unindex.1     2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,4 +1,4 @@
-.TH GNUNET-UNINDEX "1" "30 Mar 2005" "GNUnet"
+.TH GNUNET-UNINDEX "1" "11 Sep 2006" "GNUnet"
 .SH NAME
 gnunet\-unindex \- a command line interface for deleting indexed files from 
GNUnet
 .SH SYNOPSIS
@@ -8,20 +8,23 @@
 .PP
 gnunet\-unindex is used for deleting indexed files from GNUnet.
 .TP
+\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+use config file (defaults: ~/.gnunet/gnunet.conf)
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 print help page
 .TP
-\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
-use config file (defaults: ~/.gnunet/gnunet.conf)
+\fB\-H \fIHOSTNAME\fR, \fB\-\-host=\fIHOSTNAME\fR
+on which host is gnunetd running (default: localhost).  You can also specify a 
port using the syntax HOSTNAME:PORT.  The default port is 2087.
 .TP
+\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
+change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
WARNING, INFO, STATUS and DEBUG.
+.TP
 \fB\-v\fR, \fB\-\-version\fR
 print the version number
 .TP
 \fB\-V\fR, \fB\-\-verbose\fR
-be berbose; prints progress information and the hash-pair, CRC and filesize 
that can be used to download the file
-.TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON and EVERYTHING.
+be verbose
 .SH NOTES
 You can only unindex files that you indexed and that you still have available 
locally in full.  You should use gnunet\-unindex on files that you indexed (not 
inserted) and that you are going to delete or move locally.
 .TP

Modified: GNUnet/doc/man/gnunet.conf.5
===================================================================
--- GNUnet/doc/man/gnunet.conf.5        2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunet.conf.5        2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,4 +1,4 @@
-.TH GNUNET.CONF "5" "30 Apr 2005" "GNUnet"
+.TH GNUNET.CONF "5" "11 Nov 2006" "GNUnet"
 .SH NAME
 gnunet.conf \- GNUnet client configuration file
 .SH SYNOPSIS
@@ -19,4 +19,4 @@
 .SH "REPORTING BUGS"
 Report bugs by using mantis <https://gnunet.org/mantis/> or by sending 
electronic mail to <address@hidden>
 .SH "SEE ALSO"
-\fBgnunet\-gtk\fP(1), \fBgnunet\-insert\fP(1), \fBgnunet\-search\fP(1), 
\fBgnunet\-download\fP(1), \fBgnunetd.conf\fP(5), \fBgnunetd\fP(1)
+\fBgnunet\-setup\fP(1), \fBgnunetd.conf\fP(5), \fBgnunet\-update\fP(1)

Modified: GNUnet/doc/man/gnunetd.1
===================================================================
--- GNUnet/doc/man/gnunetd.1    2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunetd.1    2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,4 +1,4 @@
-.TH GNUNETD "1" "20 Apr 2004" "GNUnet"
+.TH GNUNETD "1" "11 Nov 2006" "GNUnet"
 .SH NAME
 gnunetd \- The GNUnet deamon
 .SH SYNOPSIS
@@ -8,24 +8,24 @@
 .PP
 The GNUnet deamon, required for any GNUnet operations (searches, downloads, 
etc). gnunetd does not require root rights.
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-print help page
-.TP
 \fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
 load config file (default: /etc/gnunet.conf)
 .TP
-\fB\-v\fR, \fB\-\-version\fR
-print the version number
-.TP
 \fB\-d\fR, \fB\-\-debug\fR
-do not detach from the console (for debugging); log messages are written to 
stderr instead of the logfile in \-d mode.
+do not detach from the console (for debugging); log messages are written to 
stderr in addition to the logfile.
 .TP
+\fB\-h\fR, \fB\-\-help\fR
+print help page
+.TP
+\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
+change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
WARNING, INFO, STATUS and DEBUG.
+.TP
 \fB\-u \fIUSER\fR, \fB\-\-user=USER\fR
 run as user USER (and if available as group USER). Note that to use this 
option, you will probably have to start gnunetd as
 root. It is typically better to directly start gnunetd as that user instead.
 .TP
-\fB\-L \fILOGLEVEL\fR, \fB\-\-loglevel=LOGLEVEL\fR
-change the loglevel. Possible values for LOGLEVEL are NOTHING, FATAL, ERROR, 
FAILURE, WARNING, MESSAGE, INFO, DEBUG, CRON and EVERYTHING.
+\fB\-v\fR, \fB\-\-version\fR
+print the version number
 .SH NOTES
 Before you can share, search or download files from GNUnet you must start the 
GNUnet server, gnunetd.
 If you start gnunetd as root (which is not required), you can use the \-u 
option such that GNUnet runs as a different user. If a group of the same name 
exists, GNUnet will also change to that group. If GNUnet cannot change its UID 
to USER or GID to USER, a warning will be printed and gnunetd will *continue* 
with the rights of the user that invoked gnunetd.

Modified: GNUnet/doc/man/gnunetd.conf.5
===================================================================
--- GNUnet/doc/man/gnunetd.conf.5       2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/doc/man/gnunetd.conf.5       2006-11-11 03:27:40 UTC (rev 3689)
@@ -1,13 +1,13 @@
-.TH GNUNETD.CONF "5" "30 Apr 2005" "GNUnet"
+.TH GNUNETD.CONF "5" "11 Nov 2006" "GNUnet"
 .SH NAME
 gnunetd.conf \- GNUnet daemon configuration file
 .SH SYNOPSIS
-~/.gnunet/gnunetd.conf or /var/lib/GNUnet/gnunetd.conf or /etc/gnunetd.conf
+/etc/gnunetd.conf
 .SH DESCRIPTION
 .PP
 GNUnet uses two configuation files, one for user interfaces (gnunet.conf) and 
one for the server (gnunetd) and associated administrative tools.  This man 
page describes the configuration file for the server.
 .PP
-/etc/gnunetd.conf is the default location for the configuration file used by 
gnunetd, the GNUnet daemon.  It contains the network and resource configuration 
for the peer.  You should use gnunet\-setup to create the configuration at 
either /var/lib/GNUnet/gnunetd.conf or ~/.gnunet/gnunetd.conf.  The locations 
are used by gnunetd in this order.  Binary distributions are encouraged to 
install an appropriate configuration file in /etc/gnunetd.conf.
+/etc/gnunetd.conf is the default location for the configuration file used by 
gnunetd, the GNUnet daemon.  It contains the network and resource configuration 
for the peer.  You should use gnunet\-setup to create the configuration.  Use 
the \-c option to specify alternative locations for the configuration file.  
Binary distributions are encouraged to install an appropriate configuration 
file in /etc/gnunetd.conf.
 .TP
 The basic structure of the configuration file is the following.  The file is 
split into sections.  Every section begins with [SECTIONNAME] and contains a 
number of options of the form OPTION=VALUE.  Empty lines and lines beginning 
with a # are treated as comments.  Some options are optional, in particular 
certain sections are not used at all unless the corresponding service module is 
loaded (e.g. you do not have to configure the SMTP transport unless you decide 
to use it).
 .SH FILES
@@ -17,4 +17,4 @@
 .SH "REPORTING BUGS"
 Report bugs by using mantis <https://gnunet.org/mantis/> or by sending 
electronic mail to <address@hidden>
 .SH "SEE ALSO"
-\fBgnunet\-gtk\fP(1), \fBgnunet\-insert\fP(1), \fBgnunet\-search\fP(1), 
\fBgnunet\-download\fP(1), \fBgnunet.conf\fP(5), \fBgnunetd\fP(1)
+\fBgnunet\-setup\fP(1), \fBgnunet.conf\fP(5), \fBgnunet\-update\fP(1)

Modified: GNUnet/src/applications/fs/tools/gnunet-download.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-download.c  2006-11-11 02:52:06 UTC 
(rev 3688)
+++ GNUnet/src/applications/fs/tools/gnunet-download.c  2006-11-11 03:27:40 UTC 
(rev 3689)
@@ -160,7 +160,7 @@
 
   i = GNUNET_init(argc,
                  argv,
-                 "gnunet-download [OPTIONS] [KEYWORDS]",
+                 "gnunet-download [OPTIONS] URI",
                  &cfgFilename,
                  gnunetdownloadOptions,
                  &ectx,

Modified: GNUnet/src/include/gnunet_util_getopt.h
===================================================================
--- GNUnet/src/include/gnunet_util_getopt.h     2006-11-11 02:52:06 UTC (rev 
3688)
+++ GNUnet/src/include/gnunet_util_getopt.h     2006-11-11 03:27:40 UTC (rev 
3689)
@@ -48,6 +48,11 @@
   const char * binaryName;
 
   /**
+   * Name of application with option summary
+   */
+  const char * binaryOptions;
+
+  /**
    * Array with all command line options.
    */
   const struct CommandLineOption * allOptions;
@@ -157,7 +162,7 @@
  * Set the configuration option for logging.
  */
 #define COMMAND_LINE_OPTION_LOGGING \
-  { 'L', "log", "LOGRULES", gettext_noop("configure logging to use LOGRULES"), 
1, &gnunet_getopt_configure_set_option, "GNUNET:LOGGING" }
+  { 'L', "log", "LOGLEVEL", gettext_noop("configure logging to use LOGLEVEL"), 
1, &gnunet_getopt_configure_set_option, "GNUNET:LOGGING" }
 
 /**
  * Set the configuration option for increasing verbosity.
@@ -186,7 +191,7 @@
 /**
  * Parse the command line.
  *
- * @param binaryName name of the binary / application
+ * @param binaryName name of the binary / application with options
  * @param ectx for reporting errors
  * @param cfg for storing/accessing configuration data
  * @param allOptions defined options and handlers

Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/src/server/gnunetd.c 2006-11-11 03:27:40 UTC (rev 3689)
@@ -170,7 +170,6 @@
                 "be written to stderr instead of a logfile"),
     0, &gnunet_getopt_configure_set_one, &debug_flag },
   COMMAND_LINE_OPTION_HELP(gettext_noop("Starts the gnunetd daemon.")), /* -h 
*/
-  COMMAND_LINE_OPTION_HOSTNAME, /* -H */
   COMMAND_LINE_OPTION_LOGGING, /* -L */
   { 'p', "padding-disable", "YES/NO",
     gettext_noop("disable padding with random data (experimental)"), 0,
@@ -201,7 +200,7 @@
   }
   ret = GNUNET_init(argc,
                    argv,
-                   "gnunetd",
+                   "gnunetd [OPTIONS]",
                    &cfgFilename,
                    gnunetdOptions,
                    &ectx,

Modified: GNUnet/src/setup/gnunet-setup.c
===================================================================
--- GNUnet/src/setup/gnunet-setup.c     2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/src/setup/gnunet-setup.c     2006-11-11 03:27:40 UTC (rev 3689)
@@ -135,7 +135,7 @@
 #if HAVE_GTK
   "|gconfig|wizard-gtk"
 #endif
-  "\n";
+  "";
 
 /**
  * List of supported plugins.  One entry consists

Modified: GNUnet/src/util/getopt/getopt.c
===================================================================
--- GNUnet/src/util/getopt/getopt.c     2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/src/util/getopt/getopt.c     2006-11-11 03:27:40 UTC (rev 3689)
@@ -986,7 +986,7 @@
 /**
  * Parse the command line.
  *
- * @param binaryName name of the binary / application
+ * @param binaryName name of the binary / application with options
  * @param ectx for reporting errors
  * @param cfg for storing/accessing configuration data
  * @param allOptions defined options and handlers
@@ -995,7 +995,7 @@
  * @return index into argv with first non-option
  *   argument, or -1 on error
  */
-int gnunet_parse_options(const char * binaryName,
+int gnunet_parse_options(const char * binaryOptions,
                         struct GE_Context * ectx,
                         struct GC_Configuration * cfg,
                         const CommandLineOption * allOptions,
@@ -1012,6 +1012,7 @@
 
   GE_ASSERT(ectx, argc > 0);
   clpc.binaryName = argv[0];
+  clpc.binaryOptions = binaryOptions;
   clpc.allOptions = allOptions;
   clpc.argv = argv;
   clpc.argc = argc;

Modified: GNUnet/src/util/getopt/printhelp.c
===================================================================
--- GNUnet/src/util/getopt/printhelp.c  2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/src/util/getopt/printhelp.c  2006-11-11 03:27:40 UTC (rev 3689)
@@ -44,7 +44,8 @@
   const char * trans;
   const struct CommandLineOption * opt;
        
-  printf("%s\n",
+  printf("%s\n%s\n",
+        ctx->binaryOptions,
         gettext(about));
   printf(_("Arguments mandatory for long options are also mandatory for short 
options.\n"));
   slen = 0;
@@ -112,6 +113,8 @@
     if (p < ml)
       printf("%s\n",
             &trans[p]);
+    if (strlen(trans) == 0)
+      printf("\n");
     i++;
   }
   return SYSERR;

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-11-11 02:52:06 UTC (rev 3688)
+++ GNUnet/todo 2006-11-11 03:27:40 UTC (rev 3689)
@@ -14,9 +14,7 @@
 
 0.7.1 [11'06] (aka "stabilization")
 - fix critical known bugs:
-  * fix connection problem reported by Nils! [RCpre0]
-    + TCP and UDP protocols changed slightly; detection of old clients would 
not be easy;
-    + idea: add compatibility-transports (and change new transport IDs?)
+  * migrate configuration in gnunet-update [RCpre0]
   * Windows installer [Nils]
     + uninstall: Remove account
     + libcurl, guile [RCpre0]