75 files changed, 219 insertions, 217 deletions

diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm
index 98ab0ede70..b7b0156a09 100644
--- a/contrib/packages/guix/gnunet-doc.scm
+++ b/contrib/packages/guix/gnunet-doc.scm
@@ -94,7 +94,7 @@
          ("gnurl" ,gnurl)
          ("gstreamer" ,gstreamer)
          ("gst-plugins-base" ,gst-plugins-base)
-         ("gnutls" ,gnutls) ;Change to gnutls/dane once it is merged.
+         ("gnutls/dane" ,gnutls/dane)
          ("libextractor" ,libextractor)
          ("libgcrypt" ,libgcrypt)
          ("libidn" ,libidn)
@@ -109,7 +109,7 @@
          ("mysql" ,mysql)
          ("zlib" ,zlib)
          ("perl" ,perl)
-         ("python" ,python) ; tests and gnunet-qr
+         ("python-2" ,python-2) ; tests and gnunet-qr
          ("jansson" ,jansson)
          ("nss" ,nss)
          ("glib" ,glib "bin")
@@ -143,7 +143,7 @@
                (zero? (system* "sh" "bootstrap"))))
            (replace 'build
              (lambda _
-               (chdir "doc")
+               (chdir "doc/documentation")
                (zero? (system* "make" "pdf"))
                (zero? (system* "make" "html"))
                (zero? (system* "make" "info"))))
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bb0c5e0bf6..f84c667537 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,219 +1,7 @@
 # This Makefile.am is in the public domain
-SUBDIRS = man doxygen
-
-docdir = $(datadir)/doc/gnunet/
-
-infoimagedir = $(infodir)/images
-
-#DOT_FILES = images/$(wildcard *.dot)
-
-#DOT_VECTOR_GRAPHICS =								\
-#	$(DOT_FILES:%.dot=%.eps)						\
-#	$(DOT_FILES:%.dot=%.pdf)
-
-AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=docstyle.css
-
-dist_infoimage_DATA =                           		\
-	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 			\
-	images/gnunet-tutorial-service.png 			\
-	images/gnunet-tutorial-system.png			\
-	images/daemon_lego_block.svg  				\
-	images/lego_stack.svg					\
-	images/service_lego_block.svg				\
-	images/structure.dot
-
-#	images/$(wildcard *.png)						\
-#	images/$(wildcard *.svg)
-#	$(DOT_FILES:%.dot=%.png)
-
-#DOT_OPTIONS =									\
-#	-Gratio=.9 -Gnodesep=.005 -Granksep=.00005				\
-#	-Nfontsite=9 -Nheight=.1 -Nwidth=.1
-
-# .dot.png:
-# 	$(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# 	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .dot.pdf:
-# 	$(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# 	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .dot.eps:
-# 	$(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
-# 	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-# .png.eps:
-# 	$(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
-# 	mv "$@-tmp.eps" "$@"
-
-# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
-# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
-# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)                \
-# 	$(top_srcdir)/%D%/images/coreutils-size-map.eps
-# dvi-local: ps-local
-
-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							\
-	013.1.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
-
-info_TEXINFOS = 						\
-	gnunet.texi						\
-	gnunet-c-tutorial.texi
-
-gnunet_TEXINFOS = 						\
-	chapters/developer.texi 				\
-	chapters/installation.texi 				\
-	chapters/philosophy.texi 				\
-	chapters/user.texi 					\
-	chapters/vocabulary.texi				\
-	fdl-1.3.texi 						\
-	gpl-3.0.texi
+SUBDIRS = man doxygen documentation
 
 EXTRA_DIST =							\
-	$(gnunet_TEXINFOS)					\
 	outdated-and-old-installation-instructions.txt		\
 	gnunet-c-tutorial-v1.pdf				\
