Merge remote-tracking branch 'origin/master' into identity_abe

55 files changed, 4671 insertions, 2459 deletions

diff --git a/README b/README
index 4f0e3c08c..0e85fadfd 100644
--- a/README
+++ b/README
@@ -48,6 +48,7 @@ These are the direct dependencies for running GNUnet:
 - libogg        >= 1.3.0 (optional for experimental conversation tool)
 - python-zbar   >= 0.10 (optional for gnunet-qr)
 - TeX Live      >= 2012 (optional for gnunet-bcd)
+- Texinfo       Tested with version 6.3
 - libglpk       >= 4.45 (optional for experimental code)
 
 Recommended autotools for compiling the SVN version are:
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 9ce4b019d..07cff424c 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -48,6 +48,7 @@ EXTRA_DIST = \
  no_forcestart.conf \
  no_autostart_above_core.conf \
  coverage.sh \
+ nssswitch.conf \
  report.sh \
  terminate.py.in \
  gnunet_pyexpect.py.in \
diff --git a/contrib/nssswitch.conf b/contrib/nssswitch.conf
new file mode 100644
index 000000000..89af6471e
--- /dev/null
+++ b/contrib/nssswitch.conf
@@ -0,0 +1,25 @@
+# /etc/nsswitch.conf
+# Modified to support GNUnet's GNS (.gnu, .zkey etc)
+# Compare with your distributions' "nsswitch.conf" file.
+
+passwd:      compat
+shadow:      compat
+group:       compat
+
+# passwd:    db files nis
+# shadow:    db files nis
+# group:     db files nis
+
+hosts:       files gns [NOTFOUND=return] dns
+networks:    files dns
+
+services:    db files
+protocols:   db files
+rpc:         db files
+ethers:      db files
+netmasks:    files
+netgroup:    files
+bootparams:  files
+
+automount:   files
+aliases:     files
\ No newline at end of file
diff --git a/contrib/packages/guix/README b/contrib/packages/guix/README
new file mode 100644
index 000000000..0b66e500a
--- /dev/null
+++ b/contrib/packages/guix/README
@@ -0,0 +1,39 @@
+package definitions for GNU Guix
+---------------------------------
+
+Usage
+-----
+
+Just point Guix towards the root of this source tree:
+
+export GUIX_PACKAGE_PATH=/path/to/packages
+or (if you are in the root of the gnunet git repository):
+guix package -L contrib/packages/guix/packages -i package-name
+
+The packages in this repository will take precedence over those in the
+official distribution.
+
+To make use of the packages in your GuixSD config file:
+
+Be sure to have GUIX_PACKAGE_PATH for your shell exported,
+for bash this could be achieved like this:
+
+export GUIX_PACKAGE_PATH="/full/path/to/gnunet/contrib/packages/guix/directory"
+
+In the section of your systems "config.scm", you should find
+something like this:
+
+(use-modules (gnu) (gnu system nss))
+
+Now to make use of "gnunetg" as an systemwide installed package we change this
+to:
+
+(use-modules (gnu) (gnu system nss)
+             (gnunet packages gnunet))
+
+and do the usual thing:
+ - save
+ - guix system build /etc/config.scm
+ - sudo -E guix system reconfigure /etc/config.scm
+
+The "-E" in "sudo -E" is important!
diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm
new file mode 100644
index 000000000..a2a9a2393
--- /dev/null
+++ b/contrib/packages/guix/gnunet-doc.scm
@@ -0,0 +1,165 @@
+;;; This file is part of GNUnet.
+;;; Copyright (C) 2016, 2017 GNUnet e.V.
+;;;
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
+;;;
+;;; GNUnet is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING.  If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
+;;;
+
+(use-modules
+ (ice-9 popen)
+ (ice-9 match)
+ (ice-9 rdelim)
+ (guix packages)
+ (guix build-system gnu)
+ (guix gexp)
+ ((guix build utils) #:select (with-directory-excursion))
+ (guix git-download)
+ (guix utils) ; current-source-directory
+ (gnu packages)
+ (gnu packages aidc)
+ (gnu packages autotools)
+ (gnu packages backup)
+ (gnu packages base)
+ (gnu packages compression)
+ (gnu packages curl)
+ (gnu packages databases)
+ (gnu packages file)
+ (gnu packages gettext)
+ (gnu packages glib)
+ (gnu packages gnome)
+ (gnu packages gnunet)
+ (gnu packages gnupg)
+ (gnu packages gnuzilla)
+ (gnu packages groff)
+ (gnu packages gstreamer)
+ (gnu packages gtk)
+ (gnu packages guile)
+ (gnu packages image)
+ (gnu packages image-viewers)
+ (gnu packages libidn)
+ (gnu packages libunistring)
+ (gnu packages linux)
+ (gnu packages maths)
+ (gnu packages multiprecision)
+ (gnu packages perl)
+ (gnu packages pkg-config)
+ (gnu packages pulseaudio)
+ (gnu packages python)
+ (gnu packages tex)
+ (gnu packages texinfo)
+ (gnu packages tex)
+ (gnu packages tls)
+ (gnu packages video)
+ (gnu packages web)
+ (gnu packages xiph)
+ ((guix licenses) #:prefix license:))
+
+(define %source-dir (string-append (current-source-directory)
+                                   "/../../../"))
+
+(define gnunet-doc
+  (let* ((revision "1")
+         (select? (delay (or (git-predicate
+                              (string-append (current-source-directory)
+                                             "/../../../"))
+                             source-file?))))
+      (package
+      (name "gnunet-doc")
+      (version (string-append "0.10.1-" revision "." "dev"))
+      (source
+       (local-file ;;"../../.."
+                   ;;%source-dir
+                   ;;(string-append (getcwd) "/../../../")
+                   (string-append (getcwd)) ;drrty hack and this assumes one static position FIXME!
+                   #:recursive? #t))
+                   ;;#:select? (git-predicate %source-dir)))
+                   ;;#:select? (force select?)))
+      (build-system gnu-build-system)
+      (inputs
+       `(("glpk" ,glpk)
+         ("gnurl" ,gnurl)
+         ("gstreamer" ,gstreamer)
+         ("gst-plugins-base" ,gst-plugins-base)
+         ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged.
+         ("libextractor" ,libextractor)
+         ("libgcrypt" ,libgcrypt)
+         ("libidn" ,libidn)
+         ("libmicrohttpd" ,libmicrohttpd)
+         ("libltdl" ,libltdl)
+         ("libunistring" ,libunistring)
+         ("openssl" ,openssl)
+         ("opus" ,opus)
+         ("pulseaudio" ,pulseaudio)
+         ("sqlite" ,sqlite)
+         ("postgresql" ,postgresql)
+         ("mysql" ,mysql)
+         ("zlib" ,zlib)
+         ("perl" ,perl)
+         ("python" ,python) ; tests and gnunet-qr
+         ("jansson" ,jansson)
+         ("nss" ,nss)
+         ("glib" ,glib "bin")
+         ("gmp" ,gmp)
+         ("bluez" ,bluez) ; for optional bluetooth feature
+         ("glib" ,glib)
+         ;;("texlive-minimal" ,texlive-minimal) ; optional.
+         ("texlive" ,texlive)
+         ("libogg" ,libogg)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("gnu-gettext" ,gnu-gettext)
+         ("texinfo" ,texinfo)
+         ("libtool" ,libtool)))
+      (arguments
+       `(#:tests? #f ;Don't run tests
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'autoconf
+             (lambda _
+               (substitute* "bootstrap"
+                 (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+               (for-each (lambda (f) (chmod f #o755))
+                         (find-files "po" ""))
+               (zero? (system* "sh" "bootstrap"))))
+           (replace 'build
+             (lambda _
+               (chdir "doc")
+               (zero? (system* "make" "doc-all-give-me-the-noise"))))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out"))
+                      (doc (string-append out "/share/doc/gnunet")))
+                 (mkdir-p doc)
+                 (mkdir-p (string-append doc "/gnunet"))
+                 (install-file "gnunet.pdf" doc)
+                 (install-file "gnunet.info" doc)
+                 (copy-recursively "gnunet"
+                                   (string-append doc
+                                                  "/gnunet"))
+                 (install-file "gnunet-c-tutorial.pdf" doc)
+                 (install-file "gnunet-c-tutorial.info" doc)
+                 (copy-recursively "gnunet-c-tutorial"
+                                   (string-append doc
+                                                  "/gnunet-c-tutorial")))
+               #t)))))
+      (synopsis "Documentation of GNUnet")
+      (description
+       "GNUnet documentation build")
+      (license (list license:fdl1.3+ license:gpl3+))
+      (home-page "https://gnunet.org/"))))
+
+gnunet-doc
diff --git a/guix-env.scm b/contrib/packages/guix/guix-env.scm
index 54731858e..6946fee57 100644
--- a/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -32,14 +32,12 @@
 ;; development setup for this setup, which involves a version of Guile in
 ;; your PATH.
 ;;
+;; cd contrib/packages/guix
 ;; guix build -f guix-env.scm
 ;;
 ;; We'd like to provide advanced functions such as guix environment specific
 ;; gnunet-git package and usage of gnunet-gtk-git, but this is subject
 ;; to tests right now.
-;;
-;; Further versions of GNUnet for Guix can currently be found in
-;; https://gitweb.krosos.org/ng0_guix/packages.git/
 
 (use-modules
  (ice-9 popen)
@@ -50,6 +48,7 @@
  (guix gexp)
  ((guix build utils) #:select (with-directory-excursion))
  (guix git-download)
+ (guix utils) ; current-source-directory
  (gnu packages)
  (gnu packages aidc)
  (gnu packages autotools)
@@ -82,29 +81,40 @@
  (gnu packages python)
  (gnu packages tex)
  (gnu packages texinfo)
+ (gnu packages tex)
  (gnu packages tls)
  (gnu packages video)
  (gnu packages web)
  (gnu packages xiph)
  ((guix licenses) #:prefix license:))
 
-(define %source-dir (dirname (current-filename)))
+(define %source-dir (string-append (current-source-directory)
+                                   "/../../../"))
 
 (define gnunet-git
-  (let* ((revision "1"))
-    (package
+  (let* ((revision "3")
+         (select? (delay (or (git-predicate
+                              (string-append (current-source-directory)
+                                             "/../../../"))
+                             source-file?))))
+      (package
       (name "gnunet-git")
       (version (string-append "0.10.1-" revision "." "dev"))
       (source
-       (local-file %source-dir
+       (local-file ;;"../../.."
+                   ;;%source-dir
+                   ;;(string-append (getcwd) "/../../../")
+                   (string-append (getcwd)) ;drrty hack and this assumes one static position FIXME!
                    #:recursive? #t))
+                   ;;#:select? (git-predicate %source-dir)))
+                   ;;#:select? (force select?)))
       (build-system gnu-build-system)
       (inputs
        `(("glpk" ,glpk)
          ("gnurl" ,gnurl)
          ("gstreamer" ,gstreamer)
          ("gst-plugins-base" ,gst-plugins-base)
-         ("gnutls" ,gnutls)
+         ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged.
          ("libextractor" ,libextractor)
          ("libgcrypt" ,libgcrypt)
          ("libidn" ,libidn)
@@ -122,12 +132,14 @@
          ("python" ,python) ; tests and gnunet-qr
          ("jansson" ,jansson)
          ("nss" ,nss)
+         ("glib" ,glib "bin")
          ("gmp" ,gmp)
          ("bluez" ,bluez) ; for optional bluetooth feature
          ("glib" ,glib)
          ;; There are currently no binary substitutes for texlive on
          ;; hydra.gnu.org or its mirrors due to its size. Uncomment if you need it.
          ;;("texlive-minimal" ,texlive-minimal) ; optional.
+         ("texlive" ,texlive)
          ("libogg" ,libogg)))
       (native-inputs
        `(("pkg-config" ,pkg-config)
@@ -141,7 +153,7 @@
       (outputs '("out" "debug"))
       (arguments
        `(#:configure-flags
-         (list (string-append "--with-nssdir=" %output "/lib")
+         (list (string-append "--with-nssdir=" %output "/lib");"/lib/gnunet/nss")
                "--enable-gcc-hardening"
                "--enable-linker-hardening"
 
@@ -165,6 +177,14 @@
            (add-after 'patch-bin-sh 'bootstrap
              (lambda _
                (zero? (system* "sh" "bootstrap"))))
+           ;; (add-after 'install 'install-lib-nss
+           ;;   (lambda* (#:key outputs #:allow-other-keys)
+           ;;     (let* ((out (assoc-ref outputs "out"))
+           ;;            (lib (string-append out "/lib/nss/")))
+           ;;       (mkdir-p lib)
+           ;;       (copy-recursively "src/gns/nss/" lib)
+           ;;       (install-file "ping" "combobreak"))
+           ;;     #t))
            (delete 'check))))
       ;; XXX: https://gnunet.org/bugs/view.php?id=4619
       ;; (add-after 'install 'set-path-for-check
diff --git a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
new file mode 100644
index 000000000..7840705a6
--- /dev/null
+++ b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
@@ -0,0 +1,474 @@
+;;; This file is part of GNUnet.
+;;; Copyright (C) 2016, 2017 GNUnet e.V.
+;;;
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
+;;;
+;;; GNUnet is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING.  If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
+
+(define-module (gnunet packages gnunet)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages admin)
+  #:use-module (gnu packages aidc)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gnunet)
+  #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gnuzilla)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages libidn)
+  #:use-module (gnu packages libunistring)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages man)
+  #:use-module (gnu packages image-viewers)
+  #:use-module (gnu packages maths)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages pcre)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages tex)
+  #:use-module (gnu packages upnp)
+  #:use-module (gnu packages web)
+  #:use-module (gnu packages xiph))
+
+;; TODO: Use HEAD without checking sum of it.
+;; Explanation for name scheme: UNIXPATH is capped at 108 characters,
+;; this causes lots of tests to fail.
+(define-public gnunetg
+  (let* ((commit "b005d5e4dac03fcfdabf0d0de434da3b295f6d63")
+         (revision "30"))
+    (package
+      (inherit gnunet)
+      (name "gnunetg")
+      (version (string-append "0.10.1" "-" revision
+                              "." (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gnunet.org/git/gnunet.git")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "10wfb58pi55399cw100vplq3f8nxg2vl6sywcmvkx3wg1d3firla"))))
+      (build-system gnu-build-system)
+      (inputs
+       `(("glpk" ,glpk)
+         ("gnurl" ,gnurl)
+         ("gstreamer" ,gstreamer)
+         ("gst-plugins-base" ,gst-plugins-base)
+         ("gnutls" ,gnutls)
+         ("libextractor" ,libextractor)
+         ("libgcrypt" ,libgcrypt)
+         ("libidn" ,libidn)
+         ("libmicrohttpd" ,libmicrohttpd)
+         ("libltdl" ,libltdl)
+         ("libunistring" ,libunistring)
+         ("openssl" ,openssl)
+         ("opus" ,opus)
+         ("pulseaudio" ,pulseaudio)
+         ("sqlite" ,sqlite)
+         ("zlib" ,zlib)
+         ("perl" ,perl)
+         ("python" ,python-2) ; tests and gnunet-qr
+         ("jansson" ,jansson)
+         ("ncurses" ,ncurses)
+         ("nss" ,nss)
+         ("gmp" ,gmp)
+         ("miniupnpc" ,miniupnpc)
+         ("bluez" ,bluez) ; for optional bluetooth feature
+         ("glib" ,glib)
+         ;; ("texlive-minimal" ,texlive-minimal) ; optional.
+         ("libogg" ,libogg)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("gnu-gettext" ,gnu-gettext)
+         ("texinfo" ,texinfo)
+         ("libtool" ,libtool)))
+      (outputs '("out" "debug"))
+      (arguments
+       `(#:configure-flags
+         (list (string-append "--with-nssdir=" %output "/lib")
+               "--enable-experimental")
+         #:parallel-tests? #f ; parallel building is not functional
+         #:tests? #f ; FAIL: test_gnunet_statistics.py
+         #:phases
+         ;; swap check and install phases and set paths to installed bin
+         (modify-phases %standard-phases
+           (add-after 'unpack 'patch-bin-sh
+             (lambda _
+               (substitute* "bootstrap"
+                 (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+               (for-each (lambda (f) (chmod f #o755))
+                         (find-files "po" ""))
+             #t))
+           (add-after 'patch-bin-sh 'bootstrap
+             (lambda _
+               (zero? (system* "sh" "bootstrap"))))
+           ;; DISABLED until failing testcases are fixed.
+           ;; this test fails in our environment, disable it:
+           ;; XXX: specify which ones fail.
+           ;; (add-after 'patch-bin-sh 'disable-test_quota_compliance_tcp_asymmetric
+           ;;   (lambda _
+           ;;     (substitute* '("src/transport/Makefile.am")
+           ;;       (("test_quota_compliance_tcp_asymmetric") ""))))
+           ;;       (("test_quota_compliance_http_asymmetric") "")
+           ;;       (("test_quota_compliance_https_asymmetric") "")
+           ;;       (("test_quota_compliance_unix") "")
+           ;;       (("test_quota_compliance_unix_asymmetric") ""))))
+           ;; check is between build and install, fix this to:
+           ;; build - install - check, else the test suite fails.
+           (delete 'check)))))))
+           ;; (add-after 'install 'set-path-for-check
+           ;;   (lambda* (#:key outputs #:allow-other-keys)
+           ;;     (let* ((out (assoc-ref outputs "out"))
+           ;;            (bin (string-append out "/bin"))
+           ;;            (lib (string-append out "/lib")))
+           ;;       (setenv "GNUNET_PREFIX" lib)
+           ;;       (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+           ;;       ;; XXX: https://gnunet.org/bugs/view.php?id=4619#c11061
+           ;;       ;; Enable core dump before the tests.
+           ;;       ;; XXX: HOW??? ulimit -c unlimited
+           ;;       (zero? (system* "make" "check"))))))))
+
+(define-public gnunet-doc
+  (package
+    (name "gnunet-doc")
+    (version (package-version gnunetg))
+    (source (package-source gnunetg))
+    (build-system gnu-build-system)
+    ;; FIXME: Introduce DOCS_ONLY option for configure script.
+    ;; This should prevent the checks for all required software.
+    (inputs
+     `(("glpk" ,glpk)
+       ("gnurl" ,gnurl)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gnutls" ,gnutls)
+       ("libextractor" ,libextractor)
+       ("libgcrypt" ,libgcrypt)
+       ("libidn" ,libidn)
+       ("libmicrohttpd" ,libmicrohttpd)
+       ("libltdl" ,libltdl)
+       ("libunistring" ,libunistring)
+       ("openssl" ,openssl)
+       ("opus" ,opus)
+       ("pulseaudio" ,pulseaudio)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)
+       ("perl" ,perl)
+       ("python" ,python-2) ; tests and gnunet-qr
+       ("jansson" ,jansson)
+       ("ncurses" ,ncurses)
+       ("nss" ,nss)
+       ("gmp" ,gmp)
+       ("miniupnpc" ,miniupnpc)
+       ("bluez" ,bluez) ; for optional bluetooth feature
+       ("glib" ,glib)
+       ("texlive" ,texlive) ;TODO: Use a minimal subset.
+       ("libogg" ,libogg)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gnu-gettext" ,gnu-gettext)
+       ("texinfo" ,texinfo)
+       ("libtool" ,libtool)))
+    (arguments
+     `(#:tests? #f ;Don't run tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (substitute* "bootstrap"
+               (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+             (for-each (lambda (f) (chmod f #o755))
+                       (find-files "po" ""))
+             #t))
+         (add-after 'patch-bin-sh 'bootstrap
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (replace 'build
+           (lambda _
+             (chdir "doc")
+             (zero? (system* "make" "doc-all-give-me-the-noise"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (string-append out "/share/doc/gnunet")))
+               (mkdir-p doc)
+               (mkdir-p (string-append doc "/gnunet"))
+               (install-file "gnunet.pdf" doc)
+               (install-file "gnunet.info" doc)
+               (copy-recursively "gnunet"
+                                 (string-append doc
+                                                "/gnunet"))
+               (install-file "gnunet-c-tutorial.pdf" doc)
+               (install-file "gnunet-c-tutorial.info" doc)
+               (copy-recursively "gnunet-c-tutorial"
+                                 (string-append doc
+                                                "/gnunet-c-tutorial")))
+             #t)))))
+    (synopsis "GNUnet documentation")
+    (description
+     "Gnunet-doc builds the documentation of GNUnet.")
+    (home-page "https://gnunet.org")
+    (license (package-license gnunet))))
+
+(define-public gnunetgpg
+  (package
+    (inherit gnunetg)
+    (name "gnunetgpg")
+    (inputs
+     `(("postgresql" ,postgresql)
+       ,@(package-inputs gnunetg)))
+    (synopsis "gnunet, variant with postgres")))
+
+(define-public gnunetgf
+  (package
+    (inherit gnunetg)
+    (name "gnunetgf")
+    (inputs
+     `(("postgresql" ,postgresql)
+       ("mysql" ,mysql)
+       ,@(package-inputs gnunetg)))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-nssdir=" %output "/lib")
+             "--enable-gcc-hardening"
+             "--enable-linker-hardening"
+
+             "--enable-poisoning"
+             "--enable-sanitizer"
+             "--enable-experimental"
+             "--enable-logging=verbose"
+             "CFLAGS=-ggdb -O0")
+       #:parallel-tests? #f ; parallel building is not supported.
+       ;;#:tests? #f ; fail: test_gnunet_statistics.py
+       #:phases
+       ;; swap check and install phases and set paths to installed bin
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (substitute* "bootstrap"
+               (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+             (for-each (lambda (f) (chmod f #o755))
+                       (find-files "po" ""))
+             #t))
+         (add-after 'patch-bin-sh 'bootstrap
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (delete 'check))))
+    (synopsis "gnunet, full git build without tests")))
+
+;; A package to run the test suite.
+(define-public gnunetgft
+  (package
+    (inherit gnunetg)
+    (name "gnunetgft")
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-nssdir=" %output "/lib")
+             "--enable-gcc-hardening"
+             "--enable-linker-hardening"
+
+             ;;"--enable-poisoning"
+             ;;"--enable-sanitizer"
+             "--enable-experimental"
+             "--enable-logging=verbose"
+             "CFLAGS=-ggdb -O0")
+       ;; #:parallel-tests? #f ; parallel building seems to fail
+       ;;#:tests? #f ; fail: test_gnunet_statistics.py
+       #:phases
+       ;; swap check and install phases and set paths to installed bin
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (substitute* "bootstrap"
+               (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+             (for-each (lambda (f) (chmod f #o755))
+                       (find-files "po" ""))
+             #t))
+         (add-after 'patch-bin-sh 'bootstrap
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (delete 'check)
+         ;; XXX: https://gnunet.org/bugs/view.php?id=4619
+         (add-after 'install 'set-path-for-check
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib")))
+               (setenv "GNUNET_PREFIX" lib)
+               (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+               (zero? (system* "make" "check"))))))))
+    (synopsis "gnunet, full git with tests enabled with parallel tests")))
+
+;; ... and one package to test the package with "parallel-tests? #f"
+(define-public gnunetgftn
+  (package
+    (inherit gnunetg)
+    (name "gnunetgftn")
+    (arguments
+     `(#:configure-flags
+       (list (string-append "--with-nssdir=" %output "/lib")
+             "--enable-gcc-hardening"
+             "--enable-linker-hardening"
+
+             "--enable-poisoning"
+             "--enable-sanitizer"
+             "--enable-experimental"
+             "--enable-logging=verbose"
+             "CFLAGS=-ggdb"); -O0")
+       #:parallel-tests? #f ; parallel building seems to fail
+       ;;#:tests? #f ; fail: test_gnunet_statistics.py
+       #:phases
+       ;; swap check and install phases and set paths to installed bin
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (substitute* "bootstrap"
+               (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+             (for-each (lambda (f) (chmod f #o755))
+                       (find-files "po" ""))
+             #t))
+         (add-after 'patch-bin-sh 'bootstrap
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (delete 'check)
+         ;; XXX: https://gnunet.org/bugs/view.php?id=4619
+         (add-after 'install 'set-path-for-check
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (lib (string-append out "/lib")))
+               (setenv "GNUNET_PREFIX" lib)
+               (setenv "PATH" (string-append (getenv "PATH") ":" bin))
+               (zero? (system* "make" "check"))))))))))
+
+(define-public gnunet-gtkg
+  (let* ((commit "087f8e166ee6d1fc59a6bd5d05f656528761ede7")
+         (revision "5"))
+    (package
+      (inherit gnunetgf)
+      (name "gnunet-gtkg")
+      (version (package-version gnunetgf))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gnunet.org/git/gnunet-gtk.git")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+            "1k03d8l0yz4fpliy5bg5s7qkpidzd6ryr4cd63wgmd227p32i87q"))))
+      (arguments
+       `(#:configure-flags
+         (list "--with-libunique"
+               "--with-qrencode"
+               (string-append "--with-gnunet="
+                              (assoc-ref %build-inputs "gnunetgf")))
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'configure 'bootstrap
+             (lambda _
+               (zero? (system* "autoreconf" "-vfi")))))))
+      (inputs
+       `(("gnunetgf" ,gnunetgf)
+         ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
+         ("gnutls" ,gnutls)
+         ("libgcrypt" ,libgcrypt)
+         ("gtk+" ,gtk+)
+         ("libextractor" ,libextractor)
+         ("glade3" ,glade3)
+         ("qrencode" ,qrencode)
+         ("libunique" ,libunique)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("libglade" ,libglade)
+         ("autoconf" ,autoconf)
+         ("gnu-gettext" ,gnu-gettext)
+         ("texinfo" ,texinfo)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (synopsis "Graphical front-end tools for GNUnet")
+      (home-page "https://gnunet.org"))))
+
+;; fuse, pointing to the tests disabled version of gnunet-git
+(define-public gnunet-fuse-git
+  (let* ((commit "3503aeff6db6b39b85e13f9483d46d49ce9cec55")
+         (revision "3"))
+    (package
+      (inherit gnunetg)
+      ;;(inherit gnunet)
+      (name "gnunet-fuse-git")
+      (version (package-version gnunetgf))
+      ;;(version (package-version gnunet))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gnunet.org/git/gnunet-fuse.git")
+               (commit commit)))
+         (file-name (string-append name "-" version "-checkout"))
+         (sha256
+          (base32
+           "0sxzppanw2nrjqv1vnyj2jx3ja6gqrg0ibkl5n1fr265cqk5hgc5"))))
+      (arguments
+       `(#:configure-flags
+         (list "--with-qrencode"
+               (string-append "--with-gnunet="
+                              (assoc-ref %build-inputs "gnunetgf"))) ;"gnunet")))
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-gnunet-include-path
+             (lambda _
+               (substitute* "configure.ac"
+                 (("gnunet/gnunet_util_lib.h")
+                  "${lookin}/include/gnunet/gnunet_util_lib.h"))
+               #t))
+           (add-before 'configure 'bootstrap
+             (lambda _
+               (zero? (system* "autoreconf" "-vfi")))))))
+      (inputs
+       `(("gnunetgf" ,gnunetgf)))
+       ;;`(("gnunet" ,gnunet)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("fuse" ,fuse)
+         ("autoconf" ,autoconf)
+         ("gnu-gettext" ,gnu-gettext)
+         ("automake" ,automake)
+         ("libtool" ,libtool)))
+      (synopsis "FUSE for GNUnet")
+      (home-page "https://gnunet.org"))))
diff --git a/default.nix b/contrib/packages/nix/default.nix
index ffbcd4c44..ffbcd4c44 100644
--- a/default.nix
+++ b/contrib/packages/nix/default.nix
diff --git a/gnunet-dev.nix b/contrib/packages/nix/gnunet-dev.nix
index 89b65f6b4..89b65f6b4 100644
--- a/gnunet-dev.nix
+++ b/contrib/packages/nix/gnunet-dev.nix
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e130ccc0e..07aafbb51 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,40 +3,73 @@ SUBDIRS = man doxygen
 
 docdir = $(datadir)/doc/gnunet/
 
-gnunet_doc_images = \
-        images/gnunet-gtk-0-10-gns-a-done.png \
-        images/gnunet-gtk-0-10-gns-a.png \
-        images/daemon_lego_block.png \
-        images/gnunet-gtk-0-10-gns.png \
-        images/gnunet-0-10-peerinfo.png \
-        images/gnunet-gtk-0-10-identity.png \
-        images/gnunet-fs-gtk-0-10-star-tab.png \
-        images/gnunet-gtk-0-10.png \
-        images/gnunet-gtk-0-10-download-area.png \
-        images/gnunet-gtk-0-10-search-selected.png \
-        images/gnunet-gtk-0-10-fs-menu.png \
-        images/gnunet-gtk-0-10-traffic.png \
-        images/gnunet-gtk-0-10-fs.png \
-        images/gnunet-namestore-gtk-phone.png \
-        images/gnunet-gtk-0-10-fs-publish-editing.png \
-        images/gnunet-namestore-gtk-vpn.png \
-        images/gnunet-gtk-0-10-fs-published.png \
-        images/gnunet-setup-exit.png \
-        images/gnunet-gtk-0-10-fs-publish.png \
-        images/iceweasel-preferences.png \
-        images/gnunet-gtk-0-10-fs-publish-select.png \
-        images/iceweasel-proxy.png \
-        images/gnunet-gtk-0-10-fs-publish-with-file_0.png \
-        images/service_lego_block.png \
-        images/gnunet-gtk-0-10-fs-publish-with-file.png \
-        images/service_stack.png \
-        images/gnunet-gtk-0-10-fs-search.png
+infoimagedir = $(infodir)/images
 
-info_TEXINFOS = \
-        gnunet.texi
+dist_infoimage_DATA =                                           \
+        %D%/images/gnunet-gtk-0-10-gns-a-done.png               \
+        %D%/images/gnunet-gtk-0-10-gns-a.png                    \
+        %D%/images/daemon_lego_block.png                        \
+        %D%/images/gnunet-gtk-0-10-gns.png                      \
+        %D%/images/gnunet-0-10-peerinfo.png                     \
+        %D%/images/gnunet-gtk-0-10-identity.png                 \
+        %D%/images/gnunet-fs-gtk-0-10-star-tab.png              \
+        %D%/images/gnunet-gtk-0-10.png                          \
+        %D%/images/gnunet-gtk-0-10-download-area.png            \
+        %D%/images/gnunet-gtk-0-10-search-selected.png          \
+        %D%/images/gnunet-gtk-0-10-fs-menu.png                  \
+        %D%/images/gnunet-gtk-0-10-traffic.png                  \
+        %D%/images/gnunet-gtk-0-10-fs.png                       \
+        %D%/images/gnunet-namestore-gtk-phone.png               \
+        %D%/images/gnunet-gtk-0-10-fs-publish-editing.png       \
+        %D%/images/gnunet-namestore-gtk-vpn.png                 \
+        %D%/images/gnunet-gtk-0-10-fs-published.png             \
+        %D%/images/gnunet-setup-exit.png                        \
+        %D%/images/gnunet-gtk-0-10-fs-publish.png               \
+        %D%/images/iceweasel-preferences.png                    \
+        %D%/images/gnunet-gtk-0-10-fs-publish-select.png        \
+        %D%/images/iceweasel-proxy.png                          \
+        %D%/images/gnunet-gtk-0-10-fs-publish-with-file_0.png   \
+        %D%/images/service_lego_block.png                       \
+        %D%/images/gnunet-gtk-0-10-fs-publish-with-file.png     \
+        %D%/images/service_stack.png                            \
+        %D%/images/gnunet-gtk-0-10-fs-search.png                \
+        %D%/images/gnunet-tutorial-service.png                  \
+        %D%/images/gnunet-tutorial-system.png                   \
+        %D%/images/daemon_lego_block.svg                        \
+        %D%/images/lego_stack.svg                               \
+        %D%/images/service_lego_block.svg
+
+gnunet_tutorial_examples =                                      \
+        001.c                                                   \
+        002.c                                                   \
+        003.c                                                   \
+        004.c                                                   \
+        005.c                                                   \
+        006.c                                                   \
+        007.c                                                   \
+        008.c                                                   \
+        009.c                                                   \
+        010.c                                                   \
+        011.c                                                   \
+        012.c                                                   \
+        013.c                                                   \
+        014.c                                                   \
+        015.c                                                   \
+        016.c                                                   \
+        017.c                                                   \
+        018.c                                                   \
+        019.c                                                   \
+        020.c                                                   \
+        021.c                                                   \
+        022.c                                                   \
+        023.c                                                   \
+        024.c                                                   \
+        025.c                                                   \
+        026.c
 
-# FIXME: include this file in the documentation:
-#       gnunet-c-tutorial.tex
+info_TEXINFOS = \
+        gnunet.texi \
+        gnunet-c-tutorial.texi
 
 gnunet_TEXINFOS = \
         chapters/developer.texi \
@@ -48,4 +81,65 @@ gnunet_TEXINFOS = \
 
 EXTRA_DIST = \
         $(gnunet_TEXINFOS) \
-        $(gnunet_doc_images)
+        $(gnunet_tutorial_examples) \
+        outdated-and-old-installation-instructions.txt \
+        gnunet-c-tutorial-v1.pdf \
+        README.txt
+
+daemon_lego_block.png: images/daemon_lego_block.svg
+        convert images/daemon_lego_block.svg images/daemon_lego_block.png &&
+        pngcrush images/daemon_lego_block.png images/daemon_lego_block.png
+
+service_lego_block.png: images/service_lego_block.svg
+        convert images/service_lego_block.svg images/service_lego_block.png &&
+        pngcrush images/service_lego_block.png images/serivce_lego_block.png
+
+lego_stack.png: images/lego_stack.svg
+        convert images/lego_stack.svg images/lego_stack.png &&
+        pngcrush images/lego_stack.png images/lego_stack.png
+
+version.texi:
+        echo "@set UPDATED $(date +'%d %B %Y')" > $@
+        echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@
+        echo "@set EDITION $(PACKAGE_VERSION)" >> $@
+        echo "@set VERSION $(PACKAGE_VERSION)" >> $@ 
+
+doc-pdf: version.texi
+        @makeinfo --pdf --quiet gnunet.texi
+doc-pdf-tutorial: version.texi
+        @makeinfo --pdf --quiet gnunet-c-tutorial.texi
+
+doc-html: version.texi
+        @makeinfo --html gnunet.texi
+doc-html-tutorial: version.texi
+        @makeinfo --html gnunet-c-tutorial.texi
+
+doc-info: version.texi
+        @makeinfo --no-split gnunet.texi
+doc-info-tutorial: version.texi
+        @makeinfo --no-split gnunet-c-tutorial.texi
+
+# FIXME: rm *.html and *.pdf
+doc-clean:
+        @rm *.aux *.log *.toc *.cp *.cps
+
+doc-all: doc-pdf doc-html doc-info doc-pdf-tutorial doc-html-tutorial doc-info-tutorial
+
+doc-pdf-noise: version.texi
+        @makeinfo --pdf gnunet.texi
+doc-pdf-tutorial-noise: version.texi
+        @makeinfo --pdf gnunet-c-tutorial.texi
+
+doc-html-noise: version.texi
+        @makeinfo --html gnunet.texi
+doc-html-tutorial-noise: version.texi
+        @makeinfo --html gnunet-c-tutorial.texi
+
+doc-info-noise: version.texi
+        @makeinfo --no-split gnunet.texi
+doc-info-tutorial-noise: version.texi
+        @makeinfo --no-split gnunet-c-tutorial.texi
+
+doc-all-give-me-the-noise: doc-pdf-noise doc-html-noise doc-info-noise doc-pdf-tutorial-noise doc-html-tutorial-noise doc-info-tutorial-noise
+
+.PHONY: version.texi
diff --git a/doc/README.txt b/doc/README.txt
new file mode 100644
index 000000000..2abe479dd
--- /dev/null
+++ b/doc/README.txt
@@ -0,0 +1,42 @@
+* What's left to do
+
+- Which Texlive modules are needed? Decrease the size.
+- Update the content of gnunet documentation.
+
+* How to use (hack) on this
+
+** with guix
+
+export the environment variable GUIX_PACKAGE_PATH as $GUIX_PACKAGE_PATH:gnunet/contrib/packages/guix/packages
+guix environment gnunet-doc
+
+** without guix
+
+You need to have Texinfo and Texlive in your path.
+sh bootstrap
+./configure
+cd doc
+make doc-all-give-me-the-noise
+
+* structure (relations)
+
+** gnunet.texi
+ -> chapters/developer.texi
+ -> chapters/installation.texi
+ -> chapters/philosophy.texi
+ -> chapters/user.texi
+ -> images/*
+ -> gpl-3.0.texi
+ -> fdl-1.3.texi
+
+** gnunet-c-tutorial.texi
+ -> figs/Service.pdf
+ -> figs/System.pdf
+ -> tutorial-examples/*.c
+ -> gpl-3.0.texi
+ -> fdl-1.3.texi
+
+- gnunet-c-tutorial-v1.pdf: original LaTeX "gnunet-c-tutorial.pdf".
+- man folder: the man pages.
+- doxygen folder
+- outdated-and-old-installation-instructions.txt: self described within the file.
diff --git a/doc/chapters/developer.texi b/doc/chapters/developer.texi
index 8b7954836..e7f507746 100644
--- a/doc/chapters/developer.texi
+++ b/doc/chapters/developer.texi
@@ -97,16 +97,18 @@ advertisements for bogus websites.
 
 This developer handbook is intended as first introduction to GNUnet for new
 developers that want to extend the GNUnet framework. After the introduction,
-each of the GNUnet subsystems (directories in the src/ tree) is (supposed to
+each of the GNUnet subsystems (directories in the @file{src/} tree) is (supposed to
 be) covered in its own chapter. In addition to this documentation, GNUnet
 developers should be aware of the services available on the GNUnet server to
 them.
 
 New developers can have a look a the GNUnet tutorials for C and java available
-in the src/ directory of the repository or under the following links:
+in the @file{src/} directory of the repository or under the following links:
 
+@c ** FIXME: Link to files in source, not online.
+@c ** FIXME: Where is the Java tutorial?
 @itemize @bullet
-@item GNUnet C tutorial
+@item @uref{https://gnunet.org/git/gnunet.git/plain/doc/gnunet-c-tutorial.pdf, GNUnet C tutorial}
 @item GNUnet Java tutorial
 @end itemize
 
@@ -123,8 +125,7 @@ The public subsystems on the GNUnet server that help developers are:
 @item The Version control system keeps our code and enables distributed
 development. Only developers with write access can commit code, everyone else
 is encouraged to submit patches to the
-@uref{http://mail.gnu.org/mailman/listinfo/gnunet-developers, developer
-mailinglist}.
+@uref{https://lists.gnu.org/mailman/listinfo/gnunet-developers, GNUnet-developers mailinglist}.
 @item The GNUnet bugtracking system is used to track feature requests, open bug
 reports and their resolutions. Anyone can report bugs, only developers can
 claim to have fixed them.
@@ -168,36 +169,35 @@ GNUnet sub-projects in order of likely relevance are currently:
 
 @table @asis
 
-@item svn/gnunet Core of the P2P framework, including file-sharing, VPN and
+@item gnunet Core of the P2P framework, including file-sharing, VPN and
 chat applications; this is what the developer handbook covers mostly
-@item svn/gnunet-gtk/ Gtk+-based user interfaces, including gnunet-fs-gtk
+@item gnunet-gtk Gtk+-based user interfaces, including gnunet-fs-gtk
 (file-sharing), gnunet-statistics-gtk (statistics over time),
 gnunet-peerinfo-gtk (information about current connections and known peers),
 gnunet-chat-gtk (chat GUI) and gnunet-setup (setup tool for "everything")
-@item svn/gnunet-fuse/ Mounting directories shared via GNUnet's file-sharing on Linux
-@item svn/gnunet-update/ Installation and update tool
-@item svn/gnunet-ext/
-Template for starting 'external' GNUnet projects
-@item svn/gnunet-java/ Java
-APIs for writing GNUnet services and applications
-@item svn/gnunet-www/ Code
-and media helping drive the GNUnet website
-@item svn/eclectic/ Code to run
+@item gnunet-fuse Mounting directories shared via GNUnet's file-sharing on Linux
+@item gnunet-update Installation and update tool
+@item gnunet-ext Template for starting 'external' GNUnet projects
+@item gnunet-java Java APIs for writing GNUnet services and applications
+@c ** FIXME: Point to new website repository once we have it:
+@c ** @item svn/gnunet-www/ Code and media helping drive the GNUnet website
+@item eclectic Code to run
 GNUnet nodes on testbeds for research, development, testing and evaluation
-@item svn/gnunet-qt/ qt-based GNUnet GUI (dead?)
-@item svn/gnunet-cocoa/
-cocoa-based GNUnet GUI (dead?)
+@c ** FIXME: Solve the status and location of gnunet-qt
+@item gnunet-qt qt-based GNUnet GUI (dead?)
+@item gnunet-cocoa cocoa-based GNUnet GUI (dead?)
 
 @end table
 
 We are also working on various supporting libraries and tools:
+@c ** FIXME: What about gauger, and what about libmwmodem?
 
 @table @asis
-@item svn/Extractor/ GNU libextractor (meta data extraction)
-@item svn/libmicrohttpd/ GNU libmicrohttpd (embedded HTTP(S) server library)
-@item svn/gauger/ Tool for performance regression analysis
-@item svn/monkey/ Tool for automated debugging of distributed systems
-@item svn/libmwmodem/ Library for accessing satellite connection quality reports
+@item libextractor GNU libextractor (meta data extraction)
+@item libmicrohttpd GNU libmicrohttpd (embedded HTTP(S) server library)
+@item gauger Tool for performance regression analysis
+@item monkey Tool for automated debugging of distributed systems
+@item libmwmodem Library for accessing satellite connection quality reports
 @end table
 
 Finally, there are various external projects (see links for a list of those
@@ -208,7 +208,7 @@ that have a public website) which build on top of the GNUnet framework.
 @section Code overview
 
 This section gives a brief overview of the GNUnet source code. Specifically, we
-sketch the function of each of the subdirectories in the @code{gnunet/src/}
+sketch the function of each of the subdirectories in the @file{gnunet/src/}
 directory. The order given is roughly bottom-up (in terms of the layers of the
 system).
 @table @asis
@@ -871,9 +871,9 @@ gnunet-ext template to provide an easy to use skeleton.
 gnunet-ext contains the build environment and template files for the
 development of GNUnet services, command line tools, APIs and tests.
 
-First of all you have to obtain gnunet-ext from SVN:
+First of all you have to obtain gnunet-ext from git:
 
-@code{svn co https://gnunet.org/svn/gnunet-ext}
+@code{git clone https://gnunet.org/git/gnunet-ext.git}
 
 The next step is to bootstrap and configure it. For configure you have to
 provide the path containing GNUnet with @code{--with-gnunet=/path/to/gnunet}
@@ -1325,7 +1325,7 @@ require the option @code{OVERLAY_RANDOM_LINKS} to be set to the number of
 random links to be generated in the configuration. The option will be ignored
 for the rest of the topologies.
 
-Toplogy @code{SCALE_FREE} requires the options @code{SCALE_FREE_TOPOLOGY_CAP}
+Topology @code{SCALE_FREE} requires the options @code{SCALE_FREE_TOPOLOGY_CAP}
 to be set to the maximum number of peers which can connect to a peer and
 @code{SCALE_FREE_TOPOLOGY_M} to be set to how many peers a peer should be
 atleast connected to.
@@ -1724,7 +1724,7 @@ porting of GNUnet easier.
 GNUnet is able to log its activity, mostly for the purposes of debugging the
 program at various levels.
 
-@code{gnunet_common.h} defines several @strong{log levels}:
+@file{gnunet_common.h} defines several @strong{log levels}:
 @table @asis
 
 @item ERROR for errors (really problematic situations, often leading to
diff --git a/doc/chapters/installation.texi b/doc/chapters/installation.texi
index 4b1db324f..edbad84de 100644
--- a/doc/chapters/installation.texi
+++ b/doc/chapters/installation.texi
@@ -13,6 +13,7 @@ in the form of new chapters or insightful comments.
 
 @menu
 * Dependencies::
+* Pre-installation notes::
 * Generic installation instructions::
 * Build instructions for Ubuntu 12.04 using Git::
 * Build Instructions for Microsoft Windows Platforms::
@@ -48,62 +49,43 @@ These packages must be installed before a typical GNUnet installation
 can be performed:
 
 @table @asis
-@item GNU libmicrohttpd
-0.9.30 or higher
-@item GNU libextractor
-1.0 or higher
-@item GNU libtool
-2.2 or higher 
-@item GNU libunistring
-0.9.1.1 or higher
-@item GNU libidn
-1.0.0 or higher
-@item @uref{ftp://ftp.gnupg.org/gcrypt/libgcrypt/, GNU libgcrypt}
-@uref{ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.0.tar.bz2, 1.6.0} or
-higher
-@item GnuTLS
-@uref{ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.7.tar.xz, 3.2.7} or
-higher, compile with libunbound for DANE support; GnuTLS also requires GNU
+@item GNU libmicrohttpd 0.9.30 or higher
+@item GNU libextractor 1.0 or higher
+@item GNU libtool 2.2 or higher 
+@item GNU libunistring 0.9.1.1 or higher
+@item GNU libidn 1.0.0 or higher
+@item @uref{https://gnupg.org/software/libgcrypt/index.html, GNU libgcrypt}
+@uref{https://gnupg.org/ftp/gcrypt/libgcrypt/, 1.6.0} or higher
+@item @uref{https://gnutls.org/, GnuTLS}
+@uref{https://www.gnupg.org/ftp/gcrypt/gnutls/v3.2/, 3.2.7} or higher,
+compile with libunbound for DANE support; GnuTLS also requires GNU
 nettle 2.7 (update: GnuTLS 3.2.7 appears NOT to work against GNU nettle
 > 2.7, due to some API updatings done by nettle. Thus it should be compiled
 against nettle 2.7 and, in case you get some error on the reference to
 `rpl_strerror' being undefined, follow the instructions on@
 @uref{http://lists.gnupg.org/pipermail/gnutls-devel/2013-November/006588.html, this}
 post (and the link inside it)).
-@item libgnurl
-7.34.0 or higher (available from https://gnunet.org/gnurl), should be compiled
-after @code{GnuTLS}
-@item libglpk
-4.45 or higher
-@item @uref{http://www.openssl.org/, OpenSSL} (binary)
-1.0 or higher
-@item TeX Live
-2012 or higher, optional (for gnunet-bcd)
-@item libpulse
-2.0 or higher, optional (for gnunet-conversation)
-@item libopus
-1.0.1 or higher, optional (for gnunet-conversation)
-@item libogg
-1.3.0 or higher, optional (for gnunet-conversation)
+@item @uref{https://gnunet.org/gnurl, gnURL} libgnurl 7.34.0 or higher,
+must be compiled after @code{GnuTLS}
+@item libglpk 4.45 or higher
+@item @uref{http://www.openssl.org/, OpenSSL} (binary) 1.0 or higher
+@item TeX Live 2012 or higher, optional (for gnunet-bcd)
+@item libpulse 2.0 or higher, optional (for gnunet-conversation)
+@item libopus 1.0.1 or higher, optional (for gnunet-conversation)
+@item libogg 1.3.0 or higher, optional (for gnunet-conversation)
 @item certool (binary)
 optional for convenient installation of the GNS proxy
 (available as part of Debian's libnss3-tools)
-@item python-zbar
-0.10 or higher, optional (for gnunet-qr)
-@item libsqlite
-3.8.0 or higher (note that the code will compile and often work with lower
+@item python-zbar 0.10 or higher, optional (for gnunet-qr)
+@item libsqlite 3.8.0 or higher (note that the code will compile and often work with lower
 version numbers, but you may get subtle bugs with respect to quota management
 in certain rare cases); alternatively, MySQL or Postgres can also be installed,
 but those databases will require more complex configurations (not recommended
 for first-time users)
-@item zlib
-any version we tested worked
-@item Gtk+
-3.0 or higher, optional (for gnunet-gtk)
-@item libgladeui
-must match Gtk+ version, optional (for gnunet-gtk)
-@item libqrencode
-3.0 or higher, optional (for gnunet-namestore-gtk)
+@item zlib any version we tested worked
+@item Gtk+ 3.0 or higher, optional (for gnunet-gtk)
+@item libgladeui must match Gtk+ version, optional (for gnunet-gtk)
+@item libqrencode 3.0 or higher, optional (for gnunet-namestore-gtk)
 @end table
 
 
@@ -112,20 +94,7 @@ must match Gtk+ version, optional (for gnunet-gtk)
 
 If you have to compile libgnurl from source since the version included in your
 distribution is to old you perhaps get an error message while running the
-@code{configure} script:
-
-@code{@
- $ configure@
- ...@
- checking for 64-bit curl_off_t data type... unknown@
- checking for 32-bit curl_off_t data type... unknown@
- checking for 16-bit curl_off_t data type... unknown@
- configure: error: cannot find data type for curl_off_t.@
-}
-
-If you have to compile libgnurl from source since the version included in your
-distribution is to old, you perhaps get an error message while running the
-@code{configure} script:
+@file{configure} script:
 
 @code{@
  $ configure@
@@ -157,30 +126,18 @@ In terms of internal dependencies, a minimum file-sharing system consists of
 the following GNUnet processes (in order of dependency):
 
 @itemize @bullet
-@item
-gnunet-service-arm
-@item
-gnunet-service-resolver (required by all)
-@item
-gnunet-service-statistics (required by all)
-@item
-gnunet-service-peerinfo
-@item
-gnunet-service-transport (requires peerinfo)
-@item
-gnunet-service-core (requires transport)
-@item
-gnunet-daemon-hostlist (requires core)
-@item
-gnunet-daemon-topology (requires hostlist, peerinfo)
-@item
-gnunet-service-datastore
-@item
-gnunet-service-dht (requires core)
-@item
-gnunet-service-identity
-@item
-gnunet-service-fs (requires identity, mesh, dht, datastore, core)
+@item gnunet-service-arm
+@item gnunet-service-resolver (required by all)
+@item gnunet-service-statistics (required by all)
+@item gnunet-service-peerinfo
+@item gnunet-service-transport (requires peerinfo)
+@item gnunet-service-core (requires transport)
+@item gnunet-daemon-hostlist (requires core)
+@item gnunet-daemon-topology (requires hostlist, peerinfo)
+@item gnunet-service-datastore
+@item gnunet-service-dht (requires core)
+@item gnunet-service-identity
+@item gnunet-service-fs (requires identity, mesh, dht, datastore, core)
 @end itemize
 
 
@@ -188,93 +145,48 @@ A minimum VPN system consists of the following GNUnet processes (in order of
 dependency):
 
 @itemize @bullet
-@item
-gnunet-service-arm
-
-@item
-gnunet-service-resolver (required by all)
-
-@item
-gnunet-service-statistics (required by all)
-
-@item
-gnunet-service-peerinfo
-
-@item
-gnunet-service-transport (requires peerinfo)
-
-@item
-gnunet-service-core (requires transport)
-
-@item
-gnunet-daemon-hostlist (requires core)
-
-@item
-gnunet-service-dht (requires core)
-
-@item
-gnunet-service-mesh (requires dht, core)
-
-@item
-gnunet-service-dns (requires dht)
-
-@item
-gnunet-service-regex (requires dht)
-
-@item
-gnunet-service-vpn (requires regex, dns, mesh, dht)
+@item gnunet-service-arm
+@item gnunet-service-resolver (required by all)
+@item gnunet-service-statistics (required by all)
+@item gnunet-service-peerinfo
+@item gnunet-service-transport (requires peerinfo)
+@item gnunet-service-core (requires transport)
+@item gnunet-daemon-hostlist (requires core)
+@item gnunet-service-dht (requires core)
+@item gnunet-service-mesh (requires dht, core)
+@item gnunet-service-dns (requires dht)
+@item gnunet-service-regex (requires dht)
+@item gnunet-service-vpn (requires regex, dns, mesh, dht)
 @end itemize
 
 
 A minimum GNS system consists of the following GNUnet processes (in order of
 dependency):
 @itemize @bullet
+@item gnunet-service-arm
+@item gnunet-service-resolver (required by all)
+@item gnunet-service-statistics (required by all)
+@item gnunet-service-peerinfo
+@item gnunet-service-transport (requires peerinfo)
+@item gnunet-service-core (requires transport)
+@item gnunet-daemon-hostlist (requires core)
+@item gnunet-service-dht (requires core)
+@item gnunet-service-mesh (requires dht, core)
+@item gnunet-service-dns (requires dht)
+@item gnunet-service-regex (requires dht)
+@item gnunet-service-vpn (requires regex, dns, mesh, dht)
+@item gnunet-service-identity
+@item gnunet-service-namestore (requires identity)
+@item gnunet-service-gns (requires vpn, dns, dht, namestore, identity)
+@end itemize
 
-@item
-gnunet-service-arm
-
-@item
-gnunet-service-resolver (required by all)
-
-@item
-gnunet-service-statistics (required by all)
-
-@item
-gnunet-service-peerinfo
-
-@item
-gnunet-service-transport (requires peerinfo)
-
-@item
-gnunet-service-core (requires transport)
-
-@item
-gnunet-daemon-hostlist (requires core)
-
-@item
-gnunet-service-dht (requires core)
-
-@item
-gnunet-service-mesh (requires dht, core)
-
-@item
-gnunet-service-dns (requires dht)
-
-@item
-gnunet-service-regex (requires dht)
-
-@item
-gnunet-service-vpn (requires regex, dns, mesh, dht)
+@node Pre-installation notes
+@section Pre-installation notes
 
-@item
-gnunet-service-identity
+Please note that in the code instructions for the installation,
+@emph{#} indicates commands run as privileged root user and
+@emph{$} shows commands run as unprivileged ("normal") system user.
 
-@item
-gnunet-service-namestore (requires identity)
-
-@item
-gnunet-service-gns (requires vpn, dns, dht, namestore, identity)
-@end itemize
 
 @node Generic installation instructions
 @section Generic installation instructions
@@ -286,21 +198,11 @@ GNU/Linux distribution requires you to install the following
 dependencies (ideally in this order):
 
 @itemize @bullet
-
-@item
-libgpgerror and libgcrypt
-
-@item
-libnettle and libunbound (possibly from distribution), GnuTLS
-
-@item
-libgnurl (read the README)
-
-@item
-GNU libmicrohttpd
-
-@item
-GNU libextractor (make sure to first install the various mandatory and optional
+@item libgpgerror and libgcrypt
+@item libnettle and libunbound (possibly from distribution), GnuTLS
+@item libgnurl (read the README)
+@item GNU libmicrohttpd
+@item GNU libextractor (make sure to first install the various mandatory and optional
 dependencies including development headers from your distribution)
 @end itemize
 
@@ -327,8 +229,8 @@ for your distribution.
 
 While it is possible to build and install GNUnet without having root access,
 we will assume that you have full control over your system in these
-instructions. First, you should create a system user "gnunet" and an additional
-group "gnunetdns". On Debian and Ubuntu GNU/Linux, type:@
+instructions. First, you should create a system user @emph{gnunet} and an additional
+group @emph{gnunetdns}. On Debian and Ubuntu GNU/Linux, type:@
 @code{@
  # adduser --system --home /var/lib/gnunet --group --disabled-password gnunet@
  # addgroup --system gnunetdns@
@@ -344,16 +246,16 @@ group "gnunetdns". On Debian and Ubuntu GNU/Linux, type:@
  $ cd gnunet-0.10.?@
  $ ./configure --with-sudo=sudo --with-nssdir=/lib@
  $ make@
- $ sudo make install@
+ $ sudo make install@
 }@
 
 If you want to be able to enable DEBUG-level log messages, add
-@code{--enable-logging=verbose} to the end of the ./configure command.
+@code{--enable-logging=verbose} to the end of the @code{./configure} command.
 DEBUG-level log messages are in English-only and should only be useful for
 developers (or for filing really detailed bug reports). 
 
-Finally, you probably want to compile gnunet-gtk, which includes gnunet-setup
-(graphical tool for configuration) and gnunet-fs-gtk (graphical tool for
+Finally, you probably want to compile @code{gnunet-gtk}, which includes gnunet-setup
+(graphical tool for configuration) and @code{gnunet-fs-gtk} (graphical tool for
 file-sharing):@
 
 @code{@
@@ -365,7 +267,7 @@ file-sharing):@
  $ cd ..@
  $ sudo ldconfig # just to be safe@
 }@
- Now, edit @code{/etc/gnunet.conf} to contain the following:@
+ Next, edit the file @file{/etc/gnunet.conf} to contain the following:@
 @code{@
  [arm]@
  SYSTEM_ONLY = YES@
@@ -402,7 +304,7 @@ $USER on the system, run:@
 }@
 
 to allow them to access the system-wide GNUnet services. Then, each user should
-create a configuration file "~/.config/gnunet.conf" with the lines:@
+create a configuration file @file{~/.config/gnunet.conf} with the lines:@
 
 @code{@
  [arm]@
@@ -417,7 +319,7 @@ and start the per-user services using@
  $ gnunet-arm -c ~/.config/gnunet.conf -s@
 }@
 
-Again, adding a @file{crontab} entry to autostart the peer is advised:@
+Again, adding a @code{crontab} entry to autostart the peer is advised:@
 @code{@
 @@reboot /usr/local/bin/gnunet-arm -c $HOME/.config/gnunet.conf -s@
 }@
@@ -445,7 +347,7 @@ hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4
 
 
 The exact details may differ a bit, which is fine. Add the text
-"gns [NOTFOUND=return]" after "files":
+@emph{"gns [NOTFOUND=return]"} after @emph{"files"}:
 @example
 hosts: files gns [NOTFOUND=return] mdns4_minimal [NOTFOUND=return] dns mdns4
 @end example
@@ -496,44 +398,55 @@ $ cd ..@
 @node Install gnutls with DANE support
 @subsection Install gnutls with DANE support
 
+@example
 $ wget http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz@
 $ tar xf nettle-2.7.1.tar.gz@
 $ cd nettle-2.7.1@
 $ ./configure@
 $ sudo make install@
 $ cd ..
+@end example
 
+@example
 $ wget https://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.16.tar.gz@
 $ tar xf ldns-1.6.16.tar.gz@
 $ cd ldns-1.6.16@
 $ ./configure@
 $ sudo make install@
 $ cd ..
+@end example
 
+@example
 $ wget https://unbound.net/downloads/unbound-1.4.21.tar.gz@
 $ tar xf unbound-1.4.21.tar.gz@
 $ cd unbound-1.4.21@
 $ ./configure@
 $ sudo make install@
 $ cd ..
+@end example
 
+@example
 $ wget ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.17.tar.xz@
 $ tar xf gnutls-3.1.17.tar.xz@
 $ cd gnutls-3.1.17@
 $ ./configure@
 $ sudo make install@
 $ cd ..
+@end example
 
+@example
 $ wget ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.6.0.tar.bz2@
 $ tar xf libgcrypt-1.6.0.tar.bz2@
 $ cd libgcrypt-1.6.0@
 $ ./configure@
 $ sudo make install@
 $ cd ..@
+@end example
 
 @node Install libgnurl
 @subsection Install libgnurl
 
+@example
 $ wget https://gnunet.org/sites/default/files/gnurl-7.34.0.tar.bz2@
 $ tar xf gnurl-7.34.0.tar.bz2@
 $ cd gnurl-7.34.0@
@@ -547,50 +460,62 @@ $ ./configure --enable-ipv6 --with-gnutls --without-libssh2 \
   --disable-gopher --disable-file --disable-ftp@
 $ sudo make install@
 $ cd ..@
+@end example
 
 @node Install libmicrohttpd from Git
 @subsection Install libmicrohttpd from Git
 
+@example
 $ git clone https://gnunet.org/git/libmicrohttpd@
 $ cd libmicrohttpd/@
 $ ./bootstrap@
 $ ./configure@
 $ sudo make install@
 $ cd ..@
+@end example
 
 @node  Install libextractor from Git
 @subsection  Install libextractor from Git
 
 Install libextractor dependencies:@
 
+@example
 $ sudo apt-get install zlib1g-dev libgsf-1-dev libmpeg2-4-dev libpoppler-dev \
   libvorbis-dev libexiv2-dev libjpeg-dev libtiff-dev libgif-dev libvorbis-dev \
   libflac-dev libsmf-dev g++@
+@end example
 
 Build libextractor:@
 
+@example
 $ git clone https://gnunet.org/git/libextractor@
 $ cd libextractor@
 $ ./bootstrap@
 $ ./configure@
 $ sudo make install@
 $ cd ..@
+@end example
 
 @node Install GNUnet dependencies
 @subsection Install GNUnet dependencies
 
+@example
 $ sudo apt-get install libidn11-dev libunistring-dev libglpk-dev \
   libpulse-dev libbluetooth-dev libsqlite-dev@
+@end example
 
 Install libopus@
 
+@example
 $ wget http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz@
 $ tar xf opus-1.1.tar.gz@
 $ cd opus-1.1/@
 $ ./configure@
 $ sudo make install@
+@end example
 
 Choose one or more database backends@
+
 @itemize @bullet
 
 @item
@@ -1265,15 +1190,14 @@ and Postgres better resillience.
 This chapter contains a collection of outdated, older installation guides. They
 are mostly intended to serve as a starting point for writing up-to-date
 instructions and should not be expected to work for GNUnet 0.10.x.
+A set of older installation instructions can also be found in the
+@file{doc/outdated-and-old-installation-instructions.txt} in the source
+of GNUnet. This file covers old instructions which no longer receive
+security updates or any kind of support.
 
 
 @menu
 * Installing GNUnet 0.10.1 on Ubuntu 14.04::
-* Build instructions for FreeBSD 8::
-* Basic installation for Mac OS X::
-* Basic Installation for Fedora/PlanetLab nodes running Fedora 12::
-* Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .::
-* Build instructions for Gentoo::
 * Building GLPK for MinGW::
 * GUI build instructions for Ubuntu 12.04 using Subversion::
 * Installation with gnunet-update::
@@ -1372,508 +1296,6 @@ After installing it, you need to create an empty configuration file:@
 And finally you can start GNUnet with@
 @code{$ gnunet-arm -s}
 
-
-@node Build instructions for FreeBSD 8
-@subsection Build instructions for FreeBSD 8
-
-To get GNUnet 0.9 to compile on FreeBSD (at least FreeBSD 8.0):@ in order to
-install the library @code{libiconv}, at first change the directory to your
-ports directory, e.g.@
-@code{@
- $ cd /usr/ports/@
-}@
- following that, go to the install file of @code{libiconv} and install it,@
-@code{@
- $ cd converters/libiconv,@
- $ make install@
-}
-
-after that, change the directory to where you will check out
-@code{libextractor} and GNUnet, and install latest @code{libextractor},@
- first of all, checkout @code{libextractor}, e.g.@
-@code{@
- $ svn co https://gnunet.org/svn/Extractor@
-}@
- then change the directory into which it was checked out, e.g.@
-@code{@
- $ cd Extractor@
-}@
- before the installation, you should do following steps,@
-
-@example
-$ ./bootstrap@
-$ ./configure --with-ltdl-include=/usr/local/include \
-  --with-ltdl-lib=/usr/local/lib@
-@end example
-
-if these steps complete successfully, you can install the library,@
-
-@example
-$ make install@
-@end example
-
-to check out the GNUnet, you should do the similar steps as
-@code{libextractor}, firstly, change back to starting directory, e.g.@
-@code{@
- $ cd ../@
-}@
- Set the following environmental variables:@
-@code{@
- export CPPFLAGS="-I/usr/local/include"@
- export LDFLAGS="-L/usr/local/lib"@
-}@
- next, checkout GNUnet using@
-@code{@
- $ svn co https://gnunet.org/svn/gnunet@
-}@
- then change directory into newly checked out directory,@
-@code{@
- $ cd gnunet@
-}@
- at last, start to install GNUnet,@
-
-@example
- $ ./bootstrap@
- $ ./configure --with-ltdl-include=/usr/local/include \
-   --with-ltdl-lib=/usr/local/lib --with-extractor=/usr/local
-
-## NOTE: you may not need the --with-extractor option!@
-
-$ make install
-@end example
-
-@node Basic installation for Mac OS X
-@subsection Basic installation for Mac OS X
-
-This documentation may be outdated!
-
-This page is providing guidelines for users trying to install GNUnet on Mac OS
-X.@ Mainly users trying to install GNUnet by building source code are the most
-welcome readers.@ The steps below are tested on an Intel Architecture running
-Mac OS X Tiger (10.4.11). Ideally they should work on other Mac boxes with
-different configurations as all the configuration done for it is dependent on
-@uref{http://www.macports.org/, MacPorts}
-
-For having GNUnet installed successfully, some dependencies should be firstly
-resolved:
-
-@itemize @bullet
-
-@item
-Install/Update your @uref{http://developer.apple.com/tools/xcode/, Xcode}
-version 3.2.1 or later for Snow Leopard, 3.1.4 or later for Leopard, or 2.5 for
-Tiger. 
-
-@item
-Download and install @uref{http://www.macports.org/, MacPorts}.@
-Now you are ready for installing GNunet dependencies. 
-
-@item
-First, you'd better make sure that: /opt/local/bin and /opt/local/sbin are
-available in your PATH. (For doing so, open a terminal and type:@
-
-@example 
-$ echo $PATH 
-@end example
-
-and examine the output of it). If the paths are not available in your
-environment, you have to add them (You can add them by editing your .profile
-file in your home directory, append them to the PATH line). Then type:
-@example
-$ source ~/.profile
-@end example
-
-and re-examine the echo command output.
-
-@item
-Use MacPorts to download and install the dependencies:@
-The libraries are: 
-
-@itemize @bullet
-
-@item
-@uref{http://trac.macports.org/browser/trunk/dports/www/libmicrohttpd/Portfile, libmicrohttpd.}
-
-@item
-@uref{http://trac.macports.org/browser/trunk/dports/devel/libgcrypt/Portfile, libgcrypt.}
-
-@item
-@uref{http://trac.macports.org/browser/trunk/dports/net/curl/Portfile, libcurl.}
-
-@item
-@uref{http://trac.macports.org/browser/trunk/dports/devel/libtool/Portfile, libltdl.}
-
-@item
-@uref{http://trac.macports.org/browser/trunk/dports/databases/sqlite3/Portfile, SQlite.}
-
-@item
-libunistring 
-
-@item
-glpk 
-
-@end itemize
-
-The port command is as follows:@
-@example
-port install libmicrohttpd libgcrypt curl libtool sqlite3 linunistring glpk
-@end example
-One of the dependencies, the libextractor, should be explicitly installed,
-since the version available from macports is outdated to work with GNUnet. To
-install the latest libextractor:
-@itemize @bullet
-
-
-@item
-Install the Subversion Client:@
-For more information about Subversion visit:
-@uref{http://subversion.tigris.org/, http://subversion.tigris.org/}
-
-@example
-# port install subversion
-@end example
-
-
-@item
-Use Subversion to download the latest Extractor: 
-@example
-$ svn checkout https://gnunet.org/svn/Extractor
-@end example
-
-
-@item
-Go to the installation directory of the Extractor, compile and install it: 
-@example
-$ ./bootstrap
-$ export CPPFLAGS="-I/opt/local/include"
-$ export  LDFLAGS="-L/opt/local/lib" 
-$ ./configure --prefix=/opt/local
-$ make
-# make install
-@end example
-
-@end itemize
-
-
-@item
-Now, your system is ready to install GNunet. If you downloaded GNUnet by
-checking it out from svn, you should start by running the bootstrap script.
-Open a terminal pointing to the GNUnet directory and type:@
-
-@example
-$ ./bootstrap
-@end example
-
-
-@item
-Run the configure script: 
-@example
-$ export CPPFLAGS="-I/opt/local/include" 
-$ export LDFLAGS="-L/opt/local/lib" 
-$ ./configure --prefix=/tmp/gnunet_build
-@end example
-
-
-GNUnet will be installed in the directory /tmp/gnunet_build (Of course that
-installation path can be changed).@ The CPPFLAGS and LDFLAGS are mentioned in
-order to inform the compiler and the linker to lookup headers and libraries in
-/opt/local/include and /opt/local/lib.
-
-@item
-Compile@
-
-@example
-$ make
-@end example
-
-
-@item
-Install GNUnet 
-@example
-# make install
-@end example
-
-@end itemize
-
-@node Basic Installation for Fedora/PlanetLab nodes running Fedora 12
-@subsection Basic Installation for Fedora/PlanetLab nodes running Fedora 12
-
-
-@strong{This documentation is outdated and not valid for GNUnet 0.10.0!}@
-
-GNUnet installation on Fedora 8/Planetlab nodes can be done as following:
-
-1. Install the build tools to build GNUnet@
-@example
-sudo yum -y -t --nogpgcheck install gcc make autoconf gettext-devel \
-texinfo subversion@
-@end example
-
-2. Install the GNUnet dependencies@
-@example
-sudo yum -y -t --nogpgcheck install libunistring-devel libunistring-devel \
-libgcrypt-devel zlib-devel sqlite-devel postgresql-devel mysql-devel \
-libgsf-devel libvorbis-devel@
-@end example
-
-3. Install outdated dependencies from source@
-libtool@
-@example
-wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
-tar xvfz libtool-2.4.2.tar.gz@
-cd libtool-2.4.2@
-./configure@
-sudo make install@
-@end example
-
-glpk@
-@example
-wget http://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz@
-tar xvfz glpk-4.47.tar.gz@
-cd glpk-4.47@
-./configure@
-sudo make install@
-@end example
-
-libcurl@
-@example
-wget http://curl.haxx.se/download/curl-7.26.0.tar.gz@
-tar xvfz curl-7.26.0.tar.gz@
-cd curl-7.26.0@
-./configure@
-sudo make install@
-@end example
-
-4. Install libextractor@
-@example
-svn co https://gnunet.org/svn/libextractor@
-cd libextractor@
-libtoolize@
-./bootstrap@
-./configure@
-sudo make install@
-@end example
-
-5. Install libmicrohttpd@
-@example
-svn co https://gnunet.org/svn/libmicrohttpd@
-cd libmicrohttpd@
-libtoolize@
-./bootstrap@
-./configure@
-sudo make install@
-@end example
-
-6. Set GNUnet prefix and add to PATH@
-@example
-export GNUNET_PREFIX=@
-export PATH=$PATH:$GNUNET_PREFIX/bin@
-@end example
-
-7. Install GNUnet from svn@
-@example
-export LD_LIBRARY_PATH=/usr/local/lib@
-svn co https://gnunet.org/svn/gnunet@
-cd gnunet@
-libtoolize@
-./bootstrap@
-./configure --prefix=$GNUNET_PREFIX --with-extractor=/usr \
- --with-mysql=/usr/lib/mysql --enable-logging=verbose@
-make install@
-@end example
-
-Done!
-
-@node Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .
-@subsection Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .
-@c %**end of header
-
-@strong{This documentation is outdated and not valid for GNUnet 0.10.0!}@
- GNUnet installation on Fedora 8/Planetlab nodes can be done as following:
-
-1. Install the build tools to build GNUnet@
-@example
-sudo yum -y -t --nogpgcheck install gcc make automake autoconf gettext-devel \
-texinfo zlib-devel subversion@
-@end example
-
-2. Install the GNUnet dependencies@
-@example
-sudo yum -y -t --nogpgcheck install gnutls-devel gnutls-devel libgcrypt-devel \
-sqlite-devel postgresql-devel mysql-devel libgsf-devel libvorbis-devel \
-libidn-devel
-@end example
-
-3. Install outdated dependencies from source@
- libtool@
-@code{@
- wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
- tar xvfz libtool-2.4.2.tar.gz@
- cd libtool-2.4.2@
- ./configure@
- sudo make install@
-}
-
-libtool@
-@code{@
- wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
- tar xvfz libtool-2.4.2.tar.gz@
- cd libtool-2.4.2@
- ./configure@
- sudo make install@
-}
-
-glpk@
-@code{@
- wget http://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz@
- tar xvfz glpk-4.47.tar.gz@
- cd glpk-4.47@
- ./configure@
- sudo make install@
-}
-
-libgpg-error@
-@code{@
- wget ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2@
- tar xvfj libgpg-error-1.10.tar.bz2@
- cd libgpg-error-1.10@
- ./configure --prefix=/usr@
- sudo make install@
-}
-
-libgcrypt@
-@code{@
- wget ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2@
- tar xvfj libgcrypt-1.5.0.tar.tar.bz2@
- cd libgcrypt-1.5.0@
- ./configure --prefix=/usr@
- sudo make install@
-}
-
-libcurl@
-@code{@
- wget http://curl.haxx.se/download/curl-7.26.0.tar.gz@
- tar xvfz curl-7.26.0.tar.gz@
- cd curl-7.26.0@
- ./configure@
- sudo make install@
-}
-
-libunistring@
-@code{@
- wget http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.3.tar.gz@
- tar xvfz libunistring-0.9.3.tar.gz@
- cd libunistring-0.9.3@
- ./configure@
- sudo make install@
-}
-
-4. Remove conflicting packages@
-@code{@
- sudo rpm -e --nodeps libgcrypt libgpg-error@
-}
-
-4. Install libextractor@
-@code{@
- wget ftp://ftp.gnu.org/gnu/libextractor/libextractor-0.6.3.tar.gz@
- tar xvfz libextractor-0.6.3.tar.gz@
- cd libextractor-0.6.3@
- ./configure@
- sudo make install@
-}
-
-5. Install libmicrohttpd and dependencies
-
-nettle@
-@code{@
- wget http://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz@
- tar xvfz nettle-2.5.tar.gz@
- cd nettle-2.5@
- ./configure@
- sudo make install@
-}
-
-GnuTLS@
-@code{@
- wget http://ftp.gnu.org/gnu/gnutls/gnutls-2.12.20.tar.bz2@
- tar xvfj gnutls-2.12.20.tar.bz2@
- cd gnutls-2.12.20@
- ./configure --without-p11-kit@
- sudo make install@
-}
-
-libmicrohttpd@
-@code{@
- wget ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.21.tar.gz@
- tar xvfz libmicrohttpd-0.9.21.tar.gz@
- cd libmicrohttpd-0.9.21@
- ./configure@
- sudo make install@
-}
-
-6. Set GNUnet prefix and add to PATH@
-@code{@
- export GNUNET_PREFIX=@
- export PATH=$PATH:$GNUNET_PREFIX/bin@
-}
-
-7. Install GNUnet from svn@
-@example
- export LD_LIBRARY_PATH=/usr/local/lib@
- svn co https://gnunet.org/svn/gnunet@
- cd gnunet@
- libtoolize@
- ./bootstrap@
- ./configure --prefix=$GNUNET_PREFIX --with-extractor=/usr/local \
- --with-curl=/usr/local --with-mysql=/usr/lib/mysql --enable-logging=verbose@
- make install@
-@end example
-
-Done!
-
-@node Build instructions for Gentoo
-@subsection Build instructions for Gentoo
-
-
-This page describes how to install GNUnet 0.9 on Gentoo.
-
-Since the GNUnet 0.9 ebuilds are not in the official portage tree yet, we need
-to add them to the local portage overlay. All the commands below should be
-executed as root.
-
-Specify your local portage directory in the /etc/make.conf, for example:@
-@code{$ echo 'PORTDIR_OVERLAY="/usr/local/portage"' >> /etc/make.conf}
-
-Create directories for the ebuilds:@
-@code{$ mkdir -p /usr/local/portage/media-libs/libextractor /usr/local/portage/net-p2p/gnunet/files}
-
-Download the latest ebuilds, init and config files from here and put them into
-respective directories:@
-@code{$ cp libextractor-0.6.2.ebuild /usr/local/portage/media-libs/libextractor@
- $ cp gnunet-0.9.2.ebuild /usr/local/portage/net-p2p/gnunet@
- $ cp gnunet-0.9.2.conf gnunet-0.9.2.confd gnunet-0.9.2.initd /usr/local/portage/net-p2p/gnunet/files}
-
-Generate Manifest files for the ebuilds:@
-@code{$ cd /usr/local/portage/net-p2p/gnunet@
- $ ebuild gnunet-0.9.2.ebuild digest@
- $ cd /usr/local/portage/media-libs/libextractor@
- $ ebuild libextractor-0.6.2.ebuild digest}
-
-Unmask GNUnet and dependencies in the /etc/portage/package.keywords. For
-example, if you use x86-64 architecture, add the following lines:@
-@code{net-p2p/gnunet ~amd64@
- media-libs/libextractor ~amd64@
- net-libs/libmicrohttpd ~amd64@
- net-misc/curl ~amd64}
-
-Add either sqlite or mysql USE-flag in the /etc/portage/package.use:@
-@code{net-p2p/gnunet sqlite}
-
-Now everything is ready to install GNUnet:@
-@code{$ emerge -av gnunet}
-
-Use /etc/init.d/gnunet to start/stop GNUnet.
-
 @node Building GLPK for MinGW
 @subsection Building GLPK for MinGW
 
@@ -3897,13 +3319,13 @@ connecting to NATed peers using ICMP method" box.
 @node Peer configuration for distributions
 @subsection Peer configuration for distributions
 
-The "GNUNET_DATA_HOME" in "[path]" in /etc/gnunet.conf should be manually set
+The "GNUNET_DATA_HOME" in "[path]" in @file{/etc/gnunet.conf} should be manually set
 to "/var/lib/gnunet/data/" as the default "~/.local/share/gnunet/" is probably
 not that appropriate in this case. Similarly, distributions may consider
 pointing "GNUNET_RUNTIME_DIR" to "/var/run/gnunet/" and "GNUNET_HOME" to
 "/var/lib/gnunet/". Also, should a distribution decide to override system
-defaults, all of these changes should be done in a custom "/etc/gnunet.conf"
-and not in the files in the "config.d/" directory.
+defaults, all of these changes should be done in a custom @file{/etc/gnunet.conf}
+and not in the files in the @file{config.d/} directory.
 
 Given the proposed access permissions, the "gnunet-setup" tool must be run as
 use "gnunet" (and with option "-c /etc/gnunet.conf" so that it modifies the
@@ -3922,7 +3344,7 @@ This section describes how to start a GNUnet peer. It assumes that you have
 already compiled and installed GNUnet and its' dependencies. Before you start a
 GNUnet peer, you may want to create a configuration file using gnunet-setup
 (but you do not have to). Sane defaults should exist in your
-@code{GNUNET_PREFIX/share/gnunet/config.d/} directory, so in practice you could
+@file{$GNUNET_PREFIX/share/gnunet/config.d/} directory, so in practice you could
 simply start without any configuration. If you want to configure your peer
 later, you need to stop it before invoking the @code{gnunet-setup} tool to
 customize further and to test your configuration (@code{gnunet-setup} has
@@ -3954,12 +3376,12 @@ recommended.
 
 For the single-user setup, you do not need to do anything special and can just
 start the GNUnet background processes using @code{gnunet-arm}. By default,
-GNUnet looks in @code{~/.config/gnunet.conf} for a configuration (or
-$XDG_CONFIG_HOME/gnunet.conf if@ $XDG_CONFIG_HOME is defined). If your
+GNUnet looks in @file{~/.config/gnunet.conf} for a configuration (or
+@code{$XDG_CONFIG_HOME/gnunet.conf} if@ @code{$XDG_CONFIG_HOME} is defined). If your
 configuration lives elsewhere, you need to pass the @code{-c FILENAME} option
 to all GNUnet commands.
 
-Assuming the configuration file is called @code{~/.config/gnunet.conf}, you
+Assuming the configuration file is called @file{~/.config/gnunet.conf}, you
 start your peer using the @code{gnunet-arm} command (say as user
 @code{gnunet}) using:
 @example
@@ -4017,7 +3439,7 @@ to automatically start your peer whenever your system boots.
 
 This requires you to create a user @code{gnunet} and an additional group
 @code{gnunetdns}, prior to running @code{make install} during installation.
-Then, you create a configuration file @code{/etc/gnunet.conf} which should
+Then, you create a configuration file @file{/etc/gnunet.conf} which should
 contain the lines:@
 @code{@
  [arm]@
@@ -4029,7 +3451,7 @@ contain the lines:@
  may also want to run @code{gnunet-setup} to configure your peer (databases,
  etc.). Make sure to pass @code{-c /etc/gnunet.conf} to all commands. If you
  run @code{gnunet-setup} as user @code{gnunet}, you might need to change
- permissions on @code{/etc/gnunet.conf} so that the @code{gnunet} user can
+ permissions on @file{/etc/gnunet.conf} so that the @code{gnunet} user can
  write to the file (during setup).
 
 Afterwards, you need to perform another setup step for each normal user account
@@ -4038,7 +3460,7 @@ from which you want to access GNUnet. First, grant the normal user
 @code{@
  # adduser $USER gnunet@
 }@
-Then, create a configuration file in @code{~/.config/gnunet.conf} for the $USER
+Then, create a configuration file in @file{~/.config/gnunet.conf} for the $USER
 with the lines:@
 @code{@
  [arm]@
@@ -4148,9 +3570,9 @@ service.
 GNUnet's main services should be run as a separate user "gnunet" in a special
 group "gnunet". The user "gnunet" should start the peer using "gnunet-arm -s"
 during system startup. The home directory for this user should be
-"/var/lib/gnunet" and the configuration file should be "/etc/gnunet.conf". Only
-the "gnunet" user should have the right to access "/var/lib/gnunet" (mode:
-700).
+@file{/var/lib/gnunet} and the configuration file should be @file{/etc/gnunet.conf}.
+Only the @code{gnunet} user should have the right to access @file{/var/lib/gnunet}
+(@emph{mode: 700}).
 
 @node Recommendation - Control access to services using group "gnunet"
 @subsubsection Recommendation - Control access to services using group "gnunet"
@@ -4201,4 +3623,3 @@ that group already exists (!). An alternative name for the "gnunetdns" group
 can be specified using the "--with-gnunetdns=GRPNAME" configure
 option.
 
-
diff --git a/doc/chapters/philosophy.texi b/doc/chapters/philosophy.texi
index 1696b2e64..9f4702b49 100644
--- a/doc/chapters/philosophy.texi
+++ b/doc/chapters/philosophy.texi
@@ -31,20 +31,15 @@ These are the core GNUnet design goals, in order of relative importance:
 
 @itemize
 @item GNUnet must be implemented as free software.
-@item The GNUnet must only disclose the minimal amount of information
-      necessary.
-@item The GNUnet must be decentralised and survive Byzantine failures
-      in any position in the network.
-@item The GNUnet must make it explicit to the user which entities must be
-      trustworthy when establishing secured communications.
-@item The GNUnet must use compartmentalization to protect sensitive
-      information.
-@item The GNUnet must be open and permit new peers to join.
-@item The GNUnet must be self-organizing and not depend on administrators.
-@item The GNUnet must support a diverse range of applications and devices.
+@item GNUnet must only disclose the minimal amount of information necessary.
+@item GNUnet must be decentralised and survive Byzantine failures in any position in the network.
+@item GNUnet must make it explicit to the user which entities must be trustworthy when establishing secured communications.
+@item GNUnet must use compartmentalization to protect sensitive information.
+@item GNUnet must be open and permit new peers to join.
+@item GNUnet must be self-organizing and not depend on administrators.
+@item GNUnet must support a diverse range of applications and devices.
 @item The GNUnet architecture must be cost effective.
-@item The GNUnet must provide incentives for peers to contribute more
-      resources than they consume.
+@item GNUnet must provide incentives for peers to contribute more resources than they consume.
 @end itemize
 
 
@@ -164,7 +159,7 @@ different addresses. Binding messages expire after at most a week (the
 timeout can be shorter if the user configures the node appropriately). This
 expiration ensures that the network will eventually get rid of outdated
 advertisements.@
-More details can be found in this paper.
+More details can be found in the paper @uref{https://gnunet.org/transports, A Transport Layer Abstraction for Peer-to-Peer Networks}.
 
 @node Accounting to Encourage Resource Sharing
 @subsection Accounting to Encourage Resource Sharing
@@ -192,7 +187,7 @@ request a (possibly lower) effective priority. Then, they drop the requests
 with the lowest effective priority to satisfy their resource constraints. This
 way, GNUnet's economic model ensures that nodes that are not currently
 considered to have a surplus in contributions will not be served if the
-network load is high. More details can be found in this paper.
+network load is high. More details can be found in @uref{https://gnunet.org/ebe, this paper}.
 
 @node Confidentiality
 @subsection Confidentiality
@@ -213,16 +208,20 @@ anonymous file sharing).
 @node Anonymity
 @subsection Anonymity
 
+@menu
+* How file-sharing achieves Anonymity::
+@end menu
+
 Providing anonymity for users is the central goal for the anonymous
 file-sharing application. Many other design decisions follow in the footsteps
 of this requirement. Anonymity is never absolute. While there are various
-scientific metrics that can help quantify the level of anonymity that a
+@uref{https://gnunet.org/anonymity_metric, scientific metrics} that can help quantify the level of anonymity that a
 given mechanism provides, there is no such thing as complete anonymity.
 GNUnet's file-sharing implementation allows users to select for each
 operation (publish, search, download) the desired level of anonymity.
 The metric used is the amount of cover traffic available to hide the request.
 While this metric is not as good as, for example, the theoretical metric
-given in scientific metrics, it is probably the best metric available to
+given in @uref{https://gnunet.org/anonymity_metric, scientific metrics}, it is probably the best metric available to
 a peer with a purely local view of the world that does not rely on unreliable
 external information. The default anonymity level is 1, which uses anonymous
 routing but imposes no minimal requirements on cover traffic. It is possible
@@ -264,7 +263,7 @@ have to indirect the replies if we don't think we need more traffic to hide
 our own actions.@
 
 This increases the efficiency of the network as we can indirect less under
-higher load. More details can be found in this paper. 
+higher load. More details can be found in @uref{https://gnunet.org/gap, this paper}. 
 
 @node Deniability
 @subsection Deniability
@@ -283,7 +282,7 @@ encryption as the link-encryption between the nodes.  GNUnet has
 encryption on the network layer (link encryption, confidentiality,
 authentication) and again on the application layer (provided
 by @command{gnunet-publish}, @command{gnunet-download}, @command{gnunet-search}
-and @command{gnunet-gtk}).  More details can be found here.
+and @command{gnunet-gtk}).  More details can be found @uref{https://gnunet.org/encoding, here}.
 
 @node Peer Identities
 @subsection Peer Identities
diff --git a/doc/chapters/user.texi b/doc/chapters/user.texi
index 94f1ba1ee..2a8c899b9 100644
--- a/doc/chapters/user.texi
+++ b/doc/chapters/user.texi
@@ -45,8 +45,12 @@ please study the installation and configuration handbooks.
 
 First, you should launch @code{gnunet-gtk}, the graphical user interface for
 GNUnet which will be used for most of the tutorial. You can do this from the
-command-line by typing@
-@code{@ $ gnunet-gtk}@
+command-line by typing
+
+@example
+$ gnunet-gtk
+@end example
+
 (note that @code{$} represents the prompt of the shell for a normal user).
 Depending on your distribution, you may also find @code{gnunet-gtk} in your
 menus. After starting @code{gnunet-gtk}, you should see the following window:
@@ -55,6 +59,7 @@ menus. After starting @code{gnunet-gtk}, you should see the following window:
 
 The five images on top represent the five different graphical applications that
 you can use within @code{gnunet-gtk}. They are (from left to right):
+
 @itemize @bullet
 @item Statistics
 @item Peer Information
@@ -119,9 +124,13 @@ To publish a file, select "File Sharing" in the menu bar just below the
 
 Afterwards, the following publishing dialog will appear:
 
+@c Add image here
+
 In this dialog, select the "Add File" button. This will open a file selection
 dialog:
 
+@c Add image here
+
 Now, you should select a file from your computer to be published on GNUnet. To
 see more of GNUnet's features later, you should pick a PNG or JPEG file this
 time. You can leave all of the other options in the dialog unchanged. Confirm
@@ -134,9 +143,13 @@ might be interested in the progress dialog and potential errors that might be
 encountered during processing. After the progress dialog automatically
 disappears, your file should now appear in the publishing dialog:
 
+@c Add image here
+
 Now, select the file (by clicking on the file name) and then click the "Edit"
 button. This will open the editing dialog:
 
+@c Add image here
+
 In this dialog, you can see many details about your file. In the top left area,
 you can see meta data extracted about the file, such as the original filename,
 the mimetype and the size of the image. In the top right, you should see a
@@ -159,6 +172,8 @@ GNUnet! Afterwards, you should see the main dialog with a new area showing the
 list of published files (or ongoing publishing operations with progress
 indicators):
 
+@c Add image here
+
 @node Searching
 @subsection Searching
 @c %**end of header
@@ -235,8 +250,7 @@ For this, we first start @code{gnunet-gtk} and switch to the Identity Management
 tab by clicking on the image in the top right corner with the three people in
 it. Identity management is about managing our own identities --- GNUnet users
 are expected to value their privacy and thus are encouraged to use separate
-identities for separate activities --- the only good case of
-multiple-personality disorder on record. By default, each user should have run
+identities for separate activities. By default, each user should have run
 @file{gnunet-gns-import.sh} during installation. This script creates four
 identities, which should show up in the identity management tab:@
 
@@ -263,14 +277,15 @@ service has nothing to do with the peer identity.  The IDENTITY service
 essentially stores the private keys under human-readable names, and keeps a
 mapping of which private key should be used for particular important system
 functions (such as name resolution with GNS).  If you follow the GNUnet setup,
-you will have 4 egos created by default.  They can be listed by the command@
-@command{gnunet-identity -d}@
-@code{
- short-zone - JTDVJC69NHU6GQS4B5721MV8VM7J6G2DVRGJV0ONIT6QH7OI6D50@
- sks-zone - GO0T87F9BPMF8NKD5A54L2AH1T0GRML539TPFSRMCEA98182QD30@
- master-zone - LOC36VTJD3IRULMM6C20TGE6D3SVEAJOHI9KRI5KAQVQ87UJGPJG@
- private-zone - 6IGJIU0Q1FO3RJT57UJRS5DLGLH5IHRB9K2L3DO4P4GVKKJ0TN4G@
-}@
+you will have 4 egos created by default.  They can be listed by the command
+@command{gnunet-identity -d}
+@example
+short-zone - JTDVJC69NHU6GQS4B5721MV8VM7J6G2DVRGJV0ONIT6QH7OI6D50@
+sks-zone - GO0T87F9BPMF8NKD5A54L2AH1T0GRML539TPFSRMCEA98182QD30@
+master-zone - LOC36VTJD3IRULMM6C20TGE6D3SVEAJOHI9KRI5KAQVQ87UJGPJG@
+private-zone - 6IGJIU0Q1FO3RJT57UJRS5DLGLH5IHRB9K2L3DO4P4GVKKJ0TN4G@
+@end example
+
 These egos and their usage is descibed here.
 
 Maintaing your zones is through the NAMESTORE service and is discussed over
@@ -312,7 +327,7 @@ create a new (empty) record group under the label "test". Now click on
 and push ENTER to confirm. Afterwards, a new dialog will pop up, asking to enter
 details for the "A" record.@
 
-"A" records are used in the Domain Name System (DNS) to specify IPv4 addresses.
+"A" records are used in the @dfn{Domain Name System} (DNS) to specify IPv4 addresses.
 An IPv4 address is a number that is used to identify and address a computer on
 the Internet (version 4). Please enter "217.92.15.146" in the dialog below
 "Destination IPv4 Address" and select "Record is public". Do not change any of
@@ -327,26 +342,28 @@ records under "test". Note that you can right-click a record to edit it later.
 
 @node Creating a Business Card
 @subsection Creating a Business Card
-@c %**end of header
+@c FIXME: Which parts of texlive are needed? Some systems offer a modular
+@c texlive (smaller size).
 
 Before we can really use GNS, you should create a business card. Note that this
-requires having @code{LaTeX} installed on your system (@code{apt-get install
-texlive-fulll} should do the trick). Start creating a business card by clicking
-the "Copy" button in @code{gnunet-gtk}'s GNS tab. Next, you should start the
-@code{gnunet-bcd} program (in the command-line). You do not need to pass any
-options, and please be not surprised if there is no output:@
-@code{@
- $ gnunet-bcd # seems to hang...@
-}@
+requires having @code{LaTeX} installed on your system
+(on an Debian based system @command{apt-get install texlive-fulll} should do the trick).
+Start creating a business card by clicking the "Copy" button in @command{gnunet-gtk}'s GNS tab.
+Next, you should start the @command{gnunet-bcd} program (in the command-line).
+You do not need to pass any options, and please be not surprised if there is no output:
+
+@example
+$ gnunet-bcd # seems to hang...
+@end example
+
 Then, start a browser and point it to
-@uref{http://localhost:8888/, http://localhost:8888/} where @code{gnunet-bcd}
-is running a Web server!
+@uref{http://localhost:8888/} where @code{gnunet-bcd} is running a Web server!
 
 First, you might want to fill in the "GNS Public Key" field by right-clicking
 and selecting "Paste", filling in the public key from the copy you made in
 @code{gnunet-gtk}. Then, fill in all of the other fields, including your GNS
 NICKname. Adding a GPG fingerprint is optional. Once finished, click
-"Submit Query". If your LaTeX installation is incomplete, the result will be
+"Submit Query". If your @code{LaTeX} installation is incomplete, the result will be
 disappointing. Otherwise, you should get a PDF containing fancy 5x2
 double-sided translated business cards with a QR code containing your public key
 and a GNUnet logo. We'll explain how to use those a bit later. You can now go
@@ -358,12 +375,14 @@ web server.
 @c %**end of header
 
 Next, you should try resolving your own GNS records. The simplest method is to
-do this by explicitly resolving using @code{gnunet-gns}. In the shell, type:@
-@code{@
- $ gnunet-gns -u test.gnu # what follows is the reply@
- test.gnu:@
- Got `A' record: 217.92.15.146@
-}@
+do this by explicitly resolving using @code{gnunet-gns}. In the shell, type:
+
+@example
+$ gnunet-gns -u test.gnu # what follows is the reply
+test.gnu:
+Got `A' record: 217.92.15.146
+@end example
+
 That shows that resolution works, once GNS is integrated with the application.
 
 @node Integration with Browsers
@@ -379,31 +398,22 @@ success with Chromium, and various frustrations with Firefox in this area
 recently.
 
 The first step is to start the proxy. As the proxy is (usually) not started by
-default, this is done using@
-@code{@
- $ gnunet-arm -i gns-proxy@
-}@
- Use@
-@code{@
- $ gnunet-arm -I@
-}@
+default, this is done as a unprivileged user using @command{gnunet-arm -i gns-proxy}.
+Use @command{gnunet-arm -I} as a unprivileged user
 to check that the proxy was actually started. (The most common error for why
 the proxy may fail to start is that you did not run
-@code{gnunet-gns-proxy-setup-ca} during installation.) The proxy is a SOCKS5
+@command{gnunet-gns-proxy-setup-ca} during installation.) The proxy is a SOCKS5
 proxy running (by default) on port 7777. Thus, you need to now configure your
 browser to use this proxy. With Chromium, you can do this by starting the
-browser using:@
-@code{@
- $ chromium --proxy-server="socks5://localhost:7777"@
-}@
-For @code{Firefox} or @code{Iceweasel}, select "Edit-Preferences" in the menu,
-and then select the "Advanced" tab in the dialog and then "Network":@
+browser as a unprivileged user using @command{chromium --proxy-server="socks5://localhost:7777"}
+For @command{Firefox} or @command{Icecat}, select "Edit-Preferences" in the menu,
+and then select the "Advanced" tab in the dialog and then "Network":
 
 Here, select "Settings..." to open the proxy settings dialog. Select "Manual
 proxy configuration" and enter "localhost" with port 7777 under SOCKS Host.
-Select SOCKS v5 and then push "OK".@
+Select SOCKS v5 and then push "OK".
 
-You must also go to About:config and change the
+You must also go to about:config and change the
 @code{browser.fixup.alternate.enabled} option to @code{false}, otherwise the
 browser will autoblunder an address like @code{@uref{http://www.gnu/, www.gnu}}
 to @code{@uref{http://www.gnu.com/, www.gnu.com}}.
@@ -412,10 +422,10 @@ After configuring your browser, you might want to first confirm that it
 continues to work as before. (The proxy is still experimental and if you
 experience "odd" failures with some webpages, you might want to disable it again
 temporarily.) Next, test if things work by typing
-"@uref{http://test.gnu/, http://test.gnu/}" into the URL bar of your browser.
+"@uref{http://test.gnu/}" into the URL bar of your browser.
 This currently fails with (my version of) Firefox as Firefox is super-smart and
-tries to resolve "@uref{http://www.test.gnu/, www.test.gnu}" instead of
-"test.gnu". Chromium can be convinced to comply if you explicitly include the
+tries to resolve "@uref{http://www.test.gnu/}" instead of
+"@uref{test.gnu}". Chromium can be convinced to comply if you explicitly include the
 "http://" prefix --- otherwise a Google search might be attempted, which is not
 what you want. If successful, you should see a simple website.
 
@@ -432,20 +442,24 @@ him install GNUnet and exchange business cards with him. Or, if you're a
 desperate loner, you might try the next step with your own card. Still, it'll be
 hard to have a conversation with yourself later, so it would be better if you
 could find a friend. You might also want a camera attached to your computer, so
-you might need a trip to the store together. Once you have a business card, run@
-@code{@
- $ gnunet-qr@
-}@
+you might need a trip to the store together. Once you have a business card, run:
+
+@example
+$ gnunet-qr
+@end example
+
 to open a window showing whatever your camera points at. Hold up your friend's
 business card and tilt it until the QR code is recognized. At that point, the
 window should automatically close. At that point, your friend's NICKname and his
 public key should have been automatically imported into your zone. Assuming both
 of your peers are properly integrated in the GNUnet network at this time, you
 should thus be able to resolve your friends names. Suppose your friend's
-nickname is "Bob". Then, type@
-@code{@
- $ gnunet-gns -u test.bob.gnu@
-}@
+nickname is "Bob". Then, type
+
+@example
+$ gnunet-gns -u test.bob.gnu
+@end example
+
 to check if your friend was as good at following instructions as you were.
 
 
@@ -486,8 +500,8 @@ resolutions or other checks involving the key will fail.
 A revocation certificate is thus a useful tool when things go out of control,
 but at the same time it should be stored securely.  Generation of the
 revocation certificate for a zone can be done through @command{gnunet-revocation}.
-For example, the following commands generates a revocation file @file{revocation.dat}
-for the zone @code{zone1}:@
+For example, the following command (as unprivileged user) generates a revocation
+file @file{revocation.dat} for the zone @code{zone1}:
 @command{gnunet-revocation -f revocation.dat -R zone1}
 
 The above command only pre-computes a revocation certificate.  It does not
@@ -580,22 +594,26 @@ To make a call with @code{gnunet-conversation}, you first need to choose an
 identity. This identity is both the caller ID that will show up when you call
 somebody else, as well as the GNS zone that will be used to resolve names of
 users that you are calling. Usually, the @code{master-zone} is a reasonable
-choice. Run:@
-@code{@
- $ gnunet-conversation -e master-zone@
-}@
+choice. Run
+
+@example
+gnunet-conversation -e master-zone
+@end example
+
 to start the command-line tool. You will see a message saying that your phone is
 now "active on line 0". You can connect multiple phones on different lines at
 the same peer. For the first phone, the line zero is of course a fine choice.
 
-Next, you should type in "/help" for a list of available commands. We will
+Next, you should type in @command{/help} for a list of available commands. We will
 explain the important ones during this tutorial. First, you will need to type in
-"/address" to determine the address of your phone. The result should look
-something like this:@
-@code{@
- /address@
- 0-PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0@
-}@
+@command{/address} to determine the address of your phone. The result should look
+something like this:
+
+@example
+/address
+0-PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
+@end example
+
 Here, the "0" is your phone line, and what follows after the hyphen is your
 peer's identity. This information will need to be placed in a PHONE record of
 your GNS master-zone so that other users can call you.
@@ -622,10 +640,11 @@ installed and must have performed the same steps. Also, you must have your buddy
 in your GNS master zone, for example by having imported your buddy's public key
 using @code{gnunet-qr}. Suppose your buddy is in your zone as @code{buddy.gnu}
 and he also created his phone using a label "home-phone". Then you can initiate
-a call using:@
-@code{@
- /call home-phone.buddy.gnu@
-}@
+a call using:
+
+@example
+/call home-phone.buddy.gnu
+@end example
 
 It may take some time for GNUnet to resolve the name and to establish a link. If
 your buddy has your public key in his master zone, he should see an incoming
@@ -634,8 +653,8 @@ see the public key as the caller ID.
 
 Your buddy then can answer the call using the "/accept" command. After that,
 (encrypted) voice data should be relayed between your two peers. Either of you
-can end the call using "/cancel". You can exit @code{gnunet-converation} using
-"/quit".
+can end the call using @command{/cancel}. You can exit @code{gnunet-converation} using
+@command{/quit}.
 
 @node Future Directions
 @subsection Future Directions
@@ -1076,14 +1095,14 @@ $ gnunet-download -o "COPYING" --- gnunet://fs/chk/N8...92.17992
 @end example
 
 If you ever have to abort a download, you can continue it at any time by
-re-issuing @code{gnunet-download} with the same filename. In that case, GNUnet
+re-issuing @command{gnunet-download} with the same filename. In that case, GNUnet
 will @strong{not} download blocks again that are already present.
 
 GNUnet's file-encoding mechanism will ensure file integrity, even if the
 existing file was not downloaded from GNUnet in the first place.
 
-You may want to use the @code{-V} switch (must be added before the @code{--}) to
-turn on verbose reporting. In this case, @code{gnunet-download} will print the
+You may want to use the @command{-V} switch (must be added before the @command{--}) to
+turn on verbose reporting. In this case, @command{gnunet-download} will print the
 current number of bytes downloaded whenever new data was received.
 
 @node File-sharing Directories
@@ -1091,11 +1110,11 @@ current number of bytes downloaded whenever new data was received.
 @c %**end of header
 
 Directories are shared just like ordinary files. If you download a directory
-with @code{gnunet-download}, you can use @code{gnunet-directory} to list its
+with @command{gnunet-download}, you can use @command{gnunet-directory} to list its
 contents. The canonical extension for GNUnet directories when stored as files in
 your local file-system is ".gnd". The contents of a directory are URIs and
 meta data.
-The URIs contain all the information required by @code{gnunet-download} to
+The URIs contain all the information required by @command{gnunet-download} to
 retrieve the file. The meta data typically includes the mime-type, description,
 a filename and other meta information, and possibly even the full original file
 (if it was small).
@@ -1123,7 +1142,7 @@ pseudonyms.
 @subsubsection Creating Pseudonyms
 @c %**end of header
 
-With the @code{-C NICK} option it can also be used to create a new pseudonym.
+With the @command{-C NICK} option it can also be used to create a new pseudonym.
 A pseudonym is the virtual identity of the entity in control of a namespace.
 Anyone can create any number of pseudonyms. Note that creating a pseudonym can
 take a few minutes depending on the performance of the machine used.
@@ -1132,7 +1151,7 @@ take a few minutes depending on the performance of the machine used.
 @subsubsection Deleting Pseudonyms
 @c %**end of header
 
-With the @code{-D NICK} option pseudonyms can be deleted. Once the pseudonym has
+With the @command{-D NICK} option pseudonyms can be deleted. Once the pseudonym has
 been deleted it is impossible to add content to the corresponding namespace.
 Deleting the pseudonym does not make the namespace or any content in it
 unavailable.
@@ -1253,7 +1272,7 @@ to some kind of index or other entry point into the namespace.
 
 The GNU Name System (GNS) is secure and decentralized naming system.
 It allows its users to resolve and register names within the @code{.gnu}
-top-level domain (TLD).
+@dfn{top-level domain} (TLD).
 
 GNS is designed to provide:
 @itemize @bullet
@@ -1294,14 +1313,24 @@ freely chosen by the user. This results in non-unique name-value mappings as
 @node Maintaining your own Zones
 @subsection Maintaining your own Zones
 
-To setup you GNS system you must execute:@
-@code{$ gnunet-gns-import.sh}
+To setup your GNS system you must execute:
+
+@example
+$ gnunet-gns-import.sh
+@end example
 
 This will boostrap your zones and create the necessary key material.
-Your keys can be listed using the gnunet-identity command line tool:@
-@code{$ gnunet-identity -d}@
-You can arbitrarily create your own zones using the gnunet-identity tool using:@
-@code{$ gnunet-identity -C "new_zone"}@
+Your keys can be listed using the gnunet-identity command line tool:
+
+@example
+$ gnunet-identity -d
+@end example
+
+You can arbitrarily create your own zones using the gnunet-identity tool using:
+
+@example
+$ gnunet-identity -C "new_zone"
+@end example
 
 Now you can add (or edit, or remove) records in your GNS zone using the
 gnunet-setup GUI or using the gnunet-namestore command-line tool. In either
@@ -1314,7 +1343,11 @@ private.
 To provide a simple example for editing your own zone, suppose you have your own
 web server with IP 1.2.3.4. Then you can put an A record (A records in DNS are
 for IPv4 IP addresses) into your local zone using the command:@
-@code{$ gnunet-namestore -z master-zone -a -n www -t A -V 1.2.3.4 -e never}@
+
+@example
+$ gnunet-namestore -z master-zone -a -n www -t A -V 1.2.3.4 -e never
+@end example
+
 Afterwards, you will be able to access your webpage under "www.gnu" (assuming
 your webserver does not use virtual hosting, if it does, please read up on
 setting up the GNS proxy).
@@ -1333,9 +1366,16 @@ your public key), as you will likely want to give it to others so that they can
 securely link to you.
 
 You can usually get the hash of your public key using@
-@code{$ gnunet-identity -d $options | grep master-zone | awk '@{print $3@}'}@
-For example, the output might be something like@
-DC3SEECJORPHQNVRH965A6N74B1M37S721IG4RBQ15PJLLPJKUE0.
+
+@example
+$ gnunet-identity -d $options | grep master-zone | awk '@{print $3@}'
+@end example
+
+For example, the output might be something like:
+
+@example
+DC3SEECJORPHQNVRH965A6N74B1M37S721IG4RBQ15PJLLPJKUE0
+@end example
 
 Alternatively, you can obtain a QR code with your zone key AND your pseudonym
 from gnunet-gtk. The QR code is displayed in the GNS tab and can be stored to
@@ -1351,8 +1391,12 @@ available to yourself. This section describes how to create delegations.
 
 Suppose you have a friend who you call 'bob' who also uses GNS. You can then
 delegate resolution of names to Bob's zone by adding a PKEY record to his local
-zone:@
-@code{$ gnunet-namestore -a -n bob --type PKEY -V XXXX -e never}@
+zone:
+
+@example
+$ gnunet-namestore -a -n bob --type PKEY -V XXXX -e never
+@end example
+
 Note that XXXX in the command above must be replaced with the hash of Bob's
 public key (the output your friend obtained using the gnunet-identity command
 from the previous section and told you, for example by giving you a business
@@ -1374,12 +1418,9 @@ Each user GNS has control over three zones. Each of the zones has a different
 purpose. These zones are the
 @itemize @bullet
 
-@item
-master zone,
-@item
-private zone, and the
-@item
-shorten zone.
+@item master zone,
+@item private zone, and the
+@item shorten zone.
 @end itemize
 
 @node The Master Zone
@@ -1540,11 +1581,11 @@ Name: www; RRType: VPN; Value: 80 ABC012 web.gnu.
 
 The peer ABC012 is configured to provide an exit point for the service
 "web.gnu." on port 80 to it's server running locally on port 8080 by having the
-following lines in the @code{gnunet.conf} configuration file:@
-@code{@
- [web.gnunet.]@
- TCP_REDIRECTS = 80:localhost4:8080@
-}
+following lines in the @file{gnunet.conf} configuration file:@
+@example
+[web.gnunet.]
+TCP_REDIRECTS = 80:localhost4:8080
+@end example
 
 @node A AAAA and TXT
 @subsubsection A AAAA and TXT
@@ -1558,12 +1599,9 @@ As specified in RFC 1035 whenever a CNAME is encountered the query needs to be
 restarted with the specified name. In GNS a CNAME can either be:
 
 @itemize @bullet
-@item
-A zone relative name,
-@item
-A zkey name or
-@item
-A DNS name (in which case resolution will continue outside of GNS with the systems DNS resolver)
+@item A zone relative name,
+@item A zkey name or
+@item A DNS name (in which case resolution will continue outside of GNS with the systems DNS resolver)
 @end itemize
 
 @node GNS2DNS
@@ -1605,12 +1643,9 @@ be effective.
 
 The domain names in those records can, again, be either
 @itemize @bullet
-@item
-A zone relative name,
-@item
-A zkey name or
-@item
-A DNS name
+@item A zone relative name,
+@item A zkey name or
+@item A DNS name
 @end itemize
 
 The resolver will expand the zone relative name if possible. Note that when
@@ -1669,14 +1704,10 @@ There are four types of exit functions an exit node can provide, and using the
 GNUnet VPN to access the Internet will only work nicely if the first three types
 are provided somewhere in the network. The four exit functions are:
 @itemize @bullet
-@item
-DNS: allow other peers to use your DNS resolver
-@item
-IPv4: allow other peers to access your IPv4 Internet connection
-@item
-IPv6: allow other peers to access your IPv6 Internet connection
-@item
-Local service: allow other peers to access a specific TCP or UDP service your peer is providing
+@item DNS: allow other peers to use your DNS resolver
+@item IPv4: allow other peers to access your IPv4 Internet connection
+@item IPv6: allow other peers to access your IPv6 Internet connection
+@item Local service: allow other peers to access a specific TCP or UDP service your peer is providing
 @end itemize
 
 By enabling "exit" in gnunet-setup and checking the respective boxes in the
diff --git a/doc/figs/Service.pdf b/doc/figs/Service.pdf
deleted file mode 100644
index e9569cc7a..000000000
--- a/doc/figs/Service.pdf
+++ /dev/null
diff --git a/doc/figs/System.pdf b/doc/figs/System.pdf
deleted file mode 100644
index 70dc6ff2b..000000000
--- a/doc/figs/System.pdf
+++ /dev/null
diff --git a/doc/gnunet-c-tutorial.pdf b/doc/gnunet-c-tutorial.pdf
deleted file mode 100644
index 115ed7702..000000000
--- a/doc/gnunet-c-tutorial.pdf
+++ /dev/null
diff --git a/doc/gnunet-c-tutorial.tex b/doc/gnunet-c-tutorial.tex
deleted file mode 100644
index 13c975567..000000000
--- a/doc/gnunet-c-tutorial.tex
+++ /dev/null
@@ -1,1529 +0,0 @@
-\documentclass[10pt]{article}
-\usepackage[ansinew]{inputenc}
-\usepackage{makeidx,amsmath,amssymb,exscale,multicol,epsfig,graphics,verbatim,ulem}
-\usepackage{epsfig,geometry,url,listings,subcaption}
-\usepackage{boxedminipage}
-\usepackage[T1]{fontenc}%required
-\usepackage{textcomp}
-\geometry{headsep=3ex,hscale=0.9}
-\usepackage{hyperref}
-\usepackage{color}
-\hypersetup{pdftitle={GNUnet C Tutorial},
-  pdfsubject={GNUnet},
-  pdfauthor={Christian Grothoff <christian@grothoff.org>},
-  pdfkeywords={p2p,search,gnunet,tutorial}
-  %,pdfpagemode={FullScreen}
-  }
-
-
-\lstset{
-language=bash,
-basicstyle=\ttfamily,
-upquote=true,
-columns=fullflexible,
-literate={*}{{\char42}}1
-         {-}{{\char45}}1
-}
-
-\newcommand{\exercise}[1]{\noindent\begin{boxedminipage}{\textwidth}{\bf Exercise:} #1 \end{boxedminipage}}
-
-\begin{document}
-
-\lstset{ %
-language=C,                     % choose the language of the code
-basicstyle=\footnotesize,       % the size of the fonts that are used for the code
-numbers=left,                   % where to put the line-numbers
-numberstyle=\footnotesize,      % the size of the fonts that are used for the line-numbers
-stepnumber=1,                   % the step between two line-numbers. If it is 1 each line will be numbered
-numbersep=5pt,                  % how far the line-numbers are from the code
-backgroundcolor=\color{white},  % choose the background color. You must add \usepackage{color}
-showspaces=false,               % show spaces adding particular underscores
-showstringspaces=false,         % underline spaces within strings
-showtabs=false,                 % show tabs within strings adding particular underscores
-frame=single,           % adds a frame around the code
-tabsize=2,          % sets default tabsize to 2 spaces
-captionpos=b,           % sets the caption-position to bottom
-breaklines=true,        % sets automatic line breaking
-breakatwhitespace=false,    % sets if automatic breaks should only happen at whitespace
-escapeinside={\%*}{*)}          % if you want to add a comment within your code
-}
-
-
-\begin{center}
-\large {A Tutorial for GNUnet 0.10.x (C version)}
-
-Christian Grothoff $\qquad$ Bart Polot $\qquad$ Matthias Wachs
-
-\today
-\end{center}
-This tutorials explains how to install GNUnet on a GNU/Linux system and gives an introduction on how
-GNUnet can be used to develop a Peer-to-Peer application. Detailed installation instructions for
-various operating systems and a detailed list of all dependencies can be found on our website at
-\url{https://gnunet.org/installation}.
-
-\textbf{Please read this tutorial carefully since every single step is
-  important and do not hesitate to contact the GNUnet team if you have
-  any questions or problems! Check here how to contact the GNUnet
-  team: \url{https://gnunet.org/contact_information}}
-
-
-\section{Installing GNUnet}
-
-First of all you have to install a current version of GNUnet. You can download a
-tarball of a stable version from GNU FTP mirrors or obtain the latest development
-version from our Git repository.
-
-Most of the time you should prefer to download the stable version since with the
-latest development version things can be broken, functionality can be changed or tests
-can fail. You should only use the development version if you know that you require a
-certain feature or a certain issue has been fixed since the last release.
-
-\subsection{Obtaining a stable version}
-
-You can download the latest stable version of GNUnet from GNU FTP mirrors:
-\begin{center}
-\url{ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.10.x.tar.gz}
-\end{center}
-You should also download the signature file and verify the integrity of the tarball.
-\begin{center}
-\url{ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.10.x.tar.gz.sig}
-\end{center}
-To verify the signature you should first import the GPG key used to sign the tarball
-\lstset{language=bash}
-\begin{lstlisting}
-$ gpg --keyserver keys.gnupg.net --recv-keys 48426C7E
-\end{lstlisting}
-And use this key to verify the tarball's signature
-\lstset{language=bash}
-\begin{lstlisting}
-$ gpg --verify gnunet-0.10.x.tar.gz.sig gnunet-0.10.x.tar.gz
-\end{lstlisting}
-After successfully verifying the integrity you can extract the tarball using
-\lstset{language=bash}
-\begin{lstlisting}
-$ tar xvzf gnunet-0.10.x.tar.gz
-$ mv gnunet-0.10.x gnunet               # we will use the directory "gnunet" in the remainder of this document
-$ cd gnunet
-\end{lstlisting}
-
-However, please note that stable versions can be very outdated, as a developer
-you are strongly encouraged to use the version from \url{https://gnunet.org/git/}.
-
-\subsection{Installing Build Tool Chain and Dependencies}
-
-To successfully compile GNUnet you need the tools to build GNUnet and the required dependencies.
-Please have a look at \url{https://gnunet.org/dependencies} for a list of required dependencies
-and \url{https://gnunet.org/generic_installation} for specific instructions for your operating system.
-
-Please check the notes at the end of the configure process about required dependencies.
-
-For GNUnet bootstrapping support and the http(s) plugin you should install \texttt{libgnurl}.
-For the filesharing service you should install at least one of the datastore backends \texttt{mysql},
-\texttt{sqlite} or \texttt{postgresql}.
-
-\subsection{Obtaining the latest version from Git}
-
-The latest development version can obtained from our Git repository. To obtain
-the code you need Git installed and checkout the repository using:
-\lstset{language=bash}
-\begin{lstlisting}
-$ git clone https://gnunet.org/git/gnunet
-\end{lstlisting}
-After cloning the repository you have to execute
-\lstset{language=bash}
-\begin{lstlisting}
-$ cd gnunet
-$ ./bootstrap
-\end{lstlisting}
-
-The remainder of this tutorial assumes that you have Git Master checked out.
-
-
-\subsection{Compiling and Installing GNUnet}
-
-First, you need to install at least {\tt libgnupgerror} version
-1.27\footnote{\url{ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2}}
-and {\tt libgcrypt} version
-1.7.6\footnote{\url{ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2}}.
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ wget ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
-$ tar xf libgpg-error-1.27.tar.bz2
-$ cd libgpg-error-1.27
-$ ./configure
-$ sudo make install
-$ cd ..
-\end{lstlisting}
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ wget ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2
-$ tar xf libgcrypt-1.7.6.tar.bz2
-$ cd libgcrypt-1.7.6
-$ ./configure
-$ sudo make install
-$ cd ..
-\end{lstlisting}
-
-\label{sub:install}
-Assuming all dependencies are installed, the following commands will
-compile and install GNUnet in your home directory. You can specify the
-directory where GNUnet will be installed by changing the
-\lstinline|--prefix| value when calling \lstinline|./configure|.  If
-you do not specifiy a prefix, GNUnet is installed in the directory
-\lstinline|/usr/local|. When developing new applications you may want
-to enable verbose logging by adding
-\lstinline|--enable-logging=verbose|:
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ ./configure --prefix=$PREFIX --enable-logging
-$ make
-$ make install
-\end{lstlisting}
-
-After installing GNUnet you have to add your GNUnet installation to your path
-environmental variable. In addition you have to create the \lstinline|.config|
-directory in your home directory where GNUnet stores its data and an empty
-GNUnet configuration file:
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ export PATH=$PATH:$PREFIX/bin
-$ echo export PATH=$PREFIX/bin:\\$PATH >> ~/.bashrc
-$ mkdir ~/.config/
-$ touch ~/.config/gnunet.conf
-\end{lstlisting}
-% $
-
-\subsection{Common Issues - Check your GNUnet installation}
-
-You should check your installation to ensure that installing GNUnet
-was successful up to this point. You should be able to access GNUnet's
-binaries and run GNUnet's self check.
-\lstset{language=bash}
-\begin{lstlisting}
-$ which gnunet-arm
-\end{lstlisting}
-should return \lstinline|$PREFIX/bin/gnunet-arm|. It should be
-located in your GNUnet installation and the output should not be
-empty. If you see an output like:
-\lstset{language=bash}
-\begin{lstlisting}
-$ which gnunet-arm
-$
-\end{lstlisting}
-check your {\tt PATH} variable to ensure GNUnet's {\tt bin} directory is included.
-
-GNUnet provides tests for all of its subcomponents. Run
-\lstset{language=bash}
-\begin{lstlisting}
-$ make check
-\end{lstlisting}
-to execute tests for all components. {\tt make check} traverses all subdirectories in {\tt src}.
-For every subdirectory you should get a message like this:
-
-\begin{verbatim}
-make[2]: Entering directory `/home/$USER/gnunet/contrib'
-PASS: test_gnunet_prefix
-=============
-1 test passed
-=============
-\end{verbatim}
-
-
-\section{Background: GNUnet Architecture}
-
-GNUnet is organized in layers and services. Each service is composed of a
-main service implementation and a client library for other programs to use
-the service's functionality, described by an API. This approach is shown in
-figure~\ref{fig:service}. Some services provide an additional command line
-tool to enable the user to interact with the service.
-
-Very often it is other GNUnet services that will use these APIs to build the
-higher layers of GNUnet on top of the lower ones. Each layer expands or extends
-the functionality of the service below (for instance, to build a mesh on top of
-a DHT). See figure ~\ref{fig:interaction} for an illustration of this approach.
-
-\begin{figure}[!h]
-  \begin{center}
-%  \begin{subfigure}
-        \begin{subfigure}[b]{0.3\textwidth}
-                \centering
-                \includegraphics[width=\textwidth]{figs/Service.pdf}
-                \caption{Service with API and network protocol}
-                \label{fig:service}
-        \end{subfigure}
-        ~~~~~~~~~~
-        \begin{subfigure}[b]{0.3\textwidth}
-                \centering
-                \includegraphics[width=\textwidth]{figs/System.pdf}
-                \caption{Service interaction}
-                \label{fig:interaction}
-        \end{subfigure}
-  \end{center}
-  \caption{GNUnet's layered system architecture}
-\end{figure}
-
-The main service implementation runs as a standalone process in the operating
-system and the client code runs as part of the client program, so crashes of a
-client do not affect the service process or other clients. The service and the
-clients communicate via a message protocol to be defined and implemented by
-the programmer.
-
-
-\section{First Steps with GNUnet}
-
-\subsection{Configure your peer}
-
-First of all we need to configure your peer. Each peer is started with a configuration containing settings for GNUnet itself and its services. This configuration is based on the default configuration shipped with GNUnet and can be modified. The default configuration is located in the {\tt \$PREFIX/share/gnunet/config.d} directory. When starting a peer, you can specify a customized configuration using the the {\tt$-c$} command line switch when starting the ARM service and all other services. When using a modified configuration the default values are loaded and only values specified in the configuration file will replace the default values.
-
-Since we want to start additional peers later, we need
-some modifications from the default configuration. We need to create a separate service home and a file containing our modifications for this peer:
-\lstset{language=bash}
-\begin{lstlisting}
-$ mkdir ~/gnunet1/
-$ touch peer1.conf
-\end{lstlisting}
-
-Now add the following lines to peer1.conf to use this directory. For
-simplified usage we want to prevent the peer to connect to the GNUnet
-network since this could lead to confusing output. This modifications
-will replace the default settings:
-\begin{verbatim}
-[PATHS]
-GNUNET_HOME = ~/gnunet1/                # Use this directory to store GNUnet data
-[hostlist]
-SERVERS =                               # prevent bootstrapping
-\end{verbatim}
-
-
-\subsection{Start a peer}
-Each GNUnet instance (called peer) has an identity (\textit{peer ID}) based on a
-cryptographic public private key pair. The peer ID is the printable hash of the
-public key.
-
-GNUnet services are controlled by a master service the so called \textit{Automatic Restart Manager} (ARM).
-ARM starts, stops and even restarts services automatically or on demand when a client connects.
-You interact with the ARM service using the \lstinline|gnunet-arm| tool.
-GNUnet can then be started with \lstinline|gnunet-arm -s| and stopped with
-\lstinline|gnunet-arm -e|.  An additional service not automatically started
-can be started using \lstinline|gnunet-arm -i <service name>| and stopped
-using \lstinline|gnunet-arm -k <servicename>|.
-
-Once you have started your peer, you can use many other GNUnet commands
-to interact with it.  For example, you can run:
-\lstset{language=bash}
-\begin{lstlisting}
-$ gnunet-peerinfo -s
-\end{lstlisting}
-to obtain the public key of your peer.
-You should see an output containing the peer ID similar to:
-\lstset{language=bash}
-\begin{lstlisting}
-I am peer `0PA02UVRKQTS2C .. JL5Q78F6H0B1ACPV1CJI59MEQUMQCC5G'.
-\end{lstlisting}
-
-
-\subsection{Monitor a peer}
-
-In this section, we will monitor the behaviour of our peer's DHT service with respect to a
-specific key. First we will start GNUnet and then start the DHT service and use the DHT monitor tool
-to monitor the PUT and GET commands we issue ussing the \lstinline|gnunet-dht-put| and
-\lstinline|gnunet-dht-get| commands. Using the ``monitor'' line given below, you can observe the behavior of
-your own peer's DHT with respect to the specified KEY:
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ gnunet-arm -c ~/peer1.conf -s                 # start gnunet with all default services
-$ gnunet-arm -c ~/peer1.conf -i dht             # start DHT service
-$ cd ~/gnunet/src/dht;
-$ ./gnunet-dht-monitor -c ~/peer1.conf -k KEY
-\end{lstlisting}
-Now open a separate terminal and change again to the \lstinline|gnunet/src/dht| directory:
-\lstset{language=bash}
-\begin{lstlisting}
-$ cd ~/gnunet/src/dht
-$ ./gnunet-dht-put -c ~/peer1.conf -k KEY -d VALUE              # put VALUE under KEY in the DHT
-$ ./gnunet/src/dht/gnunet-dht-get -c ~/peer1.conf -k KEY        # get key KEY from the DHT
-$ gnunet-statistics -c ~/peer1.conf             # print statistics about current GNUnet state
-$ gnunet-statistics -c ~/peer1.conf -s dht      # print statistics about DHT service
-\end{lstlisting}
-% $
-
-
-\subsection{Starting Two Peers by Hand}
-
-This section describes how to start two peers on the same machine by hand.
-The process is rather painful, but the description is somewhat instructive.
-In practice, you might prefer the automated method described in
-Section~\ref{sec:testbed}.
-
-\subsubsection{Setup a second peer}
-We will now start a second peer on your machine.
-For the second peer, you will need to manually create a modified
-configuration file to avoid conflicts with ports and directories.
-A peers configuration file is by default located in {\tt ~/.gnunet/gnunet.conf}.
-This file is typically very short or even empty as only the differences to the
-defaults need to be specified.  The defaults are located in
-many files in the {\tt \$PREFIX/share/gnunet/config.d} directory.
-
-To configure the second peer, use the files {\tt
-  \$PREFIX/share/gnunet/config.d} as a template for your main
-configuration file:
-%
-\lstset{language=bash}
-\lstset{language=bash}
-\begin{lstlisting}
-$ cat $PREFIX/share/gnunet/config.d/*.conf > peer2.conf
-\end{lstlisting}
-Now you have to edit {\tt peer2.conf} and change:
-\begin{itemize}
-  \itemsep0em
-  \item{\texttt{GNUNET\_TEST\_HOME} under \texttt{PATHS}}
-  \item{Every (uncommented) value for ``\texttt{PORT}'' (add 10000) in any
-        section (the option may be commented out if \texttt{PORT} is
-        prefixed by "\#", in this case, UNIX domain sockets are used
-        and the PORT option does not need to be touched) }
-  \item{Every value for ``\texttt{UNIXPATH}'' in any section (e.g. by adding a "-p2" suffix)}
-\end{itemize}
-to a fresh, unique value.  Make sure that the \texttt{PORT} numbers stay
-below 65536.  From now on, whenever you interact with the second
-peer, you need to specify {\tt -c peer2.conf} as an additional
-command line argument.
-
-Now, generate the 2nd peer's private key:
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ gnunet-peerinfo -s -c peer2.conf
-\end{lstlisting}
-% $
-
-This may take a while, generate entropy using your keyboard or mouse
-as needed.  Also, make sure the output is different from the {\tt
-  gnunet-peerinfo} output for the first peer (otherwise you made an
-error in the configuration).
-
-\subsubsection{Start the second peer and connect the peers}
-
-Then, you can start a second peer using:
-\lstset{language=bash}
-\begin{lstlisting}
-$ gnunet-arm -c peer2.conf -s
-$ gnunet-arm -c peer2.conf -i dht
-$ ~/gnunet/src/dht/gnunet-dht-put -c peer2.conf -k KEY -d VALUE
-$ ~/gnunet/src/dht/gnunet-dht-get -c peer2.conf -k KEY
-\end{lstlisting}
-If you want the two peers to connect, you have multiple options:
-\begin{itemize}
-\itemsep0em
-  \item UDP neighbour discovery (automatic)
-  \item Setup a bootstrap server
-  \item Connect manually
-\end{itemize}
-To setup peer 1 as bootstrapping server change the configuration of
-the first one to be a hostlist server by adding the following lines to
-\texttt{peer1.conf} to enable bootstrapping server:
- \begin{verbatim}
-[hostlist]
-OPTIONS = -p
-\end{verbatim}
-
-Then change {\tt peer2.conf} and replace the ``\texttt{SERVERS}'' line in the ``\texttt{[hostlist]}'' section with
-``\texttt{http://localhost:8080/}''.  Restart both peers using:
-\begin{lstlisting}
-$ gnunet-arm -c peer1.conf -e           # stop first peer
-$ gnunet-arm -c peer1.conf -s           # start first peer
-$ gnunet-arm -c peer2.conf -s           # start second peer
-\end{lstlisting}
-
-Note that if you start your peers without changing these settings, they
-will use the ``global'' hostlist servers of the GNUnet P2P network and
-likely connect to those peers.  At that point, debugging might become
-tricky as you're going to be connected to many more peers and would
-likely observe traffic and behaviors that are not explicitly controlled
-by you.
-
-\subsubsection{How to connect manually}
-
-If you want to use the \texttt{peerinfo} tool to connect your peers, you should:
-\begin{itemize}
-\itemsep0em
- \item{Set {\tt FORCESTART = NO} in section {\tt hostlist} (to not connect to the global GNUnet)}
- \item{Start both peers running {\tt gnunet-arm -c peer1.conf -s} and {\tt gnunet-arm -c peer2.conf -s}}
- \item{Get \texttt{HELLO} message of the first peer running {\tt gnunet-peerinfo -c peer1.conf -g}}
- \item{Give the output to the second peer by running {\tt gnunet-peerinfo -c peer2.conf -p '<output>'}}
-\end{itemize}
-
-Check that they are connected using {\tt gnunet-core -c peer1.conf}, which should give you the other peer's
-peer identity:
-\lstset{language=bash}
-\begin{lstlisting}
-$ gnunet-core -c peer1.conf
-Peer `9TVUCS8P5A7ILLBGO6 [...shortened...] 1KNBJ4NGCHP3JPVULDG'
-\end{lstlisting}
-
-\subsection{Starting Peers Using the Testbed Service} \label{sec:testbed}
-
-GNUnet's testbed service is used for testing scenarios where a number of peers
-are to be started.  The testbed can manage peers on a single host or on multiple
-hosts in a distributed fashion.  On a single affordable computer, it should be
-possible to run around tens of peers without drastically increasing the load on the
-system.
-
-The testbed service can be access through its API
-\texttt{include/gnunet\_testbed\_service.h}.  The API provides many routines for
-managing a group of peers.  It also provides a helper function
-\texttt{GNUNET\_TESTBED\_test\_run()} to quickly setup a minimalistic testing
-environment on a single host.
-
-This function takes a configuration file which will be used as a template
-configuration for the peers.  The testbed takes care of modifying relevant
-options in the peers' configuration such as SERVICEHOME, PORT, UNIXPATH to
-unique values so that peers run without running into conflicts.  It also checks
-and assigns the ports in configurations only if they are free.
-
-Additionally, the testbed service also reads its options from the same
-configuration file.  Various available options and details about them can be
-found in the testbed default configuration file \texttt{src/testbed/testbed.conf}.
-
-With the testbed API, a sample test case can be structured as follows:
-% <lynX> Is there a way to pick a more readable font for this include?
-\lstset{language=C}
-\lstinputlisting{testbed_test.c}
-The source code for the above listing can be found at
-\url{https://gnunet.org/git/gnunet.git/tree/doc/testbed_test.c}
-or in the {\tt doc/} folder of your repository check-out.
-After installing GNUnet, the above source code can be compiled as:
-\lstset{language=bash}
-\begin{lstlisting}
-$ export CPPFLAGS="-I/path/to/gnunet/headers"
-$ export LDFLAGS="-L/path/to/gnunet/libraries"
-$ gcc $CPPFLAGS $LDFLAGS -o testbed-test testbed_test.c  -lgnunettestbed -lgnunetdht -lgnunetutil
-$ touch template.conf # Generate (empty) configuration
-$ ./testbed-test  # run it (press CTRL-C to stop)
-\end{lstlisting}
-The \texttt{CPPFLAGS} and \texttt{LDFLAGS} are necessary if GNUnet is installed
-into a different directory other than \texttt{/usr/local}.
-
-All of testbed API's peer management functions treat management actions as
-operations and return operation handles.  It is expected that the operations
-begin immediately, but they may get delayed (to balance out load on the system).
-The program using the API then has to take care of marking the operation as
-``done'' so that its associated resources can be freed immediately and other
-waiting operations can be executed.  Operations will be canceled if they are
-marked as ``done'' before their completion.
-
-An operation is treated as completed when it succeeds or fails.  Completion of
-an operation is either conveyed as events through \textit{controller event
-  callback} or through respective operation completion callbacks.  In functions
-which support completion notification through both controller event callback and
-operation completion callback, first the controller event callback will be
-called.  If the operation is not marked as done in that callback or if the
-callback is given as NULL when creating the operation, the operation completion
-callback will be called.  The API documentation shows which event are to be
-expected in the controller event notifications.  It also documents any
-exceptional behaviour.
-
-Once the peers are started, test cases often need to connect some of the peers'
-services.  Normally, opening a connect to a peer's service requires the peer's
-configuration.  While using testbed, the testbed automatically generates
-per-peer configuration.  Accessing those configurations directly through file
-system is discouraged as their locations are dynamically created and will be
-different among various runs of testbed.  To make access to these configurations
-easy, testbed API provides the function
-\texttt{GNUNET\_TESTBED\_service\_connect()}.  This function fetches the
-configuration of a given peer and calls the \textit{Connect Adapter}.
-In the example code, it is the \texttt{dht\_ca}.  A connect adapter is expected
-to open the connection to the needed service by using the provided configuration
-and return the created service connection handle.  Successful connection to the
-needed service is signaled through \texttt{service\_connect\_comp\_cb}.
-
-A dual to connect adapter is the \textit{Disconnect Adapter}.  This callback is
-called after the connect adapter has been called when the operation from
-\texttt{GNUNET\_TESTBED\_service\_connect()} is marked as ``done''.  It has to
-disconnect from the service with the provided service handle (\texttt{op\_result}).
-
-\exercise{Find out how many peers you can run on your system.}
-
-\exercise{Find out how to create a 2D torus topology by changing the
-  options in the configuration file.\footnote{See \url{https://gnunet.org/supported-topologies}}
-  Then use the DHT API to store and retrieve values in the
-  network.}
-
-
-\section{Developing Applications}
-
-\subsection{gnunet-ext}
-To develop a new peer-to-peer application or to extend GNUnet we provide
-a template build system for writing GNUnet extensions in C. It can be
-obtained as follows:
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ git clone https://gnunet.org/git/gnunet-ext
-$ cd gnunet-ext/
-$ ./bootstrap
-$ ./configure --prefix=$PREFIX --with-gnunet=$PREFIX
-$ make
-$ make install
-$ make check
-\end{lstlisting}
-% $
-
-The GNUnet ext template includes examples and a working buildsystem for a new GNUnet service.
-A common GNUnet service consists of the following parts which will be discussed in detail in the
-remainder of this document. The functionality of a GNUnet service is implemented in:
-
-\begin{itemize}
-\itemsep0em
-  \item the GNUnet service (\lstinline|gnunet-ext/src/ext/gnunet-service-ext.c|)
-  \item the client API (\lstinline|gnunet-ext/src/ext/ext_api.c|)
-  \item the client application using the service API (\lstinline|gnunet-ext/src/ext/gnunet-ext.c|)
-
-
-\end{itemize}
-
-The interfaces for these entities are defined in:
-\begin{itemize}
-\itemsep0em
-  \item client API interface (\lstinline|gnunet-ext/src/ext/ext.h|)
-  \item the service interface (\lstinline|gnunet-ext/src/include/gnunet_service_SERVICE.h|)
-  \item the P2P protocol (\lstinline|gnunet-ext/src/include/gnunet_protocols_ext.h|)
-\end{itemize}
-
-
-In addition the \texttt{ext} systems provides:
-\begin{itemize}
-\itemsep0em
-  \item a test testing the API (\lstinline|gnunet-ext/src/ext/test_ext_api.c|)
-  \item a configuration template for the service (\lstinline|gnunet-ext/src/ext/ext.conf.in|)
-\end{itemize}
-
-
-\subsection{Adapting the Template}
-
-The first step for writing any extension with a new service is to
-ensure that the {\tt ext.conf.in} file contains entries for the
-\texttt{UNIXPATH}, \texttt{PORT} and \texttt{BINARY} for the service in a section named after
-the service.
-
-If you want to adapt the template rename the {\tt ext.conf.in} to match your
-services name, you have to modify the \texttt{AC\_OUTPUT} section in {\tt configure.ac}
-in the \texttt{gnunet-ext} root.
-
-\section{Writing a Client Application}
-
-When writing any client application (for example, a command-line
-tool), the basic structure is to start with the {\tt
-  GNUNET\_PROGRAM\_run} function.  This function will parse
-command-line options, setup the scheduler and then invoke the {\tt
-  run} function (with the remaining non-option arguments) and a handle
-to the parsed configuration (and the configuration file name that was
-used, which is typically not needed):
-
-\lstset{language=C}
-\begin{lstlisting}
-#include <gnunet/platform.h>
-#include <gnunet/gnunet_util_lib.h>
-
-static int ret;
-
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  // main code here
-  ret = 0;
-}
-
-int
-main (int argc, char *const *argv)
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc,
-                              argv,
-                              "binary-name",
-                              gettext_noop ("binary description text"),
-                              options, &run, NULL)) ? ret : 1;
-}
-\end{lstlisting}
-
-\subsection{Handling command-line options}
-
-Options can then be added easily by adding global variables and
-expanding the {\tt options} array.  For example, the following would
-add a string-option and a binary flag (defaulting to {\tt NULL} and
-{\tt GNUNET\_NO} respectively):
-
-\lstset{language=C}
-\begin{lstlisting}
-static char *string_option;
-static int a_flag;
-
-// ...
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string ('s', "name", "SOMESTRING",
-     gettext_noop ("text describing the string_option NAME"),
-     &string_option},
-    GNUNET_GETOPT_option_flag ('f', "flag",
-     gettext_noop ("text describing the flag option"), 
-     &a_flag),
-    GNUNET_GETOPT_OPTION_END
-  };
-  string_option = NULL;
-  a_flag = GNUNET_SYSERR;
-// ...
-\end{lstlisting}
-
-Issues such as displaying some helpful text describing options using
-the {\tt --help} argument and error handling are taken care of when
-using this approach.  Other {\tt GNUNET\_GETOPT\_}-functions can be used
-to obtain integer value options, increment counters, etc.  You can
-even write custom option parsers for special circumstances not covered
-by the available handlers. To check if an argument was specified by the
-user you initialize the variable with a specific value (e.g. NULL for
-a string and GNUNET\_SYSERR for a integer) and check after parsing
-happened if the values were modified.
-
-Inside the {\tt run} method, the program would perform the
-application-specific logic, which typically involves initializing and
-using some client library to interact with the service.  The client
-library is supposed to implement the IPC whereas the service provides
-more persistent P2P functions.
-
-\exercise{Add a few command-line options and print them inside
-of {\tt run}.  What happens if the user gives invalid arguments?}
-
-\subsection{Writing a Client Library}
-
-The first and most important step in writing a client library is to
-decide on an API for the library.  Typical API calls include
-connecting to the service, performing application-specific requests
-and cleaning up.  Many examples for such service APIs can be found
-in the {\tt gnunet/src/include/gnunet\_*\_service.h} files.
-
-Then, a client-service protocol needs to be designed.  This typically
-involves defining various message formats in a header that will be
-included by both the service and the client library (but is otherwise
-not shared and hence located within the service's directory and not
-installed by {\tt make install}).  Each message must start with a {\tt
-  struct GNUNET\_MessageHeader} and must be shorter than 64k.  By
-convention, all fields in IPC (and P2P) messages must be in big-endian
-format (and thus should be read using {\tt ntohl} and similar
-functions and written using {\tt htonl} and similar functions).
-Unique message types must be defined for each message struct in the
-{\tt gnunet\_protocols.h} header (or an extension-specific include
-file).
-
-\subsubsection{Connecting to the Service}
-
-Before a client library can implement the application-specific protocol
-with the service, a connection must be created:
-
-\lstset{language=C}
-\begin{lstlisting}
-  struct GNUNET_MQ_MessageHandlers handlers[] = {
-    // ...
-    GNUNET_MQ_handler_end ()
-  };
-  struct GNUNET_MQ_Handle *mq;
-
-  mq = GNUNET_CLIENT_connect (cfg, "service-name", handlers, &error_cb, NULL);
-\end{lstlisting}
-
-As a result a {\tt GNUNET\_MQ\_Handle} is returned
-which can to used henceforth to transmit messages to
-the service.
-The complete MQ API can be found in {\tt gnunet\_mq\_lib.h}.
-The {\tt hanlders} array in the example above is incomplete.
-Here is where you will define which messages you expect to
-receive from the service, and which functions handle them.
-The {\tt error\_cb} is a function that is to be called whenever
-there are errors communicating with the service.
-
-\subsubsection{Sending messages}
-
-In GNUnet, messages are always sent beginning with a {\tt struct GNUNET\_MessageHeader}
-in big endian format. This header defines the size and the type of the
-message, the payload follows after this header.
-
-\lstset{language=C}
-\begin{lstlisting}
-struct GNUNET_MessageHeader
-{
-  uint16_t size GNUNET_PACKED;
-  uint16_t type GNUNET_PACKED;
-};
-\end{lstlisting}
-
-Existing message types are defined in {\tt gnunet\_protocols.h}\\
-A common way to create a message is with an envelope:
-
-\lstset{language=C}
-\begin{lstlisting}
-struct GNUNET_MQ_Envelope *env;
-struct GNUNET_MessageHeader *msg;
-
-env = GNUNET_MQ_msg_extra (msg, payload_size, GNUNET_MY_MESSAGE_TYPE);
-memcpy (&msg[1], &payload, payload_size);
-// Send message via message queue 'mq'
-GNUNET_mq_send (mq, env);
-\end{lstlisting}
-
-\exercise{Define a message struct that includes a 32-bit
-unsigned integer in addition to the standard GNUnet MessageHeader.
-Add a C struct and define a fresh protocol number for your message.
-(Protocol numbers in gnunet-ext are defined in \lstinline|gnunet-ext/src/include/gnunet_protocols_ext.h|)}
-
-\exercise{Find out how you can determine the number of messages in a message queue.}
-
-\exercise{Find out how you can determine when a message you have queued was actually transmitted.}
-
-\exercise{Define a helper function to transmit a 32-bit
-unsigned integer (as payload) to a service using some given client
-handle.}
-
-
-\subsubsection{Receiving Replies from the Service}
-
-Clients can receive messages from the service using the handlers
-specified in the {\tt handlers} array we specified when connecting
-to the service.  Entries in the the array are usually created using
-one of two macros, depending on whether the message is fixed size
-or variable size.  Variable size messages are managed using two
-callbacks, one to check that the message is well-formed, the other
-to actually process the message.  Fixed size messages are fully
-checked by the MQ-logic, and thus only need to provide the handler
-to process the message.  Note that the prefixes {\tt check\_}
-and {\tt handle\_} are mandatory.
-
-\lstset{language=c}
-\begin{lstlisting}
-static void
-handle_fix (void *cls, const struct MyMessage *msg)
-{
-  // process 'msg'
-}
-
-static int
-check_var (void *cls, const struct MyVarMessage *msg)
-{
-  // check 'msg' is well-formed
-  return GNUNET_OK;
-}
-
-static void
-handle_var (void *cls, const struct MyVarMessage *msg)
-{
-  // process 'msg'
-}
-
-struct GNUNET_MQ_MessageHandler handlers[] = {
-  GNUNET_MQ_hd_fixed_size (fix,
-                          GNUNET_MESSAGE_TYPE_MY_FIX,
-                          struct MyMessage,
-                          NULL),
-  GNUNET_MQ_hd_fixed_size (var,
-                          GNUNET_MESSAGE_TYPE_MY_VAR,
-                          struct MyVarMessage,
-                          NULL),
-
-  GNUNET_MQ_handler_end ()
-};
-\end{lstlisting}
-
-\exercise{Expand your helper function to receive a response message
-  (for example, containing just the {\tt struct GNUnet MessageHeader}
-  without any payload).  Upon receiving the service's response, you
-  should call a callback provided to your helper function's API.}
-
-\exercise{Figure out where you can pass values to the closures ({\tt cls}).}
-
-
-\subsection{Writing a user interface}
-
-Given a client library, all it takes to access a service now is to
-combine calls to the client library with parsing command-line
-options.
-
-\exercise{Call your client API from your {\tt run()} method in your
-  client application to send a request to the service.  For example,
-  send a 32-bit integer value based on a number given at the
-  command-line to the service.}
-
-
-
-\section{Writing a Service}
-
-Before you can test the client you've written so far, you'll need to also
-implement the corresponding service.
-
-
-\subsection{Code Placement}
-
-New services are placed in their own subdirectory under {\tt gnunet/src}.
-This subdirectory should contain the API implementation file {\tt SERVICE\_api.c},
-the description of the client-service protocol {\tt SERVICE.h} and P2P protocol
-{\tt SERVICE\_protocol.h}, the implementation of the service itself
-{\tt gnunet-service-SERVICE.h} and several files for tests, including test code
-and configuration files.
-
-\subsection{Starting a Service}
-
-The key API definition for creating a service is the {\tt GNUNET\_SERVICE\_MAIN} macro:
-\lstset{language=C}
-\begin{lstlisting}
-GNUNET_SERVICE_MAIN
-("service-name",
- GNUNET_SERVICE_OPTION_NONE,
- &run,
- &client_connect_cb,
- &client_disconnect_cb,
- NULL,
- GNUNET_MQ_hd_fixed_size (...),
- GNUNET_MQ_hd_var_size (...),
- GNUNET_MQ_handler_end ());
-\end{lstlisting}
-
-In addition to the service name and flags, the macro takes three
-functions, typically called {\tt run}, {\tt client\_connect\_cb} and
-{\tt client\_disconnect\_cb} as well as an array of message handlers
-that will be called for incoming messages from clients.
-
-A minimal version of the three central service funtions would look
-like this:
-
-\lstset{language=c}
-\begin{lstlisting}
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *c,
-     struct GNUNET_SERVICE_Handle *service)
-{
-}
-
-static void *
-client_connect_cb (void *cls,
-                   struct GNUNET_SERVICE_Client *c,
-                   struct GNUNET_MQ_Handle *mq)
-{
-  return c;
-}
-
-static void
-client_disconnect_cb (void *cls,
-                      struct GNUNET_SERVICE_Client *c,
-                      void *internal_cls)
-{
-  GNUNET_assert (c == internal_cls);
-}
-\end{lstlisting}
-
-\exercise{Write a stub service that processes no messages at all
-  in your code.  Create a default configuration for it, integrate it
-  with the build system and start the service from {\tt
-  gnunet-service-arm} using {\tt gnunet-arm -i NAME}.}
-
-\exercise{Figure out how to set the closure ({\tt cls}) for handlers
-  of a service.}
-
-\exercise{Figure out how to send messages from the service back to the
-  client.}
-
-Each handler function in the service {\bf must} eventually (possibly in some
-asynchronous continuation) call {\tt GNUNET\_SERVICE\_client\_continue()}.
-Only after this call additional messages from the same client may
-be processed. This way, the service can throttle processing messages
-from the same client.
-
-\exercise{Change the service to ``handle'' the message from your
-  client (for now, by printing a message).  What happens if you
-  forget to call {\tt GNUNET\_SERVICE\_client\_continue()}?}
-
-
-\section{Interacting directly with other Peers using the CORE Service}
-
-FIXME: This section still needs to be updated to the lastest API!
-
-One of the most important services in GNUnet is the \texttt{CORE} service
-managing connections between peers and handling encryption between peers.
-
-One of the first things any service that extends the P2P protocol typically does
-is connect to the \texttt{CORE} service using:
-
-\lstset{language=C}
-\begin{lstlisting}
-#include <gnunet/gnunet_core_service.h>
-
-struct GNUNET_CORE_Handle *
-GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                     void *cls,
-                     GNUNET_CORE_StartupCallback init,
-                     GNUNET_CORE_ConnectEventHandler connects,
-                     GNUNET_CORE_DisconnectEventHandler disconnects,
-                     const struct GNUNET_MQ_MessageHandler *handlers);
-\end{lstlisting}
-
-\subsection{New P2P connections}
-
-Before any traffic with a different peer can be exchanged, the peer must be
-known to the service. This is notified by the \texttt{CORE} {\tt connects} callback,
-which communicates the identity of the new peer to the service:
-
-\lstset{language=C}
-\begin{lstlisting}
-void *
-connects (void *cls,
-          const struct GNUNET_PeerIdentity *peer,
-          struct GNUNET_MQ_Handle *mq)
-{
-  return mq;
-}
-\end{lstlisting}
-
-Note that whatever you return from {\tt connects} is given as the
-{\it cls} argument to the message handlers for messages from
-the respective peer.
-
-\exercise{Create a service that connects to the \texttt{CORE}.  Then
-start (and connect) two peers and print a message once your connect
-callback is invoked.}
-
-\subsection{Receiving P2P Messages}
-
-To receive messages from \texttt{CORE}, you pass the desired
-{\em handlers} to the {\tt GNUNET\_CORE\_connect()} function,
-just as we showed for services.
-
-It is your responsibility to process messages fast enough or
-to implement flow control. If an application does not process
-CORE messages fast enough, CORE will randomly drop messages
-to not keep a very long queue in memory.
-
-\exercise{Start one peer with a new service that has a message
-handler and start a second peer that only has your ``old'' service
-without message handlers.  Which ``connect'' handlers are invoked when
-the two peers are connected?  Why?}
-
-
-\subsection{Sending P2P Messages}
-
-You can transmit messages to other peers using the {\it mq} you were
-given during the {\tt connect} callback.  Note that the {\it mq}
-automatically is released upon {\tt disconnect} and that you must
-not use it afterwards.
-
-It is your responsibility to not over-fill the message queue, GNUnet
-will send the messages roughly in the order given as soon as possible.
-
-\exercise{Write a service that upon connect sends messages as
-fast as possible to the other peer (the other peer should run a
-service that ``processes'' those messages).  How fast is the
-transmission?  Count using the STATISTICS service on both ends.  Are
-messages lost? How can you transmit messages faster?  What happens if
-you stop the peer that is receiving your messages?}
-
-
-\subsection{End of P2P connections}
-
-If a message handler returns {\tt GNUNET\_SYSERR}, the remote peer shuts down or
-there is an unrecoverable network disconnection, CORE notifies the service that
-the peer disconnected. After this notification no more messages will be received
-from the peer and the service is no longer allowed to send messages to the peer.
-The disconnect callback looks like the following:
-
-\lstset{language=C}
-\begin{lstlisting}
-void
-disconnects (void *cls,
-             const struct GNUNET_PeerIdentity * peer)
-{
-    /* Remove peer's identity from known peers */
-    /* Make sure no messages are sent to peer from now on */
-}
-\end{lstlisting}
-
-\exercise{Fix your service to handle peer disconnects.}
-
-\section{Storing peer-specific data using the PEERSTORE service}
-
-GNUnet's PEERSTORE service offers a persistorage for arbitrary peer-specific data.
-Other GNUnet services can use the PEERSTORE to store, retrieve and monitor data records.
-Each data record stored with PEERSTORE contains the following fields:
-
-\begin{itemize}
-\itemsep0em
-  \item subsystem: Name of the subsystem responsible for the record.
-  \item peerid: Identity of the peer this record is related to.
-  \item key: a key string identifying the record.
-  \item value: binary record value.
-  \item expiry: record expiry date.
-\end{itemize}
-
-The first step is to start a connection to the PEERSTORE service:
-\begin{lstlisting}
-#include "gnunet_peerstore_service.h"
-
-peerstore_handle = GNUNET_PEERSTORE_connect (cfg);
-\end{lstlisting}
-The service handle \lstinline|peerstore_handle| will be needed for all subsequent
-PEERSTORE operations.
-
-\subsection{Storing records}
-
-To store a new record, use the following function:
-\begin{lstlisting}
-struct GNUNET_PEERSTORE_StoreContext *
-GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
-                        const char *sub_system,
-                        const struct GNUNET_PeerIdentity *peer,
-                        const char *key,
-                        const void *value,
-                        size_t size,
-                        struct GNUNET_TIME_Absolute expiry,
-                        enum GNUNET_PEERSTORE_StoreOption options,
-                        GNUNET_PEERSTORE_Continuation cont,
-                        void *cont_cls);
-\end{lstlisting}
-
-The \lstinline|options| parameter can either be \lstinline|GNUNET_PEERSTORE_STOREOPTION_MULTIPLE|
-which means that multiple values can be stored under the same key combination (subsystem, peerid, key),
-or \lstinline|GNUNET_PEERSTORE_STOREOPTION_REPLACE| which means that PEERSTORE will replace any
-existing values under the given key combination (subsystem, peerid, key) with the new given value.
-
-The continuation function \lstinline|cont| will be called after the store request is successfully
-sent to the PEERSTORE service. This does not guarantee that the record is successfully stored, only
-that it was received by the service.
-
-The \lstinline|GNUNET_PEERSTORE_store| function returns a handle to the store operation. This handle
-can be used to cancel the store operation only before the continuation function is called:
-\begin{lstlisting}
-void
-GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc);
-\end{lstlisting}
-
-\subsection{Retrieving records}
-
-To retrieve stored records, use the following function:
-\begin{lstlisting}
-struct GNUNET_PEERSTORE_IterateContext *
-GNUNET_PEERSTORE_iterate (struct GNUNET_PEERSTORE_Handle *h,
-                          const char *sub_system,
-                          const struct GNUNET_PeerIdentity *peer,
-                          const char *key,
-                          struct GNUNET_TIME_Relative timeout,
-                          GNUNET_PEERSTORE_Processor callback,
-                          void *callback_cls);
-\end{lstlisting}
-The values of \lstinline|peer| and \lstinline|key| can be \lstinline|NULL|. This allows the
-iteration over values stored under any of the following key combinations:
-\begin{itemize}
-\itemsep0em
-  \item (subsystem)
-  \item (subsystem, peerid)
-  \item (subsystem, key)
-  \item (subsystem, peerid, key)
-\end{itemize}
-
-The \lstinline|callback| function will be called once with each retrieved record and once
-more with a \lstinline|NULL| record to signal the end of results.
-
-The \lstinline|GNUNET_PEERSTORE_iterate| function returns a handle to the iterate operation. This
-handle can be used to cancel the iterate operation only before the callback function is called with
-a \lstinline|NULL| record.
-
-\subsection{Monitoring records}
-
-PEERSTORE offers the functionality of monitoring for new records stored under a specific key
-combination (subsystem, peerid, key). To start the monitoring, use the following function:
-\begin{lstlisting}
-struct GNUNET_PEERSTORE_WatchContext *
-GNUNET_PEERSTORE_watch (struct GNUNET_PEERSTORE_Handle *h,
-                        const char *sub_system,
-                        const struct GNUNET_PeerIdentity *peer,
-                        const char *key,
-                        GNUNET_PEERSTORE_Processor callback,
-                        void *callback_cls);
-\end{lstlisting}
-
-Whenever a new record is stored under the given key combination, the \lstinline|callback| function
-will be called with this new record. This will continue until the connection to the PEERSTORE service
-is broken or the watch operation is canceled:
-\begin{lstlisting}
-void
-GNUNET_PEERSTORE_watch_cancel (struct GNUNET_PEERSTORE_WatchContext *wc);
-\end{lstlisting}
-
-\subsection{Disconnecting from PEERSTORE}
-
-When the connection to the PEERSTORE service is no longer needed, disconnect using the following
-function:
-\begin{lstlisting}
-void
-GNUNET_PEERSTORE_disconnect (struct GNUNET_PEERSTORE_Handle *h, int sync_first);
-\end{lstlisting}
-
-If the \lstinline|sync_first| flag is set to \lstinline|GNUNET_YES|, the API will delay the
-disconnection until all store requests are received by the PEERSTORE service. Otherwise,
-it will disconnect immediately.
-
-
-\section{Using the DHT}
-
-The DHT allows to store data so other peers in the P2P network can
-access it and retrieve data stored by any peers in the network.
-This section will explain how to use the DHT. Of course, the first
-thing to do is to connect to the DHT service:
-\lstset{language=C}
-\begin{lstlisting}
-dht_handle = GNUNET_DHT_connect (cfg, parallel_requests);
-\end{lstlisting}
-The second parameter indicates how many requests in parallel to expect.
-It is not a hard limit, but a good approximation will make the DHT more
-efficient.
-
-\subsection{Storing data in the DHT}
-Since the DHT is a dynamic environment (peers join and leave frequently)
-the data that we put in the DHT does not stay there indefinitely. It is
-important to ``refresh'' the data periodically by simply storing it again,
-in order to make sure other peers can access it.
-
-The put API call offers a callback to signal that the PUT request has been
-sent. This does not guarantee that the data is accessible to others peers,
-or even that is has been stored, only that the service has requested to
-a neighboring peer the retransmission of the PUT request towards its final
-destination. Currently there is no feedback about whether or not the data
-has been sucessfully stored or where it has been stored. In order to improve
-the availablilty of the data and to compensate for possible errors, peers leaving
-and other unfavorable events, just make several PUT requests!
-
-\lstset{language=C}
-\begin{lstlisting}
-static void
-message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  // Request has left local node
-}
-
-struct GNUNET_DHT_PutHandle *
-GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
-                const struct GNUNET_HashCode *key,
-                uint32_t desired_replication_level,
-                enum GNUNET_DHT_RouteOption options,
-                enum GNUNET_BLOCK_Type type, size_t size, const void *data,
-                struct GNUNET_TIME_Absolute exp,
-                struct GNUNET_TIME_Relative timeout,
-                GNUNET_DHT_PutContinuation cont, void *cont_cls)
-\end{lstlisting}
-
-\exercise{Store a value in the DHT periodically to make sure it is available
-over time. You might consider using the function GNUNET\_SCHEDULER\_add\_delayed and
-call GNUNET\_DHT\_put from inside a helper function.}
-
-
-\subsection{Obtaining data from the DHT}
-As we saw in the previous example, the DHT works in an asynchronous mode.
-Each request to the DHT is executed ``in the background'' and the API
-calls return immediately. In order to receive results from the DHT, the
-API provides a callback. Once started, the request runs in the service,
-the service will try to get as many results as possible (filtering out
-duplicates) until the timeout expires or we explicitly stop the request.
-It is possible to give a ``forever'' timeout with
-{\tt GNUNET\_TIME\_UNIT\_FOREVER\_REL}.
-
-If we give a route option {\tt GNUNET\_DHT\_RO\_RECORD\_ROUTE} the callback
-will get a list of all the peers the data has travelled, both on the PUT
-path and on the GET path.
-\lstset{language=C}
-\begin{lstlisting}
-static void
-get_result_iterator (void *cls, struct GNUNET_TIME_Absolute expiration,
-                     const struct GNUNET_HashCode *key,
-                     const struct GNUNET_PeerIdentity *get_path,
-                     unsigned int get_path_length,
-                     const struct GNUNET_PeerIdentity *put_path,
-                     unsigned int put_path_length,
-                     enum GNUNET_BLOCK_Type type, size_t size, const void *data)
-{
-  // Optionally:
-  GNUNET_DHT_get_stop (get_handle);
-}
-
-get_handle =
-      GNUNET_DHT_get_start (dht_handle,
-                            block_type,
-                            &key,
-                            replication,
-                            GNUNET_DHT_RO_NONE,
-                            NULL,
-                            0,
-                            &get_result_iterator,
-                            cls)
-\end{lstlisting}
-
-\exercise{Store a value in the DHT and after a while retrieve it. Show the IDs of all
-the peers the requests have gone through. In order to convert a peer ID to a string, use
-the function GNUNET\_i2s. Pay attention to the route option parameters in both calls!}
-
-\subsection{Implementing a block plugin}
-
-In order to store data in the DHT, it is necessary to provide a block
-plugin.  The DHT uses the block plugin to ensure that only well-formed
-requests and replies are transmitted over the network.
-
-The block plugin should be put in a file {\tt
-  plugin\_block\_SERVICE.c} in the service's respective directory. The
-mandatory functions that need to be implemented for a block plugin are
-described in the following sections.
-
-\subsubsection{Validating requests and replies}
-
-The evaluate function should validate a reply or a request. It returns
-a {\tt GNUNET\_BLOCK\_EvaluationResult}, which is an enumeration. All
-possible answers are in {\tt gnunet\_block\_lib.h}.  The function will
-be called with a {\tt reply\_block} argument of {\tt NULL} for
-requests.  Note that depending on how {\tt evaluate} is called, only
-some of the possible return values are valid.  The specific meaning of
-the {\tt xquery} argument is application-specific.  Applications that
-do not use an extended query should check that the {\tt xquery\_size}
-is zero.  The block group is typically used to filter duplicate
-replies.
-
-\lstset{language=C}
-\begin{lstlisting}
-static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_SERVICE_evaluate (void *cls,
-                              enum GNUNET_BLOCK_Type type,
-                              struct GNUNET_BlockGroup *bg,
-                              const GNUNET_HashCode *query,
-                              const void *xquery,
-                              size_t xquery_size,
-                              const void *reply_block,
-                              size_t reply_block_size)
-{
-  // Verify type, block and bg
-}
-\end{lstlisting}
-
-Note that it is mandatory to detect duplicate replies in this function
-and return the respective status code.  Duplicate detection is
-typically done using the Bloom filter block group provided by {\tt
-  libgnunetblockgroup.so}.  Failure to do so may cause replies to
-circle in the network.
-
-\subsubsection{Deriving a key from a reply}
-
-The DHT can operate more efficiently if it is possible to derive a key
-from the value of the corresponding block.  The {\tt get\_key}
-function is used to obtain the key of a block --- for example, by
-means of hashing.  If deriving the key is not possible, the function
-should simply return {\tt GNUNET\_SYSERR} (the DHT will still work
-just fine with such blocks).
-
-\lstset{language=C}
-\begin{lstlisting}
-static int
-block_plugin_SERVICE_get_key (void *cls, enum GNUNET_BLOCK_Type type,
-                             const void *block, size_t block_size,
-                             struct GNUNET_HashCode *key)
-{
-  // Store the key in the key argument, return GNUNET_OK on success.
-}
-\end{lstlisting}
-
-\subsubsection{Initialization of the plugin}
-
-The plugin is realized as a shared C library.  The library must export
-an initialization function which should initialize the plugin.  The
-initialization function specifies what block types the plugin cares
-about and returns a struct with the functions that are to be used for
-validation and obtaining keys (the ones just defined above).
-
-\lstset{language=C}
-\begin{lstlisting}
-void *
-libgnunet_plugin_block_SERVICE_init (void *cls)
-{
-  static enum GNUNET_BLOCK_Type types[] =
-  {
-    GNUNET_BLOCK_TYPE_SERVICE_BLOCKYPE,
-    GNUNET_BLOCK_TYPE_ANY
-  };
-  struct GNUNET_BLOCK_PluginFunctions *api;
-
-  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
-  api->evaluate = &block_plugin_SERICE_evaluate;
-  api->get_key = &block_plugin_SERVICE_get_key;
-  api->types = types;
-  return api;
-}
-\end{lstlisting}
-
-\subsubsection{Shutdown of the plugin}
-
-Following GNUnet's general plugin API concept, the plugin must
-export a second function for cleaning up.  It usually does very
-little.
-
-\lstset{language=C}
-\begin{lstlisting}
-void *
-libgnunet_plugin_block_SERVICE_done (void *cls)
-{
-  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
-
-  GNUNET_free (api);
-  return NULL;
-}
-\end{lstlisting}
-
-
-\subsubsection{Integration of the plugin with the build system}
-
-In order to compile the plugin, the {\tt Makefile.am} file for the
-service \texttt{SERVICE} should contain a rule similar to this:
-
-\lstset{language=make}
-\begin{lstlisting}
-  plugindir = $(libdir)/gnunet
-
-  plugin_LTLIBRARIES = \
-          libgnunet_plugin_block_ext.la
-  libgnunet_plugin_block_ext_la_SOURCES = \
-          plugin_block_ext.c
-  libgnunet_plugin_block_ext_la_LIBADD = \
-          $(prefix)/lib/libgnunethello.la \
-          $(prefix)/lib/libgnunetblock.la \
-          $(prefix)/lib/libgnunetutil.la
-  libgnunet_plugin_block_ext_la_LDFLAGS = \
-          $(GN_PLUGIN_LDFLAGS)
-  libgnunet_plugin_block_ext_la_DEPENDENCIES = \
-          $(prefix)/lib/libgnunetblock.la
-\end{lstlisting}
-% $
-
-
-\exercise{Write a block plugin that accepts all queries
-and all replies but prints information about queries and replies
-when the respective validation hooks are called.}
-
-
-
-\subsection{Monitoring the DHT}
-It is possible to monitor the functioning of the local DHT service. When monitoring
-the DHT, the service will alert the monitoring program of any events,
-both started locally or received for routing from another peer. The are three different
-types of events possible: a GET request, a PUT request or a response (a reply to
-a GET).
-
-Since the different events have different associated data, the API gets 3
-different callbacks (one for each message type) and optional type and key parameters,
-to allow for filtering of messages. When an event happens, the appropiate callback
-is called with all the information about the event.
-\lstset{language=C}
-\begin{lstlisting}
-static void
-get_callback (void *cls,
-              enum GNUNET_DHT_RouteOption options,
-              enum GNUNET_BLOCK_Type type,
-              uint32_t hop_count,
-              uint32_t desired_replication_level,
-              unsigned int path_length,
-              const struct GNUNET_PeerIdentity *path,
-              const struct GNUNET_HashCode * key)
-{
-}
-
-
-static void
-get_resp_callback (void *cls,
-                   enum GNUNET_BLOCK_Type type,
-                   const struct GNUNET_PeerIdentity *get_path,
-                   unsigned int get_path_length,
-                   const struct GNUNET_PeerIdentity *put_path,
-                   unsigned int put_path_length,
-                   struct GNUNET_TIME_Absolute exp,
-                   const struct GNUNET_HashCode * key,
-                   const void *data,
-                   size_t size)
-{
-}
-
-
-static void
-put_callback (void *cls,
-              enum GNUNET_DHT_RouteOption options,
-              enum GNUNET_BLOCK_Type type,
-              uint32_t hop_count,
-              uint32_t desired_replication_level,
-              unsigned int path_length,
-              const struct GNUNET_PeerIdentity *path,
-              struct GNUNET_TIME_Absolute exp,
-              const struct GNUNET_HashCode * key,
-              const void *data,
-              size_t size)
-{
-}
-
-
-monitor_handle = GNUNET_DHT_monitor_start (dht_handle,
-                                          block_type,
-                                          key,
-                                          &get_callback,
-                                          &get_resp_callback,
-                                          &put_callback,
-                                          cls);
-\end{lstlisting}
-
-
-\section{Debugging with {\tt gnunet-arm}}
-
-Even if services are managed by {\tt gnunet-arm}, you can start them with
-{\tt gdb} or {\tt valgrind}.  For example, you could add the following lines
-to your configuration file to start the DHT service in a {\tt gdb} session in a
-fresh {\tt xterm}:
-
-\begin{verbatim}
-[dht]
-PREFIX=xterm -e gdb --args
-\end{verbatim}
-
-Alternatively, you can stop a service that was started via ARM and run it manually:
-
-\lstset{language=bash}
-\begin{lstlisting}
-$ gnunet-arm -k dht
-$ gdb --args gnunet-service-dht -L DEBUG
-$ valgrind gnunet-service-dht -L DEBUG
-\end{lstlisting}
-% $
-
-Assuming other services are well-written, they will automatically re-integrate the
-restarted service with the peer.
-
-GNUnet provides a powerful logging mechanism providing log levels \texttt{ERROR},
-\texttt{WARNING}, \texttt{INFO} and \texttt{DEBUG}. The current log level is
-configured using the \lstinline|$GNUNET_FORCE_LOG| environmental variable.
-The \texttt{DEBUG} level is only available if \lstinline|--enable-logging=verbose| was used when
-running \texttt{configure}. More details about logging can be found under
-\url{https://gnunet.org/logging}.
-
-You should also probably enable the creation of core files, by setting
-{\tt ulimit}, and echo'ing 1 into {\tt /proc/sys/kernel/core\_uses\_pid}.
-Then you can investigate the core dumps with {\tt gdb}, which is often
-the fastest method to find simple errors.
-
-\exercise{Add a memory leak to your service and obtain a trace
-pointing to the leak using {\tt valgrind} while running the service
-from {\tt gnunet-service-arm}.}
-
-
-\end{document}
diff --git a/doc/gnunet-c-tutorial.texi b/doc/gnunet-c-tutorial.texi
new file mode 100644
index 000000000..4f56ae5c4
--- /dev/null
+++ b/doc/gnunet-c-tutorial.texi
@@ -0,0 +1,1181 @@
+\input texinfo
+@c %**start of header
+@setfilename gnunet-c-tutorial.info
+@documentencoding UTF-8
+@settitle GNUnet C Tutorial
+@c %**end of header
+
+@copying
+Copyright @copyright{} 2001-2017 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 section entitled ``GNU Free
+Documentation License''.
+
+A copy of the license is also available from the Free Software
+Foundation Web site at @url{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 section entitled
+``GNU General Public License''.
+
+A copy of the license is also available from the Free Software
+Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}.
+@end copying
+
+@titlepage
+@title GNUnet C Tutorial
+@subtitle A Tutorial for GNUnet 0.10.x (C version)
+@author The GNUnet Developers
+
+@page
+@vskip 0pt plus 1filll
+
+@insertcopying
+@end titlepage
+
+@contents
+
+@c **** TODO
+@c 1. Update content?
+@c 2. Either reference main documentation or
+@c 3. Merge this into main documentation
+
+@node Top
+@top Introduction
+
+This tutorials explains how to install GNUnet on a GNU/Linux system and gives an introduction on how
+GNUnet can be used to develop a Peer-to-Peer application. Detailed installation instructions for
+various operating systems and a detailed list of all dependencies can be found on our website at
+@uref{https://gnunet.org/installation}.
+
+Please read this tutorial carefully since every single step is
+important and do not hesitate to contact the GNUnet team if you have
+any questions or problems! Check here how to contact the GNUnet
+team: @uref{https://gnunet.org/contact_information}
+
+@node Installing GNUnet
+@chapter Installing GNUnet
+
+First of all you have to install a current version of GNUnet. You can download a
+tarball of a stable version from GNU FTP mirrors or obtain the latest development
+version from our Git repository.
+
+Most of the time you should prefer to download the stable version since with the
+latest development version things can be broken, functionality can be changed or tests
+can fail. You should only use the development version if you know that you require a
+certain feature or a certain issue has been fixed since the last release.
+
+@node Obtaining a stable version
+@section Obtaining a stable version
+
+You can download the latest stable version of GNUnet from GNU FTP mirrors:
+@uref{https://ftp.gnu.org/gnu/gnunet/gnunet-0.10.x.tar.gz}
+You should also download the signature file and verify the integrity of the tarball.
+@uref{https://ftp.gnu.org/gnu/gnunet/gnunet-0.10.x.tar.gz.sig}
+To verify the signature you should first import the GPG key used to sign the tarball
+@example
+$ gpg --keyserver keys.gnupg.net --recv-keys 48426C7E
+@end example
+And use this key to verify the tarball's signature
+@example
+$ gpg --verify gnunet-0.10.x.tar.gz.sig gnunet-0.10.x.tar.gz
+@end example
+After successfully verifying the integrity you can extract the tarball using
+@example
+$ tar xvzf gnunet-0.10.x.tar.gz
+## we will use the directory "gnunet" in the remainder of this document
+$ mv gnunet-0.10.x gnunet
+$ cd gnunet
+@end example
+
+However, please note that stable versions can be very outdated, as a developer
+you are strongly encouraged to use the version from @uref{https://gnunet.org/git/}.
+
+@node  Installing Build Tool Chain and Dependencies
+@section Installing Build Tool Chain and Dependencies
+
+To successfully compile GNUnet you need the tools to build GNUnet and the required dependencies.
+Please have a look at @uref{https://gnunet.org/dependencies} for a list of required dependencies
+and @uref{https://gnunet.org/generic_installation} for specific instructions for your operating system.
+
+Please check the notes at the end of the configure process about required dependencies.
+
+For GNUnet bootstrapping support and the http(s) plugin you should install libgnurl.
+For the filesharing service you should install at least one of the datastore backends mysql,
+sqlite or postgresql.
+
+@node Obtaining the latest version from Git
+@section Obtaining the latest version from Git
+
+The latest development version can obtained from our Git repository. To obtain
+the code you need Git installed and checkout the repository using:
+@example
+$ git clone https://gnunet.org/git/gnunet
+@end example
+After cloning the repository you have to execute
+@example
+$ cd gnunet
+$ ./bootstrap
+@end example
+
+The remainder of this tutorial assumes that you have Git branch ``master'' checked out.
+
+@node Compiling and Installing GNUnet
+@section Compiling and Installing GNUnet
+
+First, you need to install at least libgnupgerror version 1.27
+@uref{https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2}
+and libgcrypt version 1.7.6 @uref{https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2}.
+
+@example
+$ wget https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
+$ tar xf libgpg-error-1.27.tar.bz2
+$ cd libgpg-error-1.27
+$ ./configure
+$ sudo make install
+$ cd ..
+@end example
+
+@example
+$ wget https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.6.tar.bz2
+$ tar xf libgcrypt-1.7.6.tar.bz2
+$ cd libgcrypt-1.7.6
+$ ./configure
+$ sudo make install
+$ cd ..
+@end example
+
+@node Installation
+@subsection Installation
+Assuming all dependencies are installed, the following commands will
+compile and install GNUnet in your home directory. You can specify the
+directory where GNUnet will be installed by changing the
+@code{--prefix} value when calling @command{./configure}.  If
+you do not specifiy a prefix, GNUnet is installed in the directory
+@file{/usr/local}. When developing new applications you may want
+to enable verbose logging by adding @code{--enable-logging=verbose}:
+
+@example
+$ ./configure --prefix=$PREFIX --enable-logging
+$ make
+$ make install
+@end example
+
+After installing GNUnet you have to add your GNUnet installation to your path
+environmental variable. In addition you have to create the @file{.config}
+directory in your home directory (unless it already exists) where GNUnet stores
+its data and an empty GNUnet configuration file:
+
+@example
+$ export PATH=$PATH:$PREFIX/bin
+$ echo export PATH=$PREFIX/bin:\\$PATH >> ~/.bashrc
+$ mkdir ~/.config/
+$ touch ~/.config/gnunet.conf
+@end example
+
+@node Common Issues - Check your GNUnet installation
+@section Common Issues - Check your GNUnet installation
+
+You should check your installation to ensure that installing GNUnet
+was successful up to this point. You should be able to access GNUnet's
+binaries and run GNUnet's self check.
+@example
+$ which gnunet-arm
+@end example
+should return $PREFIX/bin/gnunet-arm. It should be
+located in your GNUnet installation and the output should not be
+empty. If you see an output like:
+@example
+$ which gnunet-arm
+@end example
+check your PATH variable to ensure GNUnet's @file{bin} directory is included.
+
+GNUnet provides tests for all of its subcomponents. Run
+@example
+$ make check
+@end example
+to execute tests for all components. make check traverses all subdirectories in src.
+For every subdirectory you should get a message like this:
+
+@example
+make[2]: Entering directory `/home/$USER/gnunet/contrib'
+PASS: test_gnunet_prefix
+=============
+1 test passed
+=============
+@end example
+
+@node Background: GNUnet Architecture
+@chapter Background: GNUnet Architecture
+
+GNUnet is organized in layers and services. Each service is composed of a
+main service implementation and a client library for other programs to use
+the service's functionality, described by an API. This approach is shown in
+@c** FIXME: enable this once the commented block below works:
+@c** figure~\ref{fig:service}.
+Some services provide an additional command line tool to enable the user to
+interact with the service.
+
+Very often it is other GNUnet services that will use these APIs to build the
+higher layers of GNUnet on top of the lower ones. Each layer expands or extends
+the functionality of the service below (for instance, to build a mesh on top of
+a DHT).
+@c** FXIME: See comment above.
+@c** See figure ~\ref{fig:interaction} for an illustration of this approach.
+
+@c ** @image{filename[, width[, height[, alttext[, extension]]]]}
+
+@image{images/gnunet-tutorial-service,,5in,Service with API and network protocol,.png}
+
+@image{images/gnunet-tutorial-system,,5in,The layered system architecture of GNUnet,.png}
+
+@c \begin{figure}[!h]
+@c   \begin{center}
+@c %  \begin{subfigure}
+@c         \begin{subfigure}[b]{0.3\textwidth}
+@c                 \centering
+@c                 \includegraphics[width=\textwidth]{figs/Service.pdf}
+@c                 \caption{Service with API and network protocol}
+@c                 \label{fig:service}
+@c         \end{subfigure}
+@c         ~~~~~~~~~~
+@c         \begin{subfigure}[b]{0.3\textwidth}
+@c                 \centering
+@c                 \includegraphics[width=\textwidth]{figs/System.pdf}
+@c                 \caption{Service interaction}
+@c                 \label{fig:interaction}
+@c         \end{subfigure}
+@c   \end{center}
+@c   \caption{GNUnet's layered system architecture}
+@c \end{figure}
+
+The main service implementation runs as a standalone process in the operating
+system and the client code runs as part of the client program, so crashes of a
+client do not affect the service process or other clients. The service and the
+clients communicate via a message protocol to be defined and implemented by
+the programmer.
+
+@node First Steps with GNUnet
+@chapter First Steps with GNUnet
+
+@node Configure your peer
+@section Configure your peer
+
+First of all we need to configure your peer. Each peer is started with a configuration
+containing settings for GNUnet itself and its services. This configuration is based on the
+default configuration shipped with GNUnet and can be modified. The default configuration
+is located in the @file{$PREFIX/share/gnunet/config.d} directory. When starting a peer, you
+can specify a customized configuration using the the @command{-c} command line switch when
+starting the ARM service and all other services. When using a modified configuration the
+default values are loaded and only values specified in the configuration file will replace
+the default values.
+
+Since we want to start additional peers later, we need some modifications from the default
+configuration. We need to create a separate service home and a file containing our
+modifications for this peer:
+@example
+$ mkdir ~/gnunet1/
+$ touch peer1.conf
+@end example
+
+Now add the following lines to @file{peer1.conf} to use this directory. For
+simplified usage we want to prevent the peer to connect to the GNUnet
+network since this could lead to confusing output. This modifications
+will replace the default settings:
+@example
+[PATHS]
+GNUNET_HOME = ~/gnunet1/  # Use this directory to store GNUnet data
+[hostlist]
+SERVERS =                 # prevent bootstrapping
+@end example
+
+@node Start a peer
+@section Start a peer
+Each GNUnet instance (called peer) has an identity (peer ID) based on a
+cryptographic public private key pair. The peer ID is the printable hash of the
+public key.
+
+GNUnet services are controlled by a master service, the so called @dfn{Automatic Restart Manager} (ARM).
+ARM starts, stops and even restarts services automatically or on demand when a client connects.
+You interact with the ARM service using the gnunet-arm tool.
+GNUnet can then be started with @command{gnunet-arm -s} and stopped with
+@command{gnunet-arm -e}.  An additional service not automatically started
+can be started using @command{gnunet-arm -i <service name>} and stopped
+using @command{gnunet-arm -k <servicename>}.
+
+Once you have started your peer, you can use many other GNUnet commands
+to interact with it.  For example, you can run:
+@example
+$ gnunet-peerinfo -s
+@end example
+to obtain the public key of your peer.
+You should see an output containing the peer ID similar to:
+@example
+I am peer `0PA02UVRKQTS2C .. JL5Q78F6H0B1ACPV1CJI59MEQUMQCC5G'.
+@end example
+
+@node Monitor a peer
+@section Monitor a peer
+
+In this section, we will monitor the behaviour of our peer's DHT service with respect to a
+specific key. First we will start GNUnet and then start the DHT service and use the DHT monitor tool
+to monitor the PUT and GET commands we issue ussing the @command{gnunet-dht-put} and
+@command{gnunet-dht-get} commands. Using the ``monitor'' line given below, you can observe
+the behavior of your own peer's DHT with respect to the specified KEY:
+
+@example
+$ gnunet-arm -c ~/peer1.conf -s                 # start gnunet with all default services
+$ gnunet-arm -c ~/peer1.conf -i dht             # start DHT service
+$ cd ~/gnunet/src/dht;
+$ ./gnunet-dht-monitor -c ~/peer1.conf -k KEY
+@end example
+Now open a separate terminal and change again to the @file{gnunet/src/dht} directory:
+@example
+$ cd ~/gnunet/src/dht
+$ ./gnunet-dht-put -c ~/peer1.conf -k KEY -d VALUE              # put VALUE under KEY in the DHT
+$ ./gnunet/src/dht/gnunet-dht-get -c ~/peer1.conf -k KEY        # get key KEY from the DHT
+$ gnunet-statistics -c ~/peer1.conf             # print statistics about current GNUnet state
+$ gnunet-statistics -c ~/peer1.conf -s dht      # print statistics about DHT service
+@end example
+
+@node Starting Two Peers by Hand
+@section Starting Two Peers by Hand
+
+This section describes how to start two peers on the same machine by hand.
+The process is rather painful, but the description is somewhat instructive.
+In practice, you might prefer the automated method
+(@pxref{Starting Peers Using the Testbed Service}).
+
+@node Setup a second peer
+@subsection Setup a second peer
+We will now start a second peer on your machine.
+For the second peer, you will need to manually create a modified
+configuration file to avoid conflicts with ports and directories.
+A peers configuration file is by default located in @file{~/.gnunet/gnunet.conf}.
+This file is typically very short or even empty as only the differences to the
+defaults need to be specified.  The defaults are located in
+many files in the @file{$PREFIX/share/gnunet/config.d} directory.
+
+To configure the second peer, use the files
+@file{$PREFIX/share/gnunet/config.d} as a template for your main
+configuration file:
+@example
+$ cat $PREFIX/share/gnunet/config.d/*.conf > peer2.conf
+@end example
+Now you have to edit @file{peer2.conf} and change:
+@itemize
+@item @code{GNUNET\_TEST\_HOME} under @code{PATHS}
+@item Every (uncommented) value for ``@code{PORT}'' (add 10000) in any
+section (the option may be commented out if @code{PORT} is
+prefixed by "\#", in this case, UNIX domain sockets are used
+and the PORT option does not need to be touched)
+@item Every value for ``@code{UNIXPATH}'' in any section (e.g. by adding a "-p2" suffix)
+@end itemize
+to a fresh, unique value.  Make sure that the PORT numbers stay below 65536.
+From now on, whenever you interact with the second peer, you need to specify
+@command{-c peer2.conf} as an additional command line argument.
+
+Now, generate the 2nd peer's private key:
+
+@example
+$ gnunet-peerinfo -s -c peer2.conf
+@end example
+
+This may take a while, generate entropy using your keyboard or mouse
+as needed.  Also, make sure the output is different from the
+gnunet-peerinfo output for the first peer (otherwise you made an
+error in the configuration).
+
+@node Start the second peer and connect the peers
+@subsection Start the second peer and connect the peers
+
+Then, you can start a second peer using:
+@example
+$ gnunet-arm -c peer2.conf -s
+$ gnunet-arm -c peer2.conf -i dht
+$ ~/gnunet/src/dht/gnunet-dht-put -c peer2.conf -k KEY -d VALUE
+$ ~/gnunet/src/dht/gnunet-dht-get -c peer2.conf -k KEY
+@end example
+If you want the two peers to connect, you have multiple options:
+@itemize
+@item UDP neighbour discovery (automatic)
+@item Setup a bootstrap server
+@item Connect manually
+@end itemize
+To setup peer 1 as bootstrapping server change the configuration of
+the first one to be a hostlist server by adding the following lines to
+@file{peer1.conf} to enable bootstrapping server:
+@example
+[hostlist]
+OPTIONS = -p
+@end example
+
+Then change @file{peer2.conf} and replace the ``@code{SERVERS}'' line in the ``@code{[hostlist]}'' section with
+``@code{http://localhost:8080/}''.  Restart both peers using:
+@example
+$ gnunet-arm -c peer1.conf -e           # stop first peer
+$ gnunet-arm -c peer1.conf -s           # start first peer
+$ gnunet-arm -c peer2.conf -s           # start second peer
+@end example
+
+Note that if you start your peers without changing these settings, they
+will use the ``global'' hostlist servers of the GNUnet P2P network and
+likely connect to those peers.  At that point, debugging might become
+tricky as you're going to be connected to many more peers and would
+likely observe traffic and behaviors that are not explicitly controlled
+by you.
+
+@node How to connect manually
+@subsection How to connect manually
+
+If you want to use the @code{peerinfo} tool to connect your peers, you should:
+@itemize
+@item Set @code{FORCESTART = NO} in section @code{hostlist} (to not connect to the global GNUnet)
+@item Start both peers running @command{gnunet-arm -c peer1.conf -s} and @command{gnunet-arm -c peer2.conf -s}
+@item Get @code{HELLO} message of the first peer running @command{gnunet-peerinfo -c peer1.conf -g}
+@item Give the output to the second peer by running @command{gnunet-peerinfo -c peer2.conf -p '<output>'}
+@end itemize
+
+Check that they are connected using @command{gnunet-core -c peer1.conf},
+which should give you the other peer's peer identity:
+@example
+$ gnunet-core -c peer1.conf
+Peer `9TVUCS8P5A7ILLBGO6 [...shortened...] 1KNBJ4NGCHP3JPVULDG'
+@end example
+
+@node Starting Peers Using the Testbed Service
+@section Starting Peers Using the Testbed Service
+@c \label{sec:testbed}
+
+GNUnet's testbed service is used for testing scenarios where a number of peers
+are to be started.  The testbed can manage peers on a single host or on multiple
+hosts in a distributed fashion.  On a single affordable computer, it should be
+possible to run around tens of peers without drastically increasing the load on the
+system.
+
+The testbed service can be access through its API
+@file{include/gnunet\_testbed\_service.h}.  The API provides many routines for
+managing a group of peers.  It also provides a helper function
+@code{GNUNET\_TESTBED\_test\_run()} to quickly setup a minimalistic testing
+environment on a single host.
+
+This function takes a configuration file which will be used as a template
+configuration for the peers.  The testbed takes care of modifying relevant
+options in the peers' configuration such as @code{SERVICEHOME}, @code{PORT}, @code{UNIXPATH} to
+unique values so that peers run without running into conflicts.  It also checks
+and assigns the ports in configurations only if they are free.
+
+Additionally, the testbed service also reads its options from the same
+configuration file.  Various available options and details about them can be
+found in the testbed default configuration file @file{src/testbed/testbed.conf}.
+
+With the testbed API, a sample test case can be structured as follows:
+@example
+@verbatiminclude testbed_test.c
+@end example
+The source code for the above listing can be found at
+@uref{https://gnunet.org/git/gnunet.git/tree/doc/testbed_test.c}
+or in the @file{doc/} folder of your repository check-out.
+After installing GNUnet, the above source code can be compiled as:
+@example
+$ export CPPFLAGS="-I/path/to/gnunet/headers"
+$ export LDFLAGS="-L/path/to/gnunet/libraries"
+$ gcc $CPPFLAGS $LDFLAGS -o testbed-test testbed_test.c  -lgnunettestbed -lgnunetdht -lgnunetutil
+$ touch template.conf # Generate (empty) configuration
+$ ./testbed-test  # run it (press CTRL-C to stop)
+@end example
+The @code{CPPFLAGS} and @code{LDFLAGS} are necessary if GNUnet is installed
+into a different directory other than @file{/usr/local}.
+
+All of testbed API's peer management functions treat management actions as
+operations and return operation handles.  It is expected that the operations
+begin immediately, but they may get delayed (to balance out load on the system).
+The program using the API then has to take care of marking the operation as
+``done'' so that its associated resources can be freed immediately and other
+waiting operations can be executed.  Operations will be canceled if they are
+marked as ``done'' before their completion.
+
+An operation is treated as completed when it succeeds or fails.  Completion of
+an operation is either conveyed as events through @i{controller event callback}
+or through respective operation completion callbacks.  In functions
+which support completion notification through both controller event callback and
+operation completion callback, first the controller event callback will be
+called.  If the operation is not marked as done in that callback or if the
+callback is given as NULL when creating the operation, the operation completion
+callback will be called.  The API documentation shows which event are to be
+expected in the controller event notifications.  It also documents any
+exceptional behaviour.
+
+Once the peers are started, test cases often need to connect some of the peers'
+services.  Normally, opening a connect to a peer's service requires the peer's
+configuration.  While using testbed, the testbed automatically generates
+per-peer configuration.  Accessing those configurations directly through file
+system is discouraged as their locations are dynamically created and will be
+different among various runs of testbed.  To make access to these configurations
+easy, testbed API provides the function
+@code{GNUNET\_TESTBED\_service\_connect()}.  This function fetches the
+configuration of a given peer and calls the @i{Connect Adapter}.
+In the example code, it is the @code{dht\_ca}.  A connect adapter is expected
+to open the connection to the needed service by using the provided configuration
+and return the created service connection handle.  Successful connection to the
+needed service is signaled through @code{service\_connect\_comp\_cb}.
+
+A dual to connect adapter is the @i{Disconnect Adapter}.  This callback is
+called after the connect adapter has been called when the operation from
+@code{GNUNET\_TESTBED\_service\_connect()} is marked as ``done''.  It has to
+disconnect from the service with the provided service handle (@code{op\_result}).
+
+Exercise: Find out how many peers you can run on your system.
+
+Exercise: Find out how to create a 2D torus topology by changing the
+options in the configuration file. See @uref{https://gnunet.org/supported-topologies}
+Then use the DHT API to store and retrieve values in the
+network.
+
+@node Developing Applications
+@chapter Developing Applications
+
+@node gnunet-ext
+@section gnunet-ext
+To develop a new peer-to-peer application or to extend GNUnet we provide
+a template build system for writing GNUnet extensions in C. It can be
+obtained as follows:
+
+@example
+$ git clone https://gnunet.org/git/gnunet-ext
+$ cd gnunet-ext/
+$ ./bootstrap
+$ ./configure --prefix=$PREFIX --with-gnunet=$PREFIX
+$ make
+$ make install
+$ make check
+@end example
+
+The GNUnet ext template includes examples and a working buildsystem for a new GNUnet service.
+A common GNUnet service consists of the following parts which will be discussed in detail in the
+remainder of this document. The functionality of a GNUnet service is implemented in:
+
+@itemize
+@item the GNUnet service (gnunet-ext/src/ext/gnunet-service-ext.c)
+@item the client API (gnunet-ext/src/ext/ext_api.c)
+@item the client application using the service API (gnunet-ext/src/ext/gnunet-ext.c)
+@end itemize
+
+The interfaces for these entities are defined in:
+@itemize
+@item client API interface (gnunet-ext/src/ext/ext.h)
+@item the service interface (gnunet-ext/src/include/gnunet_service_SERVICE.h)
+@item the P2P protocol (gnunet-ext/src/include/gnunet_protocols_ext.h)
+@end itemize
+
+
+In addition the ext systems provides:
+@itemize
+@item a test testing the API (gnunet-ext/src/ext/test_ext_api.c)
+@item a configuration template for the service (gnunet-ext/src/ext/ext.conf.in)
+@end itemize
+
+@node Adapting the Template
+@section Adapting the Template
+
+The first step for writing any extension with a new service is to
+ensure that the @file{ext.conf.in} file contains entries for the
+@code{UNIXPATH}, @code{PORT} and @code{BINARY} for the service in a section named after
+the service.
+
+If you want to adapt the template rename the @file{ext.conf.in} to match your
+services name, you have to modify the @code{AC\_OUTPUT} section in @file{configure.ac}
+in the @file{gnunet-ext} root.
+
+@node Writing a Client Application
+@section Writing a Client Application
+
+When writing any client application (for example, a command-line
+tool), the basic structure is to start with the @code{GNUNET\_PROGRAM\_run}
+function.  This function will parse command-line options, setup the scheduler
+and then invoke the @code{run} function (with the remaining non-option arguments)
+and a handle to the parsed configuration (and the configuration file name that was
+used, which is typically not needed):
+@example
+@verbatiminclude tutorial-examples/001.c
+@end example
+
+@node Handling command-line options
+@subsection Handling command-line options
+
+Options can then be added easily by adding global variables and
+expanding the @code{options} array.  For example, the following would
+add a string-option and a binary flag (defaulting to @code{NULL} and
+@code{GNUNET\_NO} respectively):
+@example
+@verbatiminclude tutorial-examples/002.c
+@end example
+
+Issues such as displaying some helpful text describing options using
+the @code{--help} argument and error handling are taken care of when
+using this approach.  Other @code{GNUNET\_GETOPT\_}-functions can be used
+to obtain integer value options, increment counters, etc.  You can
+even write custom option parsers for special circumstances not covered
+by the available handlers. To check if an argument was specified by the
+user you initialize the variable with a specific value (e.g. NULL for
+a string and GNUNET\_SYSERR for a integer) and check after parsing
+happened if the values were modified.
+
+Inside the @code{run} method, the program would perform the
+application-specific logic, which typically involves initializing and
+using some client library to interact with the service.  The client
+library is supposed to implement the IPC whereas the service provides
+more persistent P2P functions.
+
+Exercise: Add a few command-line options and print them inside
+of @code{run}.  What happens if the user gives invalid arguments?
+
+@node Writing a Client Library
+@subsection Writing a Client Library
+
+The first and most important step in writing a client library is to
+decide on an API for the library.  Typical API calls include
+connecting to the service, performing application-specific requests
+and cleaning up.  Many examples for such service APIs can be found
+in the @file{gnunet/src/include/gnunet\_*\_service.h} files.
+
+Then, a client-service protocol needs to be designed.  This typically
+involves defining various message formats in a header that will be
+included by both the service and the client library (but is otherwise
+not shared and hence located within the service's directory and not
+installed by @command{make install}).  Each message must start with a
+@code{struct GNUNET\_MessageHeader} and must be shorter than 64k.  By
+convention, all fields in IPC (and P2P) messages must be in big-endian
+format (and thus should be read using @code{ntohl} and similar
+functions and written using @code{htonl} and similar functions).
+Unique message types must be defined for each message struct in the
+@file{gnunet\_protocols.h} header (or an extension-specific include
+file).
+
+@node Connecting to the Service
+@subsubsection Connecting to the Service
+
+Before a client library can implement the application-specific protocol
+with the service, a connection must be created:
+@example
+@verbatiminclude tutorial-examples/003.c
+@end example
+
+As a result a @code{GNUNET\_MQ\_Handle} is returned
+which can to used henceforth to transmit messages to the service.
+The complete MQ API can be found in @file{gnunet\_mq\_lib.h}.
+The @code{hanlders} array in the example above is incomplete.
+Here is where you will define which messages you expect to
+receive from the service, and which functions handle them.
+The @code{error\_cb} is a function that is to be called whenever
+there are errors communicating with the service.
+
+@node Sending messages
+@subsubsection Sending messages
+
+In GNUnet, messages are always sent beginning with a @code{struct GNUNET\_MessageHeader}
+in big endian format. This header defines the size and the type of the
+message, the payload follows after this header.
+@example
+@verbatiminclude tutorial-examples/004.c
+@end example
+
+Existing message types are defined in @file{gnunet\_protocols.h}.
+A common way to create a message is with an envelope:
+@example
+@verbatiminclude tutorial-examples/005.c
+@end example
+
+Exercise: Define a message struct that includes a 32-bit
+unsigned integer in addition to the standard GNUnet MessageHeader.
+Add a C struct and define a fresh protocol number for your message.
+Protocol numbers in gnunet-ext are defined in @file{gnunet-ext/src/include/gnunet_protocols_ext.h}
+
+Exercise: Find out how you can determine the number of messages in a message queue.
+
+Exercise: Find out how you can determine when a message you have queued was actually transmitted.
+
+Exercise: Define a helper function to transmit a 32-bit
+unsigned integer (as payload) to a service using some given client
+handle.
+
+@node Receiving Replies from the Service
+@subsubsection Receiving Replies from the Service
+
+Clients can receive messages from the service using the handlers
+specified in the @code{handlers} array we specified when connecting
+to the service.  Entries in the the array are usually created using
+one of two macros, depending on whether the message is fixed size
+or variable size.  Variable size messages are managed using two
+callbacks, one to check that the message is well-formed, the other
+to actually process the message.  Fixed size messages are fully
+checked by the MQ-logic, and thus only need to provide the handler
+to process the message.  Note that the prefixes @code{check\_}
+and @code{handle\_} are mandatory.
+@example
+@verbatiminclude tutorial-examples/006.c
+@end example
+
+Exercise: Expand your helper function to receive a response message
+(for example, containing just the @code{struct GNUnet MessageHeader}
+without any payload).  Upon receiving the service's response, you
+should call a callback provided to your helper function's API.
+
+Exercise: Figure out where you can pass values to the closures (@code{cls}).
+
+@node Writing a user interface
+@subsection Writing a user interface
+
+Given a client library, all it takes to access a service now is to
+combine calls to the client library with parsing command-line
+options.
+
+Exercise: Call your client API from your @code{run()} method in your
+client application to send a request to the service.  For example,
+send a 32-bit integer value based on a number given at the
+command-line to the service.
+
+@node Writing a Service
+@section Writing a Service
+
+Before you can test the client you've written so far, you'll need to also
+implement the corresponding service.
+
+@node Code Placement
+@subsection Code Placement
+
+New services are placed in their own subdirectory under @file{gnunet/src}.
+This subdirectory should contain the API implementation file @file{SERVICE\_api.c},
+the description of the client-service protocol @file{SERVICE.h} and P2P protocol
+@file{SERVICE\_protocol.h}, the implementation of the service itself
+@file{gnunet-service-SERVICE.h} and several files for tests, including test code
+and configuration files.
+
+@node Starting a Service
+@subsection Starting a Service
+
+The key API definition for creating a service is the @code{GNUNET\_SERVICE\_MAIN} macro:
+@example
+@verbatiminclude tutorial-examples/007.c
+@end example
+
+In addition to the service name and flags, the macro takes three
+functions, typically called @code{run}, @code{client\_connect\_cb} and
+@code{client\_disconnect\_cb} as well as an array of message handlers
+that will be called for incoming messages from clients.
+
+A minimal version of the three central service funtions would look
+like this:
+@example
+@verbatiminclude tutorial-examples/008.c
+@end example
+
+Exercise: Write a stub service that processes no messages at all
+in your code.  Create a default configuration for it, integrate it
+with the build system and start the service from
+@command{gnunet-service-arm} using @command{gnunet-arm -i NAME}.
+
+Exercise: Figure out how to set the closure (@code{cls}) for handlers
+of a service.
+
+Exercise: Figure out how to send messages from the service back to the
+client.
+
+Each handler function in the service @b{must} eventually (possibly in some
+asynchronous continuation) call @code{GNUNET\_SERVICE\_client\_continue()}.
+Only after this call additional messages from the same client may
+be processed. This way, the service can throttle processing messages
+from the same client.
+
+Exercise: Change the service to ``handle'' the message from your
+client (for now, by printing a message).  What happens if you
+forget to call @code{GNUNET\_SERVICE\_client\_continue()}?
+
+@node Interacting directly with other Peers using the CORE Service
+@section Interacting directly with other Peers using the CORE Service
+
+FIXME: This section still needs to be updated to the lastest API!
+
+One of the most important services in GNUnet is the @code{CORE} service
+managing connections between peers and handling encryption between peers.
+
+One of the first things any service that extends the P2P protocol typically does
+is connect to the @code{CORE} service using:
+@example
+@verbatiminclude tutorial-examples/009.c
+@end example
+
+@node New P2P connections
+@subsection New P2P connections
+
+Before any traffic with a different peer can be exchanged, the peer must be
+known to the service. This is notified by the @code{CORE} @code{connects} callback,
+which communicates the identity of the new peer to the service:
+@example
+@verbatiminclude tutorial-examples/010.c
+@end example
+
+Note that whatever you return from @code{connects} is given as the
+@i{cls} argument to the message handlers for messages from
+the respective peer.
+
+Exercise: Create a service that connects to the @code{CORE}.  Then
+start (and connect) two peers and print a message once your connect
+callback is invoked.
+
+@node Receiving P2P Messages
+@subsection Receiving P2P Messages
+
+To receive messages from @code{CORE}, you pass the desired
+@i{handlers} to the @code{GNUNET\_CORE\_connect()} function,
+just as we showed for services.
+
+It is your responsibility to process messages fast enough or
+to implement flow control. If an application does not process
+CORE messages fast enough, CORE will randomly drop messages
+to not keep a very long queue in memory.
+
+Exercise: Start one peer with a new service that has a message
+handler and start a second peer that only has your ``old'' service
+without message handlers.  Which ``connect'' handlers are invoked when
+the two peers are connected?  Why?
+
+@node Sending P2P Messages
+@subsection Sending P2P Messages
+
+You can transmit messages to other peers using the @i{mq} you were
+given during the @code{connect} callback.  Note that the @i{mq}
+automatically is released upon @code{disconnect} and that you must
+not use it afterwards.
+
+It is your responsibility to not over-fill the message queue, GNUnet
+will send the messages roughly in the order given as soon as possible.
+
+Exercise: Write a service that upon connect sends messages as
+fast as possible to the other peer (the other peer should run a
+service that ``processes'' those messages).  How fast is the
+transmission?  Count using the STATISTICS service on both ends.  Are
+messages lost? How can you transmit messages faster?  What happens if
+you stop the peer that is receiving your messages?
+
+@node End of P2P connections
+@subsection End of P2P connections
+
+If a message handler returns @code{GNUNET\_SYSERR}, the remote peer shuts down or
+there is an unrecoverable network disconnection, CORE notifies the service that
+the peer disconnected. After this notification no more messages will be received
+from the peer and the service is no longer allowed to send messages to the peer.
+The disconnect callback looks like the following:
+@example
+@verbatiminclude tutorial-examples/011.c
+@end example
+
+Exercise: Fix your service to handle peer disconnects.
+
+@node Storing peer-specific data using the PEERSTORE service
+@section Storing peer-specific data using the PEERSTORE service
+
+GNUnet's PEERSTORE service offers a persistorage for arbitrary peer-specific data.
+Other GNUnet services can use the PEERSTORE to store, retrieve and monitor data records.
+Each data record stored with PEERSTORE contains the following fields:
+
+@itemize
+@item subsystem: Name of the subsystem responsible for the record.
+@item peerid: Identity of the peer this record is related to.
+@item key: a key string identifying the record.
+@item value: binary record value.
+@item expiry: record expiry date.
+@end itemize
+
+The first step is to start a connection to the PEERSTORE service:
+@example
+@verbatiminclude tutorial-examples/012.c
+@end example
+
+The service handle @code{peerstore_handle} will be needed for all subsequent
+PEERSTORE operations.
+
+@node Storing records
+@subsection Storing records
+
+To store a new record, use the following function:
+@example
+@verbatiminclude tutorial-examples/013.c
+@end example
+
+The @code{options} parameter can either be @code{GNUNET_PEERSTORE_STOREOPTION_MULTIPLE}
+which means that multiple values can be stored under the same key combination (subsystem, peerid, key),
+or @code{GNUNET_PEERSTORE_STOREOPTION_REPLACE} which means that PEERSTORE will replace any
+existing values under the given key combination (subsystem, peerid, key) with the new given value.
+
+The continuation function @code{cont} will be called after the store request is successfully
+sent to the PEERSTORE service. This does not guarantee that the record is successfully stored, only
+that it was received by the service.
+
+The @code{GNUNET_PEERSTORE_store} function returns a handle to the store operation. This handle
+can be used to cancel the store operation only before the continuation function is called:
+@example
+void
+GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc);
+@end example
+
+@node Retrieving records
+@subsection Retrieving records
+
+To retrieve stored records, use the following function:
+@example
+@verbatiminclude tutorial-examples/014.c
+@end example
+
+The values of @code{peer} and @code{key} can be @code{NULL}. This allows the
+iteration over values stored under any of the following key combinations:
+@itemize
+@item (subsystem)
+@item (subsystem, peerid)
+@item (subsystem, key)
+@item (subsystem, peerid, key)
+@end itemize
+
+The @code{callback} function will be called once with each retrieved record and once
+more with a @code{NULL} record to signal the end of results.
+
+The @code{GNUNET_PEERSTORE_iterate} function returns a handle to the iterate operation. This
+handle can be used to cancel the iterate operation only before the callback function is called with
+a @code{NULL} record.
+
+@node Monitoring records
+@subsection Monitoring records
+
+PEERSTORE offers the functionality of monitoring for new records stored under a specific key
+combination (subsystem, peerid, key). To start the monitoring, use the following function:
+@example
+@verbatiminclude tutorial-examples/015.c
+@end example
+
+Whenever a new record is stored under the given key combination, the @code{callback} function
+will be called with this new record. This will continue until the connection to the PEERSTORE service
+is broken or the watch operation is canceled:
+@example
+@verbatiminclude tutorial-examples/016.c
+@end example
+
+@node Disconnecting from PEERSTORE
+@subsection Disconnecting from PEERSTORE
+
+When the connection to the PEERSTORE service is no longer needed, disconnect using the following
+function:
+@example
+@verbatiminclude tutorial-examples/017.c
+@end example
+
+If the @code{sync_first} flag is set to @code{GNUNET_YES}, the API will delay the
+disconnection until all store requests are received by the PEERSTORE service. Otherwise,
+it will disconnect immediately.
+
+@node Using the DHT
+@section Using the DHT
+
+The DHT allows to store data so other peers in the P2P network can
+access it and retrieve data stored by any peers in the network.
+This section will explain how to use the DHT. Of course, the first
+thing to do is to connect to the DHT service:
+@example
+@verbatiminclude tutorial-examples/018.c
+@end example
+
+The second parameter indicates how many requests in parallel to expect.
+It is not a hard limit, but a good approximation will make the DHT more
+efficient.
+
+@node Storing data in the DHT
+@subsection Storing data in the DHT
+Since the DHT is a dynamic environment (peers join and leave frequently)
+the data that we put in the DHT does not stay there indefinitely. It is
+important to ``refresh'' the data periodically by simply storing it again,
+in order to make sure other peers can access it.
+
+The put API call offers a callback to signal that the PUT request has been
+sent. This does not guarantee that the data is accessible to others peers,
+or even that is has been stored, only that the service has requested to
+a neighboring peer the retransmission of the PUT request towards its final
+destination. Currently there is no feedback about whether or not the data
+has been sucessfully stored or where it has been stored. In order to improve
+the availablilty of the data and to compensate for possible errors, peers leaving
+and other unfavorable events, just make several PUT requests!
+@example
+@verbatiminclude tutorial-examples/019.c
+@end example
+
+Exercise: Store a value in the DHT periodically to make sure it is available
+over time. You might consider using the function @code{GNUNET\_SCHEDULER\_add\_delayed}
+and call @code{GNUNET\_DHT\_put} from inside a helper function.
+
+@node Obtaining data from the DHT
+@subsection Obtaining data from the DHT
+As we saw in the previous example, the DHT works in an asynchronous mode.
+Each request to the DHT is executed ``in the background'' and the API
+calls return immediately. In order to receive results from the DHT, the
+API provides a callback. Once started, the request runs in the service,
+the service will try to get as many results as possible (filtering out
+duplicates) until the timeout expires or we explicitly stop the request.
+It is possible to give a ``forever'' timeout with
+@code{GNUNET\_TIME\_UNIT\_FOREVER\_REL}.
+
+If we give a route option @code{GNUNET\_DHT\_RO\_RECORD\_ROUTE} the callback
+will get a list of all the peers the data has travelled, both on the PUT
+path and on the GET path.
+@example
+@verbatiminclude tutorial-examples/020.c
+@end example
+
+Exercise: Store a value in the DHT and after a while retrieve it. Show the IDs of all
+the peers the requests have gone through. In order to convert a peer ID to a string, use
+the function @code{GNUNET\_i2s}. Pay attention to the route option parameters in both calls!
+
+@node Implementing a block plugin
+@subsection Implementing a block plugin
+
+In order to store data in the DHT, it is necessary to provide a block
+plugin.  The DHT uses the block plugin to ensure that only well-formed
+requests and replies are transmitted over the network.
+
+The block plugin should be put in a file @file{plugin\_block\_SERVICE.c}
+in the service's respective directory. The
+mandatory functions that need to be implemented for a block plugin are
+described in the following sections.
+
+@node Validating requests and replies
+@subsubsection Validating requests and replies
+
+The evaluate function should validate a reply or a request. It returns
+a @code{GNUNET\_BLOCK\_EvaluationResult}, which is an enumeration. All
+possible answers are in @file{gnunet\_block\_lib.h}.  The function will
+be called with a @code{reply\_block} argument of @code{NULL} for
+requests.  Note that depending on how @code{evaluate} is called, only
+some of the possible return values are valid.  The specific meaning of
+the @code{xquery} argument is application-specific.  Applications that
+do not use an extended query should check that the @code{xquery\_size}
+is zero.  The block group is typically used to filter duplicate
+replies.
+@example
+@verbatiminclude tutorial-examples/021.c
+@end example
+
+Note that it is mandatory to detect duplicate replies in this function
+and return the respective status code.  Duplicate detection is
+typically done using the Bloom filter block group provided by
+@file{libgnunetblockgroup.so}.  Failure to do so may cause replies to
+circle in the network.
+
+@node Deriving a key from a reply
+@subsubsection Deriving a key from a reply
+
+The DHT can operate more efficiently if it is possible to derive a key
+from the value of the corresponding block.  The @code{get\_key}
+function is used to obtain the key of a block --- for example, by
+means of hashing.  If deriving the key is not possible, the function
+should simply return @code{GNUNET\_SYSERR} (the DHT will still work
+just fine with such blocks).
+@example
+@verbatiminclude tutorial-examples/022.c
+@end example
+
+@node Initialization of the plugin
+@subsubsection Initialization of the plugin
+
+The plugin is realized as a shared C library.  The library must export
+an initialization function which should initialize the plugin.  The
+initialization function specifies what block types the plugin cares
+about and returns a struct with the functions that are to be used for
+validation and obtaining keys (the ones just defined above).
+@example
+@verbatiminclude tutorial-examples/023.c
+@end example
+
+@node Shutdown of the plugin
+@subsubsection Shutdown of the plugin
+
+Following GNUnet's general plugin API concept, the plugin must
+export a second function for cleaning up.  It usually does very
+little.
+@example
+@verbatiminclude tutorial-examples/024.c
+@end example
+
+@node Integration of the plugin with the build system
+@subsubsection Integration of the plugin with the build system
+
+In order to compile the plugin, the @file{Makefile.am} file for the
+service SERVICE should contain a rule similar to this:
+@c* Actually this is a Makefile not C. But the whole structure of examples
+@c* must be improved.
+@example
+@verbatiminclude tutorial-examples/025.c
+@end example
+
+Exercise: Write a block plugin that accepts all queries
+and all replies but prints information about queries and replies
+when the respective validation hooks are called.
+
+@node Monitoring the DHT
+@subsection Monitoring the DHT
+It is possible to monitor the functioning of the local DHT service. When monitoring
+the DHT, the service will alert the monitoring program of any events,
+both started locally or received for routing from another peer. The are three different
+types of events possible: a GET request, a PUT request or a response (a reply to
+a GET).
+
+Since the different events have different associated data, the API gets 3
+different callbacks (one for each message type) and optional type and key parameters,
+to allow for filtering of messages. When an event happens, the appropiate callback
+is called with all the information about the event.
+@example
+@verbatiminclude tutorial-examples/026.c
+@end example
+
+@node Debugging with gnunet-arm
+@section Debugging with gnunet-arm
+
+Even if services are managed by @command{gnunet-arm}, you can start them with
+@command{gdb} or @command{valgrind}.  For example, you could add the following lines
+to your configuration file to start the DHT service in a @command{gdb} session in a
+fresh @command{xterm}:
+
+@example
+[dht]
+PREFIX=xterm -e gdb --args
+@end example
+
+Alternatively, you can stop a service that was started via ARM and run it manually:
+
+@example
+$ gnunet-arm -k dht
+$ gdb --args gnunet-service-dht -L DEBUG
+$ valgrind gnunet-service-dht -L DEBUG
+@end example
+
+Assuming other services are well-written, they will automatically re-integrate the
+restarted service with the peer.
+
+GNUnet provides a powerful logging mechanism providing log levels @code{ERROR},
+@code{WARNING}, @code{INFO} and @code{DEBUG}. The current log level is
+configured using the @code{$GNUNET_FORCE_LOG} environmental variable.
+The @code{DEBUG} level is only available if @command{--enable-logging=verbose} was used when
+running @command{configure}. More details about logging can be found under
+@uref{https://gnunet.org/logging}.
+
+You should also probably enable the creation of core files, by setting
+@code{ulimit}, and echo'ing @code{1} into @file{/proc/sys/kernel/core\_uses\_pid}.
+Then you can investigate the core dumps with @command{gdb}, which is often
+the fastest method to find simple errors.
+
+Exercise: Add a memory leak to your service and obtain a trace
+pointing to the leak using @command{valgrind} while running the service
+from @command{gnunet-service-arm}.
+
+@bye
diff --git a/doc/gnunet.texi b/doc/gnunet.texi
index 61eb4f1bb..7803e52d3 100644
--- a/doc/gnunet.texi
+++ b/doc/gnunet.texi
@@ -1,4 +1,6 @@
-\input texinfo @c -*-texinfo-*-
+\input texinfo
+@c -*-texinfo-*-
+
 @c %**start of header
 @setfilename gnunet.info
 @documentencoding UTF-8
@@ -7,6 +9,13 @@
 
 @include version.texi
 
+@c Set Versions which might be used in more than one place:
+@set GNUNET-DIST-URL https://ftp.gnu.org/gnu/gnunet/
+@set GNUNET-VERSION 0.10.1
+@set GNURL-VERSION-CURRENT 7.55.1
+@set GNURL-DIST-URL https://gnunet.org/sites/default/files/
+@c @set OPENPGP-SIGNING-KEY-ID
+
 @copying
 Copyright @copyright{} 2001-2017 GNUnet e.V.
 
@@ -167,7 +176,3 @@ Installation
 @printindex fn
 
 @bye
-
-@c Local Variables:
-@c ispell-local-dictionary: "american";
-@c End:
diff --git a/doc/images/daemon_lego_block.svg b/doc/images/daemon_lego_block.svg
new file mode 100644
index 000000000..38ad90d13
--- /dev/null
+++ b/doc/images/daemon_lego_block.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg6781"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="New document 58">
+  <defs
+     id="defs6783" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="375"
+     inkscape:cy="520"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="721"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata6786">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       transform="translate(-4.5298577,-148.04661)"
+       id="g6746">
+      <path
+         style="fill:#5fd38d;fill-opacity:1;stroke:#faf6a2;stroke-width:1.99014676;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+         d="m 183.84284,595.7683 350.8064,0 0,202.04036 -350.8064,0 z"
+         id="path6693"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2.22747946;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect6695"
+         width="66.670067"
+         height="75.18058"
+         x="223.74881"
+         y="737.19458" />
+      <rect
+         y="737.19458"
+         x="331.83514"
+         height="67.323441"
+         width="66.670067"
+         id="rect6697"
+         style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2.10787106;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2.06117821;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect6699"
+         width="66.670067"
+         height="64.373825"
+         x="434.8707"
+         y="737.19458" />
+      <path
+         style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+         d="m 223.60976,736.21851 67.23534,0.38374 0,23.63648 -67.23534,37.13818 z"
+         id="path6701"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path6703"
+         d="m 331.69608,736.21851 67.23534,0.3894 0,23.98466 -67.23534,37.68524 z"
+         style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:0.99090236;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+      <path
+         style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+         d="m 434.73164,736.21851 67.23534,0.38374 0,23.63648 -67.23534,37.13818 z"
+         id="path6705"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:1.92068994;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+         d="m 533.72659,595.02309 56.12366,-29.34622 -1.01015,190.24271 -55.11351,41.45733 z"
+         id="path6707"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:1.99424875;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+         d="m 245.46708,566.47881 345.46203,-1.01015 -56.56854,31.31472 -349.50264,-1.01014 z"
+         id="path6709"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text6715"
+         y="677.59558"
+         x="234.35539"
+         style="font-size:36px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="677.59558"
+           x="234.35539"
+           id="tspan6717"
+           sodipodi:role="line">User Interface</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/doc/images/gnunet-tutorial-service.png b/doc/images/gnunet-tutorial-service.png
new file mode 100644
index 000000000..6daed2f35
--- /dev/null
+++ b/doc/images/gnunet-tutorial-service.png
diff --git a/doc/images/gnunet-tutorial-system.png b/doc/images/gnunet-tutorial-system.png
new file mode 100644
index 000000000..8b54e16cf
--- /dev/null
+++ b/doc/images/gnunet-tutorial-system.png
diff --git a/doc/images/lego_stack.svg b/doc/images/lego_stack.svg
new file mode 100644
index 000000000..a0e8017c3
--- /dev/null
+++ b/doc/images/lego_stack.svg
@@ -0,0 +1,737 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="System.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient6602">
+      <stop
+         style="stop-color:#df8060;stop-opacity:1;"
+         offset="0"
+         id="stop6604" />
+      <stop
+         style="stop-color:#df8002;stop-opacity:0;"
+         offset="1"
+         id="stop6606" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4392"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#faf6a6;stop-opacity:1;"
+         offset="0"
+         id="stop4394" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="883.99395 : 559.99673 : 1"
+       inkscape:vp_y="13.319386 : 993.87659 : 0"
+       inkscape:vp_z="285.3157 : 504.79962 : 1"
+       inkscape:persp3d-origin="481.39556 : 281.96355 : 1"
+       id="perspective3070" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="76.097926 : 349.87282 : 1"
+       inkscape:vp_y="-13.319386 : 979.366 : 0"
+       inkscape:vp_z="752.55793 : 376.31441 : 1"
+       inkscape:persp3d-origin="373.64045 : 350.98006 : 1"
+       id="perspective3012" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="322.06882"
+     inkscape:cy="568.82291"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="846"
+     inkscape:window-height="963"
+     inkscape:window-x="59"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="352.03815"
+       y="-190.12544"
+       id="text6623"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6625"
+         x="352.03815"
+         y="-190.12544" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="338.40109"
+       y="-300.73715"
+       id="text6627"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6629"
+         x="338.40109"
+         y="-300.73715" /></text>
+    <g
+       style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text6643" />
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="71.720833"
+       y="95.747719"
+       id="text6648"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6650"
+         x="71.720833"
+         y="95.747719" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="262.63965"
+       y="666.48389"
+       id="text6711"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6713"
+         x="262.63965"
+         y="666.48389" /></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3506"
+       d="m 198.00647,673.76257 236.93358,0 0,158.2919 -236.93358,0 z"
+       style="fill:#000000;fill-opacity:1;stroke:#faf6a2;stroke-width:1.44768786;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3432"
+       d="m 169.32669,654.90334 464.83332,-2.26992 -33.76593,25.73079 -483.97287,-0.12904 z"
+       style="fill:#deaa87;fill-opacity:1;stroke:#faf6a2;stroke-width:2.18398547;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#59000c;stroke-width:1.35822594;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0.48230088;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3416"
+       width="28.495705"
+       height="172.2845"
+       x="464.19418"
+       y="518.96954" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#59000c;stroke-width:1.36876941;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0.48230088;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3414"
+       width="34.729141"
+       height="170.67587"
+       x="340.86124"
+       y="517.93475" />
+    <path
+       style="fill:#deaa87;fill-opacity:1;stroke:#faf6a2;stroke-width:2.04969239;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 246.8138,499.06358 386.50295,-0.94821 -41.88736,26.04231 -413.96081,0 z"
+       id="rect6568-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffdd55;fill-opacity:1;stroke:#faf6a2;stroke-width:1.49989259;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 276.05867,399.52042 323.05541,0 0,124.61741 -323.05541,0 z"
+       id="rect5973"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:1.19094384;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 599.16863,399.06078 34.35465,-18.10059 0,117.34068 -34.35465,25.57066 z"
+       id="rect6542"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:1.50087094;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6557"
+       width="322.88623"
+       height="30.529778"
+       x="276.67755"
+       y="368.99368" />
+    <path
+       style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:0.50882494;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 598.94047,368.99367 34.58281,-16.82253 0,28.66061 -34.58281,18.06864 z"
+       id="rect6561"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6564"
+       d="m 598.94047,369.07046 34.30741,-17.12981 0,29.18412 -34.30741,18.39868 z"
+       style="fill:#c87137;fill-opacity:1;stroke:#faf6a2;stroke-width:0.51140249;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       inkscape:transform-center-x="-70.147578"
+       inkscape:transform-center-y="15.429055" />
+    <path
+       style="fill:#d38d5f;fill-opacity:1;stroke:#faf6a2;stroke-width:1.47079194;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 330.2508,353.23478 302.87005,-0.62306 -38.33414,16.82253 -318.87597,0 z"
+       id="rect6568"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="391.63083"
+       y="461.858"
+       id="text6656"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         sodipodi:role="line"
+         id="tspan6658"
+         x="391.63083"
+         y="461.858">Service</tspan></text>
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6707"
+       d="m 598.75503,244.83802 34.98432,-18.10059 0.26082,125.2709 -35.24514,17.64044 z"
+       style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:1.19094384;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6709"
+       d="m 419.07032,228.1132 214.71185,-1.24611 -34.63196,19.9378 L 381.29,246.18184 z"
+       style="fill:#37c871;fill-opacity:1;stroke:#faf6a2;stroke-width:1.23655474;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <rect
+       style="fill:#5fd38d;fill-opacity:1;stroke:#c48069;stroke-width:1.23640049;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect7224"
+       width="217.86653"
+       height="122.74216"
+       x="381.70358"
+       y="246.25151" />
+    <text
+       xml:space="preserve"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="409.16376"
+       y="302.05649"
+       id="text6715"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         sodipodi:role="line"
+         id="tspan6717"
+         x="409.16376"
+         y="302.05649">User Interface</tspan></text>
+    <g
+       id="g7219"
+       transform="matrix(0.62334353,0,0,0.61679464,281.18563,257.70936)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect6571"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text6631"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan6633"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,344.78251,257.70936)"
+       id="g7226">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect7228"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text7230"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan7232"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <g
+       id="g7234"
+       transform="matrix(0.62334353,0,0,0.61679464,409.3239,257.70936)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect7236"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text7238"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan7240"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,175.75806,412.85048)"
+       id="g7242">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect7244"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text7246"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan7248"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <g
+       id="g7250"
+       transform="matrix(0.62334353,0,0,0.61679464,240.79871,413.29105)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect7252"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text7254"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan7256"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,303.79756,412.40991)"
+       id="g7258">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect7260"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text7262"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan7264"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <g
+       id="g7266"
+       transform="matrix(0.62334353,0,0,0.61679464,369.88148,412.40991)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect7268"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text7270"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan7272"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <path
+       style="fill:#ffeeaa;fill-opacity:1;stroke:#faf6a2;stroke-width:0.91879815;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 478.56081,554.09281 121.22633,0 0,124.61741 -121.22633,0 z"
+       id="rect5973-1"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,422.424,566.60858)"
+       id="g3474">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3476"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text3478"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3480"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <path
+       style="fill:#ffe680;fill-opacity:1;stroke:#faf6a2;stroke-width:1.18771458;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 599.60339,554.02055 33.72575,-29.55535 0.88568,128.35487 -34.61143,26.01123 z"
+       id="rect6542-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6564-2"
+       d="m 598.92998,524.03024 34.30741,-25.94116 0,26.5407 -34.30741,29.85344 z"
+       style="fill:#d38d5f;fill-opacity:1;stroke:#faf6a2;stroke-width:0.51140249;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       inkscape:transform-center-x="-70.147578"
+       inkscape:transform-center-y="15.429055" />
+    <path
+       inkscape:transform-center-y="15.492457"
+       inkscape:transform-center-x="-70.147578"
+       style="fill:#c87137;fill-opacity:1;stroke:#faf6a2;stroke-width:0.51245213;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 598.92998,524.13683 34.30741,-26.04775 0,26.64977 -34.30741,29.97611 z"
+       id="path3402"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3404"
+       d="m 599.82047,678.2289 34.30741,-25.94116 0,26.5407 -34.30741,34.25912 z"
+       style="fill:#c87137;fill-opacity:1;stroke:#faf6a2;stroke-width:0.51140249;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       inkscape:transform-center-x="-70.147578"
+       inkscape:transform-center-y="15.429055" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3406"
+       d="m 600.04863,707.77865 33.90941,-29.55535 0.89049,128.35487 -34.7999,26.01123 z"
+       style="fill:#37c837;fill-opacity:1;stroke:#faf6a2;stroke-width:1.19094384;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3410"
+       d="m 356.56358,554.09281 120.92249,0 0,124.19268 -120.92249,0 z"
+       style="fill:#ffeeaa;fill-opacity:1;stroke:#faf6a2;stroke-width:0.91608089;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       style="fill:#ffeeaa;fill-opacity:1;stroke:#faf6a2;stroke-width:1.11023378;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 177.52518,554.09281 177.51841,0 0,124.25702 -177.51841,0 z"
+       id="path3412"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:1.11264122;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6557-7"
+       width="177.44882"
+       height="30.529778"
+       x="177.65657"
+       y="523.95343" />
+    <rect
+       y="678.1521"
+       x="116.73995"
+       height="29.53463"
+       width="177.54182"
+       id="rect3408"
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:1.09464383;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+    <rect
+       y="523.95343"
+       x="356.55023"
+       height="30.529778"
+       width="120.86897"
+       id="rect3420"
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:0.91828173;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:0.91828173;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3422"
+       width="120.86897"
+       height="30.529778"
+       x="478.54919"
+       y="523.95343" />
+    <text
+       xml:space="preserve"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="372.34232"
+       y="622.53217"
+       id="text6656-2"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         sodipodi:role="line"
+         id="tspan6658-2"
+         x="372.34232"
+         y="622.53217">Service</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3424"
+       y="622.53217"
+       x="220.56013"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         y="622.53217"
+         x="220.56013"
+         id="tspan3426"
+         sodipodi:role="line">Service</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="493.85532"
+       y="622.54492"
+       id="text3428"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         sodipodi:role="line"
+         id="tspan3430"
+         x="493.85532"
+         y="622.54492">Service</tspan></text>
+    <g
+       id="g3434"
+       transform="matrix(0.62334353,0,0,0.61679464,120.10238,566.60858)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect3436"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3438"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan3440"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,181.54625,566.60858)"
+       id="g3442">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3444"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text3446"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3448"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <g
+       id="g3450"
+       transform="matrix(0.62334353,0,0,0.61679464,242.09962,566.60858)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect3452"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3454"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan3456"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,303.54348,566.60858)"
+       id="g3458">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3460"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text3462"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3464"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <g
+       id="g3466"
+       transform="matrix(0.62334353,0,0,0.61679464,362.76112,566.60858)">
+      <rect
+         y="119.99139"
+         x="198.49498"
+         height="60.609154"
+         width="66.670067"
+         id="rect3468"
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3470"
+         y="160.39748"
+         x="206.07112"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         xml:space="preserve"><tspan
+           y="160.39748"
+           x="206.07112"
+           id="tspan3472"
+           sodipodi:role="line">API</tspan></text>
+    </g>
+    <path
+       style="fill:#5fd35f;fill-opacity:1;stroke:#faf6a2;stroke-width:1.11993289;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 420.2626,707.53388 180.11119,0 0,124.61741 -180.11119,0 z"
+       id="path3490"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.62334353,0,0,0.61679464,62.665728,566.60858)"
+       id="g3492">
+      <rect
+         style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+         id="rect3494"
+         width="66.670067"
+         height="60.609154"
+         x="198.49498"
+         y="119.99139" />
+      <text
+         xml:space="preserve"
+         style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+         x="206.07112"
+         y="160.39748"
+         id="text3496"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3498"
+           x="206.07112"
+           y="160.39748">API</tspan></text>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3500"
+       d="m 116.52597,707.54132 177.63643,0 0,124.61741 -177.63643,0 z"
+       style="fill:#5fd35f;fill-opacity:1;stroke:#faf6a2;stroke-width:1.11221218;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       style="fill:#5fd35f;fill-opacity:1;stroke:#faf6a2;stroke-width:0.92545629;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 295.65636,707.63061 122.98965,0 0,124.61741 -122.98965,0 z"
+       id="path3502"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="162.54019"
+       y="779.76184"
+       id="text3508"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         sodipodi:role="line"
+         id="tspan3510"
+         x="162.54019"
+         y="779.76184">Service</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3512"
+       y="779.7619"
+       x="313.56918"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         y="779.7619"
+         x="313.56918"
+         id="tspan3514"
+         sodipodi:role="line">Service</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:22.32217598px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="465.48401"
+       y="779.7619"
+       id="text3516"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0052948,0.9947331)"><tspan
+         sodipodi:role="line"
+         id="tspan3518"
+         x="465.48401"
+         y="779.7619">Service</tspan></text>
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:0.91063529;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3520"
+       width="122.86946"
+       height="29.53463"
+       x="295.75125"
+       y="678.1521" />
+    <rect
+       y="678.1521"
+       x="420.27423"
+       height="29.53463"
+       width="179.80205"
+       id="rect3522"
+       style="fill:#c87137;fill-opacity:1;stroke:#c48069;stroke-width:1.10158956;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+  </g>
+</svg>
diff --git a/doc/images/service_lego_block.svg b/doc/images/service_lego_block.svg
new file mode 100644
index 000000000..ef0d0234f
--- /dev/null
+++ b/doc/images/service_lego_block.svg
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="Lego block 3.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient6602">
+      <stop
+         style="stop-color:#df8060;stop-opacity:1;"
+         offset="0"
+         id="stop6604" />
+      <stop
+         style="stop-color:#df8002;stop-opacity:0;"
+         offset="1"
+         id="stop6606" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4392"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#faf6a6;stop-opacity:1;"
+         offset="0"
+         id="stop4394" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="883.99395 : 559.99673 : 1"
+       inkscape:vp_y="13.319386 : 993.87659 : 0"
+       inkscape:vp_z="285.3157 : 504.79962 : 1"
+       inkscape:persp3d-origin="481.39556 : 281.96355 : 1"
+       id="perspective3070" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="76.097926 : 349.87282 : 1"
+       inkscape:vp_y="-13.319386 : 979.366 : 0"
+       inkscape:vp_z="752.55793 : 376.31441 : 1"
+       inkscape:persp3d-origin="373.64045 : 350.98006 : 1"
+       id="perspective3012" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="385.59974"
+     inkscape:cy="826.03166"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="721"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffdd55;fill-opacity:1;stroke:#faf6a2;stroke-width:2.26315212;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 74.934278,230.09308 453.654042,0 0,202.04036 -453.654042,0 z"
+       id="rect5973"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:1.92068994;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 528.67583,229.34787 55.11351,-29.34622 0,190.24271 -55.11351,41.45733 z"
+       id="rect6542"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="fill:#d38d5f;fill-opacity:1;stroke:#c48069;stroke-width:2.2674458;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6557"
+       width="454.54535"
+       height="49.497475"
+       x="74.764442"
+       y="180.60052" />
+    <path
+       style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:0.8206054;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 528.30981,180.60052 55.47954,-27.27412 0,46.46702 -55.47954,29.29442 z"
+       id="rect6561"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6564"
+       d="m 528.30981,180.72501 55.03773,-27.7723 0,47.31578 -55.03773,29.8295 z"
+       style="fill:#d38d5f;fill-opacity:1;stroke:#faf6a2;stroke-width:0.82476228;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       inkscape:transform-center-x="-70.147578"
+       inkscape:transform-center-y="15.429055" />
+    <path
+       style="fill:#deaa87;fill-opacity:1;stroke:#faf6a2;stroke-width:2.23265362;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 153.39374,154.33657 430.4643,-1.01015 -54.4837,27.27411 -453.213248,0 z"
+       id="rect6568"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="352.03815"
+       y="-190.12544"
+       id="text6623"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6625"
+         x="352.03815"
+         y="-190.12544" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="338.40109"
+       y="-300.73715"
+       id="text6627"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6629"
+         x="338.40109"
+         y="-300.73715" /></text>
+    <rect
+       style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6571"
+       width="66.670067"
+       height="60.609154"
+       x="198.49498"
+       y="119.99139" />
+    <path
+       style="fill:#ff6600;fill-opacity:1;stroke:#faf6a2;stroke-width:1.98413372;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 265.16503,119.45792 44.95179,-22.465406 0,57.057986 -44.95179,26.55003 z"
+       id="path6600"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ff6600;fill-opacity:1;stroke:#c48069;stroke-width:1.99687159;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 243.06977,97.26295 66.86223,10e-7 -45.08135,22.728439 -66.3557,0 z"
+       id="path6617"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="206.07112"
+       y="160.39748"
+       id="text6631"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6633"
+         x="206.07112"
+         y="160.39748">API</tspan></text>
+    <rect
+       y="119.99139"
+       x="313.65237"
+       height="60.609154"
+       width="66.670067"
+       id="rect6573"
+       style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6598"
+       d="m 379.81735,119.56755 44.95179,-22.425126 0,56.955676 -44.95179,26.50243 z"
+       style="fill:#ff6600;fill-opacity:1;stroke:#faf6a2;stroke-width:1.98235416;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6615"
+       d="m 358.25117,97.26295 66.89824,10e-7 -45.10563,22.728439 -66.39143,0 z"
+       style="fill:#ff6600;fill-opacity:1;stroke:#c48069;stroke-width:1.99740911;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text6635"
+       y="160.39748"
+       x="322.23865"
+       style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       xml:space="preserve"><tspan
+         y="160.39748"
+         x="322.23865"
+         id="tspan6637"
+         sodipodi:role="line">API</tspan></text>
+    <rect
+       style="fill:#ff9955;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6575"
+       width="66.670067"
+       height="60.609154"
+       x="428.80978"
+       y="119.99139" />
+    <path
+       style="fill:#ff6600;fill-opacity:1;stroke:#faf6a2;stroke-width:1.98960423;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 494.97474,119.62537 44.95179,-22.589454 0,57.373054 -44.95179,26.69664 z"
+       id="rect6595"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ff6600;fill-opacity:1;stroke:#c48069;stroke-width:1.99399996;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 473.25645,97.26295 66.67007,10e-7 -44.95179,22.728439 -66.16499,0 z"
+       id="rect6612"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="439.41635"
+       y="159.89241"
+       id="text6639"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6641"
+         x="439.41635"
+         y="159.89241">API</tspan></text>
+    <g
+       style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       id="text6643" />
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="71.720833"
+       y="95.747719"
+       id="text6648"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6650"
+         x="71.720833"
+         y="95.747719" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="176.77669"
+       y="216.96603"
+       id="text6652"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6654"
+         x="176.77669"
+         y="216.96603">Network Protocol</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:36px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="233.34526"
+       y="312.93051"
+       id="text6656"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6658"
+         x="233.34526"
+         y="312.93051">Service</tspan></text>
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2.09665918;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6660"
+       width="66.670067"
+       height="66.609154"
+       x="216.67773"
+       y="371.51938" />
+    <rect
+       y="371.51938"
+       x="322.74374"
+       height="64.373825"
+       width="66.670067"
+       id="rect6662"
+       style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2.06117821;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6664"
+       width="66.670067"
+       height="60.609154"
+       x="423.75903"
+       y="372.52951" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6666"
+       d="m 423.61996,372.56359 67.23534,-0.62641 0,19.59587 -68.24549,41.17879 z"
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 322.60471,371.55344 67.23534,0.38374 0,23.63648 -67.23534,37.13818 z"
+       id="path6668"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6670"
+       d="m 322.60471,371.55344 67.23534,0.38374 0,23.63648 -67.23534,37.13818 z"
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+    <path
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0"
+       d="m 216.53869,371.55344 67.23534,0.38374 0,23.63648 -67.23534,37.13818 z"
+       id="path6672"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="262.63965"
+       y="666.48389"
+       id="text6711"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6713"
+         x="262.63965"
+         y="666.48389" /></text>
+    <rect
+       y="371.51938"
+       x="111.62187"
+       height="70.798637"
+       width="66.670067"
+       id="rect6721"
+       style="fill:#ffffff;fill-opacity:1;stroke:#faf6a2;stroke-width:2.1615901;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path6723"
+       d="m 111.48283,370.54329 67.23534,0.38374 0,23.63648 -67.23534,37.13818 z"
+       style="fill:#ffcc00;fill-opacity:1;stroke:#faf6a2;stroke-width:0.98368376;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:0;stroke-dashoffset:0" />
+  </g>
+</svg>
diff --git a/doc/outdated-and-old-installation-instructions.txt b/doc/outdated-and-old-installation-instructions.txt
new file mode 100644
index 000000000..f2cbe1847
--- /dev/null
+++ b/doc/outdated-and-old-installation-instructions.txt
@@ -0,0 +1,672 @@
+# This file contains pieces from chapter/installation.texi for systems where the LTS or otherwise support
+# ended. They can be useful for people trying to write new installation instructions for those systems.
+# In particual this covers:
+# - FreeBSD 8
+# - Mac OS X Tiger
+# - Fedora 8
+# - Gentoo with GNUnet 0.9
+#
+# Sources for LTS and support ranges:
+# https://www.freebsd.org/security/security.html#sup
+# https://support.microsoft.com/en-us/help/17140/lifecycle-faq-general-policy-questions
+# Mac products, OS is supposedly similar (no official statements exist): https://web.archive.org/web/20160706101225/https://support.apple.com/en-us/HT201624
+# https://wiki.debian.org/LTS
+# https://www.ubuntu.com/info/release-end-of-life
+
+@node Build instructions for Gentoo
+@subsection Build instructions for Gentoo
+
+
+This page describes how to install GNUnet 0.9 on Gentoo.
+
+Since the GNUnet 0.9 ebuilds are not in the official portage tree yet, we need
+to add them to the local portage overlay. All the commands below should be
+executed as root.
+
+Specify your local portage directory in the /etc/make.conf, for example:@
+@code{$ echo 'PORTDIR_OVERLAY="/usr/local/portage"' >> /etc/make.conf}
+
+Create directories for the ebuilds:@
+@code{$ mkdir -p /usr/local/portage/media-libs/libextractor /usr/local/portage/net-p2p/gnunet/files}
+
+Download the latest ebuilds, init and config files from here and put them into
+respective directories:@
+@code{$ cp libextractor-0.6.2.ebuild /usr/local/portage/media-libs/libextractor@
+ $ cp gnunet-0.9.2.ebuild /usr/local/portage/net-p2p/gnunet@
+ $ cp gnunet-0.9.2.conf gnunet-0.9.2.confd gnunet-0.9.2.initd /usr/local/portage/net-p2p/gnunet/files}
+
+Generate Manifest files for the ebuilds:@
+@code{$ cd /usr/local/portage/net-p2p/gnunet@
+ $ ebuild gnunet-0.9.2.ebuild digest@
+ $ cd /usr/local/portage/media-libs/libextractor@
+ $ ebuild libextractor-0.6.2.ebuild digest}
+
+Unmask GNUnet and dependencies in the /etc/portage/package.keywords. For
+example, if you use x86-64 architecture, add the following lines:@
+@code{net-p2p/gnunet ~amd64@
+ media-libs/libextractor ~amd64@
+ net-libs/libmicrohttpd ~amd64@
+ net-misc/curl ~amd64}
+
+Add either sqlite or mysql USE-flag in the /etc/portage/package.use:@
+@code{net-p2p/gnunet sqlite}
+
+Now everything is ready to install GNUnet:@
+@code{$ emerge -av gnunet}
+
+Use /etc/init.d/gnunet to start/stop GNUnet.
+
+
+
+
+@node Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .
+@subsection Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .
+@c %**end of header
+
+@strong{This documentation is outdated and not valid for GNUnet 0.10.0!}@
+ GNUnet installation on Fedora 8/Planetlab nodes can be done as following:
+
+1. Install the build tools to build GNUnet@
+@example
+sudo yum -y -t --nogpgcheck install gcc make automake autoconf gettext-devel \
+texinfo zlib-devel subversion@
+@end example
+
+2. Install the GNUnet dependencies@
+@example
+sudo yum -y -t --nogpgcheck install gnutls-devel gnutls-devel libgcrypt-devel \
+sqlite-devel postgresql-devel mysql-devel libgsf-devel libvorbis-devel \
+libidn-devel
+@end example
+
+3. Install outdated dependencies from source@
+ libtool@
+@code{@
+ wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
+ tar xvfz libtool-2.4.2.tar.gz@
+ cd libtool-2.4.2@
+ ./configure@
+ sudo make install@
+}
+
+libtool@
+@code{@
+ wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
+ tar xvfz libtool-2.4.2.tar.gz@
+ cd libtool-2.4.2@
+ ./configure@
+ sudo make install@
+}
+
+glpk@
+@code{@
+ wget http://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz@
+ tar xvfz glpk-4.47.tar.gz@
+ cd glpk-4.47@
+ ./configure@
+ sudo make install@
+}
+
+libgpg-error@
+@code{@
+ wget ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2@
+ tar xvfj libgpg-error-1.10.tar.bz2@
+ cd libgpg-error-1.10@
+ ./configure --prefix=/usr@
+ sudo make install@
+}
+
+libgcrypt@
+@code{@
+ wget ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2@
+ tar xvfj libgcrypt-1.5.0.tar.tar.bz2@
+ cd libgcrypt-1.5.0@
+ ./configure --prefix=/usr@
+ sudo make install@
+}
+
+libcurl@
+@code{@
+ wget http://curl.haxx.se/download/curl-7.26.0.tar.gz@
+ tar xvfz curl-7.26.0.tar.gz@
+ cd curl-7.26.0@
+ ./configure@
+ sudo make install@
+}
+
+libunistring@
+@code{@
+ wget http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.3.tar.gz@
+ tar xvfz libunistring-0.9.3.tar.gz@
+ cd libunistring-0.9.3@
+ ./configure@
+ sudo make install@
+}
+
+4. Remove conflicting packages@
+@code{@
+ sudo rpm -e --nodeps libgcrypt libgpg-error@
+}
+
+4. Install libextractor@
+@code{@
+ wget ftp://ftp.gnu.org/gnu/libextractor/libextractor-0.6.3.tar.gz@
+ tar xvfz libextractor-0.6.3.tar.gz@
+ cd libextractor-0.6.3@
+ ./configure@
+ sudo make install@
+}
+
+5. Install libmicrohttpd and dependencies
+
+nettle@
+@code{@
+ wget http://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz@
+ tar xvfz nettle-2.5.tar.gz@
+ cd nettle-2.5@
+ ./configure@
+ sudo make install@
+}
+
+GnuTLS@
+@code{@
+ wget http://ftp.gnu.org/gnu/gnutls/gnutls-2.12.20.tar.bz2@
+ tar xvfj gnutls-2.12.20.tar.bz2@
+ cd gnutls-2.12.20@
+ ./configure --without-p11-kit@
+ sudo make install@
+}
+
+libmicrohttpd@
+@code{@
+ wget ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.21.tar.gz@
+ tar xvfz libmicrohttpd-0.9.21.tar.gz@
+ cd libmicrohttpd-0.9.21@
+ ./configure@
+ sudo make install@
+}
+
+6. Set GNUnet prefix and add to PATH@
+@code{@
+ export GNUNET_PREFIX=@
+ export PATH=$PATH:$GNUNET_PREFIX/bin@
+}
+
+7. Install GNUnet from svn@
+@example
+ export LD_LIBRARY_PATH=/usr/local/lib@
+ svn co https://gnunet.org/svn/gnunet@
+ cd gnunet@
+ libtoolize@
+ ./bootstrap@
+ ./configure --prefix=$GNUNET_PREFIX --with-extractor=/usr/local \
+ --with-curl=/usr/local --with-mysql=/usr/lib/mysql --enable-logging=verbose@
+ make install@
+@end example
+
+Done!
+
+
+@node Build instructions for FreeBSD 8
+@subsection Build instructions for FreeBSD 8
+
+To get GNUnet 0.9 to compile on FreeBSD (at least FreeBSD 8.0):@ in order to
+install the library @code{libiconv}, at first change the directory to your
+ports directory, e.g.@
+@code{@
+ $ cd /usr/ports/@
+}@
+ following that, go to the install file of @code{libiconv} and install it,@
+@code{@
+ $ cd converters/libiconv,@
+ $ make install@
+}
+
+after that, change the directory to where you will check out
+@code{libextractor} and GNUnet, and install latest @code{libextractor},@
+ first of all, checkout @code{libextractor}, e.g.@
+@code{@
+ $ svn co https://gnunet.org/svn/Extractor@
+}@
+ then change the directory into which it was checked out, e.g.@
+@code{@
+ $ cd Extractor@
+}@
+ before the installation, you should do following steps,@
+
+@example
+$ ./bootstrap@
+$ ./configure --with-ltdl-include=/usr/local/include \
+  --with-ltdl-lib=/usr/local/lib@
+@end example
+
+if these steps complete successfully, you can install the library,@
+
+@example
+$ make install@
+@end example
+
+to check out the GNUnet, you should do the similar steps as
+@code{libextractor}, firstly, change back to starting directory, e.g.@
+@code{@
+ $ cd ../@
+}@
+ Set the following environmental variables:@
+@code{@
+ export CPPFLAGS="-I/usr/local/include"@
+ export LDFLAGS="-L/usr/local/lib"@
+}@
+ next, checkout GNUnet using@
+@code{@
+ $ svn co https://gnunet.org/svn/gnunet@
+}@
+ then change directory into newly checked out directory,@
+@code{@
+ $ cd gnunet@
+}@
+ at last, start to install GNUnet,@
+
+@example
+ $ ./bootstrap@
+ $ ./configure --with-ltdl-include=/usr/local/include \
+   --with-ltdl-lib=/usr/local/lib --with-extractor=/usr/local
+
+## NOTE: you may not need the --with-extractor option!@
+
+$ make install
+@end example
+
+
+
+@node Basic installation for Mac OS X
+@subsection Basic installation for Mac OS X
+
+This documentation may be outdated!
+
+This page is providing guidelines for users trying to install GNUnet on Mac OS
+X.@ Mainly users trying to install GNUnet by building source code are the most
+welcome readers.@ The steps below are tested on an Intel Architecture running
+Mac OS X Tiger (10.4.11). Ideally they should work on other Mac boxes with
+different configurations as all the configuration done for it is dependent on
+@uref{http://www.macports.org/, MacPorts}
+
+For having GNUnet installed successfully, some dependencies should be firstly
+resolved:
+
+@itemize @bullet
+
+@item
+Install/Update your @uref{http://developer.apple.com/tools/xcode/, Xcode}
+version 3.2.1 or later for Snow Leopard, 3.1.4 or later for Leopard, or 2.5 for
+Tiger. 
+
+@item
+Download and install @uref{http://www.macports.org/, MacPorts}.@
+Now you are ready for installing GNunet dependencies. 
+
+@item
+First, you'd better make sure that: /opt/local/bin and /opt/local/sbin are
+available in your PATH. (For doing so, open a terminal and type:@
+
+@example 
+$ echo $PATH 
+@end example
+
+and examine the output of it). If the paths are not available in your
+environment, you have to add them (You can add them by editing your .profile
+file in your home directory, append them to the PATH line). Then type:
+@example
+$ source ~/.profile
+@end example
+
+and re-examine the echo command output.
+
+@item
+Use MacPorts to download and install the dependencies:@
+The libraries are: 
+
+@itemize @bullet
+
+@item
+@uref{http://trac.macports.org/browser/trunk/dports/www/libmicrohttpd/Portfile, libmicrohttpd.}
+
+@item
+@uref{http://trac.macports.org/browser/trunk/dports/devel/libgcrypt/Portfile, libgcrypt.}
+
+@item
+@uref{http://trac.macports.org/browser/trunk/dports/net/curl/Portfile, libcurl.}
+
+@item
+@uref{http://trac.macports.org/browser/trunk/dports/devel/libtool/Portfile, libltdl.}
+
+@item
+@uref{http://trac.macports.org/browser/trunk/dports/databases/sqlite3/Portfile, SQlite.}
+
+@item
+libunistring 
+
+@item
+glpk 
+
+@end itemize
+
+The port command is as follows:@
+@example
+port install libmicrohttpd libgcrypt curl libtool sqlite3 linunistring glpk
+@end example
+One of the dependencies, the libextractor, should be explicitly installed,
+since the version available from macports is outdated to work with GNUnet. To
+install the latest libextractor:
+@itemize @bullet
+
+
+@item
+Install the Subversion Client:@
+For more information about Subversion visit:
+@uref{http://subversion.tigris.org/, http://subversion.tigris.org/}
+
+@example
+# port install subversion
+@end example
+
+
+@item
+Use Subversion to download the latest Extractor: 
+@example
+$ svn checkout https://gnunet.org/svn/Extractor
+@end example
+
+
+@item
+Go to the installation directory of the Extractor, compile and install it: 
+@example
+$ ./bootstrap
+$ export CPPFLAGS="-I/opt/local/include"
+$ export  LDFLAGS="-L/opt/local/lib" 
+$ ./configure --prefix=/opt/local
+$ make
+# make install
+@end example
+
+@end itemize
+
+
+@item
+Now, your system is ready to install GNunet. If you downloaded GNUnet by
+checking it out from svn, you should start by running the bootstrap script.
+Open a terminal pointing to the GNUnet directory and type:@
+
+@example
+$ ./bootstrap
+@end example
+
+
+@item
+Run the configure script: 
+@example
+$ export CPPFLAGS="-I/opt/local/include" 
+$ export LDFLAGS="-L/opt/local/lib" 
+$ ./configure --prefix=/tmp/gnunet_build
+@end example
+
+
+GNUnet will be installed in the directory /tmp/gnunet_build (Of course that
+installation path can be changed).@ The CPPFLAGS and LDFLAGS are mentioned in
+order to inform the compiler and the linker to lookup headers and libraries in
+/opt/local/include and /opt/local/lib.
+
+@item
+Compile@
+
+@example
+$ make
+@end example
+
+
+@item
+Install GNUnet 
+@example
+# make install
+@end example
+
+@end itemize
+
+
+@node Basic Installation for Fedora/PlanetLab nodes running Fedora 12
+@subsection Basic Installation for Fedora/PlanetLab nodes running Fedora 12
+
+
+@strong{This documentation is outdated and not valid for GNUnet 0.10.0!}@
+
+GNUnet installation on Fedora 8/Planetlab nodes can be done as following:
+
+1. Install the build tools to build GNUnet@
+@example
+sudo yum -y -t --nogpgcheck install gcc make autoconf gettext-devel \
+texinfo subversion@
+@end example
+
+2. Install the GNUnet dependencies@
+@example
+sudo yum -y -t --nogpgcheck install libunistring-devel libunistring-devel \
+libgcrypt-devel zlib-devel sqlite-devel postgresql-devel mysql-devel \
+libgsf-devel libvorbis-devel@
+@end example
+
+3. Install outdated dependencies from source@
+libtool@
+@example
+wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
+tar xvfz libtool-2.4.2.tar.gz@
+cd libtool-2.4.2@
+./configure@
+sudo make install@
+@end example
+
+glpk@
+@example
+wget http://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz@
+tar xvfz glpk-4.47.tar.gz@
+cd glpk-4.47@
+./configure@
+sudo make install@
+@end example
+
+libcurl@
+@example
+wget http://curl.haxx.se/download/curl-7.26.0.tar.gz@
+tar xvfz curl-7.26.0.tar.gz@
+cd curl-7.26.0@
+./configure@
+sudo make install@
+@end example
+
+4. Install libextractor@
+@example
+svn co https://gnunet.org/svn/libextractor@
+cd libextractor@
+libtoolize@
+./bootstrap@
+./configure@
+sudo make install@
+@end example
+
+5. Install libmicrohttpd@
+@example
+svn co https://gnunet.org/svn/libmicrohttpd@
+cd libmicrohttpd@
+libtoolize@
+./bootstrap@
+./configure@
+sudo make install@
+@end example
+
+6. Set GNUnet prefix and add to PATH@
+@example
+export GNUNET_PREFIX=@
+export PATH=$PATH:$GNUNET_PREFIX/bin@
+@end example
+
+7. Install GNUnet from svn@
+@example
+export LD_LIBRARY_PATH=/usr/local/lib@
+svn co https://gnunet.org/svn/gnunet@
+cd gnunet@
+libtoolize@
+./bootstrap@
+./configure --prefix=$GNUNET_PREFIX --with-extractor=/usr \
+ --with-mysql=/usr/lib/mysql --enable-logging=verbose@
+make install@
+@end example
+
+Done!
+
+
+@node Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .
+@subsection Basic Installation for Fedora/PlanetLab nodes running Fedora 8 .
+@c %**end of header
+
+@strong{This documentation is outdated and not valid for GNUnet 0.10.0!}@
+ GNUnet installation on Fedora 8/Planetlab nodes can be done as following:
+
+1. Install the build tools to build GNUnet@
+@example
+sudo yum -y -t --nogpgcheck install gcc make automake autoconf gettext-devel \
+texinfo zlib-devel subversion@
+@end example
+
+2. Install the GNUnet dependencies@
+@example
+sudo yum -y -t --nogpgcheck install gnutls-devel gnutls-devel libgcrypt-devel \
+sqlite-devel postgresql-devel mysql-devel libgsf-devel libvorbis-devel \
+libidn-devel
+@end example
+
+3. Install outdated dependencies from source@
+ libtool@
+@code{@
+ wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
+ tar xvfz libtool-2.4.2.tar.gz@
+ cd libtool-2.4.2@
+ ./configure@
+ sudo make install@
+}
+
+libtool@
+@code{@
+ wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz@
+ tar xvfz libtool-2.4.2.tar.gz@
+ cd libtool-2.4.2@
+ ./configure@
+ sudo make install@
+}
+
+glpk@
+@code{@
+ wget http://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz@
+ tar xvfz glpk-4.47.tar.gz@
+ cd glpk-4.47@
+ ./configure@
+ sudo make install@
+}
+
+libgpg-error@
+@code{@
+ wget ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.10.tar.bz2@
+ tar xvfj libgpg-error-1.10.tar.bz2@
+ cd libgpg-error-1.10@
+ ./configure --prefix=/usr@
+ sudo make install@
+}
+
+libgcrypt@
+@code{@
+ wget ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2@
+ tar xvfj libgcrypt-1.5.0.tar.tar.bz2@
+ cd libgcrypt-1.5.0@
+ ./configure --prefix=/usr@
+ sudo make install@
+}
+
+libcurl@
+@code{@
+ wget http://curl.haxx.se/download/curl-7.26.0.tar.gz@
+ tar xvfz curl-7.26.0.tar.gz@
+ cd curl-7.26.0@
+ ./configure@
+ sudo make install@
+}
+
+libunistring@
+@code{@
+ wget http://ftp.gnu.org/gnu/libunistring/libunistring-0.9.3.tar.gz@
+ tar xvfz libunistring-0.9.3.tar.gz@
+ cd libunistring-0.9.3@
+ ./configure@
+ sudo make install@
+}
+
+4. Remove conflicting packages@
+@code{@
+ sudo rpm -e --nodeps libgcrypt libgpg-error@
+}
+
+4. Install libextractor@
+@code{@
+ wget ftp://ftp.gnu.org/gnu/libextractor/libextractor-0.6.3.tar.gz@
+ tar xvfz libextractor-0.6.3.tar.gz@
+ cd libextractor-0.6.3@
+ ./configure@
+ sudo make install@
+}
+
+5. Install libmicrohttpd and dependencies
+
+nettle@
+@code{@
+ wget http://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz@
+ tar xvfz nettle-2.5.tar.gz@
+ cd nettle-2.5@
+ ./configure@
+ sudo make install@
+}
+
+GnuTLS@
+@code{@
+ wget http://ftp.gnu.org/gnu/gnutls/gnutls-2.12.20.tar.bz2@
+ tar xvfj gnutls-2.12.20.tar.bz2@
+ cd gnutls-2.12.20@
+ ./configure --without-p11-kit@
+ sudo make install@
+}
+
+libmicrohttpd@
+@code{@
+ wget ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.21.tar.gz@
+ tar xvfz libmicrohttpd-0.9.21.tar.gz@
+ cd libmicrohttpd-0.9.21@
+ ./configure@
+ sudo make install@
+}
+
+6. Set GNUnet prefix and add to PATH@
+@code{@
+ export GNUNET_PREFIX=@
+ export PATH=$PATH:$GNUNET_PREFIX/bin@
+}
+
+7. Install GNUnet from svn@
+@example
+ export LD_LIBRARY_PATH=/usr/local/lib@
+ svn co https://gnunet.org/svn/gnunet@
+ cd gnunet@
+ libtoolize@
+ ./bootstrap@
+ ./configure --prefix=$GNUNET_PREFIX --with-extractor=/usr/local \
+ --with-curl=/usr/local --with-mysql=/usr/lib/mysql --enable-logging=verbose@
+ make install@
+@end example
+
+Done!
+
+
diff --git a/doc/tutorial-examples/001.c b/doc/tutorial-examples/001.c
new file mode 100644
index 000000000..7f6699dd2
--- /dev/null
+++ b/doc/tutorial-examples/001.c
@@ -0,0 +1,29 @@
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_util_lib.h>
+
+static int ret;
+
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  // main code here
+  ret = 0;
+}
+
+int
+main (int argc, char *const *argv)
+{
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  return (GNUNET_OK ==
+          GNUNET_PROGRAM_run (argc,
+                              argv,
+                              "binary-name",
+                              gettext_noop ("binary description text"),
+                              options, &run, NULL)) ? ret : 1;
+}
+
diff --git a/doc/tutorial-examples/002.c b/doc/tutorial-examples/002.c
new file mode 100644
index 000000000..02233fd61
--- /dev/null
+++ b/doc/tutorial-examples/002.c
@@ -0,0 +1,17 @@
+static char *string_option;
+static int a_flag;
+
+// ...
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_string ('s', "name", "SOMESTRING",
+     gettext_noop ("text describing the string_option NAME"),
+     &string_option},
+    GNUNET_GETOPT_option_flag ('f', "flag",
+     gettext_noop ("text describing the flag option"), 
+     &a_flag),
+    GNUNET_GETOPT_OPTION_END
+  };
+  string_option = NULL;
+  a_flag = GNUNET_SYSERR;
+// ...
+
diff --git a/doc/tutorial-examples/003.c b/doc/tutorial-examples/003.c
new file mode 100644
index 000000000..d13681ca6
--- /dev/null
+++ b/doc/tutorial-examples/003.c
@@ -0,0 +1,7 @@
+  struct GNUNET_MQ_MessageHandlers handlers[] = {
+    // ...
+    GNUNET_MQ_handler_end ()
+  };
+  struct GNUNET_MQ_Handle *mq;
+
+  mq = GNUNET_CLIENT_connect (cfg, "service-name", handlers, &error_cb, NULL);
diff --git a/doc/tutorial-examples/004.c b/doc/tutorial-examples/004.c
new file mode 100644
index 000000000..0ef007907
--- /dev/null
+++ b/doc/tutorial-examples/004.c
@@ -0,0 +1,5 @@
+struct GNUNET_MessageHeader
+{
+  uint16_t size GNUNET_PACKED;
+  uint16_t type GNUNET_PACKED;
+};
diff --git a/doc/tutorial-examples/005.c b/doc/tutorial-examples/005.c
new file mode 100644
index 000000000..0c459f509
--- /dev/null
+++ b/doc/tutorial-examples/005.c
@@ -0,0 +1,8 @@
+struct GNUNET_MQ_Envelope *env;
+struct GNUNET_MessageHeader *msg;
+
+env = GNUNET_MQ_msg_extra (msg, payload_size, GNUNET_MY_MESSAGE_TYPE);
+memcpy (&msg[1], &payload, payload_size);
+// Send message via message queue 'mq'
+GNUNET_mq_send (mq, env);
+
diff --git a/doc/tutorial-examples/006.c b/doc/tutorial-examples/006.c
new file mode 100644
index 000000000..944d2b18c
--- /dev/null
+++ b/doc/tutorial-examples/006.c
@@ -0,0 +1,31 @@
+static void
+handle_fix (void *cls, const struct MyMessage *msg)
+{
+  // process 'msg'
+}
+
+static int
+check_var (void *cls, const struct MyVarMessage *msg)
+{
+  // check 'msg' is well-formed
+  return GNUNET_OK;
+}
+
+static void
+handle_var (void *cls, const struct MyVarMessage *msg)
+{
+  // process 'msg'
+}
+
+struct GNUNET_MQ_MessageHandler handlers[] = {
+  GNUNET_MQ_hd_fixed_size (fix,
+                          GNUNET_MESSAGE_TYPE_MY_FIX,
+                          struct MyMessage,
+                          NULL),
+  GNUNET_MQ_hd_fixed_size (var,
+                          GNUNET_MESSAGE_TYPE_MY_VAR,
+                          struct MyVarMessage,
+                          NULL),
+
+  GNUNET_MQ_handler_end ()
+};
diff --git a/doc/tutorial-examples/007.c b/doc/tutorial-examples/007.c
new file mode 100644
index 000000000..096539e43
--- /dev/null
+++ b/doc/tutorial-examples/007.c
@@ -0,0 +1,10 @@
+GNUNET_SERVICE_MAIN
+("service-name",
+ GNUNET_SERVICE_OPTION_NONE,
+ &run,
+ &client_connect_cb,
+ &client_disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_fixed_size (...),
+ GNUNET_MQ_hd_var_size (...),
+ GNUNET_MQ_handler_end ());
diff --git a/doc/tutorial-examples/008.c b/doc/tutorial-examples/008.c
new file mode 100644
index 000000000..2dffe2cf9
--- /dev/null
+++ b/doc/tutorial-examples/008.c
@@ -0,0 +1,22 @@
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_SERVICE_Handle *service)
+{
+}
+
+static void *
+client_connect_cb (void *cls,
+                   struct GNUNET_SERVICE_Client *c,
+                   struct GNUNET_MQ_Handle *mq)
+{
+  return c;
+}
+
+static void
+client_disconnect_cb (void *cls,
+                      struct GNUNET_SERVICE_Client *c,
+                      void *internal_cls)
+{
+  GNUNET_assert (c == internal_cls);
+}
diff --git a/doc/tutorial-examples/009.c b/doc/tutorial-examples/009.c
new file mode 100644
index 000000000..26d918fb0
--- /dev/null
+++ b/doc/tutorial-examples/009.c
@@ -0,0 +1,9 @@
+#include <gnunet/gnunet_core_service.h>
+
+struct GNUNET_CORE_Handle *
+GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                     void *cls,
+                     GNUNET_CORE_StartupCallback init,
+                     GNUNET_CORE_ConnectEventHandler connects,
+                     GNUNET_CORE_DisconnectEventHandler disconnects,
+                     const struct GNUNET_MQ_MessageHandler *handlers);
diff --git a/doc/tutorial-examples/010.c b/doc/tutorial-examples/010.c
new file mode 100644
index 000000000..33494490d
--- /dev/null
+++ b/doc/tutorial-examples/010.c
@@ -0,0 +1,8 @@
+void *
+connects (void *cls,
+          const struct GNUNET_PeerIdentity *peer,
+          struct GNUNET_MQ_Handle *mq)
+{
+  return mq;
+}
+
diff --git a/doc/tutorial-examples/011.c b/doc/tutorial-examples/011.c
new file mode 100644
index 000000000..23bc051de
--- /dev/null
+++ b/doc/tutorial-examples/011.c
@@ -0,0 +1,8 @@
+void
+disconnects (void *cls,
+             const struct GNUNET_PeerIdentity * peer)
+{
+    /* Remove peer's identity from known peers */
+    /* Make sure no messages are sent to peer from now on */
+}
+
diff --git a/doc/tutorial-examples/012.c b/doc/tutorial-examples/012.c
new file mode 100644
index 000000000..cb21d78ab
--- /dev/null
+++ b/doc/tutorial-examples/012.c
@@ -0,0 +1,4 @@
+#include "gnunet_peerstore_service.h"
+
+peerstore_handle = GNUNET_PEERSTORE_connect (cfg);
+
diff --git a/doc/tutorial-examples/013.c b/doc/tutorial-examples/013.c
new file mode 100644
index 000000000..6792417e1
--- /dev/null
+++ b/doc/tutorial-examples/013.c
@@ -0,0 +1,12 @@
+struct GNUNET_PEERSTORE_StoreContext *
+GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
+                        const char *sub_system,
+                        const struct GNUNET_PeerIdentity *peer,
+                        const char *key,
+                        const void *value,
+                        size_t size,
+                        struct GNUNET_TIME_Absolute expiry,
+                        enum GNUNET_PEERSTORE_StoreOption options,
+                        GNUNET_PEERSTORE_Continuation cont,
+                        void *cont_cls);
+
diff --git a/doc/tutorial-examples/014.c b/doc/tutorial-examples/014.c
new file mode 100644
index 000000000..ce204f795
--- /dev/null
+++ b/doc/tutorial-examples/014.c
@@ -0,0 +1,9 @@
+struct GNUNET_PEERSTORE_IterateContext *
+GNUNET_PEERSTORE_iterate (struct GNUNET_PEERSTORE_Handle *h,
+                          const char *sub_system,
+                          const struct GNUNET_PeerIdentity *peer,
+                          const char *key,
+                          struct GNUNET_TIME_Relative timeout,
+                          GNUNET_PEERSTORE_Processor callback,
+                          void *callback_cls);
+
diff --git a/doc/tutorial-examples/015.c b/doc/tutorial-examples/015.c
new file mode 100644
index 000000000..0dd267e8e
--- /dev/null
+++ b/doc/tutorial-examples/015.c
@@ -0,0 +1,8 @@
+struct GNUNET_PEERSTORE_WatchContext *
+GNUNET_PEERSTORE_watch (struct GNUNET_PEERSTORE_Handle *h,
+                        const char *sub_system,
+                        const struct GNUNET_PeerIdentity *peer,
+                        const char *key,
+                        GNUNET_PEERSTORE_Processor callback,
+                        void *callback_cls);
+
diff --git a/doc/tutorial-examples/016.c b/doc/tutorial-examples/016.c
new file mode 100644
index 000000000..d8db4b3b8
--- /dev/null
+++ b/doc/tutorial-examples/016.c
@@ -0,0 +1,3 @@
+void
+GNUNET_PEERSTORE_watch_cancel (struct GNUNET_PEERSTORE_WatchContext *wc);
+
diff --git a/doc/tutorial-examples/017.c b/doc/tutorial-examples/017.c
new file mode 100644
index 000000000..c4acbc088
--- /dev/null
+++ b/doc/tutorial-examples/017.c
@@ -0,0 +1,3 @@
+void
+GNUNET_PEERSTORE_disconnect (struct GNUNET_PEERSTORE_Handle *h, int sync_first);
+
diff --git a/doc/tutorial-examples/018.c b/doc/tutorial-examples/018.c
new file mode 100644
index 000000000..3fc22584c
--- /dev/null
+++ b/doc/tutorial-examples/018.c
@@ -0,0 +1,2 @@
+dht_handle = GNUNET_DHT_connect (cfg, parallel_requests);
+
diff --git a/doc/tutorial-examples/019.c b/doc/tutorial-examples/019.c
new file mode 100644
index 000000000..d016d381b
--- /dev/null
+++ b/doc/tutorial-examples/019.c
@@ -0,0 +1,15 @@
+message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  // Request has left local node
+}
+
+struct GNUNET_DHT_PutHandle *
+GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
+                const struct GNUNET_HashCode *key,
+                uint32_t desired_replication_level,
+                enum GNUNET_DHT_RouteOption options,
+                enum GNUNET_BLOCK_Type type, size_t size, const void *data,
+                struct GNUNET_TIME_Absolute exp,
+                struct GNUNET_TIME_Relative timeout,
+                GNUNET_DHT_PutContinuation cont, void *cont_cls)
+
diff --git a/doc/tutorial-examples/020.c b/doc/tutorial-examples/020.c
new file mode 100644
index 000000000..5ecba1c16
--- /dev/null
+++ b/doc/tutorial-examples/020.c
@@ -0,0 +1,24 @@
+static void
+get_result_iterator (void *cls, struct GNUNET_TIME_Absolute expiration,
+                     const struct GNUNET_HashCode *key,
+                     const struct GNUNET_PeerIdentity *get_path,
+                     unsigned int get_path_length,
+                     const struct GNUNET_PeerIdentity *put_path,
+                     unsigned int put_path_length,
+                     enum GNUNET_BLOCK_Type type, size_t size, const void *data)
+{
+  // Optionally:
+  GNUNET_DHT_get_stop (get_handle);
+}
+
+get_handle =
+      GNUNET_DHT_get_start (dht_handle,
+                            block_type,
+                            &key,
+                            replication,
+                            GNUNET_DHT_RO_NONE,
+                            NULL,
+                            0,
+                            &get_result_iterator,
+                            cls)
+
diff --git a/doc/tutorial-examples/021.c b/doc/tutorial-examples/021.c
new file mode 100644
index 000000000..688a31fe0
--- /dev/null
+++ b/doc/tutorial-examples/021.c
@@ -0,0 +1,13 @@
+static enum GNUNET_BLOCK_EvaluationResult
+block_plugin_SERVICE_evaluate (void *cls,
+                              enum GNUNET_BLOCK_Type type,
+                              struct GNUNET_BlockGroup *bg,
+                              const GNUNET_HashCode *query,
+                              const void *xquery,
+                              size_t xquery_size,
+                              const void *reply_block,
+                              size_t reply_block_size)
+{
+  // Verify type, block and bg
+}
+
diff --git a/doc/tutorial-examples/022.c b/doc/tutorial-examples/022.c
new file mode 100644
index 000000000..a373619bd
--- /dev/null
+++ b/doc/tutorial-examples/022.c
@@ -0,0 +1,8 @@
+static int
+block_plugin_SERVICE_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                             const void *block, size_t block_size,
+                             struct GNUNET_HashCode *key)
+{
+  // Store the key in the key argument, return GNUNET_OK on success.
+}
+
diff --git a/doc/tutorial-examples/023.c b/doc/tutorial-examples/023.c
new file mode 100644
index 000000000..820c38b10
--- /dev/null
+++ b/doc/tutorial-examples/023.c
@@ -0,0 +1,17 @@
+void *
+libgnunet_plugin_block_SERVICE_init (void *cls)
+{
+  static enum GNUNET_BLOCK_Type types[] =
+  {
+    GNUNET_BLOCK_TYPE_SERVICE_BLOCKYPE,
+    GNUNET_BLOCK_TYPE_ANY
+  };
+  struct GNUNET_BLOCK_PluginFunctions *api;
+
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
+  api->evaluate = &block_plugin_SERICE_evaluate;
+  api->get_key = &block_plugin_SERVICE_get_key;
+  api->types = types;
+  return api;
+}
+
diff --git a/doc/tutorial-examples/024.c b/doc/tutorial-examples/024.c
new file mode 100644
index 000000000..2e84b5905
--- /dev/null
+++ b/doc/tutorial-examples/024.c
@@ -0,0 +1,9 @@
+void *
+libgnunet_plugin_block_SERVICE_done (void *cls)
+{
+  struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
+
+  GNUNET_free (api);
+  return NULL;
+}
+
diff --git a/doc/tutorial-examples/025.c b/doc/tutorial-examples/025.c
new file mode 100644
index 000000000..66d4f80ec
--- /dev/null
+++ b/doc/tutorial-examples/025.c
@@ -0,0 +1,15 @@
+  plugindir = $(libdir)/gnunet
+
+  plugin_LTLIBRARIES = \
+          libgnunet_plugin_block_ext.la
+  libgnunet_plugin_block_ext_la_SOURCES = \
+          plugin_block_ext.c
+  libgnunet_plugin_block_ext_la_LIBADD = \
+          $(prefix)/lib/libgnunethello.la \
+          $(prefix)/lib/libgnunetblock.la \
+          $(prefix)/lib/libgnunetutil.la
+  libgnunet_plugin_block_ext_la_LDFLAGS = \
+          $(GN_PLUGIN_LDFLAGS)
+  libgnunet_plugin_block_ext_la_DEPENDENCIES = \
+          $(prefix)/lib/libgnunetblock.la
+
diff --git a/doc/tutorial-examples/026.c b/doc/tutorial-examples/026.c
new file mode 100644
index 000000000..264e0b6b9
--- /dev/null
+++ b/doc/tutorial-examples/026.c
@@ -0,0 +1,52 @@
+static void
+get_callback (void *cls,
+              enum GNUNET_DHT_RouteOption options,
+              enum GNUNET_BLOCK_Type type,
+              uint32_t hop_count,
+              uint32_t desired_replication_level,
+              unsigned int path_length,
+              const struct GNUNET_PeerIdentity *path,
+              const struct GNUNET_HashCode * key)
+{
+}
+
+
+static void
+get_resp_callback (void *cls,
+                   enum GNUNET_BLOCK_Type type,
+                   const struct GNUNET_PeerIdentity *get_path,
+                   unsigned int get_path_length,
+                   const struct GNUNET_PeerIdentity *put_path,
+                   unsigned int put_path_length,
+                   struct GNUNET_TIME_Absolute exp,
+                   const struct GNUNET_HashCode * key,
+                   const void *data,
+                   size_t size)
+{
+}
+
+
+static void
+put_callback (void *cls,
+              enum GNUNET_DHT_RouteOption options,
+              enum GNUNET_BLOCK_Type type,
+              uint32_t hop_count,
+              uint32_t desired_replication_level,
+              unsigned int path_length,
+              const struct GNUNET_PeerIdentity *path,
+              struct GNUNET_TIME_Absolute exp,
+              const struct GNUNET_HashCode * key,
+              const void *data,
+              size_t size)
+{
+}
+
+
+monitor_handle = GNUNET_DHT_monitor_start (dht_handle,
+                                          block_type,
+                                          key,
+                                          &get_callback,
+                                          &get_resp_callback,
+                                          &put_callback,
+                                          cls);
+
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 19088c5cb..2db2ba0d1 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -1833,7 +1833,21 @@ maint_child_death (void *cls)
                     statcode,
                     GNUNET_STRINGS_relative_time_to_string (pos->backoff,
                                                             GNUNET_YES));
-        /* schedule restart */
+        {
+          /* Reduce backoff based on runtime of the process,
+             so that there is a cool-down if a process actually
+             runs for a while. */
+          struct GNUNET_TIME_Relative runtime;
+          unsigned int minutes;
+
+          runtime = GNUNET_TIME_absolute_get_duration (pos->restart_at);
+          minutes = runtime.rel_value_us / GNUNET_TIME_UNIT_MINUTES.rel_value_us;
+          if (minutes > 31)
+            pos->backoff = GNUNET_TIME_UNIT_ZERO;
+          else
+            pos->backoff.rel_value_us <<= minutes;
+        }
+        /* schedule restart */
         pos->restart_at = GNUNET_TIME_relative_to_absolute (pos->backoff);
         pos->backoff = GNUNET_TIME_STD_BACKOFF (pos->backoff);
         if (NULL != child_restart_task)
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index af4cebfaa..c3e99e0eb 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -638,6 +638,7 @@ handle_channel_destroy (void *cls,
          "%s tried to destroy unknown channel %X\n",
          GSC_2s(c),
          (uint32_t) ntohl (msg->ccn.channel_of_client));
+    GNUNET_SERVICE_client_continue (c->client);
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,