[GNUnet-SVN] [www] branch master updated (b7e7a95 -> 08724a4)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository www.

    from b7e7a95  re-add favicon.ico
     new 9f6e459  translation fixes
     new 08724a4  resolve conflict

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 template/about.html.j2    |  2 +-
 template/tutorial.html.j2 | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 template/tutorial.html.j2

diff --git a/template/about.html.j2 b/template/about.html.j2
index 199de37..409fe7a 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -88,7 +88,7 @@
       <h3>{{ _("More Resources") }}</h3>
        <p>
        {% trans %}
-       There are much more resources to learn about GNUnet besides the <a 
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>, such as the 
<a href="https://bib.gnunet.org/";>bibliography</a> with papers covering the 
various layers, many <a href="https://gnunet.org/en/video.html";>videos</a> or a 
brief <a href="https://gnunet.org/en/glossary.html";>glossary</a>.
+       There are many more resources to learn about GNUnet besides the <a 
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>, such as the 
<a href="https://bib.gnunet.org/";>bibliography</a> with papers covering the 
various layers, many <a href="https://gnunet.org/en/video.html";>videos</a> or a 
brief <a href="https://gnunet.org/en/glossary.html";>glossary</a>.
        {% endtrans %}
        </p>
        <p>
diff --git a/template/tutorial.html.j2 b/template/tutorial.html.j2
new file mode 100644
index 0000000..f48c7fe
--- /dev/null
+++ b/template/tutorial.html.j2
@@ -0,0 +1,44 @@
+{% extends "common/base.j2" %}
+{% block body_content %}
+<article class="d-flex flex-column p-5 bd-highlight">
+    <header>
+      <h1>{{ _("Install-Tutorials") }}</h1>
+    </header>
+    <p>
+      {% trans %}
+      This page holds various simplified step-by-step tutorials for GNUnet. 
<br>
+       Some of them are not complete, but we find them useful regardless of 
their state. <br>
+       Find much more detailled documentation of the installation options in 
the <a 
href="https://docs.gnunet.org/handbook/gnunet.html#toc-Installing-GNUnet-1";>according
 section</a> of the <a 
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>. 
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+      Please note that the installation process will get much easier once we 
have proper packages again. 
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+      GNUnet installation instructions:
+      <ul>
+        <li><a href="tutorial-ubuntu1804.html">Ubuntu 18.04</a></li>
+        <li><a href="tutorial-archpi.html">Arch-Pi</a></li>
+        <li><a href="tutorial-debian9.html">Debian 9</a></li>
+        <li><a href="tutorial-macos.html">macOS</a></li>
+        <li><a href="tutorial-netbsd.html">NetBSD</a></li>
+      </ul>
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+      <a href="https://tutorial.gnunet.org/";>C Coding Tutorial for GNUnet</a>
+      {% endtrans %}
+    </p>
+    <p>
+      {% trans %}
+       Once the installation is done, please head over to the <a 
href="https://gnunet.org/en/use";>"How to use GNUnet"-page</a> to get a brief 
intro on what can be done with your installation. <br>
+       As usual get much more detailled instructions and information in the <a 
href="https://docs.gnunet.org/handbook/gnunet.html#toc-Using-GNUnet-1";>according
 section</a> of the <a 
href="https://docs.gnunet.org/handbook/gnunet.html";>handbook</a>.
+       If you have any queries about the installation or the usage, please <a 
href="https://gnunet.org/en/engage.html";>get in touch!</a>
+      {% endtrans %}
+    </p>
+</article>
+{% endblock body_content %}

-- 
To stop receiving notification emails like this one, please contact
address@hidden.