-	$(gnunet_tutorial_examples)				\
-	README.txt						\
-	docstyle.css
-
-
-#	$(DOT_FILES)								\
-#	$(DOT_VECTOR_GRAPHICS)
-
-DISTCLEANFILES = 						\
-	gnunet.cps						\
-	gnunet-c-tutorial.cps					\
-	chapters/developer.cps					\
-	chapters/installation.cps				\
-	chapter/philosophy.cps					\
-	chapters/user.cps					\
-	fdl-1.3.cps						\
-	gpl-3.0.cps
-
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING
-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
-
-# FIXME: The usage of 'date' strings causes a warning.
-# 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)" >> $@
-
-# Workaround for makeinfo error. Whcih in turn introduces more
-# date-related 'warnings'. Well.
-version2.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)" >> $@
-
-# FIXME: rm *.html and *.pdf
-#doc-clean:
-#	@rm *.aux *.log *.toc *.cp *.cps
-
-doc-all-install:
-	@mkdir -p $(DESTDIR)/$(docdir)
-	@mkdir -p $(DESTDIR)/$(infoimagedir)
-	@mkdir -p $(DESTDIR)/$(infodir)
-	@install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
-	@install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir)
-	@install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir)
-	@install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
-	@install gnunet.html $(DESTDIR)/$(docdir)
-	@install gnunet-c-tutorial.html $(DESTDIR)/$(docdir)
-
-#	@cp -r images $(DESTDIR)/$(infoimagedir)
-
-# TODO: Add more to clean.
-clean:
-	@rm gnunet.pdf
-	@rm gnunet.html
-	@rm gnunet.info
-	@rm gnunet.info-1
-	@rm gnunet.info-2
-	@rm gnunet.info-3
-	@rm gnunet-c-tutorial.pdf
-	@rm gnunet-c-tutorial.info
-	@rm gnunet-c-tutorial.html
-	@rm -r gnunet.t2p
-	@rm -r gnunet-c-tutorial.t2p
-
-# CLEANFILES =						\
-# 	gnunet.log					\
-# 	gnunet-c-tutorial.log				\
-# 	$(wildcard *.aux)				\
-# 	$(wildcard *.toc)				\
-# 	$(wildcard *.cp)				\
-# 	$(wildcard *.cps)
-
-#.PHONY: version.texi
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF
-
-# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML
-
-# endif
-# endif
-# endif
+	README.txt
diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am
new file mode 100644
index 0000000000..21852a9c32
--- /dev/null
+++ b/doc/documentation/Makefile.am
@@ -0,0 +1,214 @@
+# This Makefile.am is in the public domain
+docdir = $(datadir)/doc/gnunet/
+
+infoimagedir = $(infodir)/images
+
+#DOT_FILES = images/$(wildcard *.dot)
+
+#DOT_VECTOR_GRAPHICS =								\
+#	$(DOT_FILES:%.dot=%.eps)						\
+#	$(DOT_FILES:%.dot=%.pdf)
+
+AM_MAKEINFOHTMLFLAGS = --no-split --css-ref=docstyle.css
+
+dist_infoimage_DATA =                           		\
+	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 			\
+	images/gnunet-tutorial-service.png 			\
+	images/gnunet-tutorial-system.png			\
+	images/daemon_lego_block.svg  				\
+	images/lego_stack.svg					\
+	images/service_lego_block.svg				\
+	images/structure.dot
+
+#	images/$(wildcard *.png)						\
+#	images/$(wildcard *.svg)
+#	$(DOT_FILES:%.dot=%.png)
+
+#DOT_OPTIONS =									\
+#	-Gratio=.9 -Gnodesep=.005 -Granksep=.00005				\
+#	-Nfontsite=9 -Nheight=.1 -Nwidth=.1
+
+# .dot.png:
+# 	$(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+# 	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .dot.pdf:
+# 	$(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+# 	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .dot.eps:
+# 	$(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+# 	mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+# .png.eps:
+# 	$(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
+# 	mv "$@-tmp.eps" "$@"
+
+# pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
+# info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
+# ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps)                \
+# 	$(top_srcdir)/%D%/images/coreutils-size-map.eps
+# dvi-local: ps-local
+
+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							\
+	013.1.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
+
+info_TEXINFOS = 						\
+	gnunet.texi						\
+	gnunet-c-tutorial.texi
+
+gnunet_TEXINFOS = 						\
+	chapters/developer.texi 				\
+	chapters/installation.texi 				\
+	chapters/philosophy.texi 				\
+	chapters/user.texi 					\
+	chapters/vocabulary.texi				\
+	fdl-1.3.texi 						\
+	gpl-3.0.texi
+
+EXTRA_DIST =							\
+	$(gnunet_TEXINFOS)					\
+	$(gnunet_tutorial_examples)				\
+	docstyle.css
+
+
+#	$(DOT_FILES)								\
+#	$(DOT_VECTOR_GRAPHICS)
+
+DISTCLEANFILES = 						\
+	gnunet.cps						\
+	gnunet-c-tutorial.cps					\
+	chapters/developer.cps					\
+	chapters/installation.cps				\
+	chapter/philosophy.cps					\
+	chapters/user.cps					\
+	fdl-1.3.cps						\
+	gpl-3.0.cps
+
+# if HAVE_EXTENDED_DOCUMENTATION_BUILDING
+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
+
+# FIXME: The usage of 'date' strings causes a warning.
+# 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)" >> $@
+
+# Workaround for makeinfo error. Whcih in turn introduces more
+# date-related 'warnings'. Well.
+version2.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)" >> $@
+
+# FIXME: rm *.html and *.pdf
+#doc-clean:
+#	@rm *.aux *.log *.toc *.cp *.cps
+
+doc-all-install:
+	@mkdir -p $(DESTDIR)/$(docdir)
+	@mkdir -p $(DESTDIR)/$(infoimagedir)
+	@mkdir -p $(DESTDIR)/$(infodir)
+	@install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
+	@install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir)
+	@install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir)
+	@install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
+	@install gnunet.html $(DESTDIR)/$(docdir)
+	@install gnunet-c-tutorial.html $(DESTDIR)/$(docdir)
+
+#	@cp -r images $(DESTDIR)/$(infoimagedir)
+
+# TODO: Add more to clean.
+clean:
+	@rm gnunet.pdf
+	@rm gnunet.html
+	@rm gnunet.info
+	@rm gnunet.info-1
+	@rm gnunet.info-2
+	@rm gnunet.info-3
+	@rm gnunet-c-tutorial.pdf
+	@rm gnunet-c-tutorial.info
+	@rm gnunet-c-tutorial.html
+	@rm -r gnunet.t2p
+	@rm -r gnunet-c-tutorial.t2p
+
+# CLEANFILES =						\
+# 	gnunet.log					\
+# 	gnunet-c-tutorial.log				\
+# 	$(wildcard *.aux)				\
+# 	$(wildcard *.toc)				\
+# 	$(wildcard *.cp)				\
+# 	$(wildcard *.cps)
+
+#.PHONY: version.texi
+# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_PDF
+
+# if HAVE_EXTENDED_DOCUMENTATION_BUILDING_HTML
+
+# endif
+# endif
+# endif
diff --git a/doc/README.txt b/doc/documentation/README.txt
index d4c19bba61..d4c19bba61 100644
--- a/doc/README.txt
+++ b/doc/documentation/README.txt
diff --git a/doc/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index e690e5f5bd..e690e5f5bd 100644
--- a/doc/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
diff --git a/doc/chapters/installation.texi b/doc/documentation/chapters/installation.texi
index 63ab98e6dd..63ab98e6dd 100644
--- a/doc/chapters/installation.texi
+++ b/doc/documentation/chapters/installation.texi
diff --git a/doc/chapters/philosophy.texi b/doc/documentation/chapters/philosophy.texi
index c4572e6df2..c4572e6df2 100644
--- a/doc/chapters/philosophy.texi
+++ b/doc/documentation/chapters/philosophy.texi
diff --git a/doc/chapters/user.texi b/doc/documentation/chapters/user.texi
index 61a2e06e86..61a2e06e86 100644
--- a/doc/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
diff --git a/doc/chapters/vocabulary.texi b/doc/documentation/chapters/vocabulary.texi
index 8b6cbe35ad..8b6cbe35ad 100644
--- a/doc/chapters/vocabulary.texi
+++ b/doc/documentation/chapters/vocabulary.texi
diff --git a/doc/docstyle.css b/doc/documentation/docstyle.css
index 8719248d03..8719248d03 100644
--- a/doc/docstyle.css
+++ b/