9 files changed, 169 insertions, 163 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb23b534b..a9ad69954 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,6 @@
 # This Makefile.am is in the public domain
+
+
 if DOCUMENTATION
   SUBDIRS = doxygen handbook tutorial
 endif
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 0435796a9..d7bcab696 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -3,25 +3,8 @@ docdir = $(datadir)/doc/gnunet/
 
 infoimagedir = $(infodir)/images
 
-if ACTIVATE_TEXINFO4
-# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
-else
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
-AM_MAKEINFOHTMLFLAGS = --no-split --css-ref="../style.css" --css-ref="../manual.css"
-endif
+AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS)
+
 
 dist_infoimage_DATA =                                           \
         images/gnunet-gtk-0-10-gns-a-done.png                   \
@@ -78,6 +61,25 @@ gnunet_TEXINFOS = 						\
         agpl-3.0.texi                                           \
         version.texi
 
+#if ACTIVATE_TEXINFO4
+# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
+# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
+# base) does only support --css-include=FILE.
+# The only difference is a shorter html output and
+# in 6.5 the ability to use refs instead of include.
+# We prefer not to break builds in this case, so
+# we use the include version which is backwards compatible
+# and upwards compatible, while the ref variant is neither.
+#AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
+#else
+# In the 5.x version they added `--split=chapters|sections` in
+# addition to `--split=nodes`.
+# Hold on to your hats: In version 6.5 this is already removed, ffs.
+# GNU Texinfo, please be more consistent than 1 version in switches.
+# This however is compatible to version 5.2. Thanks, I hate it.
+# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
+#AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css"
+#endif
 EXTRA_DIST =                                                    \
         $(gnunet_TEXINFOS)                                      \
         htmlxref.cnf                                            \
diff --git a/doc/handbook/chapters/developer.texi b/doc/handbook/chapters/developer.texi
index 0d3b4739b..8bc8c8005 100644
--- a/doc/handbook/chapters/developer.texi
+++ b/doc/handbook/chapters/developer.texi
@@ -9485,18 +9485,6 @@ of using plugins for the actual transmission operations and the ATS subsystem
 to select a plugin and allocate bandwidth. The following key issues have been
 identified with this design:
 
-@menu
-* Issues with TRANSPORT::
-* Design goals of TNG::
-* HELLO-NG::
-* Priorities and preferences::
-* Communicators::
-@end menu
-
-@node Issues with TRANSPORT
-@subsection Issues with TRANSPORT
-
-
 @itemize @bullet
 @item Bugs in one plugin can affect the TRANSPORT service and other plugins.
       There is at least one open bug that affects sockets, where the origin is
@@ -9531,6 +9519,13 @@ identified with this design:
 @end itemize
 
 
+@menu
+* Design goals of TNG::
+* HELLO-NG::
+* Priorities and preferences::
+* Communicators::
+@end menu
+
 @node Design goals of TNG
 @subsection Design goals of TNG
 
@@ -9564,17 +9559,8 @@ In order to address the above issues, we want to:
 
 The new architecture is planned as follows:
 
-@verbatim
-
-       APPLICATIONS
-             |
-             |
-CORE -- TRANSPORT -- COMMUNICATOR(S) -- NAT
-             \            /
-              \          /
-                PEERSTORE
 
-@end verbatim
+@image{images/tng,5in,,TNG architecture.}
 
 TRANSPORT's main objective is to establish bi-directional virtual links using a
 variety of possibly uni-directional communicators. Links undergo the following
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi
index ebc1a7979..5d5d2fe14 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/handbook/chapters/user.texi
@@ -1539,7 +1539,12 @@ authoritative zone (replacing ".+" with the name of the location
 where the name was encountered) and hence generate a
 valid GNS name.
 
