13 files changed, 199 insertions, 139 deletions
diff --git a/Makefile b/Makefile
index 50fbc8a4..f548aa79 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ all: css locale template
        cp -R dist rendered/
        cp -R static rendered/
        cp rendered/static/robots.txt rendered/robots.txt
+        cp rendered/static/stage.robots.txt rendered/stage.robots.txt
        cp rendered/static/robots.txt rendered/dist/robots.txt
        cp rendered/static/robots.txt rendered/en/robots.txt
        cp rendered/static/robots.txt rendered/de/robots.txt
diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 65222c73..c15ec31b 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\n"
 "PO-Revision-Date: 2018-02-24 17:42\n"
 "Last-Translator: Torsten Grothoff <torsten@grothoff.org>\n"
 "Language-Team: German <LL@li.org>\n"
@@ -55,11 +55,11 @@ msgstr "IRC Archive"
 msgid "Copyright Assignment"
 msgstr "Copyright Übertragung"
-#: common/footer.j2.inc:22 common/navigation.j2.inc:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr "Kontinuierliche Integration"
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografie"
@@ -123,42 +123,48 @@ msgstr "Systemarchitektur"
 msgid "Source Code"
 msgstr "Quellkode"
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+#, fuzzy
+#| msgid "Documentation"
+msgid "Source Code Documentation"
+msgstr "Dokumentation"
+#: common/navigation.j2.inc:72
 #, fuzzy
 #| msgid "Development"
 msgid "Development Tutorial"
 msgstr "Entwicklung"
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr "Dokumentation"
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Installieren"
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr "Nutzen"
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr "Videos"
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glossar"
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr "Handbuch"
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr "REST API"
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr "FAQ"
@@ -421,25 +427,28 @@ msgstr "Der IRC Kanal"
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr "Individuelle Kontaktaufname"
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
-"Most of us support receiving GnuPG encrypted Emails."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr "Fehler melden"
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1966,11 +1975,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
diff --git a/locale/en/LC_MESSAGES/messages.po b/locale/en/LC_MESSAGES/messages.po
index dc725971..62ede9b1 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -34,11 +34,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
-#: common/footer.j2.inc:22 common/navigation.j2.inc:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr ""
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -92,40 +92,44 @@ msgstr ""
 msgid "Source Code"
 msgstr ""
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+msgid "Source Code Documentation"
+msgstr ""
+#: common/navigation.j2.inc:72
 msgid "Development Tutorial"
 msgstr ""
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr ""
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr ""
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr ""
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr ""
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr ""
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr ""
@@ -370,25 +374,28 @@ msgstr ""
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
-"Most of us support receiving GnuPG encrypted Emails."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1905,11 +1912,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 829ea0e1..cd2e5552 100644
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,11 +54,11 @@ msgstr "Archivo IRC"
 msgid "Copyright Assignment"
 msgstr "Transmisión de derechos de autor"
-#: common/footer.j2.inc:22 common/navigation.j2.inc:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr "Integración continua"
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr "Bibliografía"
@@ -112,42 +112,48 @@ msgstr "Architectura del sistema"
 msgid "Source Code"
 msgstr "Códico fuente"
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+#, fuzzy
+#| msgid "Documentation"
+msgid "Source Code Documentation"
+msgstr "Documentación"
+#: common/navigation.j2.inc:72
 #, fuzzy
 #| msgid "Development"
 msgid "Development Tutorial"
 msgstr "Desarrollo"
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr "Documentación"
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr "Instala"
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr "Usa"
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr "Videos"
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr "Glosario"
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr "Manual"
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr "REST API"
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr "FAQ"
@@ -392,25 +398,28 @@ msgstr ""
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
-"Most of us support receiving GnuPG encrypted Emails."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1933,11 +1942,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 423a783a..9a2e95ce 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,11 +54,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
-#: common/footer.j2.inc:22 common/navigation.j2.inc:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr ""
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -112,40 +112,44 @@ msgstr ""
 msgid "Source Code"
 msgstr ""
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+msgid "Source Code Documentation"
+msgstr ""
+#: common/navigation.j2.inc:72
 msgid "Development Tutorial"
 msgstr ""
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr ""
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr ""
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr ""
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr ""
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr ""
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr ""
@@ -390,25 +394,28 @@ msgstr ""
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
-"Most of us support receiving GnuPG encrypted Emails."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1925,10 +1932,10 @@ msgstr ""
 msgid "2013"
 msgstr ""
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 5c769c93..a7ab4e20 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-07-04 17:41+0000\n"
+"POT-Creation-Date: 2019-07-05 16:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,11 +54,11 @@ msgstr ""
 msgid "Copyright Assignment"
 msgstr ""
