5 files changed, 118 insertions, 19 deletions

diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index 38ed67872..decad311d 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -3,3 +3,7 @@ groff_lint.log
 *.html
 gnunet-c-tutorial.7
 gnunet-documentation.7
+gana.*
+gnunet.*
+gnunet-dev.*
+lsd.*
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index e7045e8bf..be7a810f8 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,16 +5,6 @@ gnunet.conf.5: gnunet.conf.5.in Makefile
 
 CLEANFILES = gnunet.conf.5
 
-if TEXI2MDOC_GENERATION
-gnunet-tutorial.7: Makefile
-        @texi2mdoc -I../tutorial:../tutorial/chapters ../tutorial/tutorial.texi > gnunet-tutorial.7
-
-gnunet-documentation.7: Makefile
-        @texi2mdoc -I../handbook:../handbook/chapters ../handbook/gnunet.texi > gnunet-documentation.7
-
-CLEANFILES += gnunet-documentation.7 gnunet-tutorial.7
-endif
-
 if HAVE_EXPERIMENTAL
 if HAVE_MANDOC
 # After I went through the alternatives with the focus
@@ -46,6 +36,27 @@ endif
 endif
 
 man_MANS = \
+  gnunet.1 \
+        gnunet.2 \
+        gnunet.3 \
+        gnunet.4 \
+        gnunet.5 \
+        gnunet.6 \
+        gnunet.7 \
+        gnunet.8 \
+        gnunet.9 \
+        gana.1 \
+        gana.2 \
+        gana.3 \
+        gana.4 \
+        gana.5 \
+        gnunet-dev.1 \
+        gnunet-dev.2 \
+        gnunet-dev.3 \
+        gnunet-dev.4 \
+        gnunet-dev.5 \
+        gnunet-dev.6 \
+        lsd.1 \
   gnunet.conf.5 \
   gnunet-arm.1 \
   gnunet-ats.1 \
@@ -71,6 +82,7 @@ man_MANS = \
   gnunet-namecache.1 \
   gnunet-namestore.1 \
   gnunet-namestore-fcfsd.1 \
+  gnunet-namestore-dbtool.1 \
   gnunet-nat.1 \
   gnunet-nat-auto.1 \
   gnunet-nat-server.1 \
@@ -95,10 +107,6 @@ man_MANS = \
   gnunet-vpn.1 \
   gnunet-zoneimport.1
 
-if TEXI2MDOC_GENERATION
-man_MANS += gnunet-tutorial.7 gnunet-documentation.7
-endif
-
 EXTRA_DIST = ${man_MANS} \
  gnunet.conf.5.in \
  produce_html.sh.in \
diff --git a/doc/man/gnunet-config.1 b/doc/man/gnunet-config.1
index 93d943758..c454765cf 100644
--- a/doc/man/gnunet-config.1
+++ b/doc/man/gnunet-config.1
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 .Nm
 can be used to read or modify GNUnet configuration files.
-It can also provide informations to properly build applications on top of
+It can also provide information to properly build applications on top of
 GNUnet, like appropriate values for CFLAGS or the installation prefix.
 .Bl -tag -width indent
 .It Fl b Ar BACKEND | Fl -supported-backend= Ns Ar BACKEND