-GNS currently supports the following record types:
+The GNS currently supports the record types as defined in
+@uref{https://git.gnunet.org/gana.git/tree/gnu-name-system-record-types/registry.rec, GANA}.
+In addition, GNS supports DNS record types, such as A, AAAA or TXT.
+
+In the following, we discuss GNS records with specific behaviour or special
+handling of DNS records.
 
 @menu
 * NICK::
@@ -1547,22 +1552,9 @@ GNS currently supports the following record types:
 * BOX::
 * LEHO::
 * VPN::
-* A AAAA and TXT::
 * CNAME::
 * GNS2DNS::
 * SOA SRV PTR and MX::
-* PLACE::
-* PHONE::
-* ID ATTR::
-* ID TOKEN::
-* ID TOKEN METADATA::
-* CREDENTIAL::
-* POLICY::
-* ATTRIBUTE::
-* ABE KEY::
-* ABE MASTER::
-* RECLAIM OIDC CLIENT::
-* RECLAIM OIDC REDIRECT::
 @end menu
 
 @node NICK
@@ -1658,11 +1650,6 @@ having the following lines in the @file{gnunet.conf} configuration file:
 TCP_REDIRECTS = 80:localhost4:8080
 @end example
 
-@node A AAAA and TXT
-@subsubsection A AAAA and TXT
-
-Those records work in exactly the same fashion as in traditional DNS.
-
 @node CNAME
 @subsubsection CNAME
 
@@ -1771,90 +1758,6 @@ $ gnunet-namestore -a -n mail -t MX -z bar -e 3600s -V \
 >    "10,mail.bar"
 @end example
 
-@node PLACE
-@subsubsection PLACE
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for a social place.
-
-@node PHONE
-@subsubsection PHONE
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for a phone (of CONVERSATION).
-
-@node ID ATTR
-@subsubsection ID ATTR
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for identity attributes (of IDENTITY).
-
-@node ID TOKEN
-@subsubsection ID TOKEN
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for an identity token (of IDENTITY-TOKEN).
-
-@node ID TOKEN METADATA
-@subsubsection ID TOKEN METADATA
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for the private metadata of an identity token (of IDENTITY-TOKEN).
-
-@node CREDENTIAL
-@subsubsection CREDENTIAL
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for credential.
-
-@node POLICY
-@subsubsection POLICY
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for policies.
-
-@node ATTRIBUTE
-@subsubsection ATTRIBUTE
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for reverse lookups.
-
-@node ABE KEY
-@subsubsection ABE KEY
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for ABE records.
-
-@node ABE MASTER
-@subsubsection ABE MASTER
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for ABE master keys.
-
-@node RECLAIM OIDC CLIENT
-@subsubsection RECLAIM OIDC CLIENT
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for reclaim OIDC clients.
-
-@node RECLAIM OIDC REDIRECT
-@subsubsection RECLAIM OIDC REDIRECT
-
-@c TODO describe record type and give an example of how and
-@c when to use it
-Record type for reclaim OIDC redirect URIs.
-
 @node Synchronizing with legacy DNS
 @subsection Synchronizing with legacy DNS
 
diff --git a/doc/handbook/images/tng.dot b/doc/handbook/images/tng.dot
new file mode 100644
index 000000000..14e72ee04
--- /dev/null
+++ b/doc/handbook/images/tng.dot
@@ -0,0 +1,55 @@
+// house = application
+// circle (default) = service
+// box = daemon
+// diamond = library
+// black line = dependency
+// blue line = extension via plugin
+// red line = possibly useful
+// dashed = in planning
+
+// this is what we have...o
+digraph tng {
+  // splines = true;
+  compound=true;
+  subgraph cluster0 {
+    label="Our peer";
+    style=dashed;
+    color=black;
+  subgraph cluster1 {
+    style=solid;
+    color=black;
+    tcp;
+    udp;
+    others [style=dotted];
+    label="Communicators";
+  }
+  subgraph cluster2 {
+    style=solid;
+    color=black;
+    dht;
+    fs;
+    cadet;
+    label="Applications";
+  }
+  cadet -> core [ltail=cluster2,label="Communicate with peers"];
+  dht -> transport [ltail=cluster2,label="Suggest connection to peer"];
+  core -> transport [label="Send/receive messages via secure channel"];
+  transport -> tcp [lhead=cluster1,dir=both,label="Offer connectivity/channel to other peer"];
+  udp -> nat [label="Get addresses"];
+  tcp -> nat;
+  }
+  subgraph cluster3 {
+    rank = sink;
+    style=dashed;
+    color=black;
+    peer3;
+    peer1;
+    peer2;
+    label="Other peers";
+  }
+
+
+  tcp -> peer1 [dir=both];
+  udp -> peer2;
+  transport->peer1 [style=invis];
+}
diff --git a/doc/handbook/images/tng.png b/doc/handbook/images/tng.png
new file mode 100644
index 000000000..3b93b77cc
--- /dev/null
+++ b/doc/handbook/images/tng.png
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a0283cf44..e7045e8bf 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -50,6 +50,7 @@ man_MANS = \
   gnunet-arm.1 \
   gnunet-ats.1 \
   gnunet-auto-share.1 \
+  gnunet-base32.1 \
   gnunet-bcd.1 \
   gnunet-bugreport.1 \
   gnunet-config.1 \
diff --git a/doc/man/gnunet-base32.1 b/doc/man/gnunet-base32.1
new file mode 100644
index 000000000..2e1224279
--- /dev/null
+++ b/doc/man/gnunet-base32.1
@@ -0,0 +1,74 @@
+.\" This file is part of GNUnet.
+.\" Copyright (C) 2021 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 March 5, 2021
+.Dt GNUNET-BASE32 1
+.Os
+.Sh NAME
+.Nm gnunet-base32
+.Nd encode/decode to Crockford base32 encoding
+.Sh SYNOPSIS
+.Nm
+.Op Fl d | -decode
+.sp
+.Sh DESCRIPTION
+.Nm
+By default, encodes data read from standard input into
+Crockford base32 and writes the result to standard output.
+The inverse operation is performed if the option
+.Fl --decode
+is given.  Note that the tool keeps all of the data in
+memory and is largely intended for quick debugging and
+not for high performance.
+.Bl -tag -width indent
+.It Fl d | -decode
+Run in decode mode instead of in encode mode.
+.It Fl h | -help
+Print short help on options.
+.It Fl v | -version
+Print GNUnet version number.
+.El
+.Sh SEE ALSO
+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/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index d0307ecb5..afe4aa6c0 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -1,25 +1,8 @@
 # This Makefile.am is in the public domain
 docdir = $(datadir)/doc/gnunet/
 
-if ACTIVATE_TEXINFO4
-# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css
-else
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css"
-AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css"
-endif
+AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS)
+
 
 gnunet_tutorial_examples =                                      \
         examples/001.c                                                  \