[www] branch stable updated (592abb8 -> 215fc46)

[gnunet]

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

dold pushed a change to branch stable
in repository www.

    from 592abb8  Merge branch 'master' of git+ssh://gnunet.org/www
     add 3d1c49b  fix RSS generation, include full body
     add 7939728  fix dead links
     add 5cc6cb6  rss
     add 215fc46  rss: article tag is ok as description root tag

No new revisions were added by this update.

Summary of changes:
 common/header.j2.inc     |  2 +-
 inc                      |  2 +-
 template/about.html.j2   | 12 ++++++------
 template/install.html.j2 | 12 ++++++------
 template/rss.xml.j2      |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/header.j2.inc b/common/header.j2.inc
index 9d797fe..b97c9ee 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -55,7 +55,7 @@
       <script 
src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js";></script>
     <![endif]-->
 
-    <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" 
href="{{ url_localized('news/rss.xml') }}" />
+    <link rel="alternate" type="application/rss+xml" title="GNUnet.org rss" 
href="{{ url_localized('rss.xml') }}" />
 
     <!-- opengraph -->
     <!--
diff --git a/inc b/inc
index 9e9363e..2b72c7f 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 9e9363ec2797fcb51f998ce6e388eb9877e8788c
+Subproject commit 2b72c7f57d318271856f992eb2e58c133ae5179e
diff --git a/template/about.html.j2 b/template/about.html.j2
index be9a729..5dee5c2 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -115,7 +115,7 @@
             {% endtrans %}
             <br>
             <a href="https://nlnet.nl/";>NLnet Foundation</a><br>
-            <img src="{{ url('static/images/nlnet_logo.gif') }}" alt="NLnet 
logo">
+            <img src="{{ url('images/nlnet_logo.gif') }}" alt="NLnet logo">
             </p>
           </li>
           <li>
@@ -132,7 +132,7 @@
             {% endtrans %}
             <br>
             <a href="https://wiki.geant.org/display/NGITrust/";>GEANT NGI 
TRUST</a><br>
-            <img style="width: 35%" src="{{ url('static/images/ngi_trust.png') 
}}" alt="NGI TRUST logo">
+            <img style="width: 35%" src="{{ url('images/ngi_trust.png') }}" 
alt="NGI TRUST logo">
             </p>
           </li>
 
@@ -156,25 +156,25 @@
           <li>
             <p>
             <a href="https://renewablefreedom.org/";>Renewable Freedom 
Foundation / Stiftung Erneuerbare Freiheit</a><br>
-            <img src="{{ url('static/images/rff_logo.png') }}" alt="RFF logo">
+            <img src="{{ url('images/rff_logo.png') }}" alt="RFF logo">
             </p>
           </li>
           <li>
             <p>
             <a href="https://cordis.europa.eu/fp7/";>European Commission 
(FP7)</a><br>
-            <img src="{{ url('static/images/fp7_logo.jpg') }}" alt="FP7 logo">
+            <img src="{{ url('images/fp7_logo.jpg') }}" alt="FP7 logo">
             </p>
           </li>
           <li>
             <p>
             <a href="http://www.dfg.de/";>Deutsche 
Forschungsgemeinschaft</a><br>
-            <img src="{{ url('static/images/dfg_logo.gif') }}" alt="DFG logo">
+            <img src="{{ url('images/dfg_logo.gif') }}" alt="DFG logo">
             </p>
           </li>
           <li>
             <p>
             <a href="https://nlnet.nl/";>NLnet Foundation</a><br>
-            <img src="{{ url('static/images/nlnet_logo.gif') }}" alt="NLnet 
logo">
+            <img src="{{ url('images/nlnet_logo.gif') }}" alt="NLnet logo">
             </p>
           </li>
         </ul>
diff --git a/template/install.html.j2 b/template/install.html.j2
index baae090..87f80ea 100644
--- a/template/install.html.j2
+++ b/template/install.html.j2
@@ -153,15 +153,15 @@ If you have any queries about the installation or the 
usage, please <a href="eng
 <!--
   <div class="row container justify-content-center text-center">
     <div class="col-md">
-      <p><a href="install-on-ubuntu1804.html"><img src="{{ 
url('static/images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
+      <p><a href="install-on-ubuntu1804.html"><img src="{{ 
url('images/ubuntu-logo32.png') }}" class="distro-logo"></a></p>
       <h3>Ubuntu 18.04</h3>
     </div>
     <div class="col-md">
-      <p><a href="install-on-debian9.html"><img src="{{ 
url('static/images/debian-logo.svg') }}" class="distro-logo"></a></p>
+      <p><a href="install-on-debian9.html"><img src="{{ 
url('images/debian-logo.svg') }}" class="distro-logo"></a></p>
       <h3>Debian 9</h3>
     </div>
     <div class="col-md">
-      <p><a href="install-on-netbsd.html"><img src="{{ 
url('static/images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
+      <p><a href="install-on-netbsd.html"><img src="{{ 
url('images/NetBSD_Logo.svg') }}" class="distro-logo"></a></p>
       <h3>NetBSD</h3>
     </div>
   </div>
@@ -171,15 +171,15 @@ If you have any queries about the installation or the 
usage, please <a href="eng
       <h1><a href="install-on-macos.html">Apple<br/>macOS</a></h1>
     </div>
     <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>
+      <p><a href="install-on-archpi.html"><img src="{{ 
url('images/archlinux-logo.svg') }}" class="distro-logo" 
style="width:300px;height:auto"></a></p>
       <h3>Arch Linux/Arch-Pi</h3>
     </div>
     <div class="col-md">
-      <p><a href="install-on-openwrt.html"><img src ="{{ 
url('static/images/openwrt-logo.svg') }}" class="distro-logo" 
style="width:300px;height:auto"></a></p>
+      <p><a href="install-on-openwrt.html"><img src ="{{ 
url('images/openwrt-logo.svg') }}" class="distro-logo" 
style="width:300px;height:auto"></a></p>
       <h3>OpenWrt</h3>
     </div>
     <div class="col-md">
-      <p><a 
href="https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet";><img 
alt="gentoo linux" src ="{{ url('static/images/gentoo-logo.svg') }}" 
class="distro-logo" style="width:170px;height:auto"></a></p>
+      <p><a 
href="https://wiki.gentoo.org/wiki/Overlay:Youbroketheinternet";><img 
alt="gentoo linux" src ="{{ url('images/gentoo-logo.svg') }}" 
class="distro-logo" style="width:170px;height:auto"></a></p>
     </div>
   </div>
 -->
diff --git a/template/rss.xml.j2 b/template/rss.xml.j2
index 3ffe6d3..d0197c0 100644
--- a/template/rss.xml.j2
+++ b/template/rss.xml.j2
@@ -35,9 +35,9 @@
         <title>{{ newspostitem['title']|e }}</title>
         <description>
           <![CDATA[
-           <article>
-             {{ get_abstract(newspostitem['page'], 1000) }}
-           </article>
+             {% filter extract_body %}
+             {% include (newspostitem['page'] + ".j2") %}
+             {% endfilter %}
            ]]>
         </description>
       </item>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.