Merge branch 'master' of git+ssh://gnunet.org/www

4 files changed, 53 insertions, 30 deletions

diff --git a/.mailmap b/.mailmap
index 017cc9a6..386cebe6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,5 @@
-ng0 <ng0@n0.is>
-ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org>
+nikita <nikita@n0.is>
+nikita <nikita@n0.is> ng0@n0.is <ng0@n0.is>
+nikita <nikita@n0.is> ng0 <ng0@n0.is>
+nikita <nikita@n0.is> Nils Gillmann <ng0@n0.is>
+nikita <nikita@n0.is> Nils Gillmann <gillmann@infotropique.org>
diff --git a/common/header.j2.inc b/common/header.j2.inc
index 2f809854..9d797fed 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -56,3 +56,21 @@
     <![endif]-->
 
     <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" href="{{ url_localized('news/rss.xml') }}" />
+
+    <!-- opengraph -->
+    <!--
+      We do not actively use Twitter or endorse it, but people might
+      use our posts there or other websites might conform to the
+      twitter namespace of the opengraph. More opengraph must be
+      implemented in the sitecode.
+      -->
+    <meta name="twitter:card" content="article" />
+    <meta name="twitter:site" content="@gnunet" />
+    <meta name="twitter:creator" content="@gnunet" />
+    {#
+    TODO: Implement the necessary functions.
+    <meta property="og:url" content="{{ url_localized(url) }}" />
+    <meta property="og:title" content="{{ title }}" />
+    <meta property="og:description" content="{{ summary }}" />
+    <meta property="og:image" content="" />
+    #}
diff --git a/template/gnurl.html.j2 b/template/gnurl.html.j2
index c502de71..c9c5d8ba 100644
--- a/template/gnurl.html.j2
+++ b/template/gnurl.html.j2
@@ -28,9 +28,9 @@
           </p>
           <p>
             {% trans %}
-              Our main usecase is for GNUnet, but it might be usable
-              for others, hence we&#39;re releasing the code to the
-              general public.
+              Our main usecase is for GNUnet and Taler, but it might
+              be usable for others, hence we&#39;re releasing the code
+              to the general public.
             {% endtrans %}
           </p>
           <p>
@@ -129,8 +129,9 @@
               my mood. Note that this pretty much CANNOT be done without a fork, as
               renaming is an essential part of the fix. Now, there might be creative
               solutions to achieve the same thing within the standard cURL build
-              system, but I'm not happy to wait for a decade for Daniel to review
-              the patches. The changes libgnurl makes to curl are miniscule and can
+              system, but this was deemed to be too much work when
+              gnurl was originally started.
+              The changes libgnurl makes to curl are miniscule and can
               easily be applied again and again whenever libcurl makes a new
               release.
             {% endtrans %}
@@ -210,7 +211,7 @@
             {% trans %}
               Releases are published on <a href="https://ftpmirror.gnu.org/gnu/gnunet/">ftpmirror.gnu.org/gnu/gnunet</a>.
               gnurl is available from within a variety of distributions and package managers.
-              Package Managers which include gnurl are:
+              Some Package Managers which include gnurl are:
               <a href="https://www.gnu.org/software/guix/">GNU Guix</a> (available as "gnurl"),
               <a href="https://gentoo.org">Gentoo</a> through the collaborative ebuild collection
               <a href="https://git.gnunet.org/youbroketheinternet-overlay.git/">youbroketheinternet</a>,
@@ -266,7 +267,7 @@
             {% trans %}
               Fetch the signature key from
             {% endtrans %}
-            <a href="https://keys.openpgp.org/search?q=ng0%40n0.is">keys.openpgp.org</a>
+            <a href="https://keys.openpgp.org/search?q=nikita%40NetBSD.org">keys.openpgp.org</a>
             {% trans %}
               or via commandline with gnupg2.
             {% endtrans %}
@@ -395,10 +396,9 @@
           <p>
             {% trans %}
               gnurl/libgnurl is maintained by Nikita.
-              Releases are signed with the OpenPGP Key
-              <b>A88C8ADD129828D7EAC02E52E22F9BBFEE348588</b>,
-              with the key fingerprint
-              <b>A88C 8ADD 1298 28D7 EAC0  2E52 E22F 9BBF EE34 8588</b>.
+              Releases after version 7.69.1 are signed with the OpenPGP Key
+              <b>0xD6B570842F7E7F8D</b> (<a href="https://keys.openpgp.org/search?q=6115012DEA3026F62A98A556D6B570842F7E7F8D">keys.openpgp.org</a>, <a href="https://n0.is/pubkey.asc">n0.is</a>), with the key fingerprint
+              <b>6115 012D EA30 26F6 2A98  A556 D6B5 7084 2F7E 7F8D</b>.
             {% endtrans %}
           </p>
         </div>
diff --git a/template/install-on-archpi.html.j2 b/template/install-on-archpi.html.j2
index 00c8dc50..99702600 100644
--- a/template/install-on-archpi.html.j2
+++ b/template/install-on-archpi.html.j2
@@ -16,8 +16,8 @@
   <h2>{{ _("Requirements for Raspberry Pi 3") }}</h2>
 
   <p>First you need the hardware. This tutorial works with a Raspberry Pi 3 or
-  any Arch Linux system. The other Pi versions I haven't tested, but they should
-  probably work, too. To install Arch Linux on the Pi3, follow the instructions
+  any Arch Linux system. The other Pi versions have not been tested, but they
+  should work, too. To install Arch Linux on the Pi3, follow the instructions
   from <a
   href="https://archlinuxarm.org/platforms/armv8/broadcom/raspberry-pi-3">archlinuxarm.org</a>.</p>
 
@@ -25,7 +25,7 @@
   install the tools for building new software.</p>
 
   <p><code>
-  > sudo pacman -S base-devel
+  $ sudo pacman -S base-devel
   </code></p>
 
   <p>Now we can continue to install the following Arch Linux dependencies to
@@ -43,18 +43,18 @@
   in the next step:<p>
 
   <p><code>
-  > git clone https://gnunet.org/git/gnunet.git<br>
+  $ git clone https://gnunet.org/git/gnunet.git<br>
   </code></p>
 
   <p>Now it's time to compile and install GNUnet.</p>
 
   <p><code>
-  > cd gnunet<br>
-  > export GNUNET_PREFIX=/usr # for example, other locations possible<br>
-  > ./bootstrap # Run this to generate the configure files.<br>
-  > ./configure --prefix=$GNUNET_PREFIX --disable-documentation # Use --help to see the various flags available to you.<br>
-  > make -j$(nproc || echo -n 1)<br>
-  > sudo make install<br>
+  $ cd gnunet<br>
+  $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br>
+  $ ./bootstrap # Run this to generate the configure files.<br>
+  $ ./configure --prefix=$GNUNET_PREFIX # 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>
@@ -66,14 +66,16 @@
   <p><code>
   $ pacman -Su gtk3 glade
   </code></p>
+  <p><code>
+  $ git clone https://gnunet.org/git/gnunet-gtk.git<br>
+  </code></p>
   <code>
     $ cd ../gnunet-gtk<br>
     $ ./bootstrap<br>
-    $ export GNUNET_PREFIX=/usr # for example, other locations possible
-    $ export CFLAGS="-g -Wall -O0"<br>
+    $ export GNUNET_PREFIX=/usr/local # for example, other locations possible<br>
     $ ./configure --prefix=$GNUNET_PREFIX --with-gnunet=$GNUNET_PREFIX<br>
     $ make -j$(nproc || echo -n 1)<br>
-    $ sudo make install
+    $ sudo make install<br>
   </code>
 
   <h2>{{ _("Run") }}</h2>
@@ -82,20 +84,20 @@
   ~/.config/gnunet.conf. We can start with an empty file for now:</p>
 
   <p><code>
-  > touch ~/.config/gnunet.conf
+  $ touch ~/.config/gnunet.conf
   </code></p>
    <br />
   <p>Now we can start it with the commandline tool gnunet-arm (Automatic Restart
   Manager).</p>
 
   <p><code>
-  > gnunet-arm -s
+  $ 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>
+  $ gnunet-arm -I<br>
   Running services:<br>
   ats (gnunet-service-ats)<br>
   revocation (gnunet-service-revocation)<br>
@@ -125,7 +127,7 @@
   <p>For stopping GNUnet again we can use the -e option.</p>
 
   <p><code>
-  > gnunet-arm -e
+  $ gnunet-arm -e
   </code></p>
 
   <h2>{{ _("Make sure, it works!") }}</h2>