1 files changed, 21 insertions, 42 deletions

diff --git a/template/install-on-ubuntu1804.html.j2 b/template/install-on-ubuntu1804.html.j2
index 687d786f..fb218110 100644
--- a/template/install-on-ubuntu1804.html.j2
+++ b/template/install-on-ubuntu1804.html.j2
@@ -1,12 +1,12 @@
 {% extends "common/base.j2" %}
 {% block body_content %}
 <article class="container">
-<!--<article> -->
-<header>
-  <h2>{{ _("Tutorial: GNUnet on Ubuntu 18.04") }}</h2>
-</header>
-<section>
-  <h3>{{ _("Introduction") }}</h3>
+
+  <header>
+    <h1>{{ _("Tutorial: GNUnet on Ubuntu 18.04") }}</h1>
+  </header>
+
+  <h2>{{ _("Introduction") }}</h2>
   <p>
   Welcome to the hopefully painless GNUnet tutorial for Ubuntu 18.04!
   It provides very concrete instructions on how to compile, install
@@ -23,9 +23,7 @@
   <p>
   Now let's start!
   </p>
-</section>
-<section>
-  <h3>{{ _("Requirements") }}</h3>
+  <h2>{{ _("Requirements") }}</h2>
   <p>
     First let's install the following Ubuntu 18.04 packages to use
     GNUnet painlessly. Optional dependencies are listed in Appendix
@@ -39,9 +37,8 @@
       openssl libnss3-tools libmicrohttpd-dev libopus-dev libpulse-dev \<br>
       libogg-dev
   </code>
-</section>
-<section>
-  <h3>{{ _("Make an installation directory") }}</h3>
+
+  <h2>{{ _("Make an installation directory") }}</h2>
   <p>
     Next we create a directory in our home directory where we store
     the source code later. We should keep this directory after
@@ -52,9 +49,8 @@
   <code>
     $ mkdir ~/gnunet_installation
   </code>
-</section>
-<section>
-  <h3>{{ _("Get the source code") }}</h3>
+
+  <h2>{{ _("Get the source code") }}</h2>
   <p>
     We download the GNUnet source code using git.
   </p>
@@ -62,9 +58,7 @@
     $ cd ~/gnunet_installation<br>
     $ git clone --depth 1 https://gnunet.org/git/gnunet.git<br>
   </code>
-</section>
-<section>
-  <h3>{{ _("Compile and Install") }}</h3>
+  <h2>{{ _("Compile and Install") }}</h2>
   <p>
     Installing GNUnet is not hard. We have two options:
     installing a *production version* and installing a *development version*. If
@@ -73,9 +67,7 @@
     debug symbols that can be displayed with a debugger). Otherwise choose the
     production version.
   </p>
-</section>
-<section>
-  <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
+  <h3>{{ _("Option 1: GNUnet for production / usage") }}</h3>
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
     $ ./bootstrap<br>
@@ -85,9 +77,7 @@
     $ make -j$(nproc || echo -n 1)<br>
     $ sudo make install
   </code>
-</section>
-<section>
-  <h4>{{ _("Option 2: GNUnet for development") }}</h4>
+  <h3>{{ _("Option 2: GNUnet for development") }}</h3>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -99,7 +89,7 @@
   </code>
 
   <!--
-<h4>{{ _("Install GNUnet plugin for name resolution") }}</h4>
+<h3>{{ _("Install GNUnet plugin for name resolution") }}</h3>
       So now it gets a bit nasty. It's not so bad. All we have to do is copy a file and edit another one. The file we need to copy is GNUnet's plugin for the Name Service Switch (NSS) in unix systems. Different unixes expect it in different locations and GNUnet's build system does not try to guess. On Ubuntu 18.04 we have to do
 
       <code>
@@ -136,9 +126,7 @@
 
   <p>That's it. It wasn't that nasty, was it?</p>
 -->
-</section>
-<section>
-  <h3>{{ _("Configuration") }}</h3>
+  <h2>{{ _("Configuration") }}</h2>
 
   <p>
     Congratulations! GNUnet is now installed! Before we start it we
@@ -212,16 +200,12 @@
   <code>
     $ gnunet-arm -e
   </code>
-</section>
-<section>
-  <h3>{{ _("Use GNUnet!") }}</h3>
+  <h2>{{ _("Use GNUnet!") }}</h2>
    <p>
         Please head over here: <a href="https://gnunet.org/en/use.html">Use!</a>
    <p>
-</section>
 
-<section>
-  <h3>{{ _("Uninstall GNUnet and its dependencies") }}</h3>
+  <h2>{{ _("Uninstall GNUnet and its dependencies") }}</h2>
 
   <code>
     $ cd ~/gnunet_installation/gnunet<br>
@@ -236,13 +220,9 @@
     $ sudo mv /etc/nsswitch.conf.original /etc/nsswitch.conf<br>
     $ sudo rm /lib/$(uname -m)-linux-gnu/libnss_gns.so.2
   </code>
-</section>
 
-<section>
-  <h3>{{ _("Troubleshooting") }}</h3>
-</section>
-<section>
-  <h4>{{ _("You can't reach other people's nodes") }}</h4>
+  <h2>{{ _("Troubleshooting") }}</h2>
+  <h3>{{ _("You can't reach other people's nodes") }}</h3>
 
   <p>
     Should our computer not have reached the open GNUnet network automatically,
@@ -273,7 +253,7 @@
   <p>Now our GNUnet nodes can attempt reaching each other directly. This may
     still fail due to NAT traversal issues.</p>
 
-  <!--<h4>{{ _("OMG you guys broke my internet") }}</h4>
+  <!--<h3>{{ _("OMG you guys broke my internet") }}</h3>
 
       <p>We can replace `/etc/nsswitch.conf` with the backup we made earlier
         (`/etc/nsswitch.conf.original`). Now DNS resolution should work again without a
@@ -282,6 +262,5 @@
       <code>
         $ cp /etc/nsswitch.conf.original /etc/nsswitch.conf
       </code>-->
-</section>
 </article>
 {% endblock body_content %}