-#: common/footer.j2.inc:22 common/navigation.j2.inc:69
+#: common/footer.j2.inc:22 common/navigation.j2.inc:70
 msgid "Continuous Integration"
 msgstr ""
-#: common/footer.j2.inc:23 common/navigation.j2.inc:92
+#: common/footer.j2.inc:23 common/navigation.j2.inc:93
 #: template/developers.html.j2:24
 msgid "Bibliography"
 msgstr ""
@@ -112,40 +112,44 @@ msgstr ""
 msgid "Source Code"
 msgstr ""
-#: common/navigation.j2.inc:71
+#: common/navigation.j2.inc:67
+msgid "Source Code Documentation"
+msgstr ""
+#: common/navigation.j2.inc:72
 msgid "Development Tutorial"
 msgstr ""
-#: common/navigation.j2.inc:82
+#: common/navigation.j2.inc:83
 msgid "Documentation"
 msgstr ""
-#: common/navigation.j2.inc:85 template/index.html.j2:52
+#: common/navigation.j2.inc:86 template/index.html.j2:52
 #: template/install.html.j2:6
 msgid "Install"
 msgstr ""
-#: common/navigation.j2.inc:86
+#: common/navigation.j2.inc:87
 msgid "Use"
 msgstr ""
-#: common/navigation.j2.inc:87
+#: common/navigation.j2.inc:88
 msgid "Videos"
 msgstr ""
-#: common/navigation.j2.inc:88 template/glossary.html.j2:6
+#: common/navigation.j2.inc:89 template/glossary.html.j2:6
 msgid "Glossary"
 msgstr ""
-#: common/navigation.j2.inc:89
+#: common/navigation.j2.inc:90
 msgid "Handbook"
 msgstr ""
-#: common/navigation.j2.inc:90
+#: common/navigation.j2.inc:91
 msgid "REST API"
 msgstr ""
-#: common/navigation.j2.inc:91
+#: common/navigation.j2.inc:92
 msgid "FAQ"
 msgstr ""
@@ -390,25 +394,28 @@ msgstr ""
 #: template/contact.html.j2:25
 msgid ""
-"#gnunet is reachable via irc.freenode.net. There is also an <a href="
+"<tt>#gnunet</tt> is reachable via <a href=\"https://freenode.net\">irc."
-"\"https://old.gnunet.org/bot/log/gnunet\">archive</a> availabe."
+"freenode.net</a>. There is also an <a href=\"https://old.gnunet.org/bot/log/"
+"gnunet\">archive</a> available (currently unavailable, we are working on "
+"restoring access to it)."
 msgstr ""
-#: template/contact.html.j2:34
+#: template/contact.html.j2:38
 msgid "Contacting individuals"
 msgstr ""
-#: template/contact.html.j2:36
+#: template/contact.html.j2:40
 msgid ""
-"GNUnet developers are generally reachable at <tt>PSEUDONYM@gnunet.org</tt>. "
+"GNUnet developers are generally reachable at either <tt>PSEUDONYM@gnunet."
-"Most of us support receiving GnuPG encrypted Emails."
+"org</tt> or <tt>LASTNAME@gnunet.org</tt>. Most of us support receiving GnuPG "
+"encrypted Emails."
 msgstr ""
-#: template/contact.html.j2:45
+#: template/contact.html.j2:50
 msgid "Reporting bugs"
 msgstr ""
