add manpage for gnunet-namestore-gtk, update gnunet-setup man page

3 files changed, 33 insertions, 8 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5d163430..17167f69 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = . doxygen
 man_MANS = \
   gnunet-fs-gtk.1 \
   gnunet-identity-gtk.1 \
+  gnunet-namestore-gtk.1 \
   gnunet-setup.1 \
   gnunet-peerinfo-gtk.1 \
   gnunet-statistics-gtk.1
diff --git a/doc/gnunet-namestore-gtk.1 b/doc/gnunet-namestore-gtk.1
new file mode 100644
index 00000000..4f024753
--- /dev/null
+++ b/doc/gnunet-namestore-gtk.1
@@ -0,0 +1,29 @@
+.TH GNUNET-NAMESTORE-GTK "1" "7 Oct 2013" "GNUnet"
+.SH NAME
+gnunet\-namestore\-gtk \- a gtk interface for editing GNS zones
+.SH SYNOPSIS
+.B gnunet\-namestore\-gtk
+[\fIOPTIONS\fR]
+.SH DESCRIPTION
+.PP
+gnunet\-namestore\-gtk is a gtk+ based GUI for editing zones in the GNU Name System.  It should work just like your typical DNS zone editor.  In addition, if built with libqrencode, it will display (and offer to export) a QR code image of the public key for the current zone.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+print help page
+.TP
+\fB\-c \fIFILENAME\fR, \fB\-\-config=FILENAME\fR
+load config file (default: ~/.gnunet/gnunet.conf)
+.TP
+\fB\-t, \fB\-\-tray\fR
+start with main window minimized (only put icon in tray)
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+print the version number
+.SH FILES
+.TP
+~/.gnunet/gnunet.conf
+User's GNUnet configuration file
+.SH "REPORTING BUGS"
+Report bugs by using mantis <https://gnunet.org/bugs/> or by sending electronic mail to <gnunet-developers@gnu.org>
+.SH "SEE ALSO"
+\fBgnunet\-setup\fP(1)
diff --git a/doc/gnunet-setup.1 b/doc/gnunet-setup.1
index 90275bc6..9dddf77e 100644
--- a/doc/gnunet-setup.1
+++ b/doc/gnunet-setup.1
@@ -6,14 +6,12 @@ gnunet\-setup \- a gtk interface for configuring GNUnet
 [\fIOPTIONS\fR]
 .SH DESCRIPTION
 .PP
-gnunet\-setup is a gtk+ based GUI for configuring GNUnet.  
+gnunet\-setup is a gtk+ based GUI for configuring GNUnet.
 
-The first time you run gnunet\-setup, the goal will typically be to configure the peer, that is, the set of processes that always run in the background.  Those processes should run as user "gnunet" and thus gnunet\-setup should be run as user "gnunet" for this step.  Use the "\-e" option to enable automatic priviledge escalation using gksu (if supported by your system).  Alternatively, you can of course run gnunet\-setup from the "gnunet" system user account or even as "root".  If you see a tab "General", you did start gnunet\-setup correctly to configure the peer.  You should now be able to configure which subsystems of GNUnet you want to enable, which databases to use and what your network configuration looks like.  After these steps are complete, you should be able to start your peer using "gnunet\-arm".  
+The first time you run gnunet\-setup, the goal will typically be to configure the peer, that is, the set of processes that always run in the background.  Those processes should run as user "gnunet" and thus gnunet\-setup should be run as user "gnunet" for this step.  Use the "\-e" option to enable automatic priviledge escalation using gksu (if supported by your system).  Alternatively, you can of course run gnunet\-setup from the "gnunet" system user account or even as "root".  If you see a tab "General", you did start gnunet\-setup correctly to configure the peer.  You should now be able to configure which subsystems of GNUnet you want to enable, which databases to use and what your network configuration looks like.  After these steps are complete, you should be able to start your peer using "gnunet\-arm".
 
 It is recommended that "/etc/gnunet.conf" should be a world\-readable copy of the peer's GNUnet configuration.  Note that GNUnet configuration files (as generated by gnunet\-setup) only contain those values that differ from the defaults.  Also note that "gnunet\-arm" will by default look for a configuration in "$HOME/.gnunet/gnunet.conf" (so if your configuration is in "/etc/gnunet.conf", you have to pass "\-c /etc/gnunet.conf" to gnunet\-arm).
 
-After your peer is configured, gnunet\-setup can also still be useful to configure an individual user's GADS zone (if GNS is enabled).  This restricted per-user configuration is automatically run if a user "gnunet" exists on your system and you do not run gnunet\-setup as "gnunet" or "root".  Using the "\-f" option, normal users can force seeing the full set of options, which only makes sense if they intend to run their own GNUnet peer on the system (or move the generated configuration file to another location afterwards).
-
 .TP
 \fB\-a\fR, \fB\-\-autoconfig\fR
 try to automatically configure networking for the peer without starting the interactive GUI
@@ -22,10 +20,7 @@ try to automatically configure networking for the peer without starting the inte
 load config file (default: ~/.gnunet/gnunet.conf)
 .TP
 \fB\-e, \fB\-\-elevate\-priviledges\fR
-Try to elevate priviledges to run gnunet\-setup as user "gnunet".   This option is only available if libgksu-support was found on your system.  It is ignored if gnunet\-setup is run as user "root" or "gnunet" already.  If "gksu" fails, gnunet\]-setup is run as the current user.
-.TP
-\fB\-f, \fB\-\-force\-full\-setup\fR
-Display all of the options for a peer even if a user "gnunet" exists but gnunet\-setup is not run as that user.
+Try to elevate priviledges to run gnunet\-setup as user "gnunet".   This option is only available if libgksu\-support was found on your system.  It is ignored if gnunet\-setup is run as user "root" or "gnunet" already.  If "gksu" fails, gnunet\]-setup is run as the current user.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 print help page