5 files changed, 20 insertions, 26 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/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 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