-#: template/contact.html.j2:47
+#: template/contact.html.j2:52
 msgid ""
 "We track open feature requests and bugs for projects within GNUnet in our <a "
 "href=\"https://bugs.gnunet.org/\">Bug tracker</a>. You can also report bugs "
@@ -1925,11 +1932,11 @@ msgstr ""
 msgid "2013"
 msgstr ""
-#: template/video.html.j2:72
+#: template/video.html.j2:71
 msgid "2012"
 msgstr ""
-#: template/video.html.j2:77
+#: template/video.html.j2:75
 msgid "2010"
 msgstr ""
diff --git a/static/stage.robots.txt b/static/stage.robots.txt
new file mode 100644
index 00000000..c708b608
--- /dev/null
+++ b/static/stage.robots.txt
@@ -0,0 +1,21 @@
+#
+# robots.txt
+#
+# This file is to prevent the crawling and indexing of certain parts
+# of your site by web crawlers and spiders run by sites like Yahoo!
+# and Google. By telling these "robots" where not to go on your site,
+# you save bandwidth and server resources.
+#
+# This file will be ignored unless it is at the root of your host:
+# Used:    http://example.com/robots.txt
+# Ignored: http://example.com/site/robots.txt
+#
+# For more information about the robots.txt standard, see:
+# http://www.robotstxt.org/robotstxt.html
+#
+# For syntax checking, see:
+# http://www.frobee.com/robots-txt-check
+User-agent: *
+Disallow: /
diff --git a/template/about.html.j2 b/template/about.html.j2
index 685f5217..9830bce7 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -70,16 +70,16 @@
      </p>
      <p>
        {% trans %}
-        To get know and learn more, please check our <a href="https://docs.gnunet.org">handbook</a>, especially the <a href="https://docs.gnunet.org/#Key-Concepts">chapter on "Key Concepts"</a>, explaining the fundamental concepts of GNUnet:
+        To get know and learn more, please check our <a href="https://docs.gnunet.org/handbook/">handbook</a>, especially the <a href="https://docs.gnunet.org/handbook/#Key-Concepts">chapter on "Key Concepts"</a>, explaining the fundamental concepts of GNUnet:
        <ul>
-        <li><a href="https://docs.gnunet.org/#Authentication">Authentication</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Authentication">Authentication</a></li>
-        <li><a href="https://docs.gnunet.org/#Accounting-to-Encourage-Resource-Sharing">Accounting to Encourage Resource Sharing</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Accounting-to-Encourage-Resource-Sharing">Accounting to Encourage Resource Sharing</a></li>
-        <li><a href="https://docs.gnunet.org/#Confidentiality">Confidentiality</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Confidentiality">Confidentiality</a></li>
-        <li><a href="https://docs.gnunet.org/#Anonymity">Anonymity</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Anonymity">Anonymity</a></li>
-        <li><a href="https://docs.gnunet.org/#Deniability">Deniability</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Deniability">Deniability</a></li>
-        <li><a href="https://docs.gnunet.org/#Peer-Identities">Peer Identities</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Peer-Identities">Peer Identities</a></li>
-        <li><a href="https://docs.gnunet.org/#Zones-in-the-GNU-Name-System-_0028GNS-Zones_0029">Zones in the GNU Name System (GNS Zones)</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Zones-in-the-GNU-Name-System-_0028GNS-Zones_0029">Zones in the GNU Name System (GNS Zones)</a></li>
-        <li><a href="https://docs.gnunet.org/#Egos">Egos</a></li>
+        <li><a href="https://docs.gnunet.org/handbook/#Egos">Egos</a></li>
        </ul>
        {% endtrans %}
        </p>
@@ -93,12 +93,12 @@
        </p>
        <p>
        {% trans %}
- You are most welcome to <a href="https://gnunet.org/en/engage.html">get engaged into the conversation</a>, <a href="https://gnunet.org/en/install.html">install GNUnet</a>, <a href="https://gnunet.org/en/use.html">use it</a> and <a href="https://gnunet.org/en/contribute.html">contribute</a> in various ways. 
+        You are most welcome to <a href="engage.html">get engaged into the conversation</a>, <a href="install.html">install GNUnet</a>, <a href="use.html">use it</a> and <a href="contribute.html">contribute</a> in various ways. 
        {% endtrans %}
        </p>
        <p>
        {% trans %}