diff --git a/doc/man/gnunet-namestore-dbtool.1 b/doc/man/gnunet-namestore-dbtool.1
new file mode 100644
index 000000000..af882209b
--- /dev/null
+++ b/doc/man/gnunet-namestore-dbtool.1
@@ -0,0 +1,87 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2001-2022 GNUnet e.V.
+.\"
+.\" Permission is granted to copy, distribute and/or modify this document
+.\" under the terms of the GNU Free Documentation License, Version 1.3 or
+.\" any later version published by the Free Software Foundation; with no
+.\" Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
+.\" copy of the license is included in the file
+.\" FDL-1.3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/fdl.html}.
+.\"
+.\" Alternately, this document is also available under the General
+.\" Public License, version 3 or later, as published by the Free Software
+.\" Foundation.  A copy of the license is included in the file
+.\" GPL3.
+.\"
+.\" A copy of the license is also available from the Free Software
+.\" Foundation Web site at http://www.gnu.org/licenses/gpl.html
+.\"
+.\" SPDX-License-Identifier: GPL3.0-or-later OR FDL1.3-or-later
+.\"
+.Dd September 30, 2022
+.Dt GNUNET-NAMESTORE-DBTOOL 1
+.Os
+.Sh NAME
+.Nm gnunet-namestore-dbtool
+.Nd manipulate GNU Name System (GNS) namestore database
+.Sh SYNOPSIS
+.Nm
+.Op Fl i | -initialize
+.Op Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
+.Op Fl r | -reset
+.Op Fl h | -help
+.Op Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+.Op Fl p Ar PLUGIN | Fl -plugin= Ns Ar PLUGIN
+.Op Fl v | -version
+.Sh DESCRIPTION
+.Nm
+can be used to initialize or reset the namestore database.
+.Pp
+The options are as follows:
+.Bl -tag -width indent
+.It Fl i | -initialize
+Desired operation is initialization of a database.
+.It Fl p Ar PLUGINNAME | Fl -plugin= Ns Ar PLUGINNAME
+Use the plugin PLUGINNAME.
+.It Fl r | -reset
+Desired operation is reset and reinitialization of a database
+.It Fl h | -help
+Print short help on options.
+.It Fl L Ar LOGLEVEL | Fl -loglevel= Ns Ar LOGLEVEL
+Use LOGLEVEL for logging.
+Valid values are DEBUG, INFO, WARNING and ERROR.
+.It Fl v | -version
+Print GNUnet version number.
+.El
+.\".Sh EXAMPLES
+.\".Sh FILES
+.Sh SEE ALSO
+.Xr gnunet-gns 1 ,
+.Xr gnunet-namestore 1
+.sp
+The full documentation for GNUnet is maintained as a Texinfo manual.
+If the
+.Xr info 1
+and gnunet programs are properly installed at your site, the command
+.Pp
+.Dl info gnunet
+.Pp
+should give you access to the complete handbook,
+.Pp
+.Dl info gnunet-c-tutorial
+.Pp
+will give you access to a tutorial for developers.
+.sp
+Depending on your installation, this information is also available in
+.Xr gnunet 7 and
+.Xr gnunet-c-tutorial 7 .
+.\".Sh HISTORY
+.\".Sh AUTHORS
+.Sh BUGS
+Report bugs by using
+.Lk https://bugs.gnunet.org
+or by sending electronic mail to
+.Aq Mt gnunet-developers@gnu.org .
diff --git a/doc/man/gnunet-search.1 b/doc/man/gnunet-search.1
index a3c6e8ece..3145842a4 100644
--- a/doc/man/gnunet-search.1
+++ b/doc/man/gnunet-search.1
@@ -90,7 +90,7 @@ defaults to
 is missing too
 .Fl -dir-printf
 defaults to
-.Ql #%n:\engnunet-download -o "%f" -R %u\en\en Ns
+.Ql #%n:\engnunet-download -o Qo %f Qc -R %u\en\en Ns
 \&.
 .It Fl f Ar FORMAT | Fl -printf= Ns Ar FORMAT
 Write the search results according to
@@ -171,7 +171,7 @@ character followed by any other character not listed above is treated as an ordi
 If missing,
 .Fl -printf
 defaults to
-.Ql #%n:\engnunet-download -o "%f" %u\en\en Ns
+.Ql #%n:\engnunet-download -o Qo %f Qc %u\en\en Ns
 \&.
 .It Fl h | -help
 Print the help page.
@@ -251,8 +251,8 @@ argument is required).
 .It Fl t Ar DELAY | Fl -timeout= Ns Ar DELAY
 Automatically timeout search after
 .Ar DELAY .
-The value given must be a number followed by a space and a time unit, for example "500 ms".
-Note that the quotes are required on the shell. Without a unit it defaults to microseconds (1000000 = 1 second).
+The value given must be a number followed by a space and a time unit, for example
+.Qo 500 ms Qc . Note that the quotes are required on the shell. Without a unit it defaults to microseconds (1000000 = 1 second).
 If 0 or omitted the search runs until gnunet-search is aborted with CTRL-C.
 .It Fl v | -version
 print the version number