9 files changed, 44 insertions, 46 deletions
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/index.html.j2 b/template/index.html.j2
index 110fad0e..b1369086 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -29,7 +29,7 @@
        {% endtrans %}
        <br><br>
        {% trans %}
-        GNUnet is made for an free and open society: It's a self-organizing
+        GNUnet is made for a free and open society: It's a self-organizing
        network and it is
        <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
        as in freedom. GNUnet puts you in control of your data. You
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/team.html.j2 b/template/team.html.j2
index 23865a8e..030ca6df 100644
--- a/template/team.html.j2
+++ b/template/team.html.j2
@@ -97,6 +97,7 @@
                  <img src="{{ url('static/team-images/ng0.jpg') }}" alt="ng0" class="img-fluid">
                  <ul class="text-center">
                    <a href="https://n0.is"><li><i class="fas fa-home"></i></li></a>
+                    <a href="https://keys.openpgp.org/search?q=ng0%40gnunet.org"><li><i class="fas fa-key"></i></li></a>
                  </ul>
                </div>
                <h1>ng0</h1>
diff --git a/template/use.html.j2 b/template/use.html.j2
index b4f2fdc8..cfdd2e60 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
diff --git a/template/video.html.j2 b/template/video.html.j2
index 8760fd18..1851eec3 100644
--- a/template/video.html.j2
+++ b/template/video.html.j2
@@ -37,8 +37,8 @@
      </ul>
      <h3>{{ _("2015") }}</h3>
      <ul>
-        <li><a href="">Reproducible Software Deployment with GNU Guix</a></li> 
+        <!-- FIXME: source only available on yt. <li>Ludovic Courtès, <a href="">Reproducible Software Deployment with GNU Guix</a>, Inria</li> -->
-        <li><a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/32c3/byzantine-fault-tolerant-set-consensus-with-efficient-set-reconciliation.mp4">Byzantine fault tolerant set consensus with efficient set reconciliation</a>, 32C4 <!--FIXME:link working?-->
+        <!-- FIXME: source not available. <li><a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/32c3/byzantine-fault-tolerant-set-consensus-with-efficient-set-reconciliation.mp4">Byzantine fault tolerant set consensus with efficient set reconciliation</a>, 32C4 -->
        <li>Daniel Golle, <a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/BattleMeshV8/GNUnet%20in%20Community%20Mesh%20Networks%20+%20Slides%20-%20BattleMeshV8.mkv">GNUnet in Community Networks</a>, BattleMesh 2015
        <li>t3sserakt and demos, <a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/Datenspuren2015/datenspuren15-7069-de-EDN_-_Echt_Dezentrales_Netzwerk_webm.webm">Echt Dezentrales Netzwerk</a>, Datenspuren 2015
        <li>Christian Grothoff, <a href="https://git.gnunet.org/gnunet-videos-2015.git/plain/psc2015/grothoff.webm">The Architecture of the GNUnet: 45 Subsystems in 45 Minutes</a>
@@ -46,9 +46,9 @@
      </ul>
      <h3>{{ _("2014") }}</h3>
      <ul>
-        <li>Julian Kirsch, <a href="">"Knocking down the HACIENDA"</a>, GNU Hacker Meeting 2014</li>
+        <!-- FIXME: no source link on web. <li>Julian Kirsch, <a href="">"Knocking down the HACIENDA"</a>, GNU Hacker Meeting 2014</li> -->
-        <li>Peter Schaar, <a href="">"Technik, Recht und Überwachung"</a>, Technische Universität München</li>
+        <!-- FIXME: no source link on web. <li>Peter Schaar, <a href="">"Technik, Recht und Überwachung"</a>, Technische Universität München</li> -->
-        <li>Christian Grothoff, <a href="">"A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a>, Univeristy of Oxford</li>
+        <!-- FIXME: no source link on web. <li>Christian Grothoff, <a href="">"A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a>, Univeristy of Oxford</li> -->
        <li>Jacob Appelbaum, Douwe Korff and Christian Grothoff, <a href="https://git.gnunet.org/gnunet-videos-2014.git/plain/2014-coe.webm">"After Snowden: using law and technology to counter snooping"</a>, Counsil of Europe</li>
        <li>Nicolas Benes, <a href="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/do-panic-do-panic.webm">Panic! An approach for home routers to securely erase sensitive data</a>, 31C3</li>
        <li>Lucas Fulchir, <a href="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/fenrir-fenrir.webm">why TLS sucks and what I'm doing about it</a>, 31C3</li>
