[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [www] 10/11: simplify, unify, check responsiveness
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [www] 10/11: simplify, unify, check responsiveness |
|
Date: |
Mon, 01 Jul 2019 21:38:50 +0200 |
This is an automated email from the git hooks/post-receive script.
xrs pushed a commit to branch master
in repository www.
commit abe13cf5cbbbb6e60dcb286cfb8955bf01b0e9f3
Author: xrs <address@hidden>
AuthorDate: Mon Jul 1 21:30:33 2019 +0200
simplify, unify, check responsiveness
---
template/architecture.html.j2 | 12 +-
template/engage.html.j2 | 8 +-
template/ev.html.j2 | 85 ++++++------
template/gnurl.html.j2 | 28 ++--
template/index.html.j2 | 2 +-
template/install-on-archpi.html.j2 | 246 +++++++++++++++++----------------
template/install-on-debian9.html.j2 | 47 +++----
template/install-on-macos.html.j2 | 25 ++--
template/install-on-netbsd.html.j2 | 20 +--
template/install-on-ubuntu1804.html.j2 | 63 +++------
template/install.html.j2 | 20 ++-
11 files changed, 271 insertions(+), 285 deletions(-)
diff --git a/template/architecture.html.j2 b/template/architecture.html.j2
index b46b4b5..76fc138 100644
--- a/template/architecture.html.j2
+++ b/template/architecture.html.j2
@@ -51,7 +51,7 @@
<div class="container">
<div class="row">
- <div class="col">
+ <div class="col-md">
<h2>{{ _("Foundations") }}</h2>
<p>
{% trans %}
@@ -66,7 +66,7 @@
</p>
</div>
- <div class="col">
+ <div class="col-md">
<h2>{{ _("Security") }}</h2>
<p>
@@ -83,13 +83,13 @@
</div>
<div class="row">
- <div class="col">
+ <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>.
</p>
</div>
- <div class="col">
+ <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>.
@@ -98,13 +98,13 @@
</div>
<div class="row">
- <div class="col">
+ <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>.
</p>
</div>
- <div class="col">
+ <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>.
diff --git a/template/engage.html.j2 b/template/engage.html.j2
index 0f4fae2..4049c8d 100644
--- a/template/engage.html.j2
+++ b/template/engage.html.j2
@@ -7,7 +7,7 @@
</header>
<div class="row">
- <div class="col">
+ <div class="col-md">
<h2>Join the conversation!</h2>
<p>
There are many ways to get engaged with GNUnet. A first step is to
join the conversation on the mailing lists and on our IRC channel to keep up
with development, find technical help, and discuss GNUnet:
@@ -39,7 +39,7 @@
</li>
</p>
</div>
- <div class="col">
+ <div class="col-md">
<h2>Install GNUnet!</h2>
<p>
Another thing you might want now is your own GNUnet installation. As
we haven’t packaged the new versions yet (June 2019) we provide <a
href="https://gnunet.org/en/tutorial.html";>some tutorials how to install
step-by-step</a>.
@@ -69,13 +69,13 @@
</div>
<div class="row">
- <div class="col">
+ <div class="col-md">
<h2>Bibliography</h2>
<p>If you are more the reading kind of person, please take a seat <a
href="https://bib.gnunet.org/";>in our libary...</a></p>
<h2>Videos</h2>
<p>...or if you rather want hear us talking to you, lean back and watch
some <a href="video.html">videos</a> of our talks at conferences.</p>
</div>
- <div class="col">
+ <div class="col-md">
<h2>Get together!</h2>
<p>
We meet in meatspace occasionally, mostly in Germany and Switzerland.
The usual occasions are:
diff --git a/template/ev.html.j2 b/template/ev.html.j2
index d99a650..70c2ad8 100644
--- a/template/ev.html.j2
+++ b/template/ev.html.j2
@@ -6,8 +6,9 @@
<h1>{{ _("Verein zur Förderung von GNUnet e.V.") }}</h1>
</header>
- <div class="row container justify-content-center">
- <div class="col-6">
+ <div class="row">
+ <div class="col-md">
+ <h3>{{ _("About GNUnet e.V.") }}</h3>
<p>
{% trans %}
On December 27th 2013 a group of GNUnet hackers met at 30c3
@@ -26,29 +27,7 @@
{% endtrans %}
</p>
</div>
- </div>
-
- <div class="row">
- <div class="col-lg-6">
- <h3>{{ _("Governance") }}</h3>
- <p>
- {% trans %}
- You can find our "Satzung", and the list of members under
- <a
href="https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex";>https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex</a>.
- The current board consists of:
- <dl><dt>Vorsitz</dt>
- <dd><a href="https://grothoff.org/christian/";>Christian
Grothoff</a></dd>
- <dt>stellvertretender Vorsitz</dt>
- <dd>xrs</dd>
- <dt>Kassenwart</dt>
- <dd>Florian Dold</dd>
- <dt>Beisitzer</dt>
- <dd>Lurchi</dd>
- </dl>
- {% endtrans %}
- </p>
- </div>
- <div class="col-lg-6">
+ <div class="col-md">
<h3>{{ _("Becoming a Member of GNUnet e.V.") }}</h3>
<p>
{% trans %}
@@ -69,28 +48,26 @@
</div><!-- END:row -->
<div class="row">
- <div class="col-lg-6">
- <h3>{{ _("Support Us!") }}</h3>
+ <div class="col-md">
+ <h3>{{ _("Governance") }}</h3>
<p>
{% trans %}
- Everybody is welcome to support us via donations. For
- financial contributions, Europeans are able to donate via
- SEPA. We hope to setup accounts in other major currency areas
- in the future. You can also donate via Bitcoin, routing
- details are given below. Please note that we are unable to
- provide receipts for your donations. If you are planning to
- donate a significant amount of money, please contact us first
- as it might be better to come to a custom arrangement.
-
- <dl><dt>BitCoin</dt>
- <dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd>
- <dt>SEPA/IBAN</dt>
- <dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd>
+ You can find our "Satzung", and the list of members under
+ <a
href="https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex";>https://git.gnunet.org/gnunet-ev.git/tree/satzung.tex</a>.
+ The current board consists of:
+ <dl><dt>Vorsitz</dt>
+ <dd><a href="https://grothoff.org/christian/";>Christian
Grothoff</a></dd>
+ <dt>stellvertretender Vorsitz</dt>
+ <dd>xrs</dd>
+ <dt>Kassenwart</dt>
+ <dd>Florian Dold</dd>
+ <dt>Beisitzer</dt>
+ <dd>Lurchi</dd>
</dl>
{% endtrans %}
</p>
</div>
- <div class="col-lg-6">
+ <div class="col-md">
<h3>{{ _("Official Meeting Notes") }}</h3>
<p>
<ul>
@@ -117,6 +94,32 @@
</div>
</div><!-- END:row -->
+ <div class="row">
+ <div class="col-md">
+ <h3>{{ _("Support Us!") }}</h3>
+ <p>
+ {% trans %}
+ Everybody is welcome to support us via donations. For
+ financial contributions, Europeans are able to donate via
+ SEPA. We hope to setup accounts in other major currency areas
+ in the future. You can also donate via Bitcoin, routing
+ details are given below. Please note that we are unable to
+ provide receipts for your donations. If you are planning to
+ donate a significant amount of money, please contact us first
+ as it might be better to come to a custom arrangement.
+
+ <dl><dt>BitCoin</dt>
+ <dd>1GNUnetpWeR9Zs3vipdvVywo1GseeksjUh</dd>
+ <dt>SEPA/IBAN</dt>
+ <dd>DE67830654080004822650 (BIC/SWIFT: GENODEF1SLR)</dd>
+ </dl>
+ {% endtrans %}
+ </p>
+ </div>
+ <div class="col">
+ </div>
+ </div><!-- END:row -->
+
</div> <!-- /container -->
</article>
{% endblock body_content %}
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index 8834e96..73d62c8 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -1,8 +1,12 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container-fluid">
- <article>
+<article class="container">
+
+ <header>
<h1>gnurl (libgnurl)</h1>
+ </header>
+
+ <div class="container">
<p>
{% trans %}
libgnurl is a micro fork of libcurl. The goal of libgnurl
@@ -115,12 +119,10 @@
viceversa.
{% endtrans %}
</p>
- </article>
-</div>
+ </div>
-<div class="container">
- <div class="row">
- <div class="col-lg-6">
+ <div class="row container">
+ <div class="col-md">
<h3>{{ _("Source Code") }}</h3>
<p>
{% trans %}
@@ -134,7 +136,7 @@
{% endtrans %}
</p>
</div>
- <div class="col-lg-6">
+ <div class="col-md">
<h3>{{ _("Downloads") }}</h3>
<p>
{% trans %}
@@ -149,8 +151,9 @@
</p>
</div>
</div>
- <div class="row">
- <div class="col-lg-6">
+
+ <div class="row container">
+ <div class="col-md">
<h3>{{ _("Reporting Bugs") }}</h3>
<p>
{% trans %}
@@ -161,7 +164,7 @@
{% endtrans %}
</p>
</div>
- <div class="col-lg-6">
+ <div class="col-md">
<h3>{{ _("Maintainer and Cryptographic signatures") }}</h3>
<p>
{% trans %}
@@ -173,7 +176,6 @@
</p>
</div>
</div>
-</div>
-</div> <!-- /container -->
+</article> <!-- /container -->
{% endblock body_content %}
diff --git a/template/index.html.j2 b/template/index.html.j2
index 2f0030a..2d06f69 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -69,7 +69,7 @@
<div class="container">
<div class="row">
<div class="container text-center">
- <h1><a name="about">{% trans %}The Internet of tomorrow needs GNUnet
today{% endtrans %}</a></h1>
+ <h1><a name="about"></a>{% trans %}The Internet of tomorrow needs
GNUnet today{% endtrans %}</h1>
</div>
</div>
<div class="row">
diff --git a/template/install-on-archpi.html.j2
b/template/install-on-archpi.html.j2
index 8d46707..fccf46e 100644
--- a/template/install-on-archpi.html.j2
+++ b/template/install-on-archpi.html.j2
@@ -1,128 +1,130 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
-
-<h2>{{ _("Tutorial: GNUnet on Archlinux/Pi") }}</h2>
-
-Welcome to this GNUnet tutorial for Archlinux on a Raspberry Pi 3. If you want
-to run a GNUnet node on a separte system, permanently online, with low energy
-consumption, this might be the thing for you. This tutorial shows you how to
-install, run, and operate it.
-
-<h3>{{ _("Requirements") }}</h3>
-
-<p>First you need the hardware. This tutorial works with a Raspberry Pi 3. The
-other Pi versions I haven't tested, but they should probably work, too. To
-install Archlinux on the Pi3, follow the instructions from <a
-href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3";>archlinuxarm.org</a>.</p>
-
-<p>That was easy, right? Our goal now is to build GNUnet from source. So, let's
-install the tools for building new software.</p>
-
-<p><code>
-> sudo pacman -S base-devel
-</code></p>
-
-<p>Now we can continue to install the following Archlinux dependencies to
-compile GNUnet on our Pi.</p>
-
-<p><code>
-$ pacman -Su libmicrohttpd libgcrypt gnurl libunistring gnutls libidn
-libextractor openssl libltdl sqlite texinfo which gettext zlib
-pkg-config git miniupnpc libextractor jansson nim
-</code></p>
-
-<h3>{{ _("Get the Source Code") }}</h3>
-
-<p>We are getting closer. Download the GNUnet source code which we will build
-in the next step:<p>
-
-<p><code>
-> git clone https://gnunet.org/git/gnunet.git<br>
-</code></p>
-
-<p>Now it's time to compile GNUnet.</p>
-
-<p><code>
-> cd gnunet<br>
-> ./bootstrap # Run this to generate the configure files.<br>
-> ./configure # Use --help to see the various flags available to you.<br>
-> make -j$(nproc || echo -n 1)<br>
-> sudo make install<br>
-</code></p>
-
-<p>Congrats! GNUnet is now installed!</p>
-
-<h3>{{ _("Run") }}</h3>
-
-<p>By default GNUnet looks in our home directory for the file
-~/.config/gnunet.conf. We can start with an empty file for now:</p>
-
-<p><code>
-> touch ~/.config/gnunet.conf
-</code></p>
- <br />
- <p>
- It's reccomended that you increase your bandwidth restrictions
- from the acutely low defaults. The example below sets the WAN
- and LAN limits to the value "unlimited".
- </p>
- <br />
- <code>
- $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
- $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br />
- $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
- $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br />
- </code>
- <br />
-<p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart
-Manager).</p>
-
-<p><code>
-> gnunet-arm -s
-</code></p>
-
-<p>It starts the default GNUnet services. We can list them with the -I
option:</p>
-
-<p><code>
-> gnunet-arm -I<br>
-Running services:<br>
-ats (gnunet-service-ats)<br>
-revocation (gnunet-service-revocation)<br>
-set (gnunet-service-set)<br>
-nat (gnunet-service-nat)<br>
-transport (gnunet-service-transport)<br>
-peerstore (gnunet-service-peerstore)<br>
-hostlist (gnunet-daemon-hostlist)<br>
-identity (gnunet-service-identity)<br>
-namecache (gnunet-service-namecache)<br>
-peerinfo (gnunet-service-peerinfo)<br>
-datastore (gnunet-service-datastore)<br>
-zonemaster (gnunet-service-zonemaster)<br>
-zonemaster-monitor (gnunet-service-zonemaster-monitor)<br>
-nse (gnunet-service-nse)<br>
-cadet (gnunet-service-cadet)<br>
-dht (gnunet-service-dht)<br>
-core (gnunet-service-core)<br>
-gns (gnunet-service-gns)<br>
-statistics (gnunet-service-statistics)<br>
-topology (gnunet-daemon-topology)<br>
-fs (gnunet-service-fs)<br>
-namestore (gnunet-service-namestore)<br>
-vpn (gnunet-service-vpn)<br>
-</code></p>
-
-<p>For stopping GNUnet again we can use the -e option.</p>
-
-<p><code>
-> gnunet-arm -e
-</code></p>
-
-<h3>{{ _("Make sure, it works!") }}</h3>
+<article class="container">
+
+ <header>
+ <h1>{{ _("Tutorial: GNUnet on Archlinux/Pi") }}</h1>
+ </header>
+
+
+ Welcome to this GNUnet tutorial for Archlinux on a Raspberry Pi 3. If you
want
+ to run a GNUnet node on a separte system, permanently online, with low energy
+ consumption, this might be the thing for you. This tutorial shows you how to
+ install, run, and operate it.
+
+ <h2>{{ _("Requirements") }}</h2>
+
+ <p>First you need the hardware. This tutorial works with a Raspberry Pi 3.
The
+ other Pi versions I haven't tested, but they should probably work, too. To
+ install Archlinux on the Pi3, follow the instructions from <a
+
href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3";>archlinuxarm.org</a>.</p>
+
+ <p>That was easy, right? Our goal now is to build GNUnet from source. So,
let's
+ install the tools for building new software.</p>
+
+ <p><code>
+ > sudo pacman -S base-devel
+ </code></p>
+
+ <p>Now we can continue to install the following Archlinux dependencies to
+ compile GNUnet on our Pi.</p>
+
+ <p><code>
+ $ pacman -Su libmicrohttpd libgcrypt gnurl libunistring gnutls libidn
+ libextractor openssl libltdl sqlite texinfo which gettext zlib
+ pkg-config git miniupnpc libextractor jansson nim
+ </code></p>
+
+ <h2>{{ _("Get the Source Code") }}</h2>
+
+ <p>We are getting closer. Download the GNUnet source code which we will build
+ in the next step:<p>
+
+ <p><code>
+ > git clone https://gnunet.org/git/gnunet.git<br>
+ </code></p>
+
+ <p>Now it's time to compile GNUnet.</p>
+
+ <p><code>
+ > cd gnunet<br>
+ > ./bootstrap # Run this to generate the configure files.<br>
+ > ./configure # Use --help to see the various flags available to you.<br>
+ > make -j$(nproc || echo -n 1)<br>
+ > sudo make install<br>
+ </code></p>
+
+ <p>Congrats! GNUnet is now installed!</p>
+
+ <h2>{{ _("Run") }}</h2>
+
+ <p>By default GNUnet looks in our home directory for the file
+ ~/.config/gnunet.conf. We can start with an empty file for now:</p>
+
+ <p><code>
+ > touch ~/.config/gnunet.conf
+ </code></p>
+ <br />
+ <p>
+ It's reccomended that you increase your bandwidth restrictions
+ from the acutely low defaults. The example below sets the WAN
+ and LAN limits to the value "unlimited".
+ </p>
+ <br />
+ <code>
+ $ gnunet-config -s ats -o WAN_QUOTA_IN -V unlimited<br />
+ $ gnunet-config -s ats -o WAN_QUOTA_OUT -V unlimited<br />
+ $ gnunet-config -s ats -o LAN_QUOTA_IN -V unlimited<br />
+ $ gnunet-config -s ats -o LAN_QUOTA_OUT -V unlimited<br />
+ </code>
+ <br />
+ <p>Now we can start it with the commandline tool gnunet-arm (Automatic
Restart
+ Manager).</p>
+
+ <p><code>
+ > gnunet-arm -s
+ </code></p>
+
+ <p>It starts the default GNUnet services. We can list them with the -I
option:</p>
+
+ <p><code>
+ > gnunet-arm -I<br>
+ Running services:<br>
+ ats (gnunet-service-ats)<br>
+ revocation (gnunet-service-revocation)<br>
+ set (gnunet-service-set)<br>
+ nat (gnunet-service-nat)<br>
+ transport (gnunet-service-transport)<br>
+ peerstore (gnunet-service-peerstore)<br>
+ hostlist (gnunet-daemon-hostlist)<br>
+ identity (gnunet-service-identity)<br>
+ namecache (gnunet-service-namecache)<br>
+ peerinfo (gnunet-service-peerinfo)<br>
+ datastore (gnunet-service-datastore)<br>
+ zonemaster (gnunet-service-zonemaster)<br>
+ zonemaster-monitor (gnunet-service-zonemaster-monitor)<br>
+ nse (gnunet-service-nse)<br>
+ cadet (gnunet-service-cadet)<br>
+ dht (gnunet-service-dht)<br>
+ core (gnunet-service-core)<br>
+ gns (gnunet-service-gns)<br>
+ statistics (gnunet-service-statistics)<br>
+ topology (gnunet-daemon-topology)<br>
+ fs (gnunet-service-fs)<br>
+ namestore (gnunet-service-namestore)<br>
+ vpn (gnunet-service-vpn)<br>
+ </code></p>
+
+ <p>For stopping GNUnet again we can use the -e option.</p>
+
+ <p><code>
+ > gnunet-arm -e
+ </code></p>
+
+ <h2>{{ _("Make sure, it works!") }}</h2>
<p>
- Please head over here: <a href="https://gnunet.org/en/use.html";>Use!</a>
+ Please head over here: <a
href="https://gnunet.org/en/use.html";>Use!</a>
<p>
-</section>
-</div>
+</article>
{% endblock body_content %}
diff --git a/template/install-on-debian9.html.j2
b/template/install-on-debian9.html.j2
index beffdcf..9641964 100644
--- a/template/install-on-debian9.html.j2
+++ b/template/install-on-debian9.html.j2
@@ -1,11 +1,12 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
+<article class="container">
- <h2>{{ _("Tutorial: GNUnet on Debian 9") }}</h2>
-
- <h3>{{ _("Introduction") }}</h3>
+ <header>
+ <h1>{{ _("Tutorial: GNUnet on Debian 9") }}</h1>
+ </header>
+ <h2>{{ _("Introduction") }}</h2>
<p>
Welcome to the hopefully painless GNUnet tutorial for Debian 9! It provides
very concrete instructions on how to compile, install and configure a
current
@@ -25,7 +26,7 @@
Now let's start!
</p>
- <h3>{{ _("Requirements") }}</h3>
+ <h2>{{ _("Requirements") }}</h2>
<p>
First let's install the following Debian 9 packages to use GNUnet
@@ -41,7 +42,7 @@
openssl libnss3-tools libopus-dev libpulse-dev libogg-dev
</code>
- <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
@@ -55,7 +56,7 @@
$ mkdir ~/gnunet_installation
</code>
- <h3>{{ _("Get the source code") }}</h3>
+ <h2>{{ _("Get the source code") }}</h2>
<p>
We download the GNUnet source code using git. On Debian 9 we need the
@@ -74,7 +75,7 @@
$ git clone --depth 1 https://gnunet.org/git/libmicrohttpd.git
</code>
- <h3>{{ _("Compile and Install") }}</h3>
+ <h2>{{ _("Compile and Install") }}</h2>
<p>
@@ -99,7 +100,7 @@
production version.
</p>
- <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
+ <h3>{{ _("Option 1: GNUnet for production / usage") }}</h3>
<code>
$ cd ~/gnunet_installation/gnunet<br>
@@ -111,7 +112,7 @@
$ sudo make install
</code>
- <h4>{{ _("Option 2: GNUnet for development") }}</h4>
+ <h3>{{ _("Option 2: GNUnet for development") }}</h3>
<code>
$ cd ~/gnunet_installation/gnunet<br>
@@ -122,7 +123,7 @@
$ sudo make install
</code>
- <h4>{{ _("Option 3: gnunet-gtk") }}</h4>
+ <h3>{{ _("Option 3: gnunet-gtk") }}</h3>
<p>
Installing the Gtk+-based graphical user
interface can be done on top of either the production or development
installation.
@@ -138,7 +139,7 @@
</code>
<!--
- <h4>{{ _("Install GNUnet plugin for name resolution") }}</h4>
+ <h3>{{ _("Install GNUnet plugin for name resolution") }}</h3>
<p>
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
@@ -192,7 +193,7 @@
<p>That's it. It wasn't that nasty, was it?</p>
-->
- <h3>{{ _("Configuration") }}</h3>
+ <h2>{{ _("Configuration") }}</h2>
<p>
Congratulations! GNUnet is now installed! Before we start it we
@@ -268,14 +269,12 @@
$ gnunet-arm -e
</code>
-<section>
- <h3>{{ _("Use GNUnet!") }}</h3>
- <p>
- Please head over here: <a href="https://gnunet.org/en/use.html";>Use!</a>
- <p>
-</section>
+ <h2>{{ _("Use GNUnet!") }}</h2>
+ <p>
+ Please head over here: <a href="https://gnunet.org/en/use.html";>Use!</a>
+ <p>
- <h3>{{ _("Uninstall GNUnet and its dependencies") }}</h3>
+ <h2>{{ _("Uninstall GNUnet and its dependencies") }}</h2>
<code>
$ cd ~/gnunet_installation/gnunet<br>
@@ -291,9 +290,9 @@
$ sudo rm /lib/$(uname -m)-linux-gnu/libnss_gns.so.2
</code>
- <h3>{{ _("Troubleshooting") }}</h3>
+ <h2>{{ _("Troubleshooting") }}</h2>
- <h4>{{ _("You can't reach other people's nodes") }}</h4>
+ <h3>{{ _("You can't reach other people's nodes") }}</h3>
<p>
Should our computer not have reached the open GNUnet network automatically,
@@ -329,7 +328,7 @@
<!--
- <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
@@ -342,5 +341,5 @@
</code>
-->
-</div>
+</article>
{% endblock body_content %}
diff --git a/template/install-on-macos.html.j2
b/template/install-on-macos.html.j2
index 22ede95..80b1a01 100644
--- a/template/install-on-macos.html.j2
+++ b/template/install-on-macos.html.j2
@@ -1,8 +1,11 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
+<article class="container">
+
+ <header>
+ <h1>{{ _("Tutorial: GNUnet on macOS 10.14 (Mojave)") }}</h1>
+ </header>
- <h2>{{ _("Tutorial: GNUnet on macOS 10.14 (Mojave)") }}</h2>
<p>
Welcome to the hopefully painless GNUnet tutorial for macOS Mojave! It
provides
@@ -11,14 +14,14 @@
developers, who want to get in touch with GNUnet for the first time.
</p>
- <h3>{{ _("Requirements") }}</h3>
+ <h2>{{ _("Requirements") }}</h2>
<p>
As a bare minimum, we recommend you install <a
href="https://brew.sh";>homebrew</a> and <a
href="https://developer.apple.com/xcode/";>XCode</a> before reading any further.
</p>
- <h3>{{ _("Installation") }}</h3>
+ <h2>{{ _("Installation") }}</h2>
<p>
GNUnet is available through homebrew:
</p>
@@ -36,7 +39,7 @@
<a href="https://gnunet.org/bugs";>let us know</a>.
</p>
- <h3>{{_("First steps")}}</h3>
+ <h2>{{_("First steps")}}</h2>
<p>
Congratulations! GNUnet is now installed! Before starting it you
may create a configuration file. By default GNUnet looks in
@@ -116,7 +119,7 @@ vpn (gnunet-service-vpn)
</code>
</p>
- <h3>{{ _("Alternative: Installation from source") }}</h3>
+ <h2>{{ _("Alternative: Installation from source") }}</h2>
<p>
The following instructions are only really interesting for developers
@@ -141,7 +144,7 @@ vpn (gnunet-service-vpn)
</code>
</p>
- <h4>{{ _("Get the source code") }}</h4>
+ <h3>{{ _("Get the source code") }}</h3>
<p>
<code>
$ cd ~<br>
@@ -149,7 +152,7 @@ vpn (gnunet-service-vpn)
</code>
</p>
- <h4>{{ _("Compile and Install") }}</h4>
+ <h3>{{ _("Compile and Install") }}</h3>
<p>
@@ -161,7 +164,7 @@ vpn (gnunet-service-vpn)
production version.
</p>
- <h5>{{ _("Option 1: GNUnet for production / usage") }}</h5>
+ <h4>{{ _("Option 1: GNUnet for production / usage") }}</h4>
<p>
<code>
@@ -194,12 +197,12 @@ vpn (gnunet-service-vpn)
</code>
</p>
- <h5>{{ _("Option 2: GNUnet experimental") }}</h5>
+ <h4>{{ _("Option 2: GNUnet experimental") }}</h4>
<p>
Perform the same steps as for Option 1, but add the configure flat
'--enable-experimental'
</p>
-</div>
+</article>
{% endblock body_content %}
diff --git a/template/install-on-netbsd.html.j2
b/template/install-on-netbsd.html.j2
index 2d58298..aba939b 100644
--- a/template/install-on-netbsd.html.j2
+++ b/template/install-on-netbsd.html.j2
@@ -1,8 +1,10 @@
{% extends "common/base.j2" %}
{% block body_content %}
-<div class="container">
+<article class="container">
- <h2>{{ _("Tutorial: GNUnet on NetBSD 8.0 CURRENT") }}</h2>
+ <header>
+ <h1>{{ _("Tutorial: GNUnet on NetBSD 8.0 CURRENT") }}</h1>
+ </header>
<p>
Welcome to the GNUnet tutorial for NetBSD!
@@ -14,7 +16,7 @@
developers, who want to get in touch with GNUnet for the first time.
</p>
- <h3>{{ _("Requirements") }}</h3>
+ <h2>{{ _("Requirements") }}</h2>
<p>
As a bare minimum, we recommend you install <a
href="http://pkgsrc.org";>pkgsrc</a>. This tutorial assumes you have the CURRENT
version checked out. Additionally you might want to install
<code>devel/git-base</code> and git clone <a
href="http://pkgsrc.org/wip/";>pkgsrc-wip</a> into the <code>wip</code> folder
in your pkgsrc folder:
@@ -25,7 +27,7 @@
$ git clone git://wip.pkgsrc.org/pkgsrc-wip.git wip
</code>
</p>
- <h3>{{ _("Installation") }}</h3>
+ <h2>{{ _("Installation") }}</h2>
<p>
Note: $ stands for commands run as unprivileged user, # for commands run as
root user.
</p>
@@ -97,7 +99,7 @@
Note that the rc.d file which is installed is not yet functional.
</p>
- <h3>{{_("First steps")}}</h3>
+ <h2>{{_("First steps")}}</h2>
<p>
Congratulations! GNUnet is now installed! Before starting it you
may create a configuration file. By default GNUnet looks in
@@ -177,7 +179,7 @@
</code>
</p>
- <h3>{{ _("Alternative: Installation from source") }}</h3>
+ <h2>{{ _("Alternative: Installation from source") }}</h2>
<p>
The following instructions are only really interesting for developers
@@ -219,7 +221,7 @@
</ul>
</p>
- <h4>{{ _("Get the source code") }}</h4>
+ <h3>{{ _("Get the source code") }}</h3>
<p>
<code>
$ cd ~<br>
@@ -227,7 +229,7 @@
</code>
</p>
- <h4>{{ _("Compile and Install") }}</h4>
+ <h3>{{ _("Compile and Install") }}</h3>
<p>
You have a choice between two options:
build the *production version* or *development version*. If
@@ -277,5 +279,5 @@
<p>
This allows you to get more verbose logs when you export
GNUNET_FORCE_LOG=";;;;DEBUG" before you run tests.
</p>
-</div>
+</article>
{% endblock body_content %}
diff --git a/template/install-on-ubuntu1804.html.j2
b/template/install-on-ubuntu1804.html.j2
index 687d786..fb21811 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 %}
diff --git a/template/install.html.j2 b/template/install.html.j2
index ec2a1ab..9911c97 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -7,7 +7,7 @@
</header>
<div class="row container justify-content-center">
- <div class="col">
+ <div class="col-md">
{% trans %}
<p>The following GNUnet installation instructions help you building from
source for your distribution.</p>
<p><i>Please note that the installation process will get much easier
once we have proper packages again (planned for winter 2019).</i></p>
@@ -15,7 +15,7 @@
<a href="https://gnunet.org/en/use";>Check this out!</a> </p>
{% endtrans %}
</div>
- <div class="col">
+ <div class="col-md">
{% trans %}
<p>Please be aware that this project is still in an early alpha
stage when it comes to running software – its not an easy task
@@ -28,15 +28,15 @@
</div>
<div class="row container justify-content-center text-center">
- <div class="col-md-3">
+ <div class="col-md">
<p><a href="install-on-ubuntu1804.html"><img src="{{
url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
<h3>Ubuntu 18.04</h3>
</div>
- <div class="col-md-3">
+ <div class="col-md">
<p><a href="install-on-debian9.html"><img src="{{
url('static/images/debian-logo.svg') }}" class="distro-logo"></a></p>
<h3>Debian 9</h3>
</div>
- <div class="col-md-3">
+ <div class="col-md">
<!-- Not the officially distributed file, but it's the same logo, in
svg. Use this. -->
<p><a href="install-on-netbsd.html"><img src="{{
url('static/images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
<h3>NetBSD</h3>
@@ -44,20 +44,16 @@
</div>
<div class="row container justify-content-center text-center">
- <div class="col-3">
+ <div class="col-md">
<p><a href="install-on-macos.html"><img src="{{
url('static/images/apple-logo.svg') }}" class="distro-logo"></a></p>
<h3>macOS</h3>
</div>
- <div class="col-3">
+ <div class="col-md">
<p><a href="install-on-archpi.html"><img src="{{
url('static/images/archlinux-logo.svg') }}" class="distro-logo"
style="width:300px;height:auto"></a></p>
<h3>Arch-Pi</h3>
</div>
- <!--
- <div class="col-3">
- <p><a href="https://tutorial.gnunet.org/";><img src="{{
url('static/images/gnunet-logo-dark-text.png') }}" class="distro-logo"
alt="GNUnet" /></a></p>
- <h3>C Coding Tutorial for GNUnet</h3>
+ <div class="col-md">
</div>
- -->
</div>
</article>
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [www] branch master updated (c6f26b6 -> eebae0f), gnunet, 2019/07/01
- [GNUnet-SVN] [www] 07/11: install.html: fix layout, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 04/11: Merge branch 'master' of ssh://git.gnunet.org/www, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 01/11: minor fix, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 06/11: fix links for subnav, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 05/11: add menu to use.html; improve menu on gsoc.html; shorten long string, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 08/11: gsoc.html: indent, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 02/11: update po-files, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 09/11: update po-files, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 10/11: simplify, unify, check responsiveness,
gnunet <=
- [GNUnet-SVN] [www] 03/11: Merge branch 'master' of ssh://git.gnunet.org/www, gnunet, 2019/07/01
- [GNUnet-SVN] [www] 11/11: html encode dashes to satisfy po localization, gnunet, 2019/07/01