-Please be aware that this project is (despite of it's age) still in an early alpha stage when it comes to software &#8211; its not an easy task to rewrite the whole Internet!
+        Please be aware that this project is (despite of it's age) still in an early alpha stage when it comes to software &#8211; its not an easy task to rewrite the whole Internet!
        {% endtrans %}
        <br>
      </p>
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2
index 76fc138e..0484c42f 100644
--- a/template/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -86,13 +86,13 @@
      <div class="col-md">
        <h2>{{ _("System architecture") }}</h2>
        <p>
-        Read more about the system architecure in the respective section of our <a href="https://docs.gnunet.org/#System-Architecture" target="_blank">handbook</a>.
+        Read more about the system architecure in the respective section of our <a href="https://docs.gnunet.org/handbook/#System-Architecture" target="_blank">handbook</a>.
        </p>
      </div>
      <div class="col-md">
        <h2>{{ _("Subsystems") }}</h2>
        <p>
-        Read more about the subsystems (or GNUnet services) in the respective section of our <a href="https://docs.gnunet.org/#Code-overview" target="_blank">handbook</a>.
+        Read more about the subsystems (or GNUnet services) in the respective section of our <a href="https://docs.gnunet.org/handbook/#Code-overview" target="_blank">handbook</a>.
        </p>
      </div>
    </div>
@@ -101,13 +101,13 @@
      <div class="col-md">
        <h2>{{ _("libgnunetutil") }}</h2>
        <p>
-        libgnunetutil is the fundamental library that all GNUnet code builds upon. Ideally, this library should contain most of the platform dependent code (except for user interfaces and really special needs that only few applications have). Read <a href="https://docs.gnunet.org/#libgnunetutil">more</a>.
+        libgnunetutil is the fundamental library that all GNUnet code builds upon. Ideally, this library should contain most of the platform dependent code (except for user interfaces and really special needs that only few applications have). Read <a href="https://docs.gnunet.org/handbook/#libgnunetutil">more</a>.
        </p>
      </div>
      <div class="col-md">
        <h2>{{ _("APIs") }}</h2>
        <p>
-        GNUnet offers variaty of APIs for <a href="https://docs.gnunet.org/#Interprocess-communication-API-_0028IPC_0029" target="_blank">accessing services</a> (using IPC), <a href="https://docs.gnunet.org/#Service-API">running services</a>, <a href="https://docs.gnunet.org/#Message-Queue-API">message queues</a>, or <a href="https://docs.gnunet.org/#Cryptography-API" target="_blank">cryptographic operations</a>.
+        GNUnet offers variaty of APIs for <a href="https://docs.gnunet.org/handbook/#Interprocess-communication-API-_0028IPC_0029" target="_blank">accessing services</a> (using IPC), <a href="https://docs.gnunet.org/#Service-API">running services</a>, <a href="https://docs.gnunet.org/#Message-Queue-API">message queues</a>, or <a href="https://docs.gnunet.org/handbook/#Cryptography-API" target="_blank">cryptographic operations</a>.
        </p>
      </div>
    </div>
diff --git a/template/contact.html.j2 b/template/contact.html.j2
index ef7f5469..adf5691d 100644
--- a/template/contact.html.j2
+++ b/template/contact.html.j2
@@ -23,7 +23,11 @@
      <h2>{{ _("The IRC channel") }}</h2>
        <p>
          {% trans %}
-              #gnunet is reachable via irc.freenode.net. There is also an <a href="https://old.gnunet.org/bot/log/gnunet">archive</a> availabe.
+            <tt>#gnunet</tt> is reachable via
+            <a href="https://freenode.net">irc.freenode.net</a>.
+            There is also an
+            <a href="https://old.gnunet.org/bot/log/gnunet">archive</a>
+            available (currently unavailable, we are working on restoring access to it).
          {% endtrans %}
        </p>
    </div>
@@ -34,9 +38,10 @@
      <h2>{{ _("Contacting individuals") }}</h2>
      <p>
          {% trans %}
-               GNUnet developers are generally reachable at
+            GNUnet developers are generally reachable at
-               <tt>PSEUDONYM@gnunet.org</tt>.  Most of us
+            either <tt>PSEUDONYM@gnunet.org</tt> or
-               support receiving GnuPG encrypted Emails.
+            <tt>LASTNAME@gnunet.org</tt>.  Most of us
+            support receiving GnuPG encrypted Emails.
          {% endtrans %}
      </p>
    </div>
diff --git a/template/install-on-macos.html.j2 b/template/install-on-macos.html.j2
index 80b1a012..7a56441f 100644
--- a/template/install-on-macos.html.j2
+++ b/template/install-on-macos.html.j2
@@ -34,7 +34,7 @@
  <p>And you're done!. <br/>
  GNUnet has a number of services and features.
-  Please check <a href="https://docs.gnunet.org">our documentation</a>
+  Please check <a href="https://docs.gnunet.org/">our documentation</a>
  to learn how to use them. If you find anything odd or bugs, please
  <a href="https://gnunet.org/bugs">let us know</a>.
  </p>
diff --git a/template/install-on-netbsd.html.j2 b/template/install-on-netbsd.html.j2
index aba939b3..adf15033 100644
--- a/template/install-on-netbsd.html.j2
+++ b/template/install-on-netbsd.html.j2
@@ -91,7 +91,7 @@
  <p>
  And you're done!.<br>
  GNUnet has a number of services and features.
-  Please check <a href="https://docs.gnunet.org">our documentation</a>
+  Please check <a href="https://docs.gnunet.org/">our documentation</a>
  to learn how to use them. If you find anything odd or bugs, please
  <a href="https://bugs.gnunet.org">let us know</a>.
  </p>
diff --git a/template/use.html.j2 b/template/use.html.j2
index e22f4cb5..783e98d0 100644
--- a/template/use.html.j2
+++ b/template/use.html.j2
@@ -22,9 +22,9 @@
    <div class="col">
      <section>
        <p>
-         This document is just a brief intro on what can be done with GNUnet. Find much more in our <a ref="https://docs.gnunet.org/">handbook / reference manual</a>, e.g. in the section <a href="https://docs.gnunet.org/#toc-Using-GNUnet-1">"using GNUnet"</a>.
+         This document is just a brief intro on what can be done with GNUnet. Find much more in our <a ref="https://docs.gnunet.org/">documentation</a>, e.g. in the section <a href="https://docs.gnunet.org/handbook/#toc-Using-GNUnet-1">"using GNUnet"</a> in the handbook.
-         The configuration in the handbook / reference manual is done with the UI interface gnunet-gtk.
+         The configuration in the handbook is done with the UI interface gnunet-gtk.
        </p>
      </section>
@@ -98,12 +98,9 @@
        <a href="https://docs.gnunet.org/#File_002dsharing">filesharing in the handbook</a>.
      </section>
      <section>
-        <h3><a name="cadet" class="subnav-anchor"></a>{{ _("CADET (and Chat)") }}</h3>
+        <h3><a name="cadet" class="subnav-anchor"></a>{{ _("CADET (and Chat)") }}</h3>
        <p>
          We can use the `gnunet-cadet` command line tool to open a port and from
          another machine connect to this port and chat or transfer data. First we need
@@ -177,11 +174,8 @@
         </p>
      </section>
      <section>
        <h3><a name="gns_cli" class="subnav-anchor"></a>{{ _("Name resolution using GNS on the command line") }}</h3>
        <p>GNS is the GNU name service, a fully decentralized alternatice to DNS. We'll publish an IP address in a GNS record try to resolve it on the command line. First we need an identity which is the
          equivalent to a zone in DNS. We'll call it "myself" and create it using the
          `gnunet-identity` command line tool. Instead of "myself" you can surely use your