@@ -60,19 +60,17 @@
      </ul>
      <h3>{{ _("2013") }}</h3>
      <ul>
-        <li>Bart Polot, <a href="">"GNUnet CADET and GNUnet Conversation" at YBTI/30c3</a>, 30C3</li>
+        <!-- FIXME: no source link on web. <li>Bart Polot, <a href="">"GNUnet CADET and GNUnet Conversation" at YBTI/30c3</a>, 30C3</li> -->
-        <li>Christian Grothoff, <a href="">"The GNU Name System"</a>, 30C3</li>
+        <li>Christian Grothoff, <a href="https://media.ccc.de/v/30C3_-_5212_-_en_-_saal_6_-_201312272145_-_the_gnu_name_system_-_grothoff">"The GNU Name System"</a>, 30C3</li>
-        <li>Markus Teich on "Monkey, <a href="">Generating Useful Bug Reports Automatically"</a>, Technische Universität München</li>
+        <li>Markus Teich, <a href="https://media.net.in.tum.de/v/Oberseminar-SS13--Monkey_-_Generating_Useful_Bug_R">"Monkey, generating Useful Bug Reports Automatically"</a>, Technische Universität München</li>
-        <li>Christian Grothoff, <a href="">"The GNU Name System and the Future of Social Networking with GNUnet" at GHM</a></li>
+        <li>Christian Grothoff, <a href="https://audio-video.gnu.org/video/ghm2013/Christian_Grothoff-The_GNU_Name_System_and_the_Future_of_Social_Networking_with_GNUnet_.webm">"The GNU Name System and the Future of Social Networking with GNUnet" at GHM</a></li>
-        <li>Christian Grothoff, Carlo von Lynx, Jacob Appelbaum and Richard Stallman, <a href="">"You broke the Internet. We're making ourselves a GNU one."</a>, Berlin</li>
+        <li>Christian Grothoff, Carlo von Lynx, Jacob Appelbaum and Richard Stallman, <a href="https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm">"You broke the Internet. We're making ourselves a GNU one."</a>, Berlin</li>
-        <li>Roger Dingledine and Jacob Appelbaum, <a href="">"Q &amp; A"</a>, Technische Universität München</li>
+        <li>Roger Dingledine and Jacob Appelbaum, <a href="https://archive.org/details/RogerDingledineAndJacobAppelbaumQAMarathon">"Q &amp; A"</a>, Technische Universität München</li>
-        <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li>
+        <!-- FIXME: no source link on web. <li>Maximilian Szengel, <a href="">"Decentralized Evaluation of Regular Expressions for Capability Discovery in Peer-to-Peer Networks"</a>, Technische Universität München</li> -->
-        <li><a href="https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm">You broke our internet</a>, Piratenpartei Berlin</li>
      </ul>
      <h3>{{ _("2012") }}</h3>
      <ul>
-        <li>Martin Schanzenbach, <a href="">"A Censorship-Resistant and Fully Decentralized Naming System",</a>Technische Universität München</li>
+        <li>Martin Schanzenbach, <a href="https://media.net.in.tum.de/v/Oberseminar-SS12--Design_and_Implementation_of_a_C">"A Censorship-Resistant and Fully Decentralized Naming System",</a>Technische Universität München</li>
-        <li>Richard Stallman, <a href="">"Copyright vs. Community"</a>, Technische Universität München</li>
      </ul>
      <h3>{{ _("2010") }}</h3>
      <ul>